From 8b5af84230bccb145c9604d102e333f869682a93 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 26 Jan 2020 15:07:31 +0000 Subject: [PATCH] StatsSet properly named as StatSet. --- .../ai/areas/BeastFarm/ImprovedBabyPets.java | 6 +- .../ai/areas/FairySettlement/Wisp.java | 6 +- .../EntrancePortalToCrystalCaverns.java | 4 +- .../ai/areas/SeedOfHellfire/Zofan.java | 4 +- .../areas/TalkingIsland/Walkers/Allada.java | 4 +- .../ai/areas/TalkingIsland/Walkers/Mei.java | 4 +- .../areas/TalkingIsland/Walkers/Remons.java | 4 +- .../ai/areas/TalkingIsland/Walkers/Rinne.java | 4 +- .../areas/TalkingIsland/Walkers/Rotina.java | 4 +- .../ai/areas/TalkingIsland/Walkers/Soros.java | 4 +- .../ElmoredenServantsGhost.java | 4 +- .../data/scripts/ai/bosses/Anakim/Anakim.java | 8 +- .../scripts/ai/bosses/Antharas/Antharas.java | 6 +- .../data/scripts/ai/bosses/Baium/Baium.java | 6 +- .../scripts/ai/bosses/Balok/BalokWarzone.java | 4 +- .../ai/bosses/Baylor/BaylorWarzone.java | 4 +- .../data/scripts/ai/bosses/Beleth/Beleth.java | 8 +- .../data/scripts/ai/bosses/Core/Core.java | 8 +- .../IceQueensCastleBattle.java | 8 +- .../ai/bosses/Istina/IstinaCavern.java | 14 +- .../ai/bosses/Kimerian/KimerianCommon.java | 8 +- .../data/scripts/ai/bosses/Lilith/Lilith.java | 8 +- .../scripts/ai/bosses/Lindvior/Lindvior.java | 10 +- .../ai/bosses/Lindvior/LionelHunter.java | 4 +- .../ai/bosses/Octavis/OctavisWarzone.java | 10 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 8 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 8 +- .../ai/bosses/Spezion/Cannon/Cannon.java | 4 +- .../ai/bosses/Teredor/TeredorWarzone.java | 14 +- .../scripts/ai/bosses/Trasken/Trasken.java | 8 +- .../scripts/ai/bosses/Valakas/Valakas.java | 8 +- .../Zaken/CavernOfThePirateCaptain.java | 6 +- .../data/scripts/ai/others/AreaSkillNpc.java | 4 +- .../CastleTeleporter/CastleTeleporter.java | 6 +- .../others/NpcBuffers/NpcBufferSkillData.java | 4 +- .../ai/others/NpcBuffers/NpcBuffersData.java | 6 +- .../scripts/ai/others/Servitors/ClanFlag.java | 4 +- .../Servitors/GateOfUnlimitedSummoning.java | 4 +- .../ai/others/Servitors/TreeOfLife.java | 4 +- .../ai/others/TersisHerald/TersisHerald.java | 4 +- .../admincommandhandlers/AdminGrandBoss.java | 4 +- .../admincommandhandlers/AdminOlympiad.java | 14 +- .../conditions/CategoryTypeCondition.java | 4 +- .../conditions/NpcLevelCondition.java | 4 +- .../conditions/PlayerLevelCondition.java | 4 +- .../effecthandlers/AbnormalShield.java | 4 +- .../effecthandlers/AbnormalTimeChange.java | 4 +- .../handlers/effecthandlers/AbsorbDamage.java | 4 +- .../AbstractConditionalHpEffect.java | 4 +- .../effecthandlers/AbstractStatAddEffect.java | 4 +- .../effecthandlers/AbstractStatEffect.java | 6 +- .../AbstractStatPercentEffect.java | 4 +- .../handlers/effecthandlers/Accuracy.java | 4 +- .../handlers/effecthandlers/AddHate.java | 4 +- .../effecthandlers/AddSkillBySkill.java | 4 +- .../AddTeleportBookmarkSlot.java | 4 +- .../effecthandlers/AdditionalPotionCp.java | 4 +- .../effecthandlers/AdditionalPotionHp.java | 4 +- .../effecthandlers/AdditionalPotionMp.java | 4 +- .../handlers/effecthandlers/AirBind.java | 4 +- .../handlers/effecthandlers/AreaDamage.java | 4 +- .../effecthandlers/AttackAttribute.java | 4 +- .../effecthandlers/AttackAttributeAdd.java | 4 +- .../handlers/effecthandlers/AttackBehind.java | 4 +- .../handlers/effecthandlers/AttackTrait.java | 4 +- .../handlers/effecthandlers/Backstab.java | 4 +- .../handlers/effecthandlers/Betray.java | 4 +- .../handlers/effecthandlers/Blink.java | 4 +- .../handlers/effecthandlers/BlinkSwap.java | 4 +- .../effecthandlers/BlockAbnormalSlot.java | 4 +- .../handlers/effecthandlers/BlockAction.java | 4 +- .../handlers/effecthandlers/BlockActions.java | 4 +- .../handlers/effecthandlers/BlockChat.java | 4 +- .../handlers/effecthandlers/BlockControl.java | 4 +- .../handlers/effecthandlers/BlockEscape.java | 4 +- .../handlers/effecthandlers/BlockMove.java | 4 +- .../handlers/effecthandlers/BlockParty.java | 4 +- .../effecthandlers/BlockResurrection.java | 4 +- .../handlers/effecthandlers/BlockSkill.java | 4 +- .../handlers/effecthandlers/BlockTarget.java | 4 +- .../handlers/effecthandlers/Bluff.java | 4 +- .../effecthandlers/BonusDropAmount.java | 4 +- .../effecthandlers/BonusDropRate.java | 4 +- .../effecthandlers/BonusSpoilRate.java | 4 +- .../handlers/effecthandlers/Breath.java | 4 +- .../handlers/effecthandlers/BuffBlock.java | 4 +- .../effecthandlers/CallLearnedSkill.java | 4 +- .../handlers/effecthandlers/CallParty.java | 4 +- .../handlers/effecthandlers/CallPc.java | 4 +- .../effecthandlers/CallRandomSkill.java | 4 +- .../handlers/effecthandlers/CallSkill.java | 4 +- .../effecthandlers/CallSkillOnActionTime.java | 4 +- .../effecthandlers/CallTargetParty.java | 4 +- .../effecthandlers/ChameleonRest.java | 4 +- .../handlers/effecthandlers/ChangeBody.java | 6 +- .../handlers/effecthandlers/ChangeFace.java | 4 +- .../effecthandlers/ChangeFishingMastery.java | 4 +- .../effecthandlers/ChangeHairColor.java | 4 +- .../effecthandlers/ChangeHairStyle.java | 4 +- .../handlers/effecthandlers/CheapShot.java | 4 +- .../handlers/effecthandlers/ClassChange.java | 4 +- .../handlers/effecthandlers/Compelling.java | 4 +- .../handlers/effecthandlers/Confuse.java | 4 +- .../handlers/effecthandlers/ConsumeBody.java | 4 +- .../handlers/effecthandlers/ConvertItem.java | 4 +- .../effecthandlers/CounterPhysicalSkill.java | 4 +- .../scripts/handlers/effecthandlers/Cp.java | 4 +- .../handlers/effecthandlers/CpHeal.java | 4 +- .../effecthandlers/CpHealOverTime.java | 4 +- .../effecthandlers/CpHealPercent.java | 4 +- .../handlers/effecthandlers/CpRegen.java | 4 +- .../effecthandlers/CriticalDamage.java | 4 +- .../CriticalDamagePosition.java | 4 +- .../handlers/effecthandlers/CriticalRate.java | 4 +- .../CriticalRatePositionBonus.java | 4 +- .../effecthandlers/CrystalGradeModify.java | 4 +- .../handlers/effecthandlers/CubicMastery.java | 4 +- .../handlers/effecthandlers/DamOverTime.java | 4 +- .../effecthandlers/DamOverTimePercent.java | 4 +- .../handlers/effecthandlers/DamageBlock.java | 4 +- .../effecthandlers/DamageByAttack.java | 4 +- .../handlers/effecthandlers/DamageShield.java | 4 +- .../effecthandlers/DamageShieldResist.java | 4 +- .../handlers/effecthandlers/DeathLink.java | 4 +- .../handlers/effecthandlers/DebuffBlock.java | 4 +- .../effecthandlers/DefenceAttribute.java | 4 +- .../effecthandlers/DefenceCriticalDamage.java | 4 +- .../effecthandlers/DefenceCriticalRate.java | 4 +- .../DefenceMagicCriticalDamage.java | 4 +- .../DefenceMagicCriticalRate.java | 4 +- .../handlers/effecthandlers/DefenceTrait.java | 4 +- .../handlers/effecthandlers/DeleteHate.java | 4 +- .../effecthandlers/DeleteHateOfMe.java | 4 +- .../effecthandlers/DeleteTopAgro.java | 4 +- .../effecthandlers/DetectHiddenObjects.java | 4 +- .../handlers/effecthandlers/Detection.java | 4 +- .../handlers/effecthandlers/DisableSkill.java | 4 +- .../effecthandlers/DisableTargeting.java | 4 +- .../handlers/effecthandlers/Disarm.java | 4 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 4 +- .../effecthandlers/DispelByCategory.java | 4 +- .../handlers/effecthandlers/DispelBySlot.java | 4 +- .../effecthandlers/DispelBySlotMyself.java | 4 +- .../DispelBySlotProbability.java | 4 +- .../handlers/effecthandlers/DoubleCast.java | 4 +- .../handlers/effecthandlers/DuelistFury.java | 4 +- .../handlers/effecthandlers/EnableCloak.java | 4 +- .../handlers/effecthandlers/EnergyAttack.java | 4 +- .../effecthandlers/EnlargeAbnormalSlot.java | 4 +- .../handlers/effecthandlers/EnlargeSlot.java | 4 +- .../handlers/effecthandlers/Escape.java | 4 +- .../handlers/effecthandlers/ExpModify.java | 4 +- .../handlers/effecthandlers/Faceoff.java | 4 +- .../handlers/effecthandlers/FakeDeath.java | 4 +- .../handlers/effecthandlers/FatalBlow.java | 4 +- .../effecthandlers/FatalBlowRate.java | 4 +- .../scripts/handlers/effecthandlers/Fear.java | 4 +- .../scripts/handlers/effecthandlers/Feed.java | 4 +- .../effecthandlers/FishingExpSpBonus.java | 4 +- .../scripts/handlers/effecthandlers/Flag.java | 4 +- .../handlers/effecthandlers/FlipBlock.java | 4 +- .../handlers/effecthandlers/FlyAway.java | 4 +- .../handlers/effecthandlers/FocusEnergy.java | 4 +- .../effecthandlers/FocusMaxMomentum.java | 4 +- .../effecthandlers/FocusMomentum.java | 4 +- .../handlers/effecthandlers/FocusSouls.java | 4 +- .../handlers/effecthandlers/GetAgro.java | 4 +- .../effecthandlers/GetDamageLimit.java | 4 +- .../handlers/effecthandlers/GetMomentum.java | 4 +- .../effecthandlers/GiveClanReputation.java | 4 +- .../handlers/effecthandlers/GiveExpAndSp.java | 4 +- .../handlers/effecthandlers/GiveFame.java | 4 +- .../effecthandlers/GiveRecommendation.java | 4 +- .../handlers/effecthandlers/GiveSp.java | 4 +- .../handlers/effecthandlers/GiveXp.java | 4 +- .../scripts/handlers/effecthandlers/Grow.java | 4 +- .../effecthandlers/HairAccessorySet.java | 4 +- .../handlers/effecthandlers/Harvesting.java | 4 +- .../handlers/effecthandlers/HateAttack.java | 4 +- .../effecthandlers/HeadquarterCreate.java | 4 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealEffect.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 4 +- .../handlers/effecthandlers/HealPercent.java | 4 +- .../scripts/handlers/effecthandlers/Hide.java | 4 +- .../handlers/effecthandlers/HitAtNight.java | 4 +- .../handlers/effecthandlers/HitNumber.java | 4 +- .../scripts/handlers/effecthandlers/Hp.java | 4 +- .../handlers/effecthandlers/HpByLevel.java | 4 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../effecthandlers/HpCpHealCritical.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 4 +- .../handlers/effecthandlers/HpRegen.java | 4 +- .../handlers/effecthandlers/HpToOwner.java | 4 +- .../handlers/effecthandlers/IgnoreDeath.java | 4 +- .../effecthandlers/ImmobilePetBuff.java | 4 +- .../effecthandlers/InstantKillResist.java | 4 +- .../handlers/effecthandlers/JewelSlot.java | 4 +- .../handlers/effecthandlers/KarmaCount.java | 4 +- .../handlers/effecthandlers/KnockBack.java | 4 +- .../handlers/effecthandlers/Lethal.java | 4 +- .../handlers/effecthandlers/LimitCp.java | 4 +- .../handlers/effecthandlers/LimitHp.java | 4 +- .../handlers/effecthandlers/LimitMp.java | 4 +- .../handlers/effecthandlers/Lucky.java | 4 +- .../scripts/handlers/effecthandlers/MAtk.java | 4 +- .../effecthandlers/MagicAccuracy.java | 4 +- .../effecthandlers/MagicCriticalDamage.java | 4 +- .../effecthandlers/MagicCriticalRate.java | 4 +- .../handlers/effecthandlers/MagicMpCost.java | 4 +- .../MagicalAbnormalDispelAttack.java | 4 +- .../effecthandlers/MagicalAbnormalResist.java | 4 +- .../effecthandlers/MagicalAttack.java | 4 +- .../MagicalAttackByAbnormal.java | 4 +- .../MagicalAttackByAbnormalSlot.java | 4 +- .../effecthandlers/MagicalAttackMp.java | 4 +- .../effecthandlers/MagicalAttackRange.java | 4 +- .../effecthandlers/MagicalAttackSpeed.java | 4 +- .../effecthandlers/MagicalDamOverTime.java | 4 +- .../effecthandlers/MagicalDefence.java | 4 +- .../effecthandlers/MagicalEvasion.java | 4 +- .../effecthandlers/MagicalSkillPower.java | 4 +- .../effecthandlers/MagicalSoulAttack.java | 4 +- .../handlers/effecthandlers/ManaCharge.java | 4 +- .../effecthandlers/ManaDamOverTime.java | 4 +- .../handlers/effecthandlers/ManaHeal.java | 4 +- .../effecthandlers/ManaHealByLevel.java | 4 +- .../effecthandlers/ManaHealOverTime.java | 4 +- .../effecthandlers/ManaHealPercent.java | 4 +- .../handlers/effecthandlers/MaxCp.java | 4 +- .../handlers/effecthandlers/MaxHp.java | 4 +- .../handlers/effecthandlers/MaxMp.java | 4 +- .../handlers/effecthandlers/ModifyVital.java | 4 +- .../scripts/handlers/effecthandlers/Mp.java | 4 +- .../effecthandlers/MpConsumePerLevel.java | 4 +- .../handlers/effecthandlers/MpRegen.java | 4 +- .../handlers/effecthandlers/MpShield.java | 4 +- .../effecthandlers/MpVampiricAttack.java | 4 +- .../scripts/handlers/effecthandlers/Mute.java | 4 +- .../effecthandlers/NoblesseBless.java | 4 +- .../handlers/effecthandlers/OpenChest.java | 4 +- .../effecthandlers/OpenCommonRecipeBook.java | 4 +- .../handlers/effecthandlers/OpenDoor.java | 4 +- .../effecthandlers/OpenDwarfRecipeBook.java | 4 +- .../scripts/handlers/effecthandlers/PAtk.java | 4 +- .../handlers/effecthandlers/Passive.java | 4 +- .../PhysicalAbnormalResist.java | 4 +- .../effecthandlers/PhysicalAttack.java | 4 +- .../effecthandlers/PhysicalAttackHpLink.java | 4 +- .../effecthandlers/PhysicalAttackMute.java | 4 +- .../effecthandlers/PhysicalAttackRange.java | 4 +- .../effecthandlers/PhysicalAttackSaveHp.java | 4 +- .../effecthandlers/PhysicalAttackSpeed.java | 4 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../effecthandlers/PhysicalDefence.java | 4 +- .../effecthandlers/PhysicalEvasion.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 4 +- .../PhysicalShieldAngleAll.java | 4 +- .../effecthandlers/PhysicalSkillPower.java | 4 +- .../effecthandlers/PhysicalSoulAttack.java | 4 +- .../handlers/effecthandlers/PkCount.java | 4 +- .../handlers/effecthandlers/Plunder.java | 4 +- .../effecthandlers/PolearmSingleTarget.java | 4 +- .../effecthandlers/ProtectDeathPenalty.java | 4 +- .../effecthandlers/ProtectionBlessing.java | 4 +- .../handlers/effecthandlers/PullBack.java | 4 +- .../PveMagicalSkillDamageBonus.java | 4 +- .../PveMagicalSkillDefenceBonus.java | 4 +- .../PvePhysicalAttackDamageBonus.java | 4 +- .../PvePhysicalAttackDefenceBonus.java | 4 +- .../PvePhysicalSkillDamageBonus.java | 4 +- .../PvePhysicalSkillDefenceBonus.java | 4 +- .../PveRaidMagicalSkillDefenceBonus.java | 4 +- .../PveRaidPhysicalAttackDefenceBonus.java | 4 +- .../PveRaidPhysicalSkillDefenceBonus.java | 4 +- .../PvpMagicalSkillDamageBonus.java | 4 +- .../PvpMagicalSkillDefenceBonus.java | 4 +- .../PvpPhysicalAttackDamageBonus.java | 4 +- .../PvpPhysicalAttackDefenceBonus.java | 4 +- .../PvpPhysicalSkillDamageBonus.java | 4 +- .../PvpPhysicalSkillDefenceBonus.java | 4 +- .../effecthandlers/RandomizeHate.java | 4 +- .../handlers/effecthandlers/RealDamage.java | 4 +- .../handlers/effecthandlers/RearDamage.java | 4 +- .../handlers/effecthandlers/RebalanceHP.java | 4 +- .../effecthandlers/RebalanceHPSummon.java | 4 +- .../RecoverVitalityInPeaceZone.java | 4 +- .../handlers/effecthandlers/Recovery.java | 4 +- .../handlers/effecthandlers/ReduceCancel.java | 4 +- .../handlers/effecthandlers/ReduceDamage.java | 4 +- .../effecthandlers/ReduceDropPenalty.java | 4 +- .../handlers/effecthandlers/ReflectMagic.java | 4 +- .../handlers/effecthandlers/ReflectSkill.java | 4 +- .../effecthandlers/RefuelAirship.java | 4 +- .../handlers/effecthandlers/Relax.java | 4 +- .../effecthandlers/ResetInstanceEntry.java | 4 +- .../ResistAbnormalByCategory.java | 4 +- .../effecthandlers/ResistDDMagic.java | 4 +- .../ResistDispelByCategory.java | 4 +- .../handlers/effecthandlers/ResistSkill.java | 4 +- .../handlers/effecthandlers/Restoration.java | 4 +- .../effecthandlers/RestorationRandom.java | 8 +- .../handlers/effecthandlers/Resurrection.java | 4 +- .../effecthandlers/ResurrectionSpecial.java | 4 +- .../handlers/effecthandlers/Reuse.java | 4 +- .../effecthandlers/ReuseSkillById.java | 4 +- .../scripts/handlers/effecthandlers/Root.java | 4 +- .../effecthandlers/SacrificeSummon.java | 4 +- .../effecthandlers/SafeFallHeight.java | 4 +- .../SendSystemMessageToClan.java | 4 +- .../effecthandlers/ServitorShare.java | 4 +- .../handlers/effecthandlers/SetHp.java | 4 +- .../handlers/effecthandlers/SetSkill.java | 4 +- .../effecthandlers/ShieldDefence.java | 4 +- .../effecthandlers/ShieldDefenceRate.java | 4 +- .../handlers/effecthandlers/SilentMove.java | 4 +- .../effecthandlers/SkillCritical.java | 4 +- .../effecthandlers/SkillCriticalDamage.java | 4 +- .../SkillCriticalProbability.java | 4 +- .../handlers/effecthandlers/SkillEvasion.java | 4 +- .../effecthandlers/SkillPowerAdd.java | 4 +- .../handlers/effecthandlers/SkillTurning.java | 4 +- .../effecthandlers/SkillTurningOverTime.java | 4 +- .../handlers/effecthandlers/SoulBlow.java | 4 +- .../handlers/effecthandlers/SoulEating.java | 4 +- .../scripts/handlers/effecthandlers/Sow.java | 4 +- .../handlers/effecthandlers/SpModify.java | 4 +- .../handlers/effecthandlers/Speed.java | 4 +- .../effecthandlers/SphericBarrier.java | 4 +- .../handlers/effecthandlers/Spoil.java | 4 +- .../StatBonusSkillCritical.java | 4 +- .../effecthandlers/StatBonusSpeed.java | 4 +- .../effecthandlers/StatByMoveType.java | 4 +- .../handlers/effecthandlers/StatUp.java | 4 +- .../effecthandlers/StealAbnormal.java | 4 +- .../handlers/effecthandlers/Summon.java | 4 +- .../effecthandlers/SummonAgathion.java | 4 +- .../handlers/effecthandlers/SummonCubic.java | 4 +- .../effecthandlers/SummonHallucination.java | 4 +- .../handlers/effecthandlers/SummonMulti.java | 4 +- .../handlers/effecthandlers/SummonNpc.java | 4 +- .../handlers/effecthandlers/SummonPet.java | 4 +- .../handlers/effecthandlers/SummonPoints.java | 4 +- .../handlers/effecthandlers/SummonTrap.java | 4 +- .../handlers/effecthandlers/Sweeper.java | 4 +- .../handlers/effecthandlers/Synergy.java | 4 +- .../handlers/effecthandlers/TakeCastle.java | 4 +- .../effecthandlers/TakeCastleStart.java | 4 +- .../handlers/effecthandlers/TakeFort.java | 4 +- .../effecthandlers/TakeFortStart.java | 4 +- .../handlers/effecthandlers/TalismanSlot.java | 4 +- .../handlers/effecthandlers/TargetCancel.java | 4 +- .../handlers/effecthandlers/TargetMe.java | 4 +- .../effecthandlers/TargetMeProbability.java | 4 +- .../handlers/effecthandlers/Teleport.java | 4 +- .../effecthandlers/TeleportToNpc.java | 4 +- .../effecthandlers/TeleportToPlayer.java | 4 +- .../effecthandlers/TeleportToSummon.java | 4 +- .../effecthandlers/TeleportToTarget.java | 4 +- .../TransferDamageToPlayer.java | 4 +- .../TransferDamageToSummon.java | 4 +- .../handlers/effecthandlers/TransferHate.java | 4 +- .../effecthandlers/Transformation.java | 4 +- .../handlers/effecthandlers/TrapDetect.java | 4 +- .../handlers/effecthandlers/TrapRemove.java | 4 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 4 +- .../effecthandlers/TriggerSkillByDamage.java | 4 +- .../TriggerSkillByDeathBlow.java | 4 +- .../effecthandlers/TriggerSkillByKill.java | 4 +- .../TriggerSkillByMagicType.java | 4 +- .../effecthandlers/TriggerSkillBySkill.java | 4 +- .../TriggerSkillBySkillAttack.java | 4 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 4 +- .../effecthandlers/UnsummonAgathion.java | 4 +- .../effecthandlers/UnsummonServitors.java | 4 +- .../handlers/effecthandlers/Untargetable.java | 4 +- .../effecthandlers/VampiricAttack.java | 4 +- .../effecthandlers/VampiricDefence.java | 4 +- .../effecthandlers/VitalityExpRate.java | 4 +- .../effecthandlers/VitalityPointUp.java | 4 +- .../effecthandlers/VitalityPointsRate.java | 4 +- .../handlers/effecthandlers/WeightLimit.java | 4 +- .../effecthandlers/WeightPenalty.java | 4 +- .../effecthandlers/WorldChatPoints.java | 4 +- .../BuildAdvanceBaseSkillCondition.java | 4 +- .../BuildCampSkillCondition.java | 4 +- ...CanAddMaxEntranceInzoneSkillCondition.java | 4 +- .../CanBookmarkAddSlotSkillCondition.java | 4 +- ...CanChangeVitalItemCountSkillCondition.java | 4 +- .../CanEnchantAttributeSkillCondition.java | 4 +- .../CanMountForEventSkillCondition.java | 4 +- .../CanRefuelAirshipSkillCondition.java | 4 +- .../CanRestoreVitalPointSkillCondition.java | 4 +- .../CanSummonCubicSkillCondition.java | 4 +- .../CanSummonMultiSkillCondition.java | 4 +- .../CanSummonPetSkillCondition.java | 4 +- .../CanSummonSiegeGolemSkillCondition.java | 4 +- .../CanSummonSkillCondition.java | 4 +- .../CanTransformInDominionSkillCondition.java | 4 +- .../CanTransformSkillCondition.java | 4 +- .../CanUntransformSkillCondition.java | 4 +- .../CanUseInBattlefieldSkillCondition.java | 4 +- .../CanUseInDragonLairSkillCondition.java | 4 +- .../CanUseSwoopCannonSkillCondition.java | 4 +- ...nUseVitalityConsumeItemSkillCondition.java | 4 +- .../CannotUseInTransformSkillCondition.java | 4 +- .../CheckLevelSkillCondition.java | 4 +- .../CheckSexSkillCondition.java | 4 +- .../ConsumeBodySkillCondition.java | 4 +- .../EnergySavedSkillCondition.java | 4 +- .../EquipArmorSkillCondition.java | 4 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../NotFearedSkillCondition.java | 4 +- .../NotInUnderwaterSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 4 +- .../OpAffectedBySkillSkillCondition.java | 4 +- .../OpAgathionEnergySkillCondition.java | 4 +- .../OpAlignmentSkillCondition.java | 4 +- .../OpBlinkSkillCondition.java | 4 +- .../OpCallPcSkillCondition.java | 4 +- .../OpCanEscapeSkillCondition.java | 4 +- .../OpCanNotUseAirshipSkillCondition.java | 4 +- ...eTargetWithPrivateStoreSkillCondition.java | 4 +- .../OpChangeWeaponSkillCondition.java | 4 +- .../OpCheckAbnormalSkillCondition.java | 4 +- .../OpCheckAccountTypeSkillCondition.java | 4 +- .../OpCheckCastRangeSkillCondition.java | 4 +- .../OpCheckClassListSkillCondition.java | 4 +- .../OpCheckClassSkillCondition.java | 4 +- .../OpCheckCrtEffectSkillCondition.java | 4 +- .../OpCheckFlagSkillCondition.java | 4 +- ...eckOnGoingEventCampaignSkillCondition.java | 4 +- .../OpCheckPcbangPointSkillCondition.java | 4 +- .../OpCheckResidenceSkillCondition.java | 4 +- .../OpCheckSkillListSkillCondition.java | 4 +- .../OpCheckSkillSkillCondition.java | 4 +- .../OpCompanionSkillCondition.java | 4 +- .../OpEnchantRangeSkillCondition.java | 4 +- .../OpEncumberedSkillCondition.java | 4 +- .../OpEnergyMaxSkillCondition.java | 4 +- .../OpEquipItemSkillCondition.java | 4 +- .../OpExistNpcSkillCondition.java | 4 +- .../OpFishingCastSkillCondition.java | 4 +- .../OpFishingPumpingSkillCondition.java | 4 +- .../OpFishingReelingSkillCondition.java | 4 +- .../OpHaveSummonSkillCondition.java | 4 +- .../OpHaveSummonedNpcSkillCondition.java | 4 +- .../OpHomeSkillCondition.java | 4 +- .../OpInSiegeTimeSkillCondition.java | 4 +- .../OpInstantzoneSkillCondition.java | 4 +- .../OpMainjobSkillCondition.java | 4 +- .../OpNeedAgathionSkillCondition.java | 4 +- .../OpNeedSummonOrPetSkillCondition.java | 4 +- .../OpNotCursedSkillCondition.java | 4 +- .../OpNotInCeremonyOfChaosSkillCondition.java | 4 +- .../OpNotInPeacezoneSkillCondition.java | 4 +- .../OpNotInstantzoneSkillCondition.java | 4 +- .../OpNotOlympiadSkillCondition.java | 4 +- .../OpNotTerritorySkillCondition.java | 4 +- .../OpPeacezoneSkillCondition.java | 4 +- .../OpPkcountSkillCondition.java | 4 +- .../OpPledgeSkillCondition.java | 4 +- .../OpRestartPointSkillCondition.java | 4 +- .../OpResurrectionSkillCondition.java | 4 +- .../OpSiegeHammerSkillCondition.java | 4 +- .../OpSkillAcquireSkillCondition.java | 4 +- .../OpSkillSkillCondition.java | 4 +- .../OpSocialClassSkillCondition.java | 4 +- .../OpSoulMaxSkillCondition.java | 4 +- .../OpSubjobSkillCondition.java | 4 +- .../OpSweeperSkillCondition.java | 4 +- .../OpTargetAllItemTypeSkillCondition.java | 4 +- .../OpTargetArmorTypeSkillCondition.java | 4 +- .../OpTargetDoorSkillCondition.java | 4 +- ...OpTargetMyPledgeAcademySkillCondition.java | 4 +- .../OpTargetNpcSkillCondition.java | 4 +- .../OpTargetPcSkillCondition.java | 4 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../OpTerritorySkillCondition.java | 4 +- .../OpUnlockSkillCondition.java | 4 +- .../OpUseFirecrackerSkillCondition.java | 4 +- .../OpUsePraseedSkillCondition.java | 4 +- .../OpWyvernSkillCondition.java | 4 +- .../PossessHolythingSkillCondition.java | 4 +- .../RemainCpPerSkillCondition.java | 4 +- .../RemainHpPerSkillCondition.java | 4 +- .../RemainMpPerSkillCondition.java | 4 +- .../SoulSavedSkillCondition.java | 4 +- .../TargetItemCrystalTypeSkillCondition.java | 4 +- .../TargetMyMenteeSkillCondition.java | 4 +- .../TargetMyPartySkillCondition.java | 4 +- .../TargetMyPledgeSkillCondition.java | 4 +- .../TargetRaceSkillCondition.java | 4 +- .../ChambersOfDelusion/ChamberOfDelusion.java | 4 +- .../CrystalCavernsCoralGarden.java | 6 +- .../CrystalCavernsEmeraldSquare.java | 14 +- .../CrystalCavernsSteamCorridor.java | 14 +- .../DarkCloudMansion/DarkCloudMansion.java | 4 +- .../FaeronTrainingGrounds1.java | 6 +- .../FaeronTrainingGrounds2.java | 6 +- .../HarnakUndergroundRuins.java | 4 +- .../KartiasLabyrinth/KartiaBoss.java | 6 +- .../KartiasLabyrinth/KartiaHelperAdolph.java | 10 +- .../KartiasLabyrinth/KartiaHelperBarton.java | 6 +- .../KartiasLabyrinth/KartiaHelperElise.java | 12 +- .../KartiasLabyrinth/KartiaHelperEliyah.java | 4 +- .../KartiaHelperGuardian.java | 6 +- .../KartiasLabyrinth/KartiaHelperHayuk.java | 6 +- .../KartiasLabyrinth/KartiaSupportTroop.java | 4 +- .../KartiasLabyrinth/KartiasLabyrinth.java | 8 +- .../LabyrinthOfBelis/LabyrinthOfBelis.java | 4 +- .../MemoryOfDisaster/MemoryOfDisaster.java | 4 +- .../scripts/instances/Nursery/Nursery.java | 16 +- .../PailakaInjuredDragon.java | 4 +- .../PrisonOfDarkness/PrisonOfDarkness.java | 12 +- .../TaintedDimension/TaintedDimension.java | 4 +- .../Q10771_VolatilePower.java | 4 +- .../Q10772_ReportsFromCrumaTowerPart1.java | 4 +- .../Q10776_TheWrathOfTheGiants.java | 4 +- .../Q10777_ReportsFromCrumaTowerPart2.java | 4 +- .../Q10787_ASpyMission.java | 4 +- .../gameserver/data/xml/impl/ActionData.java | 4 +- .../gameserver/data/xml/impl/AdminData.java | 8 +- .../gameserver/data/xml/impl/AlchemyData.java | 6 +- .../data/xml/impl/AppearanceItemData.java | 6 +- .../data/xml/impl/BeautyShopData.java | 10 +- .../data/xml/impl/ClanHallData.java | 4 +- .../data/xml/impl/CombinationItemsData.java | 4 +- .../gameserver/data/xml/impl/CubicData.java | 6 +- .../gameserver/data/xml/impl/DoorData.java | 14 +- .../data/xml/impl/EnchantItemData.java | 8 +- .../data/xml/impl/EnchantSkillGroupsData.java | 6 +- .../data/xml/impl/EventEngineData.java | 12 +- .../data/xml/impl/ExtendDropData.java | 26 +- .../data/xml/impl/FakePlayerData.java | 4 +- .../gameserver/data/xml/impl/FenceData.java | 4 +- .../gameserver/data/xml/impl/HennaData.java | 4 +- .../data/xml/impl/InitialEquipmentData.java | 4 +- .../data/xml/impl/LuckyGameData.java | 10 +- .../data/xml/impl/MultisellData.java | 4 +- .../gameserver/data/xml/impl/NpcData.java | 8 +- .../xml/impl/NpcNameLocalisationData.java | 4 +- .../gameserver/data/xml/impl/OptionData.java | 4 +- .../data/xml/impl/PetDataTable.java | 4 +- .../data/xml/impl/PlayerTemplateData.java | 4 +- .../data/xml/impl/PrimeShopData.java | 4 +- .../gameserver/data/xml/impl/RecipeData.java | 4 +- .../data/xml/impl/ResidenceFunctionsData.java | 6 +- .../xml/impl/SendMessageLocalisationData.java | 4 +- .../gameserver/data/xml/impl/ShuttleData.java | 8 +- .../data/xml/impl/SiegeScheduleData.java | 6 +- .../gameserver/data/xml/impl/SkillData.java | 86 +- .../data/xml/impl/SkillTreesData.java | 4 +- .../gameserver/data/xml/impl/SpawnsData.java | 16 +- .../data/xml/impl/StaticObjectData.java | 8 +- .../data/xml/impl/TeleportersData.java | 4 +- .../data/xml/impl/TransformData.java | 6 +- .../gameserver/engines/DocumentBase.java | 8 +- .../engines/DocumentBaseGeneral.java | 4 +- .../engines/items/DocumentItem.java | 8 +- .../engines/items/ItemDataHolder.java | 4 +- .../gameserver/handler/ConditionHandler.java | 8 +- .../gameserver/handler/EffectHandler.java | 8 +- .../handler/SkillConditionHandler.java | 8 +- .../instancemanager/AirShipManager.java | 18 +- .../instancemanager/BoatManager.java | 4 +- .../instancemanager/CastleManorManager.java | 6 +- .../CeremonyOfChaosManager.java | 6 +- .../instancemanager/DBSpawnManager.java | 20 +- .../FakePlayerChatManager.java | 4 +- .../instancemanager/GrandBossManager.java | 16 +- .../instancemanager/InstanceManager.java | 20 +- .../gameserver/model/AccessLevel.java | 2 +- .../gameserver/model/ActionDataHolder.java | 2 +- .../model/AdminCommandAccessRight.java | 2 +- .../l2jmobius/gameserver/model/Location.java | 2 +- .../gameserver/model/PetLevelData.java | 2 +- .../gameserver/model/RecipeList.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../gameserver/model/SiegeScheduleDate.java | 2 +- .../gameserver/model/SkillLearn.java | 2 +- .../model/{StatsSet.java => StatSet.java} | 42 +- .../l2jmobius/gameserver/model/actor/Npc.java | 10 +- .../actor/templates/CreatureTemplate.java | 6 +- .../model/actor/templates/CubicTemplate.java | 4 +- .../model/actor/templates/DoorTemplate.java | 4 +- .../model/actor/templates/NpcTemplate.java | 14 +- .../model/actor/templates/PlayerTemplate.java | 4 +- .../model/actor/transform/Transform.java | 4 +- .../actor/transform/TransformLevelData.java | 4 +- .../actor/transform/TransformTemplate.java | 4 +- .../model/alchemy/AlchemyCraftData.java | 4 +- .../model/beautyshop/BeautyItem.java | 6 +- .../ceremonyofchaos/CeremonyOfChaosEvent.java | 8 +- .../gameserver/model/cubic/CubicSkill.java | 4 +- .../gameserver/model/entity/ClanHall.java | 4 +- .../gameserver/model/entity/Hero.java | 70 +- .../eventengine/AbstractEventManager.java | 10 +- .../model/eventengine/EventScheduler.java | 4 +- .../model/events/AbstractScript.java | 6 +- .../model/events/TimerExecutor.java | 8 +- .../model/events/timers/TimerHolder.java | 8 +- .../model/holders/AppearanceHolder.java | 4 +- .../model/holders/AttachSkillHolder.java | 4 +- .../model/holders/EnchantSkillHolder.java | 4 +- .../model/holders/ExtendDropDataHolder.java | 4 +- .../model/holders/FakePlayerHolder.java | 4 +- .../gameserver/model/holders/ItemHolder.java | 4 +- .../model/holders/ItemPointHolder.java | 4 +- .../model/holders/LuckyGameDataHolder.java | 4 +- .../model/holders/MinionHolder.java | 4 +- .../model/holders/MultisellListHolder.java | 4 +- .../model/instancezone/Instance.java | 8 +- .../model/instancezone/InstanceTemplate.java | 10 +- .../instancezone/conditions/Condition.java | 8 +- .../conditions/ConditionCommandChannel.java | 4 +- .../ConditionCommandChannelLeader.java | 4 +- .../conditions/ConditionDistance.java | 4 +- .../conditions/ConditionGroupMax.java | 4 +- .../conditions/ConditionGroupMin.java | 4 +- .../conditions/ConditionHasResidence.java | 6 +- .../conditions/ConditionItem.java | 4 +- .../conditions/ConditionLevel.java | 4 +- .../conditions/ConditionNoParty.java | 4 +- .../conditions/ConditionParty.java | 4 +- .../conditions/ConditionPartyLeader.java | 4 +- .../conditions/ConditionQuest.java | 4 +- .../conditions/ConditionReenter.java | 4 +- .../itemauction/AuctionDateGenerator.java | 4 +- .../model/itemauction/AuctionItem.java | 6 +- .../itemauction/ItemAuctionInstance.java | 6 +- .../gameserver/model/items/Armor.java | 8 +- .../gameserver/model/items/EtcItem.java | 8 +- .../gameserver/model/items/Henna.java | 4 +- .../gameserver/model/items/Item.java | 8 +- .../model/items/PlayerItemTemplate.java | 4 +- .../gameserver/model/items/Weapon.java | 8 +- .../items/appearance/AppearanceStone.java | 4 +- .../items/combination/CombinationItem.java | 4 +- .../items/enchant/AbstractEnchantItem.java | 4 +- .../model/items/enchant/EnchantScroll.java | 4 +- .../items/enchant/EnchantSupportItem.java | 4 +- .../gameserver/model/olympiad/Olympiad.java | 38 +- .../model/olympiad/Participant.java | 6 +- .../model/primeshop/PrimeShopGroup.java | 4 +- .../residences/ResidenceFunctionTemplate.java | 4 +- .../model/shuttle/ShuttleDataHolder.java | 4 +- .../gameserver/model/skills/Skill.java | 6 +- .../model/spawns/NpcSpawnTemplate.java | 16 +- .../gameserver/model/spawns/SpawnGroup.java | 12 +- .../model/spawns/SpawnTemplate.java | 12 +- .../model/teleporter/TeleportHolder.java | 4 +- .../model/teleporter/TeleportLocation.java | 4 +- .../model/variables/AbstractVariables.java | 18 +- .../network/serverpackets/ExHeroList.java | 6 +- .../gameserver/util/BypassParser.java | 4 +- .../ai/areas/BeastFarm/ImprovedBabyPets.java | 6 +- .../ai/areas/FairySettlement/Wisp.java | 6 +- .../EntrancePortalToCrystalCaverns.java | 4 +- .../ai/areas/SeedOfHellfire/Zofan.java | 4 +- .../areas/TalkingIsland/Walkers/Allada.java | 4 +- .../ai/areas/TalkingIsland/Walkers/Mei.java | 4 +- .../areas/TalkingIsland/Walkers/Remons.java | 4 +- .../ai/areas/TalkingIsland/Walkers/Rinne.java | 4 +- .../areas/TalkingIsland/Walkers/Rotina.java | 4 +- .../ai/areas/TalkingIsland/Walkers/Soros.java | 4 +- .../ElmoredenServantsGhost.java | 4 +- .../data/scripts/ai/bosses/Anakim/Anakim.java | 8 +- .../scripts/ai/bosses/Antharas/Antharas.java | 6 +- .../data/scripts/ai/bosses/Baium/Baium.java | 6 +- .../scripts/ai/bosses/Balok/BalokWarzone.java | 4 +- .../ai/bosses/Baylor/BaylorWarzone.java | 4 +- .../data/scripts/ai/bosses/Beleth/Beleth.java | 8 +- .../data/scripts/ai/bosses/Core/Core.java | 8 +- .../IceQueensCastleBattle.java | 8 +- .../ai/bosses/Istina/IstinaCavern.java | 14 +- .../data/scripts/ai/bosses/Kelbim/Kelbim.java | 8 +- .../ai/bosses/Kimerian/KimerianCommon.java | 8 +- .../data/scripts/ai/bosses/Lilith/Lilith.java | 8 +- .../scripts/ai/bosses/Lindvior/Lindvior.java | 10 +- .../ai/bosses/Lindvior/LionelHunter.java | 4 +- .../ai/bosses/Octavis/OctavisWarzone.java | 10 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 8 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 8 +- .../ai/bosses/Spezion/Cannon/Cannon.java | 4 +- .../ai/bosses/Teredor/TeredorWarzone.java | 14 +- .../scripts/ai/bosses/Trasken/Trasken.java | 8 +- .../scripts/ai/bosses/Valakas/Valakas.java | 8 +- .../Zaken/CavernOfThePirateCaptain.java | 6 +- .../data/scripts/ai/others/AreaSkillNpc.java | 4 +- .../CastleTeleporter/CastleTeleporter.java | 6 +- .../others/NpcBuffers/NpcBufferSkillData.java | 4 +- .../ai/others/NpcBuffers/NpcBuffersData.java | 6 +- .../scripts/ai/others/Servitors/ClanFlag.java | 4 +- .../Servitors/GateOfUnlimitedSummoning.java | 4 +- .../ai/others/Servitors/TreeOfLife.java | 4 +- .../ai/others/TersisHerald/TersisHerald.java | 4 +- .../admincommandhandlers/AdminGrandBoss.java | 4 +- .../admincommandhandlers/AdminOlympiad.java | 14 +- .../conditions/CategoryTypeCondition.java | 4 +- .../conditions/NpcLevelCondition.java | 4 +- .../conditions/PlayerLevelCondition.java | 4 +- .../effecthandlers/AbnormalShield.java | 4 +- .../effecthandlers/AbnormalTimeChange.java | 4 +- .../handlers/effecthandlers/AbsorbDamage.java | 4 +- .../AbstractConditionalHpEffect.java | 4 +- .../effecthandlers/AbstractStatAddEffect.java | 4 +- .../effecthandlers/AbstractStatEffect.java | 6 +- .../AbstractStatPercentEffect.java | 4 +- .../handlers/effecthandlers/Accuracy.java | 4 +- .../handlers/effecthandlers/AddHate.java | 4 +- .../effecthandlers/AddSkillBySkill.java | 4 +- .../AddTeleportBookmarkSlot.java | 4 +- .../effecthandlers/AdditionalPotionCp.java | 4 +- .../effecthandlers/AdditionalPotionHp.java | 4 +- .../effecthandlers/AdditionalPotionMp.java | 4 +- .../handlers/effecthandlers/AirBind.java | 4 +- .../handlers/effecthandlers/AreaDamage.java | 4 +- .../effecthandlers/AttackAttribute.java | 4 +- .../effecthandlers/AttackAttributeAdd.java | 4 +- .../handlers/effecthandlers/AttackBehind.java | 4 +- .../handlers/effecthandlers/AttackTrait.java | 4 +- .../handlers/effecthandlers/Backstab.java | 4 +- .../handlers/effecthandlers/Betray.java | 4 +- .../handlers/effecthandlers/Blink.java | 4 +- .../handlers/effecthandlers/BlinkSwap.java | 4 +- .../effecthandlers/BlockAbnormalSlot.java | 4 +- .../handlers/effecthandlers/BlockAction.java | 4 +- .../handlers/effecthandlers/BlockActions.java | 4 +- .../handlers/effecthandlers/BlockChat.java | 4 +- .../handlers/effecthandlers/BlockControl.java | 4 +- .../handlers/effecthandlers/BlockEscape.java | 4 +- .../handlers/effecthandlers/BlockMove.java | 4 +- .../handlers/effecthandlers/BlockParty.java | 4 +- .../effecthandlers/BlockResurrection.java | 4 +- .../handlers/effecthandlers/BlockSkill.java | 4 +- .../handlers/effecthandlers/BlockTarget.java | 4 +- .../handlers/effecthandlers/Bluff.java | 4 +- .../effecthandlers/BonusDropAmount.java | 4 +- .../effecthandlers/BonusDropRate.java | 4 +- .../effecthandlers/BonusSpoilRate.java | 4 +- .../handlers/effecthandlers/Breath.java | 4 +- .../handlers/effecthandlers/BuffBlock.java | 4 +- .../effecthandlers/CallLearnedSkill.java | 4 +- .../handlers/effecthandlers/CallParty.java | 4 +- .../handlers/effecthandlers/CallPc.java | 4 +- .../effecthandlers/CallRandomSkill.java | 4 +- .../handlers/effecthandlers/CallSkill.java | 4 +- .../effecthandlers/CallSkillOnActionTime.java | 4 +- .../effecthandlers/CallTargetParty.java | 4 +- .../effecthandlers/ChameleonRest.java | 4 +- .../handlers/effecthandlers/ChangeBody.java | 6 +- .../handlers/effecthandlers/ChangeFace.java | 4 +- .../effecthandlers/ChangeFishingMastery.java | 4 +- .../effecthandlers/ChangeHairColor.java | 4 +- .../effecthandlers/ChangeHairStyle.java | 4 +- .../handlers/effecthandlers/CheapShot.java | 4 +- .../handlers/effecthandlers/ClassChange.java | 4 +- .../handlers/effecthandlers/Compelling.java | 4 +- .../handlers/effecthandlers/Confuse.java | 4 +- .../handlers/effecthandlers/ConsumeBody.java | 4 +- .../handlers/effecthandlers/ConvertItem.java | 4 +- .../effecthandlers/CounterPhysicalSkill.java | 4 +- .../scripts/handlers/effecthandlers/Cp.java | 4 +- .../handlers/effecthandlers/CpHeal.java | 4 +- .../effecthandlers/CpHealOverTime.java | 4 +- .../effecthandlers/CpHealPercent.java | 4 +- .../handlers/effecthandlers/CpRegen.java | 4 +- .../effecthandlers/CriticalDamage.java | 4 +- .../CriticalDamagePosition.java | 4 +- .../handlers/effecthandlers/CriticalRate.java | 4 +- .../CriticalRatePositionBonus.java | 4 +- .../effecthandlers/CrystalGradeModify.java | 4 +- .../handlers/effecthandlers/CubicMastery.java | 4 +- .../handlers/effecthandlers/DamOverTime.java | 4 +- .../effecthandlers/DamOverTimePercent.java | 4 +- .../handlers/effecthandlers/DamageBlock.java | 4 +- .../effecthandlers/DamageByAttack.java | 4 +- .../handlers/effecthandlers/DamageShield.java | 4 +- .../effecthandlers/DamageShieldResist.java | 4 +- .../handlers/effecthandlers/DeathLink.java | 4 +- .../handlers/effecthandlers/DebuffBlock.java | 4 +- .../effecthandlers/DefenceAttribute.java | 4 +- .../effecthandlers/DefenceCriticalDamage.java | 4 +- .../effecthandlers/DefenceCriticalRate.java | 4 +- .../DefenceMagicCriticalDamage.java | 4 +- .../DefenceMagicCriticalRate.java | 4 +- .../handlers/effecthandlers/DefenceTrait.java | 4 +- .../handlers/effecthandlers/DeleteHate.java | 4 +- .../effecthandlers/DeleteHateOfMe.java | 4 +- .../effecthandlers/DeleteTopAgro.java | 4 +- .../effecthandlers/DetectHiddenObjects.java | 4 +- .../handlers/effecthandlers/Detection.java | 4 +- .../handlers/effecthandlers/DisableSkill.java | 4 +- .../effecthandlers/DisableTargeting.java | 4 +- .../handlers/effecthandlers/Disarm.java | 4 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 4 +- .../effecthandlers/DispelByCategory.java | 4 +- .../handlers/effecthandlers/DispelBySlot.java | 4 +- .../effecthandlers/DispelBySlotMyself.java | 4 +- .../DispelBySlotProbability.java | 4 +- .../handlers/effecthandlers/DoubleCast.java | 4 +- .../handlers/effecthandlers/DuelistFury.java | 4 +- .../handlers/effecthandlers/EnableCloak.java | 4 +- .../handlers/effecthandlers/EnergyAttack.java | 4 +- .../effecthandlers/EnlargeAbnormalSlot.java | 4 +- .../handlers/effecthandlers/EnlargeSlot.java | 4 +- .../handlers/effecthandlers/Escape.java | 4 +- .../handlers/effecthandlers/ExpModify.java | 4 +- .../handlers/effecthandlers/Faceoff.java | 4 +- .../handlers/effecthandlers/FakeDeath.java | 4 +- .../handlers/effecthandlers/FatalBlow.java | 4 +- .../effecthandlers/FatalBlowRate.java | 4 +- .../scripts/handlers/effecthandlers/Fear.java | 4 +- .../scripts/handlers/effecthandlers/Feed.java | 4 +- .../effecthandlers/FishingExpSpBonus.java | 4 +- .../scripts/handlers/effecthandlers/Flag.java | 4 +- .../handlers/effecthandlers/FlipBlock.java | 4 +- .../handlers/effecthandlers/FlyAway.java | 4 +- .../handlers/effecthandlers/FocusEnergy.java | 4 +- .../effecthandlers/FocusMaxMomentum.java | 4 +- .../effecthandlers/FocusMomentum.java | 4 +- .../handlers/effecthandlers/FocusSouls.java | 4 +- .../handlers/effecthandlers/GetAgro.java | 4 +- .../effecthandlers/GetDamageLimit.java | 4 +- .../handlers/effecthandlers/GetMomentum.java | 4 +- .../effecthandlers/GiveClanReputation.java | 4 +- .../handlers/effecthandlers/GiveExpAndSp.java | 4 +- .../handlers/effecthandlers/GiveFame.java | 4 +- .../effecthandlers/GiveRecommendation.java | 4 +- .../handlers/effecthandlers/GiveSp.java | 4 +- .../handlers/effecthandlers/GiveXp.java | 4 +- .../scripts/handlers/effecthandlers/Grow.java | 4 +- .../effecthandlers/HairAccessorySet.java | 4 +- .../handlers/effecthandlers/Harvesting.java | 4 +- .../handlers/effecthandlers/HateAttack.java | 4 +- .../effecthandlers/HeadquarterCreate.java | 4 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealEffect.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 4 +- .../handlers/effecthandlers/HealPercent.java | 4 +- .../scripts/handlers/effecthandlers/Hide.java | 4 +- .../handlers/effecthandlers/HitAtNight.java | 4 +- .../handlers/effecthandlers/HitNumber.java | 4 +- .../scripts/handlers/effecthandlers/Hp.java | 4 +- .../handlers/effecthandlers/HpByLevel.java | 4 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../effecthandlers/HpCpHealCritical.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 4 +- .../handlers/effecthandlers/HpRegen.java | 4 +- .../handlers/effecthandlers/HpToOwner.java | 4 +- .../handlers/effecthandlers/IgnoreDeath.java | 4 +- .../effecthandlers/ImmobilePetBuff.java | 4 +- .../effecthandlers/InstantKillResist.java | 4 +- .../handlers/effecthandlers/JewelSlot.java | 4 +- .../handlers/effecthandlers/KarmaCount.java | 4 +- .../handlers/effecthandlers/KnockBack.java | 4 +- .../handlers/effecthandlers/Lethal.java | 4 +- .../handlers/effecthandlers/LimitCp.java | 4 +- .../handlers/effecthandlers/LimitHp.java | 4 +- .../handlers/effecthandlers/LimitMp.java | 4 +- .../handlers/effecthandlers/Lucky.java | 4 +- .../scripts/handlers/effecthandlers/MAtk.java | 4 +- .../effecthandlers/MagicAccuracy.java | 4 +- .../effecthandlers/MagicCriticalDamage.java | 4 +- .../effecthandlers/MagicCriticalRate.java | 4 +- .../handlers/effecthandlers/MagicMpCost.java | 4 +- .../MagicalAbnormalDispelAttack.java | 4 +- .../effecthandlers/MagicalAbnormalResist.java | 4 +- .../effecthandlers/MagicalAttack.java | 4 +- .../MagicalAttackByAbnormal.java | 4 +- .../MagicalAttackByAbnormalSlot.java | 4 +- .../effecthandlers/MagicalAttackMp.java | 4 +- .../effecthandlers/MagicalAttackRange.java | 4 +- .../effecthandlers/MagicalAttackSpeed.java | 4 +- .../effecthandlers/MagicalDamOverTime.java | 4 +- .../effecthandlers/MagicalDefence.java | 4 +- .../effecthandlers/MagicalEvasion.java | 4 +- .../effecthandlers/MagicalSkillPower.java | 4 +- .../effecthandlers/MagicalSoulAttack.java | 4 +- .../handlers/effecthandlers/ManaCharge.java | 4 +- .../effecthandlers/ManaDamOverTime.java | 4 +- .../handlers/effecthandlers/ManaHeal.java | 4 +- .../effecthandlers/ManaHealByLevel.java | 4 +- .../effecthandlers/ManaHealOverTime.java | 4 +- .../effecthandlers/ManaHealPercent.java | 4 +- .../handlers/effecthandlers/MaxCp.java | 4 +- .../handlers/effecthandlers/MaxHp.java | 4 +- .../handlers/effecthandlers/MaxMp.java | 4 +- .../handlers/effecthandlers/ModifyVital.java | 4 +- .../scripts/handlers/effecthandlers/Mp.java | 4 +- .../effecthandlers/MpConsumePerLevel.java | 4 +- .../handlers/effecthandlers/MpRegen.java | 4 +- .../handlers/effecthandlers/MpShield.java | 4 +- .../effecthandlers/MpVampiricAttack.java | 4 +- .../scripts/handlers/effecthandlers/Mute.java | 4 +- .../effecthandlers/NoblesseBless.java | 4 +- .../handlers/effecthandlers/OpenChest.java | 4 +- .../effecthandlers/OpenCommonRecipeBook.java | 4 +- .../handlers/effecthandlers/OpenDoor.java | 4 +- .../effecthandlers/OpenDwarfRecipeBook.java | 4 +- .../scripts/handlers/effecthandlers/PAtk.java | 4 +- .../handlers/effecthandlers/Passive.java | 4 +- .../PhysicalAbnormalResist.java | 4 +- .../effecthandlers/PhysicalAttack.java | 4 +- .../effecthandlers/PhysicalAttackHpLink.java | 4 +- .../effecthandlers/PhysicalAttackMute.java | 4 +- .../effecthandlers/PhysicalAttackRange.java | 4 +- .../effecthandlers/PhysicalAttackSaveHp.java | 4 +- .../effecthandlers/PhysicalAttackSpeed.java | 4 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../effecthandlers/PhysicalDefence.java | 4 +- .../effecthandlers/PhysicalEvasion.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 4 +- .../PhysicalShieldAngleAll.java | 4 +- .../effecthandlers/PhysicalSkillPower.java | 4 +- .../effecthandlers/PhysicalSoulAttack.java | 4 +- .../handlers/effecthandlers/PkCount.java | 4 +- .../handlers/effecthandlers/Plunder.java | 4 +- .../effecthandlers/PolearmSingleTarget.java | 4 +- .../effecthandlers/ProtectDeathPenalty.java | 4 +- .../effecthandlers/ProtectionBlessing.java | 4 +- .../handlers/effecthandlers/PullBack.java | 4 +- .../PveMagicalSkillDamageBonus.java | 4 +- .../PveMagicalSkillDefenceBonus.java | 4 +- .../PvePhysicalAttackDamageBonus.java | 4 +- .../PvePhysicalAttackDefenceBonus.java | 4 +- .../PvePhysicalSkillDamageBonus.java | 4 +- .../PvePhysicalSkillDefenceBonus.java | 4 +- .../PveRaidMagicalSkillDefenceBonus.java | 4 +- .../PveRaidPhysicalAttackDefenceBonus.java | 4 +- .../PveRaidPhysicalSkillDefenceBonus.java | 4 +- .../PvpMagicalSkillDamageBonus.java | 4 +- .../PvpMagicalSkillDefenceBonus.java | 4 +- .../PvpPhysicalAttackDamageBonus.java | 4 +- .../PvpPhysicalAttackDefenceBonus.java | 4 +- .../PvpPhysicalSkillDamageBonus.java | 4 +- .../PvpPhysicalSkillDefenceBonus.java | 4 +- .../effecthandlers/RandomizeHate.java | 4 +- .../handlers/effecthandlers/RealDamage.java | 4 +- .../handlers/effecthandlers/RearDamage.java | 4 +- .../handlers/effecthandlers/RebalanceHP.java | 4 +- .../effecthandlers/RebalanceHPSummon.java | 4 +- .../RecoverVitalityInPeaceZone.java | 4 +- .../handlers/effecthandlers/Recovery.java | 4 +- .../handlers/effecthandlers/ReduceCancel.java | 4 +- .../handlers/effecthandlers/ReduceDamage.java | 4 +- .../effecthandlers/ReduceDropPenalty.java | 4 +- .../handlers/effecthandlers/ReflectMagic.java | 4 +- .../handlers/effecthandlers/ReflectSkill.java | 4 +- .../effecthandlers/RefuelAirship.java | 4 +- .../handlers/effecthandlers/Relax.java | 4 +- .../effecthandlers/ResetInstanceEntry.java | 4 +- .../ResistAbnormalByCategory.java | 4 +- .../effecthandlers/ResistDDMagic.java | 4 +- .../ResistDispelByCategory.java | 4 +- .../handlers/effecthandlers/ResistSkill.java | 4 +- .../handlers/effecthandlers/Restoration.java | 4 +- .../effecthandlers/RestorationRandom.java | 8 +- .../handlers/effecthandlers/Resurrection.java | 4 +- .../effecthandlers/ResurrectionSpecial.java | 4 +- .../handlers/effecthandlers/Reuse.java | 4 +- .../effecthandlers/ReuseSkillById.java | 4 +- .../scripts/handlers/effecthandlers/Root.java | 4 +- .../effecthandlers/SacrificeSummon.java | 4 +- .../effecthandlers/SafeFallHeight.java | 4 +- .../SendSystemMessageToClan.java | 4 +- .../effecthandlers/ServitorShare.java | 4 +- .../handlers/effecthandlers/SetHp.java | 4 +- .../handlers/effecthandlers/SetSkill.java | 4 +- .../effecthandlers/ShieldDefence.java | 4 +- .../effecthandlers/ShieldDefenceRate.java | 4 +- .../handlers/effecthandlers/SilentMove.java | 4 +- .../effecthandlers/SkillCritical.java | 4 +- .../effecthandlers/SkillCriticalDamage.java | 4 +- .../SkillCriticalProbability.java | 4 +- .../handlers/effecthandlers/SkillEvasion.java | 4 +- .../effecthandlers/SkillPowerAdd.java | 4 +- .../handlers/effecthandlers/SkillTurning.java | 4 +- .../effecthandlers/SkillTurningOverTime.java | 4 +- .../handlers/effecthandlers/SoulBlow.java | 4 +- .../handlers/effecthandlers/SoulEating.java | 4 +- .../scripts/handlers/effecthandlers/Sow.java | 4 +- .../handlers/effecthandlers/SpModify.java | 4 +- .../handlers/effecthandlers/Speed.java | 4 +- .../effecthandlers/SphericBarrier.java | 4 +- .../handlers/effecthandlers/Spoil.java | 4 +- .../StatBonusSkillCritical.java | 4 +- .../effecthandlers/StatBonusSpeed.java | 4 +- .../effecthandlers/StatByMoveType.java | 4 +- .../handlers/effecthandlers/StatUp.java | 4 +- .../effecthandlers/StealAbnormal.java | 4 +- .../handlers/effecthandlers/Summon.java | 4 +- .../effecthandlers/SummonAgathion.java | 4 +- .../handlers/effecthandlers/SummonCubic.java | 4 +- .../effecthandlers/SummonHallucination.java | 4 +- .../handlers/effecthandlers/SummonMulti.java | 4 +- .../handlers/effecthandlers/SummonNpc.java | 4 +- .../handlers/effecthandlers/SummonPet.java | 4 +- .../handlers/effecthandlers/SummonPoints.java | 4 +- .../handlers/effecthandlers/SummonTrap.java | 4 +- .../handlers/effecthandlers/Sweeper.java | 4 +- .../handlers/effecthandlers/Synergy.java | 4 +- .../handlers/effecthandlers/TakeCastle.java | 4 +- .../effecthandlers/TakeCastleStart.java | 4 +- .../handlers/effecthandlers/TakeFort.java | 4 +- .../effecthandlers/TakeFortStart.java | 4 +- .../handlers/effecthandlers/TalismanSlot.java | 4 +- .../handlers/effecthandlers/TargetCancel.java | 4 +- .../handlers/effecthandlers/TargetMe.java | 4 +- .../effecthandlers/TargetMeProbability.java | 4 +- .../handlers/effecthandlers/Teleport.java | 4 +- .../effecthandlers/TeleportToNpc.java | 4 +- .../effecthandlers/TeleportToPlayer.java | 4 +- .../effecthandlers/TeleportToSummon.java | 4 +- .../effecthandlers/TeleportToTarget.java | 4 +- .../TransferDamageToPlayer.java | 4 +- .../TransferDamageToSummon.java | 4 +- .../handlers/effecthandlers/TransferHate.java | 4 +- .../effecthandlers/Transformation.java | 4 +- .../handlers/effecthandlers/TrapDetect.java | 4 +- .../handlers/effecthandlers/TrapRemove.java | 4 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 4 +- .../effecthandlers/TriggerSkillByDamage.java | 4 +- .../TriggerSkillByDeathBlow.java | 4 +- .../effecthandlers/TriggerSkillByKill.java | 4 +- .../TriggerSkillByMagicType.java | 4 +- .../effecthandlers/TriggerSkillBySkill.java | 4 +- .../TriggerSkillBySkillAttack.java | 4 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 4 +- .../effecthandlers/UnsummonAgathion.java | 4 +- .../effecthandlers/UnsummonServitors.java | 4 +- .../handlers/effecthandlers/Untargetable.java | 4 +- .../effecthandlers/VampiricAttack.java | 4 +- .../effecthandlers/VampiricDefence.java | 4 +- .../effecthandlers/VitalityExpRate.java | 4 +- .../effecthandlers/VitalityPointUp.java | 4 +- .../effecthandlers/VitalityPointsRate.java | 4 +- .../handlers/effecthandlers/WeightLimit.java | 4 +- .../effecthandlers/WeightPenalty.java | 4 +- .../effecthandlers/WorldChatPoints.java | 4 +- .../BuildAdvanceBaseSkillCondition.java | 4 +- .../BuildCampSkillCondition.java | 4 +- ...CanAddMaxEntranceInzoneSkillCondition.java | 4 +- .../CanBookmarkAddSlotSkillCondition.java | 4 +- ...CanChangeVitalItemCountSkillCondition.java | 4 +- .../CanEnchantAttributeSkillCondition.java | 4 +- .../CanMountForEventSkillCondition.java | 4 +- .../CanRefuelAirshipSkillCondition.java | 4 +- .../CanRestoreVitalPointSkillCondition.java | 4 +- .../CanSummonCubicSkillCondition.java | 4 +- .../CanSummonMultiSkillCondition.java | 4 +- .../CanSummonPetSkillCondition.java | 4 +- .../CanSummonSiegeGolemSkillCondition.java | 4 +- .../CanSummonSkillCondition.java | 4 +- .../CanTransformInDominionSkillCondition.java | 4 +- .../CanTransformSkillCondition.java | 4 +- .../CanUntransformSkillCondition.java | 4 +- .../CanUseInBattlefieldSkillCondition.java | 4 +- .../CanUseInDragonLairSkillCondition.java | 4 +- .../CanUseSwoopCannonSkillCondition.java | 4 +- ...nUseVitalityConsumeItemSkillCondition.java | 4 +- .../CannotUseInTransformSkillCondition.java | 4 +- .../CheckLevelSkillCondition.java | 4 +- .../CheckSexSkillCondition.java | 4 +- .../ConsumeBodySkillCondition.java | 4 +- .../EnergySavedSkillCondition.java | 4 +- .../EquipArmorSkillCondition.java | 4 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../NotFearedSkillCondition.java | 4 +- .../NotInUnderwaterSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 4 +- .../OpAffectedBySkillSkillCondition.java | 4 +- .../OpAgathionEnergySkillCondition.java | 4 +- .../OpAlignmentSkillCondition.java | 4 +- .../OpBlinkSkillCondition.java | 4 +- .../OpCallPcSkillCondition.java | 4 +- .../OpCanEscapeSkillCondition.java | 4 +- .../OpCanNotUseAirshipSkillCondition.java | 4 +- ...eTargetWithPrivateStoreSkillCondition.java | 4 +- .../OpChangeWeaponSkillCondition.java | 4 +- .../OpCheckAbnormalSkillCondition.java | 4 +- .../OpCheckAccountTypeSkillCondition.java | 4 +- .../OpCheckCastRangeSkillCondition.java | 4 +- .../OpCheckClassListSkillCondition.java | 4 +- .../OpCheckClassSkillCondition.java | 4 +- .../OpCheckCrtEffectSkillCondition.java | 4 +- .../OpCheckFlagSkillCondition.java | 4 +- ...eckOnGoingEventCampaignSkillCondition.java | 4 +- .../OpCheckPcbangPointSkillCondition.java | 4 +- .../OpCheckResidenceSkillCondition.java | 4 +- .../OpCheckSkillListSkillCondition.java | 4 +- .../OpCheckSkillSkillCondition.java | 4 +- .../OpCompanionSkillCondition.java | 4 +- .../OpEnchantRangeSkillCondition.java | 4 +- .../OpEncumberedSkillCondition.java | 4 +- .../OpEnergyMaxSkillCondition.java | 4 +- .../OpEquipItemSkillCondition.java | 4 +- .../OpExistNpcSkillCondition.java | 4 +- .../OpFishingCastSkillCondition.java | 4 +- .../OpFishingPumpingSkillCondition.java | 4 +- .../OpFishingReelingSkillCondition.java | 4 +- .../OpHaveSummonSkillCondition.java | 4 +- .../OpHaveSummonedNpcSkillCondition.java | 4 +- .../OpHomeSkillCondition.java | 4 +- .../OpInSiegeTimeSkillCondition.java | 4 +- .../OpInstantzoneSkillCondition.java | 4 +- .../OpMainjobSkillCondition.java | 4 +- .../OpNeedAgathionSkillCondition.java | 4 +- .../OpNeedSummonOrPetSkillCondition.java | 4 +- .../OpNotCursedSkillCondition.java | 4 +- .../OpNotInCeremonyOfChaosSkillCondition.java | 4 +- .../OpNotInPeacezoneSkillCondition.java | 4 +- .../OpNotInstantzoneSkillCondition.java | 4 +- .../OpNotOlympiadSkillCondition.java | 4 +- .../OpNotTerritorySkillCondition.java | 4 +- .../OpPeacezoneSkillCondition.java | 4 +- .../OpPkcountSkillCondition.java | 4 +- .../OpPledgeSkillCondition.java | 4 +- .../OpRestartPointSkillCondition.java | 4 +- .../OpResurrectionSkillCondition.java | 4 +- .../OpSiegeHammerSkillCondition.java | 4 +- .../OpSkillAcquireSkillCondition.java | 4 +- .../OpSkillSkillCondition.java | 4 +- .../OpSocialClassSkillCondition.java | 4 +- .../OpSoulMaxSkillCondition.java | 4 +- .../OpSubjobSkillCondition.java | 4 +- .../OpSweeperSkillCondition.java | 4 +- .../OpTargetAllItemTypeSkillCondition.java | 4 +- .../OpTargetArmorTypeSkillCondition.java | 4 +- .../OpTargetDoorSkillCondition.java | 4 +- ...OpTargetMyPledgeAcademySkillCondition.java | 4 +- .../OpTargetNpcSkillCondition.java | 4 +- .../OpTargetPcSkillCondition.java | 4 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../OpTerritorySkillCondition.java | 4 +- .../OpUnlockSkillCondition.java | 4 +- .../OpUseFirecrackerSkillCondition.java | 4 +- .../OpUsePraseedSkillCondition.java | 4 +- .../OpWyvernSkillCondition.java | 4 +- .../PossessHolythingSkillCondition.java | 4 +- .../RemainCpPerSkillCondition.java | 4 +- .../RemainHpPerSkillCondition.java | 4 +- .../RemainMpPerSkillCondition.java | 4 +- .../SoulSavedSkillCondition.java | 4 +- .../TargetItemCrystalTypeSkillCondition.java | 4 +- .../TargetMyMenteeSkillCondition.java | 4 +- .../TargetMyPartySkillCondition.java | 4 +- .../TargetMyPledgeSkillCondition.java | 4 +- .../TargetRaceSkillCondition.java | 4 +- .../ChambersOfDelusion/ChamberOfDelusion.java | 4 +- .../CrystalCavernsCoralGarden.java | 6 +- .../CrystalCavernsEmeraldSquare.java | 14 +- .../CrystalCavernsSteamCorridor.java | 14 +- .../DarkCloudMansion/DarkCloudMansion.java | 4 +- .../FaeronTrainingGrounds1.java | 6 +- .../FaeronTrainingGrounds2.java | 6 +- .../HarnakUndergroundRuins.java | 4 +- .../KartiasLabyrinth/KartiaBoss.java | 6 +- .../KartiasLabyrinth/KartiaHelperAdolph.java | 10 +- .../KartiasLabyrinth/KartiaHelperBarton.java | 6 +- .../KartiasLabyrinth/KartiaHelperElise.java | 12 +- .../KartiasLabyrinth/KartiaHelperEliyah.java | 4 +- .../KartiaHelperGuardian.java | 6 +- .../KartiasLabyrinth/KartiaHelperHayuk.java | 6 +- .../KartiasLabyrinth/KartiaSupportTroop.java | 4 +- .../KartiasLabyrinth/KartiasLabyrinth.java | 8 +- .../LabyrinthOfBelis/LabyrinthOfBelis.java | 4 +- .../MemoryOfDisaster/MemoryOfDisaster.java | 4 +- .../scripts/instances/Nursery/Nursery.java | 16 +- .../PailakaInjuredDragon.java | 4 +- .../PrisonOfDarkness/PrisonOfDarkness.java | 12 +- .../TaintedDimension/TaintedDimension.java | 4 +- .../Q10771_VolatilePower.java | 4 +- .../Q10772_ReportsFromCrumaTowerPart1.java | 4 +- .../Q10776_TheWrathOfTheGiants.java | 4 +- .../Q10777_ReportsFromCrumaTowerPart2.java | 4 +- .../Q10787_ASpyMission.java | 4 +- .../gameserver/data/xml/impl/ActionData.java | 4 +- .../gameserver/data/xml/impl/AdminData.java | 8 +- .../gameserver/data/xml/impl/AlchemyData.java | 6 +- .../data/xml/impl/AppearanceItemData.java | 6 +- .../data/xml/impl/AttendanceRewardData.java | 4 +- .../data/xml/impl/BeautyShopData.java | 10 +- .../data/xml/impl/ClanHallData.java | 4 +- .../data/xml/impl/CombinationItemsData.java | 4 +- .../gameserver/data/xml/impl/CubicData.java | 6 +- .../data/xml/impl/DailyMissionData.java | 8 +- .../gameserver/data/xml/impl/DoorData.java | 14 +- .../data/xml/impl/EnchantItemData.java | 8 +- .../data/xml/impl/EnchantSkillGroupsData.java | 6 +- .../data/xml/impl/EventEngineData.java | 12 +- .../data/xml/impl/ExtendDropData.java | 26 +- .../data/xml/impl/FakePlayerData.java | 4 +- .../gameserver/data/xml/impl/FenceData.java | 4 +- .../gameserver/data/xml/impl/HennaData.java | 4 +- .../data/xml/impl/InitialEquipmentData.java | 4 +- .../data/xml/impl/LuckyGameData.java | 10 +- .../data/xml/impl/MultisellData.java | 4 +- .../gameserver/data/xml/impl/NpcData.java | 8 +- .../xml/impl/NpcNameLocalisationData.java | 4 +- .../gameserver/data/xml/impl/OptionData.java | 4 +- .../data/xml/impl/PetDataTable.java | 4 +- .../data/xml/impl/PlayerTemplateData.java | 4 +- .../data/xml/impl/PrimeShopData.java | 4 +- .../gameserver/data/xml/impl/RecipeData.java | 4 +- .../data/xml/impl/ResidenceFunctionsData.java | 6 +- .../xml/impl/SendMessageLocalisationData.java | 4 +- .../gameserver/data/xml/impl/ShuttleData.java | 8 +- .../data/xml/impl/SiegeScheduleData.java | 6 +- .../gameserver/data/xml/impl/SkillData.java | 86 +- .../data/xml/impl/SkillTreesData.java | 4 +- .../gameserver/data/xml/impl/SpawnsData.java | 16 +- .../data/xml/impl/StaticObjectData.java | 8 +- .../data/xml/impl/TeleportersData.java | 4 +- .../data/xml/impl/TransformData.java | 6 +- .../gameserver/engines/DocumentBase.java | 8 +- .../engines/DocumentBaseGeneral.java | 4 +- .../engines/items/DocumentItem.java | 8 +- .../engines/items/ItemDataHolder.java | 4 +- .../gameserver/handler/ConditionHandler.java | 8 +- .../gameserver/handler/EffectHandler.java | 8 +- .../handler/SkillConditionHandler.java | 8 +- .../instancemanager/AirShipManager.java | 18 +- .../instancemanager/BoatManager.java | 4 +- .../instancemanager/CastleManorManager.java | 6 +- .../CeremonyOfChaosManager.java | 6 +- .../instancemanager/DBSpawnManager.java | 20 +- .../FakePlayerChatManager.java | 4 +- .../instancemanager/GrandBossManager.java | 16 +- .../instancemanager/InstanceManager.java | 20 +- .../gameserver/model/AccessLevel.java | 2 +- .../gameserver/model/ActionDataHolder.java | 2 +- .../model/AdminCommandAccessRight.java | 2 +- .../model/DailyMissionDataHolder.java | 8 +- .../l2jmobius/gameserver/model/Location.java | 2 +- .../gameserver/model/PetLevelData.java | 2 +- .../gameserver/model/RecipeList.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../gameserver/model/SiegeScheduleDate.java | 2 +- .../gameserver/model/SkillLearn.java | 2 +- .../model/{StatsSet.java => StatSet.java} | 42 +- .../l2jmobius/gameserver/model/actor/Npc.java | 10 +- .../actor/templates/CreatureTemplate.java | 6 +- .../model/actor/templates/CubicTemplate.java | 4 +- .../model/actor/templates/DoorTemplate.java | 4 +- .../model/actor/templates/NpcTemplate.java | 14 +- .../model/actor/templates/PlayerTemplate.java | 4 +- .../model/actor/transform/Transform.java | 4 +- .../actor/transform/TransformLevelData.java | 4 +- .../actor/transform/TransformTemplate.java | 4 +- .../model/alchemy/AlchemyCraftData.java | 4 +- .../model/beautyshop/BeautyItem.java | 6 +- .../ceremonyofchaos/CeremonyOfChaosEvent.java | 8 +- .../gameserver/model/cubic/CubicSkill.java | 4 +- .../gameserver/model/entity/ClanHall.java | 4 +- .../gameserver/model/entity/Hero.java | 70 +- .../eventengine/AbstractEventManager.java | 10 +- .../model/eventengine/EventScheduler.java | 4 +- .../model/events/AbstractScript.java | 6 +- .../model/events/TimerExecutor.java | 8 +- .../model/events/timers/TimerHolder.java | 8 +- .../model/holders/AppearanceHolder.java | 4 +- .../model/holders/AttachSkillHolder.java | 4 +- .../model/holders/EnchantSkillHolder.java | 4 +- .../model/holders/ExtendDropDataHolder.java | 4 +- .../model/holders/FakePlayerHolder.java | 4 +- .../gameserver/model/holders/ItemHolder.java | 4 +- .../model/holders/ItemPointHolder.java | 4 +- .../model/holders/LuckyGameDataHolder.java | 4 +- .../model/holders/MinionHolder.java | 4 +- .../model/holders/MultisellListHolder.java | 4 +- .../model/instancezone/Instance.java | 8 +- .../model/instancezone/InstanceTemplate.java | 10 +- .../instancezone/conditions/Condition.java | 8 +- .../conditions/ConditionCommandChannel.java | 4 +- .../ConditionCommandChannelLeader.java | 4 +- .../conditions/ConditionDistance.java | 4 +- .../conditions/ConditionGroupMax.java | 4 +- .../conditions/ConditionGroupMin.java | 4 +- .../conditions/ConditionHasResidence.java | 6 +- .../conditions/ConditionItem.java | 4 +- .../conditions/ConditionLevel.java | 4 +- .../conditions/ConditionNoParty.java | 4 +- .../conditions/ConditionParty.java | 4 +- .../conditions/ConditionPartyLeader.java | 4 +- .../conditions/ConditionQuest.java | 4 +- .../conditions/ConditionReenter.java | 4 +- .../itemauction/AuctionDateGenerator.java | 4 +- .../model/itemauction/AuctionItem.java | 6 +- .../itemauction/ItemAuctionInstance.java | 6 +- .../gameserver/model/items/Armor.java | 8 +- .../gameserver/model/items/EtcItem.java | 8 +- .../gameserver/model/items/Henna.java | 4 +- .../gameserver/model/items/Item.java | 8 +- .../model/items/PlayerItemTemplate.java | 4 +- .../gameserver/model/items/Weapon.java | 8 +- .../items/appearance/AppearanceStone.java | 4 +- .../items/combination/CombinationItem.java | 4 +- .../items/enchant/AbstractEnchantItem.java | 4 +- .../model/items/enchant/EnchantScroll.java | 4 +- .../items/enchant/EnchantSupportItem.java | 4 +- .../gameserver/model/olympiad/Olympiad.java | 38 +- .../model/olympiad/Participant.java | 6 +- .../model/primeshop/PrimeShopGroup.java | 4 +- .../residences/ResidenceFunctionTemplate.java | 4 +- .../model/shuttle/ShuttleDataHolder.java | 4 +- .../gameserver/model/skills/Skill.java | 6 +- .../model/spawns/NpcSpawnTemplate.java | 16 +- .../gameserver/model/spawns/SpawnGroup.java | 12 +- .../model/spawns/SpawnTemplate.java | 12 +- .../model/teleporter/TeleportHolder.java | 4 +- .../model/teleporter/TeleportLocation.java | 4 +- .../model/variables/AbstractVariables.java | 18 +- .../network/serverpackets/ExHeroList.java | 6 +- .../gameserver/util/BypassParser.java | 4 +- .../ai/areas/BeastFarm/ImprovedBabyPets.java | 6 +- .../ai/areas/FairySettlement/Wisp.java | 6 +- .../EntrancePortalToCrystalCaverns.java | 4 +- .../ai/areas/SeedOfHellfire/Zofan.java | 4 +- .../areas/TalkingIsland/Walkers/Allada.java | 4 +- .../ai/areas/TalkingIsland/Walkers/Mei.java | 4 +- .../areas/TalkingIsland/Walkers/Remons.java | 4 +- .../ai/areas/TalkingIsland/Walkers/Rinne.java | 4 +- .../areas/TalkingIsland/Walkers/Rotina.java | 4 +- .../ai/areas/TalkingIsland/Walkers/Soros.java | 4 +- .../ElmoredenServantsGhost.java | 4 +- .../data/scripts/ai/bosses/Anakim/Anakim.java | 8 +- .../scripts/ai/bosses/Antharas/Antharas.java | 6 +- .../data/scripts/ai/bosses/Baium/Baium.java | 6 +- .../scripts/ai/bosses/Balok/BalokWarzone.java | 4 +- .../ai/bosses/Baylor/BaylorWarzone.java | 4 +- .../data/scripts/ai/bosses/Beleth/Beleth.java | 8 +- .../data/scripts/ai/bosses/Core/Core.java | 8 +- .../IceQueensCastleBattle.java | 8 +- .../data/scripts/ai/bosses/Helios/Helios.java | 8 +- .../ai/bosses/Istina/IstinaCavern.java | 14 +- .../data/scripts/ai/bosses/Kelbim/Kelbim.java | 8 +- .../ai/bosses/Kimerian/KimerianCommon.java | 8 +- .../data/scripts/ai/bosses/Lilith/Lilith.java | 8 +- .../scripts/ai/bosses/Lindvior/Lindvior.java | 10 +- .../ai/bosses/Lindvior/LionelHunter.java | 4 +- .../ai/bosses/Octavis/OctavisWarzone.java | 10 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 8 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 8 +- .../ai/bosses/Spezion/Cannon/Cannon.java | 4 +- .../ai/bosses/Teredor/TeredorWarzone.java | 14 +- .../scripts/ai/bosses/Trasken/Trasken.java | 8 +- .../scripts/ai/bosses/Valakas/Valakas.java | 8 +- .../Zaken/CavernOfThePirateCaptain.java | 6 +- .../data/scripts/ai/others/AreaSkillNpc.java | 4 +- .../CastleTeleporter/CastleTeleporter.java | 6 +- .../others/NpcBuffers/NpcBufferSkillData.java | 4 +- .../ai/others/NpcBuffers/NpcBuffersData.java | 6 +- .../scripts/ai/others/Servitors/ClanFlag.java | 4 +- .../Servitors/GateOfUnlimitedSummoning.java | 4 +- .../ai/others/Servitors/TreeOfLife.java | 4 +- .../ai/others/TersisHerald/TersisHerald.java | 4 +- .../admincommandhandlers/AdminGrandBoss.java | 4 +- .../admincommandhandlers/AdminOlympiad.java | 14 +- .../conditions/CategoryTypeCondition.java | 4 +- .../conditions/NpcLevelCondition.java | 4 +- .../conditions/PlayerLevelCondition.java | 4 +- .../effecthandlers/AbnormalShield.java | 4 +- .../effecthandlers/AbnormalTimeChange.java | 4 +- .../handlers/effecthandlers/AbsorbDamage.java | 4 +- .../AbstractConditionalHpEffect.java | 4 +- .../effecthandlers/AbstractStatAddEffect.java | 4 +- .../effecthandlers/AbstractStatEffect.java | 6 +- .../AbstractStatPercentEffect.java | 4 +- .../handlers/effecthandlers/Accuracy.java | 4 +- .../handlers/effecthandlers/AddHate.java | 4 +- .../effecthandlers/AddSkillBySkill.java | 4 +- .../AddTeleportBookmarkSlot.java | 4 +- .../effecthandlers/AdditionalPotionCp.java | 4 +- .../effecthandlers/AdditionalPotionHp.java | 4 +- .../effecthandlers/AdditionalPotionMp.java | 4 +- .../handlers/effecthandlers/AirBind.java | 4 +- .../handlers/effecthandlers/AreaDamage.java | 4 +- .../effecthandlers/AttackAttribute.java | 4 +- .../effecthandlers/AttackAttributeAdd.java | 4 +- .../handlers/effecthandlers/AttackBehind.java | 4 +- .../handlers/effecthandlers/AttackTrait.java | 4 +- .../handlers/effecthandlers/Backstab.java | 4 +- .../handlers/effecthandlers/Betray.java | 4 +- .../handlers/effecthandlers/Blink.java | 4 +- .../handlers/effecthandlers/BlinkSwap.java | 4 +- .../effecthandlers/BlockAbnormalSlot.java | 4 +- .../handlers/effecthandlers/BlockAction.java | 4 +- .../handlers/effecthandlers/BlockActions.java | 4 +- .../handlers/effecthandlers/BlockChat.java | 4 +- .../handlers/effecthandlers/BlockControl.java | 4 +- .../handlers/effecthandlers/BlockEscape.java | 4 +- .../handlers/effecthandlers/BlockMove.java | 4 +- .../handlers/effecthandlers/BlockParty.java | 4 +- .../effecthandlers/BlockResurrection.java | 4 +- .../handlers/effecthandlers/BlockSkill.java | 4 +- .../handlers/effecthandlers/BlockTarget.java | 4 +- .../handlers/effecthandlers/Bluff.java | 4 +- .../effecthandlers/BonusDropAmount.java | 4 +- .../effecthandlers/BonusDropRate.java | 4 +- .../effecthandlers/BonusSpoilRate.java | 4 +- .../handlers/effecthandlers/Breath.java | 4 +- .../handlers/effecthandlers/BuffBlock.java | 4 +- .../effecthandlers/CallLearnedSkill.java | 4 +- .../handlers/effecthandlers/CallParty.java | 4 +- .../handlers/effecthandlers/CallPc.java | 4 +- .../effecthandlers/CallRandomSkill.java | 4 +- .../handlers/effecthandlers/CallSkill.java | 4 +- .../effecthandlers/CallSkillOnActionTime.java | 4 +- .../effecthandlers/CallTargetParty.java | 4 +- .../effecthandlers/ChameleonRest.java | 4 +- .../handlers/effecthandlers/ChangeBody.java | 6 +- .../handlers/effecthandlers/ChangeFace.java | 4 +- .../effecthandlers/ChangeFishingMastery.java | 4 +- .../effecthandlers/ChangeHairColor.java | 4 +- .../effecthandlers/ChangeHairStyle.java | 4 +- .../handlers/effecthandlers/CheapShot.java | 4 +- .../handlers/effecthandlers/ClassChange.java | 4 +- .../handlers/effecthandlers/Compelling.java | 4 +- .../handlers/effecthandlers/Confuse.java | 4 +- .../handlers/effecthandlers/ConsumeBody.java | 4 +- .../handlers/effecthandlers/ConvertItem.java | 4 +- .../effecthandlers/CounterPhysicalSkill.java | 4 +- .../scripts/handlers/effecthandlers/Cp.java | 4 +- .../handlers/effecthandlers/CpHeal.java | 4 +- .../effecthandlers/CpHealOverTime.java | 4 +- .../effecthandlers/CpHealPercent.java | 4 +- .../handlers/effecthandlers/CpRegen.java | 4 +- .../effecthandlers/CriticalDamage.java | 4 +- .../CriticalDamagePosition.java | 4 +- .../handlers/effecthandlers/CriticalRate.java | 4 +- .../CriticalRatePositionBonus.java | 4 +- .../effecthandlers/CrystalGradeModify.java | 4 +- .../handlers/effecthandlers/CubicMastery.java | 4 +- .../handlers/effecthandlers/DamOverTime.java | 4 +- .../effecthandlers/DamOverTimePercent.java | 4 +- .../handlers/effecthandlers/DamageBlock.java | 4 +- .../effecthandlers/DamageByAttack.java | 4 +- .../handlers/effecthandlers/DamageShield.java | 4 +- .../effecthandlers/DamageShieldResist.java | 4 +- .../handlers/effecthandlers/DeathLink.java | 4 +- .../handlers/effecthandlers/DebuffBlock.java | 4 +- .../effecthandlers/DefenceAttribute.java | 4 +- .../effecthandlers/DefenceCriticalDamage.java | 4 +- .../effecthandlers/DefenceCriticalRate.java | 4 +- .../DefenceMagicCriticalDamage.java | 4 +- .../DefenceMagicCriticalRate.java | 4 +- .../handlers/effecthandlers/DefenceTrait.java | 4 +- .../handlers/effecthandlers/DeleteHate.java | 4 +- .../effecthandlers/DeleteHateOfMe.java | 4 +- .../effecthandlers/DeleteTopAgro.java | 4 +- .../effecthandlers/DetectHiddenObjects.java | 4 +- .../handlers/effecthandlers/Detection.java | 4 +- .../handlers/effecthandlers/DisableSkill.java | 4 +- .../effecthandlers/DisableTargeting.java | 4 +- .../handlers/effecthandlers/Disarm.java | 4 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 4 +- .../effecthandlers/DispelByCategory.java | 4 +- .../handlers/effecthandlers/DispelBySlot.java | 4 +- .../effecthandlers/DispelBySlotMyself.java | 4 +- .../DispelBySlotProbability.java | 4 +- .../handlers/effecthandlers/DoubleCast.java | 4 +- .../handlers/effecthandlers/DuelistFury.java | 4 +- .../handlers/effecthandlers/EnableCloak.java | 4 +- .../handlers/effecthandlers/EnergyAttack.java | 4 +- .../effecthandlers/EnlargeAbnormalSlot.java | 4 +- .../handlers/effecthandlers/EnlargeSlot.java | 4 +- .../handlers/effecthandlers/Escape.java | 4 +- .../handlers/effecthandlers/ExpModify.java | 4 +- .../handlers/effecthandlers/Faceoff.java | 4 +- .../handlers/effecthandlers/FakeDeath.java | 4 +- .../handlers/effecthandlers/FatalBlow.java | 4 +- .../effecthandlers/FatalBlowRate.java | 4 +- .../scripts/handlers/effecthandlers/Fear.java | 4 +- .../scripts/handlers/effecthandlers/Feed.java | 4 +- .../effecthandlers/FishingExpSpBonus.java | 4 +- .../scripts/handlers/effecthandlers/Flag.java | 4 +- .../handlers/effecthandlers/FlipBlock.java | 4 +- .../handlers/effecthandlers/FlyAway.java | 4 +- .../handlers/effecthandlers/FocusEnergy.java | 4 +- .../effecthandlers/FocusMaxMomentum.java | 4 +- .../effecthandlers/FocusMomentum.java | 4 +- .../handlers/effecthandlers/FocusSouls.java | 4 +- .../handlers/effecthandlers/GetAgro.java | 4 +- .../effecthandlers/GetDamageLimit.java | 4 +- .../handlers/effecthandlers/GetMomentum.java | 4 +- .../effecthandlers/GiveClanReputation.java | 4 +- .../handlers/effecthandlers/GiveExpAndSp.java | 4 +- .../handlers/effecthandlers/GiveFame.java | 4 +- .../effecthandlers/GiveRecommendation.java | 4 +- .../handlers/effecthandlers/GiveSp.java | 4 +- .../handlers/effecthandlers/GiveXp.java | 4 +- .../scripts/handlers/effecthandlers/Grow.java | 4 +- .../effecthandlers/HairAccessorySet.java | 4 +- .../handlers/effecthandlers/Harvesting.java | 4 +- .../handlers/effecthandlers/HateAttack.java | 4 +- .../effecthandlers/HeadquarterCreate.java | 4 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealEffect.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 4 +- .../handlers/effecthandlers/HealPercent.java | 4 +- .../scripts/handlers/effecthandlers/Hide.java | 4 +- .../handlers/effecthandlers/HitAtNight.java | 4 +- .../handlers/effecthandlers/HitNumber.java | 4 +- .../scripts/handlers/effecthandlers/Hp.java | 4 +- .../handlers/effecthandlers/HpByLevel.java | 4 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../effecthandlers/HpCpHealCritical.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 4 +- .../handlers/effecthandlers/HpRegen.java | 4 +- .../handlers/effecthandlers/HpToOwner.java | 4 +- .../handlers/effecthandlers/IgnoreDeath.java | 4 +- .../effecthandlers/ImmobilePetBuff.java | 4 +- .../effecthandlers/InstantKillResist.java | 4 +- .../handlers/effecthandlers/JewelSlot.java | 4 +- .../handlers/effecthandlers/KarmaCount.java | 4 +- .../handlers/effecthandlers/KnockBack.java | 4 +- .../handlers/effecthandlers/Lethal.java | 4 +- .../handlers/effecthandlers/LimitCp.java | 4 +- .../handlers/effecthandlers/LimitHp.java | 4 +- .../handlers/effecthandlers/LimitMp.java | 4 +- .../handlers/effecthandlers/Lucky.java | 4 +- .../scripts/handlers/effecthandlers/MAtk.java | 4 +- .../effecthandlers/MagicAccuracy.java | 4 +- .../effecthandlers/MagicCriticalDamage.java | 4 +- .../effecthandlers/MagicCriticalRate.java | 4 +- .../handlers/effecthandlers/MagicMpCost.java | 4 +- .../MagicalAbnormalDispelAttack.java | 4 +- .../effecthandlers/MagicalAbnormalResist.java | 4 +- .../effecthandlers/MagicalAttack.java | 4 +- .../MagicalAttackByAbnormal.java | 4 +- .../MagicalAttackByAbnormalSlot.java | 4 +- .../effecthandlers/MagicalAttackMp.java | 4 +- .../effecthandlers/MagicalAttackRange.java | 4 +- .../effecthandlers/MagicalAttackSpeed.java | 4 +- .../effecthandlers/MagicalDamOverTime.java | 4 +- .../effecthandlers/MagicalDefence.java | 4 +- .../effecthandlers/MagicalEvasion.java | 4 +- .../effecthandlers/MagicalSkillPower.java | 4 +- .../effecthandlers/MagicalSoulAttack.java | 4 +- .../handlers/effecthandlers/ManaCharge.java | 4 +- .../effecthandlers/ManaDamOverTime.java | 4 +- .../handlers/effecthandlers/ManaHeal.java | 4 +- .../effecthandlers/ManaHealByLevel.java | 4 +- .../effecthandlers/ManaHealOverTime.java | 4 +- .../effecthandlers/ManaHealPercent.java | 4 +- .../handlers/effecthandlers/MaxCp.java | 4 +- .../handlers/effecthandlers/MaxHp.java | 4 +- .../handlers/effecthandlers/MaxMp.java | 4 +- .../handlers/effecthandlers/ModifyVital.java | 4 +- .../scripts/handlers/effecthandlers/Mp.java | 4 +- .../effecthandlers/MpConsumePerLevel.java | 4 +- .../handlers/effecthandlers/MpRegen.java | 4 +- .../handlers/effecthandlers/MpShield.java | 4 +- .../effecthandlers/MpVampiricAttack.java | 4 +- .../scripts/handlers/effecthandlers/Mute.java | 4 +- .../effecthandlers/NoblesseBless.java | 4 +- .../handlers/effecthandlers/OpenChest.java | 4 +- .../effecthandlers/OpenCommonRecipeBook.java | 4 +- .../handlers/effecthandlers/OpenDoor.java | 4 +- .../effecthandlers/OpenDwarfRecipeBook.java | 4 +- .../scripts/handlers/effecthandlers/PAtk.java | 4 +- .../handlers/effecthandlers/Passive.java | 4 +- .../PhysicalAbnormalResist.java | 4 +- .../effecthandlers/PhysicalAttack.java | 4 +- .../effecthandlers/PhysicalAttackHpLink.java | 4 +- .../effecthandlers/PhysicalAttackMute.java | 4 +- .../effecthandlers/PhysicalAttackRange.java | 4 +- .../effecthandlers/PhysicalAttackSaveHp.java | 4 +- .../effecthandlers/PhysicalAttackSpeed.java | 4 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../effecthandlers/PhysicalDefence.java | 4 +- .../effecthandlers/PhysicalEvasion.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 4 +- .../PhysicalShieldAngleAll.java | 4 +- .../effecthandlers/PhysicalSkillPower.java | 4 +- .../effecthandlers/PhysicalSoulAttack.java | 4 +- .../handlers/effecthandlers/PkCount.java | 4 +- .../handlers/effecthandlers/Plunder.java | 4 +- .../effecthandlers/PolearmSingleTarget.java | 4 +- .../effecthandlers/ProtectDeathPenalty.java | 4 +- .../effecthandlers/ProtectionBlessing.java | 4 +- .../handlers/effecthandlers/PullBack.java | 4 +- .../PveMagicalSkillDamageBonus.java | 4 +- .../PveMagicalSkillDefenceBonus.java | 4 +- .../PvePhysicalAttackDamageBonus.java | 4 +- .../PvePhysicalAttackDefenceBonus.java | 4 +- .../PvePhysicalSkillDamageBonus.java | 4 +- .../PvePhysicalSkillDefenceBonus.java | 4 +- .../PveRaidMagicalSkillDefenceBonus.java | 4 +- .../PveRaidPhysicalAttackDefenceBonus.java | 4 +- .../PveRaidPhysicalSkillDefenceBonus.java | 4 +- .../PvpMagicalSkillDamageBonus.java | 4 +- .../PvpMagicalSkillDefenceBonus.java | 4 +- .../PvpPhysicalAttackDamageBonus.java | 4 +- .../PvpPhysicalAttackDefenceBonus.java | 4 +- .../PvpPhysicalSkillDamageBonus.java | 4 +- .../PvpPhysicalSkillDefenceBonus.java | 4 +- .../effecthandlers/RandomizeHate.java | 4 +- .../handlers/effecthandlers/RealDamage.java | 4 +- .../handlers/effecthandlers/RearDamage.java | 4 +- .../handlers/effecthandlers/RebalanceHP.java | 4 +- .../effecthandlers/RebalanceHPSummon.java | 4 +- .../RecoverVitalityInPeaceZone.java | 4 +- .../handlers/effecthandlers/Recovery.java | 4 +- .../handlers/effecthandlers/ReduceCancel.java | 4 +- .../handlers/effecthandlers/ReduceDamage.java | 4 +- .../effecthandlers/ReduceDropPenalty.java | 4 +- .../handlers/effecthandlers/ReflectMagic.java | 4 +- .../handlers/effecthandlers/ReflectSkill.java | 4 +- .../effecthandlers/RefuelAirship.java | 4 +- .../handlers/effecthandlers/Relax.java | 4 +- .../effecthandlers/ResetInstanceEntry.java | 4 +- .../ResistAbnormalByCategory.java | 4 +- .../effecthandlers/ResistDDMagic.java | 4 +- .../ResistDispelByCategory.java | 4 +- .../handlers/effecthandlers/ResistSkill.java | 4 +- .../handlers/effecthandlers/Restoration.java | 4 +- .../effecthandlers/RestorationRandom.java | 8 +- .../handlers/effecthandlers/Resurrection.java | 4 +- .../effecthandlers/ResurrectionSpecial.java | 4 +- .../handlers/effecthandlers/Reuse.java | 4 +- .../effecthandlers/ReuseSkillById.java | 4 +- .../scripts/handlers/effecthandlers/Root.java | 4 +- .../effecthandlers/SacrificeSummon.java | 4 +- .../effecthandlers/SafeFallHeight.java | 4 +- .../SendSystemMessageToClan.java | 4 +- .../effecthandlers/ServitorShare.java | 4 +- .../handlers/effecthandlers/SetHp.java | 4 +- .../handlers/effecthandlers/SetSkill.java | 4 +- .../effecthandlers/ShieldDefence.java | 4 +- .../effecthandlers/ShieldDefenceRate.java | 4 +- .../handlers/effecthandlers/SilentMove.java | 4 +- .../effecthandlers/SkillCritical.java | 4 +- .../effecthandlers/SkillCriticalDamage.java | 4 +- .../SkillCriticalProbability.java | 4 +- .../handlers/effecthandlers/SkillEvasion.java | 4 +- .../effecthandlers/SkillPowerAdd.java | 4 +- .../handlers/effecthandlers/SkillTurning.java | 4 +- .../effecthandlers/SkillTurningOverTime.java | 4 +- .../handlers/effecthandlers/SoulBlow.java | 4 +- .../handlers/effecthandlers/SoulEating.java | 4 +- .../scripts/handlers/effecthandlers/Sow.java | 4 +- .../handlers/effecthandlers/SpModify.java | 4 +- .../handlers/effecthandlers/Speed.java | 4 +- .../effecthandlers/SphericBarrier.java | 4 +- .../handlers/effecthandlers/Spoil.java | 4 +- .../StatBonusSkillCritical.java | 4 +- .../effecthandlers/StatBonusSpeed.java | 4 +- .../effecthandlers/StatByMoveType.java | 4 +- .../handlers/effecthandlers/StatUp.java | 4 +- .../effecthandlers/StealAbnormal.java | 4 +- .../handlers/effecthandlers/Summon.java | 4 +- .../effecthandlers/SummonAgathion.java | 4 +- .../handlers/effecthandlers/SummonCubic.java | 4 +- .../effecthandlers/SummonHallucination.java | 4 +- .../handlers/effecthandlers/SummonMulti.java | 4 +- .../handlers/effecthandlers/SummonNpc.java | 4 +- .../handlers/effecthandlers/SummonPet.java | 4 +- .../handlers/effecthandlers/SummonPoints.java | 4 +- .../handlers/effecthandlers/SummonTrap.java | 4 +- .../handlers/effecthandlers/Sweeper.java | 4 +- .../handlers/effecthandlers/Synergy.java | 4 +- .../handlers/effecthandlers/TakeCastle.java | 4 +- .../effecthandlers/TakeCastleStart.java | 4 +- .../handlers/effecthandlers/TakeFort.java | 4 +- .../effecthandlers/TakeFortStart.java | 4 +- .../handlers/effecthandlers/TalismanSlot.java | 4 +- .../handlers/effecthandlers/TargetCancel.java | 4 +- .../handlers/effecthandlers/TargetMe.java | 4 +- .../effecthandlers/TargetMeProbability.java | 4 +- .../handlers/effecthandlers/Teleport.java | 4 +- .../effecthandlers/TeleportToNpc.java | 4 +- .../effecthandlers/TeleportToPlayer.java | 4 +- .../effecthandlers/TeleportToSummon.java | 4 +- .../effecthandlers/TeleportToTarget.java | 4 +- .../TransferDamageToPlayer.java | 4 +- .../TransferDamageToSummon.java | 4 +- .../handlers/effecthandlers/TransferHate.java | 4 +- .../effecthandlers/Transformation.java | 4 +- .../handlers/effecthandlers/TrapDetect.java | 4 +- .../handlers/effecthandlers/TrapRemove.java | 4 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 4 +- .../effecthandlers/TriggerSkillByDamage.java | 4 +- .../TriggerSkillByDeathBlow.java | 4 +- .../effecthandlers/TriggerSkillByKill.java | 4 +- .../TriggerSkillByMagicType.java | 4 +- .../effecthandlers/TriggerSkillBySkill.java | 4 +- .../TriggerSkillBySkillAttack.java | 4 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 4 +- .../effecthandlers/UnsummonAgathion.java | 4 +- .../effecthandlers/UnsummonServitors.java | 4 +- .../handlers/effecthandlers/Untargetable.java | 4 +- .../effecthandlers/VampiricAttack.java | 4 +- .../effecthandlers/VampiricDefence.java | 4 +- .../effecthandlers/VitalityExpRate.java | 4 +- .../effecthandlers/VitalityPointUp.java | 4 +- .../effecthandlers/VitalityPointsRate.java | 4 +- .../handlers/effecthandlers/WeightLimit.java | 4 +- .../effecthandlers/WeightPenalty.java | 4 +- .../effecthandlers/WorldChatPoints.java | 4 +- .../BuildAdvanceBaseSkillCondition.java | 4 +- .../BuildCampSkillCondition.java | 4 +- ...CanAddMaxEntranceInzoneSkillCondition.java | 4 +- .../CanBookmarkAddSlotSkillCondition.java | 4 +- ...CanChangeVitalItemCountSkillCondition.java | 4 +- .../CanEnchantAttributeSkillCondition.java | 4 +- .../CanMountForEventSkillCondition.java | 4 +- .../CanRefuelAirshipSkillCondition.java | 4 +- .../CanRestoreVitalPointSkillCondition.java | 4 +- .../CanSummonCubicSkillCondition.java | 4 +- .../CanSummonMultiSkillCondition.java | 4 +- .../CanSummonPetSkillCondition.java | 4 +- .../CanSummonSiegeGolemSkillCondition.java | 4 +- .../CanSummonSkillCondition.java | 4 +- .../CanTransformInDominionSkillCondition.java | 4 +- .../CanTransformSkillCondition.java | 4 +- .../CanUntransformSkillCondition.java | 4 +- .../CanUseInBattlefieldSkillCondition.java | 4 +- .../CanUseInDragonLairSkillCondition.java | 4 +- .../CanUseSwoopCannonSkillCondition.java | 4 +- ...nUseVitalityConsumeItemSkillCondition.java | 4 +- .../CannotUseInTransformSkillCondition.java | 4 +- .../CheckLevelSkillCondition.java | 4 +- .../CheckSexSkillCondition.java | 4 +- .../ConsumeBodySkillCondition.java | 4 +- .../EnergySavedSkillCondition.java | 4 +- .../EquipArmorSkillCondition.java | 4 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../NotFearedSkillCondition.java | 4 +- .../NotInUnderwaterSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 4 +- .../OpAffectedBySkillSkillCondition.java | 4 +- .../OpAgathionEnergySkillCondition.java | 4 +- .../OpAlignmentSkillCondition.java | 4 +- .../OpBlinkSkillCondition.java | 4 +- .../OpCallPcSkillCondition.java | 4 +- .../OpCanEscapeSkillCondition.java | 4 +- .../OpCanNotUseAirshipSkillCondition.java | 4 +- ...eTargetWithPrivateStoreSkillCondition.java | 4 +- .../OpChangeWeaponSkillCondition.java | 4 +- .../OpCheckAbnormalSkillCondition.java | 4 +- .../OpCheckAccountTypeSkillCondition.java | 4 +- .../OpCheckCastRangeSkillCondition.java | 4 +- .../OpCheckClassListSkillCondition.java | 4 +- .../OpCheckClassSkillCondition.java | 4 +- .../OpCheckCrtEffectSkillCondition.java | 4 +- .../OpCheckFlagSkillCondition.java | 4 +- ...eckOnGoingEventCampaignSkillCondition.java | 4 +- .../OpCheckPcbangPointSkillCondition.java | 4 +- .../OpCheckResidenceSkillCondition.java | 4 +- .../OpCheckSkillListSkillCondition.java | 4 +- .../OpCheckSkillSkillCondition.java | 4 +- .../OpCompanionSkillCondition.java | 4 +- .../OpEnchantRangeSkillCondition.java | 4 +- .../OpEncumberedSkillCondition.java | 4 +- .../OpEnergyMaxSkillCondition.java | 4 +- .../OpEquipItemSkillCondition.java | 4 +- .../OpExistNpcSkillCondition.java | 4 +- .../OpFishingCastSkillCondition.java | 4 +- .../OpFishingPumpingSkillCondition.java | 4 +- .../OpFishingReelingSkillCondition.java | 4 +- .../OpHaveSummonSkillCondition.java | 4 +- .../OpHaveSummonedNpcSkillCondition.java | 4 +- .../OpHomeSkillCondition.java | 4 +- .../OpInSiegeTimeSkillCondition.java | 4 +- .../OpInstantzoneSkillCondition.java | 4 +- .../OpMainjobSkillCondition.java | 4 +- .../OpNeedAgathionSkillCondition.java | 4 +- .../OpNeedSummonOrPetSkillCondition.java | 4 +- .../OpNotCursedSkillCondition.java | 4 +- .../OpNotInCeremonyOfChaosSkillCondition.java | 4 +- .../OpNotInPeacezoneSkillCondition.java | 4 +- .../OpNotInstantzoneSkillCondition.java | 4 +- .../OpNotOlympiadSkillCondition.java | 4 +- .../OpNotTerritorySkillCondition.java | 4 +- .../OpPeacezoneSkillCondition.java | 4 +- .../OpPkcountSkillCondition.java | 4 +- .../OpPledgeSkillCondition.java | 4 +- .../OpRestartPointSkillCondition.java | 4 +- .../OpResurrectionSkillCondition.java | 4 +- .../OpSiegeHammerSkillCondition.java | 4 +- .../OpSkillAcquireSkillCondition.java | 4 +- .../OpSkillSkillCondition.java | 4 +- .../OpSocialClassSkillCondition.java | 4 +- .../OpSoulMaxSkillCondition.java | 4 +- .../OpSubjobSkillCondition.java | 4 +- .../OpSweeperSkillCondition.java | 4 +- .../OpTargetAllItemTypeSkillCondition.java | 4 +- .../OpTargetArmorTypeSkillCondition.java | 4 +- .../OpTargetDoorSkillCondition.java | 4 +- ...OpTargetMyPledgeAcademySkillCondition.java | 4 +- .../OpTargetNpcSkillCondition.java | 4 +- .../OpTargetPcSkillCondition.java | 4 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../OpTerritorySkillCondition.java | 4 +- .../OpUnlockSkillCondition.java | 4 +- .../OpUseFirecrackerSkillCondition.java | 4 +- .../OpUsePraseedSkillCondition.java | 4 +- .../OpWyvernSkillCondition.java | 4 +- .../PossessHolythingSkillCondition.java | 4 +- .../RemainCpPerSkillCondition.java | 4 +- .../RemainHpPerSkillCondition.java | 4 +- .../RemainMpPerSkillCondition.java | 4 +- .../SoulSavedSkillCondition.java | 4 +- .../TargetItemCrystalTypeSkillCondition.java | 4 +- .../TargetMyMenteeSkillCondition.java | 4 +- .../TargetMyPartySkillCondition.java | 4 +- .../TargetMyPledgeSkillCondition.java | 4 +- .../TargetRaceSkillCondition.java | 4 +- .../ChambersOfDelusion/ChamberOfDelusion.java | 4 +- .../CrystalCavernsCoralGarden.java | 6 +- .../CrystalCavernsEmeraldSquare.java | 14 +- .../CrystalCavernsSteamCorridor.java | 14 +- .../DarkCloudMansion/DarkCloudMansion.java | 4 +- .../FaeronTrainingGrounds1.java | 6 +- .../FaeronTrainingGrounds2.java | 6 +- .../HarnakUndergroundRuins.java | 4 +- .../KartiasLabyrinth/KartiaBoss.java | 6 +- .../KartiasLabyrinth/KartiaHelperAdolph.java | 10 +- .../KartiasLabyrinth/KartiaHelperBarton.java | 6 +- .../KartiasLabyrinth/KartiaHelperElise.java | 12 +- .../KartiasLabyrinth/KartiaHelperEliyah.java | 4 +- .../KartiaHelperGuardian.java | 6 +- .../KartiasLabyrinth/KartiaHelperHayuk.java | 6 +- .../KartiasLabyrinth/KartiaSupportTroop.java | 4 +- .../KartiasLabyrinth/KartiasLabyrinth.java | 8 +- .../LabyrinthOfBelis/LabyrinthOfBelis.java | 4 +- .../MemoryOfDisaster/MemoryOfDisaster.java | 4 +- .../MuseumDungeon/MuseumDungeon.java | 4 +- .../scripts/instances/Nursery/Nursery.java | 16 +- .../PailakaInjuredDragon.java | 4 +- .../PrisonOfDarkness/PrisonOfDarkness.java | 12 +- .../TaintedDimension/TaintedDimension.java | 4 +- .../Q10771_VolatilePower.java | 4 +- .../Q10772_ReportsFromCrumaTowerPart1.java | 4 +- .../Q10776_TheWrathOfTheGiants.java | 4 +- .../Q10777_ReportsFromCrumaTowerPart2.java | 4 +- .../Q10787_ASpyMission.java | 4 +- .../gameserver/data/xml/impl/ActionData.java | 4 +- .../gameserver/data/xml/impl/AdminData.java | 8 +- .../gameserver/data/xml/impl/AlchemyData.java | 6 +- .../data/xml/impl/AppearanceItemData.java | 6 +- .../data/xml/impl/AttendanceRewardData.java | 4 +- .../data/xml/impl/BeautyShopData.java | 10 +- .../data/xml/impl/ClanHallData.java | 4 +- .../data/xml/impl/CombinationItemsData.java | 4 +- .../gameserver/data/xml/impl/CubicData.java | 6 +- .../data/xml/impl/DailyMissionData.java | 8 +- .../gameserver/data/xml/impl/DoorData.java | 14 +- .../data/xml/impl/EnchantItemData.java | 8 +- .../data/xml/impl/EnchantSkillGroupsData.java | 6 +- .../data/xml/impl/EventEngineData.java | 12 +- .../data/xml/impl/ExtendDropData.java | 26 +- .../data/xml/impl/FakePlayerData.java | 4 +- .../gameserver/data/xml/impl/FenceData.java | 4 +- .../gameserver/data/xml/impl/HennaData.java | 4 +- .../data/xml/impl/InitialEquipmentData.java | 4 +- .../data/xml/impl/LuckyGameData.java | 10 +- .../data/xml/impl/MultisellData.java | 4 +- .../gameserver/data/xml/impl/NpcData.java | 8 +- .../xml/impl/NpcNameLocalisationData.java | 4 +- .../gameserver/data/xml/impl/OptionData.java | 4 +- .../data/xml/impl/PetDataTable.java | 4 +- .../data/xml/impl/PlayerTemplateData.java | 4 +- .../data/xml/impl/PrimeShopData.java | 4 +- .../gameserver/data/xml/impl/RecipeData.java | 4 +- .../data/xml/impl/ResidenceFunctionsData.java | 6 +- .../xml/impl/SendMessageLocalisationData.java | 4 +- .../gameserver/data/xml/impl/ShuttleData.java | 8 +- .../data/xml/impl/SiegeScheduleData.java | 6 +- .../gameserver/data/xml/impl/SkillData.java | 86 +- .../data/xml/impl/SkillTreesData.java | 4 +- .../gameserver/data/xml/impl/SpawnsData.java | 16 +- .../data/xml/impl/StaticObjectData.java | 8 +- .../data/xml/impl/TeleportersData.java | 4 +- .../data/xml/impl/TransformData.java | 6 +- .../gameserver/engines/DocumentBase.java | 8 +- .../engines/DocumentBaseGeneral.java | 4 +- .../engines/items/DocumentItem.java | 8 +- .../engines/items/ItemDataHolder.java | 4 +- .../gameserver/handler/ConditionHandler.java | 8 +- .../gameserver/handler/EffectHandler.java | 8 +- .../handler/SkillConditionHandler.java | 8 +- .../instancemanager/AirShipManager.java | 18 +- .../instancemanager/BoatManager.java | 4 +- .../instancemanager/CastleManorManager.java | 6 +- .../CeremonyOfChaosManager.java | 6 +- .../instancemanager/DBSpawnManager.java | 20 +- .../FakePlayerChatManager.java | 4 +- .../instancemanager/GrandBossManager.java | 16 +- .../instancemanager/InstanceManager.java | 20 +- .../gameserver/model/AccessLevel.java | 2 +- .../gameserver/model/ActionDataHolder.java | 2 +- .../model/AdminCommandAccessRight.java | 2 +- .../model/DailyMissionDataHolder.java | 8 +- .../l2jmobius/gameserver/model/Location.java | 2 +- .../gameserver/model/PetLevelData.java | 2 +- .../gameserver/model/RecipeList.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../gameserver/model/SiegeScheduleDate.java | 2 +- .../gameserver/model/SkillLearn.java | 2 +- .../model/{StatsSet.java => StatSet.java} | 42 +- .../l2jmobius/gameserver/model/actor/Npc.java | 10 +- .../actor/templates/CreatureTemplate.java | 6 +- .../model/actor/templates/CubicTemplate.java | 4 +- .../model/actor/templates/DoorTemplate.java | 4 +- .../model/actor/templates/NpcTemplate.java | 14 +- .../model/actor/templates/PlayerTemplate.java | 4 +- .../model/actor/transform/Transform.java | 4 +- .../actor/transform/TransformLevelData.java | 4 +- .../actor/transform/TransformTemplate.java | 4 +- .../model/alchemy/AlchemyCraftData.java | 4 +- .../model/beautyshop/BeautyItem.java | 6 +- .../ceremonyofchaos/CeremonyOfChaosEvent.java | 8 +- .../gameserver/model/cubic/CubicSkill.java | 4 +- .../gameserver/model/entity/ClanHall.java | 4 +- .../gameserver/model/entity/Hero.java | 70 +- .../eventengine/AbstractEventManager.java | 10 +- .../model/eventengine/EventScheduler.java | 4 +- .../model/events/AbstractScript.java | 6 +- .../model/events/TimerExecutor.java | 8 +- .../model/events/timers/TimerHolder.java | 8 +- .../model/holders/AppearanceHolder.java | 4 +- .../model/holders/AttachSkillHolder.java | 4 +- .../model/holders/EnchantSkillHolder.java | 4 +- .../model/holders/ExtendDropDataHolder.java | 4 +- .../model/holders/FakePlayerHolder.java | 4 +- .../gameserver/model/holders/ItemHolder.java | 4 +- .../model/holders/ItemPointHolder.java | 4 +- .../model/holders/LuckyGameDataHolder.java | 4 +- .../model/holders/MinionHolder.java | 4 +- .../model/holders/MultisellListHolder.java | 4 +- .../model/instancezone/Instance.java | 8 +- .../model/instancezone/InstanceTemplate.java | 10 +- .../instancezone/conditions/Condition.java | 8 +- .../conditions/ConditionCommandChannel.java | 4 +- .../ConditionCommandChannelLeader.java | 4 +- .../conditions/ConditionDistance.java | 4 +- .../conditions/ConditionGroupMax.java | 4 +- .../conditions/ConditionGroupMin.java | 4 +- .../conditions/ConditionHasResidence.java | 6 +- .../conditions/ConditionItem.java | 4 +- .../conditions/ConditionLevel.java | 4 +- .../conditions/ConditionNoParty.java | 4 +- .../conditions/ConditionParty.java | 4 +- .../conditions/ConditionPartyLeader.java | 4 +- .../conditions/ConditionQuest.java | 4 +- .../conditions/ConditionReenter.java | 4 +- .../itemauction/AuctionDateGenerator.java | 4 +- .../model/itemauction/AuctionItem.java | 6 +- .../itemauction/ItemAuctionInstance.java | 6 +- .../gameserver/model/items/Armor.java | 8 +- .../gameserver/model/items/EtcItem.java | 8 +- .../gameserver/model/items/Henna.java | 4 +- .../gameserver/model/items/Item.java | 8 +- .../model/items/PlayerItemTemplate.java | 4 +- .../gameserver/model/items/Weapon.java | 8 +- .../items/appearance/AppearanceStone.java | 4 +- .../items/combination/CombinationItem.java | 4 +- .../items/enchant/AbstractEnchantItem.java | 4 +- .../model/items/enchant/EnchantScroll.java | 4 +- .../items/enchant/EnchantSupportItem.java | 4 +- .../gameserver/model/olympiad/Olympiad.java | 38 +- .../model/olympiad/Participant.java | 6 +- .../model/primeshop/PrimeShopGroup.java | 4 +- .../residences/ResidenceFunctionTemplate.java | 4 +- .../model/shuttle/ShuttleDataHolder.java | 4 +- .../gameserver/model/skills/Skill.java | 6 +- .../model/spawns/NpcSpawnTemplate.java | 16 +- .../gameserver/model/spawns/SpawnGroup.java | 12 +- .../model/spawns/SpawnTemplate.java | 12 +- .../model/teleporter/TeleportHolder.java | 4 +- .../model/teleporter/TeleportLocation.java | 4 +- .../model/variables/AbstractVariables.java | 18 +- .../network/serverpackets/ExHeroList.java | 6 +- .../gameserver/util/BypassParser.java | 4 +- .../ai/areas/BeastFarm/ImprovedBabyPets.java | 6 +- .../ai/areas/FairySettlement/Wisp.java | 6 +- .../EntrancePortalToCrystalCaverns.java | 4 +- .../ai/areas/SeedOfHellfire/Zofan.java | 4 +- .../areas/TalkingIsland/Walkers/Allada.java | 4 +- .../ai/areas/TalkingIsland/Walkers/Mei.java | 4 +- .../areas/TalkingIsland/Walkers/Remons.java | 4 +- .../ai/areas/TalkingIsland/Walkers/Rinne.java | 4 +- .../areas/TalkingIsland/Walkers/Rotina.java | 4 +- .../ai/areas/TalkingIsland/Walkers/Soros.java | 4 +- .../ElmoredenServantsGhost.java | 4 +- .../data/scripts/ai/bosses/Anakim/Anakim.java | 8 +- .../scripts/ai/bosses/Antharas/Antharas.java | 6 +- .../data/scripts/ai/bosses/Baium/Baium.java | 6 +- .../scripts/ai/bosses/Balok/BalokWarzone.java | 4 +- .../ai/bosses/Baylor/BaylorWarzone.java | 4 +- .../data/scripts/ai/bosses/Beleth/Beleth.java | 8 +- .../data/scripts/ai/bosses/Core/Core.java | 8 +- .../IceQueensCastleBattle.java | 8 +- .../data/scripts/ai/bosses/Helios/Helios.java | 8 +- .../ai/bosses/Istina/IstinaCavern.java | 14 +- .../data/scripts/ai/bosses/Kelbim/Kelbim.java | 8 +- .../ai/bosses/Kimerian/KimerianCommon.java | 8 +- .../data/scripts/ai/bosses/Lilith/Lilith.java | 8 +- .../scripts/ai/bosses/Lindvior/Lindvior.java | 10 +- .../ai/bosses/Lindvior/LionelHunter.java | 4 +- .../ai/bosses/Octavis/OctavisWarzone.java | 10 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 8 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 8 +- .../ai/bosses/Spezion/Cannon/Cannon.java | 4 +- .../ai/bosses/Teredor/TeredorWarzone.java | 14 +- .../scripts/ai/bosses/Trasken/Trasken.java | 8 +- .../scripts/ai/bosses/Valakas/Valakas.java | 8 +- .../Zaken/CavernOfThePirateCaptain.java | 6 +- .../data/scripts/ai/others/AreaSkillNpc.java | 4 +- .../CastleTeleporter/CastleTeleporter.java | 6 +- .../others/NpcBuffers/NpcBufferSkillData.java | 4 +- .../ai/others/NpcBuffers/NpcBuffersData.java | 6 +- .../scripts/ai/others/Servitors/ClanFlag.java | 4 +- .../Servitors/GateOfUnlimitedSummoning.java | 4 +- .../ai/others/Servitors/TreeOfLife.java | 4 +- .../ai/others/TersisHerald/TersisHerald.java | 4 +- .../admincommandhandlers/AdminGrandBoss.java | 4 +- .../admincommandhandlers/AdminOlympiad.java | 14 +- .../conditions/CategoryTypeCondition.java | 4 +- .../conditions/NpcLevelCondition.java | 4 +- .../conditions/PlayerLevelCondition.java | 4 +- .../effecthandlers/AbnormalShield.java | 4 +- .../effecthandlers/AbnormalTimeChange.java | 4 +- .../handlers/effecthandlers/AbsorbDamage.java | 4 +- .../AbstractConditionalHpEffect.java | 4 +- .../effecthandlers/AbstractStatAddEffect.java | 4 +- .../effecthandlers/AbstractStatEffect.java | 6 +- .../AbstractStatPercentEffect.java | 4 +- .../handlers/effecthandlers/Accuracy.java | 4 +- .../handlers/effecthandlers/AddHate.java | 4 +- .../effecthandlers/AddSkillBySkill.java | 4 +- .../AddTeleportBookmarkSlot.java | 4 +- .../effecthandlers/AdditionalPotionCp.java | 4 +- .../effecthandlers/AdditionalPotionHp.java | 4 +- .../effecthandlers/AdditionalPotionMp.java | 4 +- .../handlers/effecthandlers/AirBind.java | 4 +- .../handlers/effecthandlers/AreaDamage.java | 4 +- .../effecthandlers/AttackAttribute.java | 4 +- .../effecthandlers/AttackAttributeAdd.java | 4 +- .../handlers/effecthandlers/AttackBehind.java | 4 +- .../handlers/effecthandlers/AttackTrait.java | 4 +- .../handlers/effecthandlers/Backstab.java | 4 +- .../handlers/effecthandlers/Betray.java | 4 +- .../handlers/effecthandlers/Blink.java | 4 +- .../handlers/effecthandlers/BlinkSwap.java | 4 +- .../effecthandlers/BlockAbnormalSlot.java | 4 +- .../handlers/effecthandlers/BlockAction.java | 4 +- .../handlers/effecthandlers/BlockActions.java | 4 +- .../handlers/effecthandlers/BlockChat.java | 4 +- .../handlers/effecthandlers/BlockControl.java | 4 +- .../handlers/effecthandlers/BlockEscape.java | 4 +- .../handlers/effecthandlers/BlockMove.java | 4 +- .../handlers/effecthandlers/BlockParty.java | 4 +- .../effecthandlers/BlockResurrection.java | 4 +- .../handlers/effecthandlers/BlockSkill.java | 4 +- .../handlers/effecthandlers/BlockTarget.java | 4 +- .../handlers/effecthandlers/Bluff.java | 4 +- .../effecthandlers/BonusDropAmount.java | 4 +- .../effecthandlers/BonusDropRate.java | 4 +- .../effecthandlers/BonusSpoilRate.java | 4 +- .../handlers/effecthandlers/Breath.java | 4 +- .../handlers/effecthandlers/BuffBlock.java | 4 +- .../effecthandlers/CallLearnedSkill.java | 4 +- .../handlers/effecthandlers/CallParty.java | 4 +- .../handlers/effecthandlers/CallPc.java | 4 +- .../effecthandlers/CallRandomSkill.java | 4 +- .../handlers/effecthandlers/CallSkill.java | 4 +- .../effecthandlers/CallSkillOnActionTime.java | 4 +- .../effecthandlers/CallTargetParty.java | 4 +- .../effecthandlers/ChameleonRest.java | 4 +- .../handlers/effecthandlers/ChangeBody.java | 6 +- .../handlers/effecthandlers/ChangeFace.java | 4 +- .../effecthandlers/ChangeFishingMastery.java | 4 +- .../effecthandlers/ChangeHairColor.java | 4 +- .../effecthandlers/ChangeHairStyle.java | 4 +- .../handlers/effecthandlers/CheapShot.java | 4 +- .../handlers/effecthandlers/ClassChange.java | 4 +- .../handlers/effecthandlers/Compelling.java | 4 +- .../handlers/effecthandlers/Confuse.java | 4 +- .../handlers/effecthandlers/ConsumeBody.java | 4 +- .../handlers/effecthandlers/ConvertItem.java | 4 +- .../effecthandlers/CounterPhysicalSkill.java | 4 +- .../scripts/handlers/effecthandlers/Cp.java | 4 +- .../handlers/effecthandlers/CpHeal.java | 4 +- .../effecthandlers/CpHealOverTime.java | 4 +- .../effecthandlers/CpHealPercent.java | 4 +- .../handlers/effecthandlers/CpRegen.java | 4 +- .../effecthandlers/CraftingCritical.java | 4 +- .../effecthandlers/CreateCommonItem.java | 4 +- .../handlers/effecthandlers/CreateItem.java | 4 +- .../effecthandlers/CriticalDamage.java | 4 +- .../CriticalDamagePosition.java | 4 +- .../handlers/effecthandlers/CriticalRate.java | 4 +- .../CriticalRatePositionBonus.java | 4 +- .../effecthandlers/CrystalGradeModify.java | 4 +- .../handlers/effecthandlers/Crystallize.java | 4 +- .../handlers/effecthandlers/CubicMastery.java | 4 +- .../handlers/effecthandlers/DamOverTime.java | 4 +- .../effecthandlers/DamOverTimePercent.java | 4 +- .../handlers/effecthandlers/DamageBlock.java | 4 +- .../effecthandlers/DamageByAttack.java | 4 +- .../handlers/effecthandlers/DamageShield.java | 4 +- .../effecthandlers/DamageShieldResist.java | 4 +- .../handlers/effecthandlers/DeathLink.java | 4 +- .../handlers/effecthandlers/DebuffBlock.java | 4 +- .../effecthandlers/DefenceAttribute.java | 4 +- .../effecthandlers/DefenceCriticalDamage.java | 4 +- .../effecthandlers/DefenceCriticalRate.java | 4 +- .../DefenceMagicCriticalDamage.java | 4 +- .../DefenceMagicCriticalRate.java | 4 +- .../handlers/effecthandlers/DefenceTrait.java | 4 +- .../handlers/effecthandlers/DeleteHate.java | 4 +- .../effecthandlers/DeleteHateOfMe.java | 4 +- .../effecthandlers/DeleteTopAgro.java | 4 +- .../effecthandlers/DetectHiddenObjects.java | 4 +- .../handlers/effecthandlers/Detection.java | 4 +- .../handlers/effecthandlers/DisableSkill.java | 4 +- .../effecthandlers/DisableTargeting.java | 4 +- .../handlers/effecthandlers/Disarm.java | 4 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 4 +- .../effecthandlers/DispelByCategory.java | 4 +- .../handlers/effecthandlers/DispelBySlot.java | 4 +- .../effecthandlers/DispelBySlotMyself.java | 4 +- .../DispelBySlotProbability.java | 4 +- .../handlers/effecthandlers/DoubleCast.java | 4 +- .../handlers/effecthandlers/DuelistFury.java | 4 +- .../handlers/effecthandlers/EnableCloak.java | 4 +- .../handlers/effecthandlers/EnergyAttack.java | 4 +- .../effecthandlers/EnlargeAbnormalSlot.java | 4 +- .../handlers/effecthandlers/EnlargeSlot.java | 4 +- .../handlers/effecthandlers/Escape.java | 4 +- .../handlers/effecthandlers/ExpModify.java | 4 +- .../handlers/effecthandlers/Faceoff.java | 4 +- .../handlers/effecthandlers/FakeDeath.java | 4 +- .../handlers/effecthandlers/FatalBlow.java | 4 +- .../effecthandlers/FatalBlowRate.java | 4 +- .../scripts/handlers/effecthandlers/Fear.java | 4 +- .../scripts/handlers/effecthandlers/Feed.java | 4 +- .../effecthandlers/FishingExpSpBonus.java | 4 +- .../scripts/handlers/effecthandlers/Flag.java | 4 +- .../handlers/effecthandlers/FlipBlock.java | 4 +- .../handlers/effecthandlers/FlyAway.java | 4 +- .../handlers/effecthandlers/FocusEnergy.java | 4 +- .../effecthandlers/FocusMaxMomentum.java | 4 +- .../effecthandlers/FocusMomentum.java | 4 +- .../handlers/effecthandlers/FocusSouls.java | 4 +- .../handlers/effecthandlers/GetAgro.java | 4 +- .../effecthandlers/GetDamageLimit.java | 4 +- .../handlers/effecthandlers/GetMomentum.java | 4 +- .../effecthandlers/GiveClanReputation.java | 4 +- .../handlers/effecthandlers/GiveExpAndSp.java | 4 +- .../handlers/effecthandlers/GiveFame.java | 4 +- .../effecthandlers/GiveRecommendation.java | 4 +- .../handlers/effecthandlers/GiveSp.java | 4 +- .../handlers/effecthandlers/GiveXp.java | 4 +- .../scripts/handlers/effecthandlers/Grow.java | 4 +- .../effecthandlers/HairAccessorySet.java | 4 +- .../handlers/effecthandlers/Harvesting.java | 4 +- .../handlers/effecthandlers/HateAttack.java | 4 +- .../effecthandlers/HeadquarterCreate.java | 4 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealEffect.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 4 +- .../handlers/effecthandlers/HealPercent.java | 4 +- .../scripts/handlers/effecthandlers/Hide.java | 4 +- .../handlers/effecthandlers/HitAtNight.java | 4 +- .../handlers/effecthandlers/HitNumber.java | 4 +- .../scripts/handlers/effecthandlers/Hp.java | 4 +- .../handlers/effecthandlers/HpByLevel.java | 4 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../effecthandlers/HpCpHealCritical.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 4 +- .../handlers/effecthandlers/HpRegen.java | 4 +- .../handlers/effecthandlers/HpToOwner.java | 4 +- .../handlers/effecthandlers/IgnoreDeath.java | 4 +- .../effecthandlers/ImmobilePetBuff.java | 4 +- .../effecthandlers/InstantKillResist.java | 4 +- .../handlers/effecthandlers/JewelSlot.java | 4 +- .../handlers/effecthandlers/KarmaCount.java | 4 +- .../handlers/effecthandlers/KnockBack.java | 4 +- .../handlers/effecthandlers/Lethal.java | 4 +- .../handlers/effecthandlers/LimitCp.java | 4 +- .../handlers/effecthandlers/LimitHp.java | 4 +- .../handlers/effecthandlers/LimitMp.java | 4 +- .../handlers/effecthandlers/Lucky.java | 4 +- .../scripts/handlers/effecthandlers/MAtk.java | 4 +- .../effecthandlers/MagicAccuracy.java | 4 +- .../effecthandlers/MagicCriticalDamage.java | 4 +- .../effecthandlers/MagicCriticalRate.java | 4 +- .../handlers/effecthandlers/MagicMpCost.java | 4 +- .../MagicalAbnormalDispelAttack.java | 4 +- .../effecthandlers/MagicalAbnormalResist.java | 4 +- .../effecthandlers/MagicalAttack.java | 4 +- .../MagicalAttackByAbnormal.java | 4 +- .../MagicalAttackByAbnormalSlot.java | 4 +- .../effecthandlers/MagicalAttackMp.java | 4 +- .../effecthandlers/MagicalAttackRange.java | 4 +- .../effecthandlers/MagicalAttackSpeed.java | 4 +- .../effecthandlers/MagicalDamOverTime.java | 4 +- .../effecthandlers/MagicalDefence.java | 4 +- .../effecthandlers/MagicalEvasion.java | 4 +- .../effecthandlers/MagicalSkillPower.java | 4 +- .../effecthandlers/MagicalSoulAttack.java | 4 +- .../handlers/effecthandlers/ManaCharge.java | 4 +- .../effecthandlers/ManaDamOverTime.java | 4 +- .../handlers/effecthandlers/ManaHeal.java | 4 +- .../effecthandlers/ManaHealByLevel.java | 4 +- .../effecthandlers/ManaHealOverTime.java | 4 +- .../effecthandlers/ManaHealPercent.java | 4 +- .../handlers/effecthandlers/MaxCp.java | 4 +- .../handlers/effecthandlers/MaxHp.java | 4 +- .../handlers/effecthandlers/MaxMp.java | 4 +- .../handlers/effecthandlers/ModifyVital.java | 4 +- .../scripts/handlers/effecthandlers/Mp.java | 4 +- .../effecthandlers/MpConsumePerLevel.java | 4 +- .../handlers/effecthandlers/MpRegen.java | 4 +- .../handlers/effecthandlers/MpShield.java | 4 +- .../effecthandlers/MpVampiricAttack.java | 4 +- .../scripts/handlers/effecthandlers/Mute.java | 4 +- .../effecthandlers/NoblesseBless.java | 4 +- .../handlers/effecthandlers/OpenChest.java | 4 +- .../effecthandlers/OpenCommonRecipeBook.java | 4 +- .../handlers/effecthandlers/OpenDoor.java | 4 +- .../effecthandlers/OpenDwarfRecipeBook.java | 4 +- .../scripts/handlers/effecthandlers/PAtk.java | 4 +- .../handlers/effecthandlers/Passive.java | 4 +- .../PhysicalAbnormalResist.java | 4 +- .../effecthandlers/PhysicalAttack.java | 4 +- .../effecthandlers/PhysicalAttackHpLink.java | 4 +- .../effecthandlers/PhysicalAttackMute.java | 4 +- .../effecthandlers/PhysicalAttackRange.java | 4 +- .../effecthandlers/PhysicalAttackSaveHp.java | 4 +- .../effecthandlers/PhysicalAttackSpeed.java | 4 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../effecthandlers/PhysicalDefence.java | 4 +- .../effecthandlers/PhysicalEvasion.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 4 +- .../PhysicalShieldAngleAll.java | 4 +- .../effecthandlers/PhysicalSkillPower.java | 4 +- .../effecthandlers/PhysicalSoulAttack.java | 4 +- .../handlers/effecthandlers/PkCount.java | 4 +- .../handlers/effecthandlers/Plunder.java | 4 +- .../effecthandlers/PolearmSingleTarget.java | 4 +- .../effecthandlers/ProtectDeathPenalty.java | 4 +- .../effecthandlers/ProtectionBlessing.java | 4 +- .../handlers/effecthandlers/PullBack.java | 4 +- .../PveMagicalSkillDamageBonus.java | 4 +- .../PveMagicalSkillDefenceBonus.java | 4 +- .../PvePhysicalAttackDamageBonus.java | 4 +- .../PvePhysicalAttackDefenceBonus.java | 4 +- .../PvePhysicalSkillDamageBonus.java | 4 +- .../PvePhysicalSkillDefenceBonus.java | 4 +- .../PveRaidMagicalSkillDefenceBonus.java | 4 +- .../PveRaidPhysicalAttackDefenceBonus.java | 4 +- .../PveRaidPhysicalSkillDefenceBonus.java | 4 +- .../PvpMagicalSkillDamageBonus.java | 4 +- .../PvpMagicalSkillDefenceBonus.java | 4 +- .../PvpPhysicalAttackDamageBonus.java | 4 +- .../PvpPhysicalAttackDefenceBonus.java | 4 +- .../PvpPhysicalSkillDamageBonus.java | 4 +- .../PvpPhysicalSkillDefenceBonus.java | 4 +- .../effecthandlers/RandomizeHate.java | 4 +- .../handlers/effecthandlers/RealDamage.java | 4 +- .../handlers/effecthandlers/RearDamage.java | 4 +- .../handlers/effecthandlers/RebalanceHP.java | 4 +- .../effecthandlers/RebalanceHPSummon.java | 4 +- .../RecoverVitalityInPeaceZone.java | 4 +- .../handlers/effecthandlers/Recovery.java | 4 +- .../handlers/effecthandlers/ReduceCancel.java | 4 +- .../handlers/effecthandlers/ReduceDamage.java | 4 +- .../effecthandlers/ReduceDropPenalty.java | 4 +- .../handlers/effecthandlers/ReflectMagic.java | 4 +- .../handlers/effecthandlers/ReflectSkill.java | 4 +- .../effecthandlers/RefuelAirship.java | 4 +- .../handlers/effecthandlers/Relax.java | 4 +- .../effecthandlers/RemoveEquipPenalty.java | 4 +- .../effecthandlers/ResetInstanceEntry.java | 4 +- .../ResistAbnormalByCategory.java | 4 +- .../effecthandlers/ResistDDMagic.java | 4 +- .../ResistDispelByCategory.java | 4 +- .../handlers/effecthandlers/ResistSkill.java | 4 +- .../handlers/effecthandlers/Restoration.java | 4 +- .../effecthandlers/RestorationRandom.java | 8 +- .../handlers/effecthandlers/Resurrection.java | 4 +- .../effecthandlers/ResurrectionSpecial.java | 4 +- .../handlers/effecthandlers/Reuse.java | 4 +- .../effecthandlers/ReuseSkillById.java | 4 +- .../scripts/handlers/effecthandlers/Root.java | 4 +- .../effecthandlers/SacrificeSummon.java | 4 +- .../effecthandlers/SafeFallHeight.java | 4 +- .../SendSystemMessageToClan.java | 4 +- .../effecthandlers/ServitorShare.java | 4 +- .../handlers/effecthandlers/SetHp.java | 4 +- .../handlers/effecthandlers/SetSkill.java | 4 +- .../effecthandlers/ShieldDefence.java | 4 +- .../effecthandlers/ShieldDefenceRate.java | 4 +- .../handlers/effecthandlers/SilentMove.java | 4 +- .../effecthandlers/SkillCritical.java | 4 +- .../effecthandlers/SkillCriticalDamage.java | 4 +- .../SkillCriticalProbability.java | 4 +- .../handlers/effecthandlers/SkillEvasion.java | 4 +- .../effecthandlers/SkillPowerAdd.java | 4 +- .../handlers/effecthandlers/SkillTurning.java | 4 +- .../effecthandlers/SkillTurningOverTime.java | 4 +- .../handlers/effecthandlers/SoulBlow.java | 4 +- .../handlers/effecthandlers/SoulEating.java | 4 +- .../scripts/handlers/effecthandlers/Sow.java | 4 +- .../handlers/effecthandlers/SpModify.java | 4 +- .../handlers/effecthandlers/Speed.java | 4 +- .../effecthandlers/SphericBarrier.java | 4 +- .../handlers/effecthandlers/Spoil.java | 4 +- .../StatBonusSkillCritical.java | 4 +- .../effecthandlers/StatBonusSpeed.java | 4 +- .../effecthandlers/StatByMoveType.java | 4 +- .../handlers/effecthandlers/StatUp.java | 4 +- .../effecthandlers/StealAbnormal.java | 4 +- .../handlers/effecthandlers/Summon.java | 4 +- .../effecthandlers/SummonAgathion.java | 4 +- .../handlers/effecthandlers/SummonCubic.java | 4 +- .../effecthandlers/SummonHallucination.java | 4 +- .../handlers/effecthandlers/SummonMulti.java | 4 +- .../handlers/effecthandlers/SummonNpc.java | 4 +- .../handlers/effecthandlers/SummonPet.java | 4 +- .../handlers/effecthandlers/SummonPoints.java | 4 +- .../handlers/effecthandlers/SummonTrap.java | 4 +- .../handlers/effecthandlers/Sweeper.java | 4 +- .../handlers/effecthandlers/Synergy.java | 4 +- .../handlers/effecthandlers/TakeCastle.java | 4 +- .../effecthandlers/TakeCastleStart.java | 4 +- .../handlers/effecthandlers/TakeFort.java | 4 +- .../effecthandlers/TakeFortStart.java | 4 +- .../handlers/effecthandlers/TalismanSlot.java | 4 +- .../handlers/effecthandlers/TargetCancel.java | 4 +- .../handlers/effecthandlers/TargetMe.java | 4 +- .../effecthandlers/TargetMeProbability.java | 4 +- .../handlers/effecthandlers/Teleport.java | 4 +- .../effecthandlers/TeleportToNpc.java | 4 +- .../effecthandlers/TeleportToPlayer.java | 4 +- .../effecthandlers/TeleportToSummon.java | 4 +- .../effecthandlers/TeleportToTarget.java | 4 +- .../TransferDamageToPlayer.java | 4 +- .../TransferDamageToSummon.java | 4 +- .../handlers/effecthandlers/TransferHate.java | 4 +- .../effecthandlers/Transformation.java | 4 +- .../handlers/effecthandlers/TrapDetect.java | 4 +- .../handlers/effecthandlers/TrapRemove.java | 4 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 4 +- .../effecthandlers/TriggerSkillByDamage.java | 4 +- .../TriggerSkillByDeathBlow.java | 4 +- .../effecthandlers/TriggerSkillByKill.java | 4 +- .../TriggerSkillByMagicType.java | 4 +- .../effecthandlers/TriggerSkillBySkill.java | 4 +- .../TriggerSkillBySkillAttack.java | 4 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 4 +- .../effecthandlers/UnsummonAgathion.java | 4 +- .../effecthandlers/UnsummonServitors.java | 4 +- .../handlers/effecthandlers/Untargetable.java | 4 +- .../effecthandlers/VampiricAttack.java | 4 +- .../effecthandlers/VampiricDefence.java | 4 +- .../effecthandlers/VitalityExpRate.java | 4 +- .../effecthandlers/VitalityPointUp.java | 4 +- .../effecthandlers/VitalityPointsRate.java | 4 +- .../handlers/effecthandlers/WeightLimit.java | 4 +- .../effecthandlers/WeightPenalty.java | 4 +- .../effecthandlers/WorldChatPoints.java | 4 +- .../BuildAdvanceBaseSkillCondition.java | 4 +- .../BuildCampSkillCondition.java | 4 +- ...CanAddMaxEntranceInzoneSkillCondition.java | 4 +- .../CanBookmarkAddSlotSkillCondition.java | 4 +- ...CanChangeVitalItemCountSkillCondition.java | 4 +- .../CanEnchantAttributeSkillCondition.java | 4 +- .../CanMountForEventSkillCondition.java | 4 +- .../CanRefuelAirshipSkillCondition.java | 4 +- .../CanRestoreVitalPointSkillCondition.java | 4 +- .../CanSummonCubicSkillCondition.java | 4 +- .../CanSummonMultiSkillCondition.java | 4 +- .../CanSummonPetSkillCondition.java | 4 +- .../CanSummonSiegeGolemSkillCondition.java | 4 +- .../CanSummonSkillCondition.java | 4 +- .../CanTransformInDominionSkillCondition.java | 4 +- .../CanTransformSkillCondition.java | 4 +- .../CanUntransformSkillCondition.java | 4 +- .../CanUseInBattlefieldSkillCondition.java | 4 +- .../CanUseInDragonLairSkillCondition.java | 4 +- .../CanUseSwoopCannonSkillCondition.java | 4 +- ...nUseVitalityConsumeItemSkillCondition.java | 4 +- .../CannotUseInTransformSkillCondition.java | 4 +- .../CheckLevelSkillCondition.java | 4 +- .../CheckSexSkillCondition.java | 4 +- .../ConsumeBodySkillCondition.java | 4 +- .../EnergySavedSkillCondition.java | 4 +- .../EquipArmorSkillCondition.java | 4 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../NotFearedSkillCondition.java | 4 +- .../NotInUnderwaterSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 4 +- .../OpAffectedBySkillSkillCondition.java | 4 +- .../OpAgathionEnergySkillCondition.java | 4 +- .../OpAlignmentSkillCondition.java | 4 +- .../OpBlinkSkillCondition.java | 4 +- .../OpCallPcSkillCondition.java | 4 +- .../OpCanEscapeSkillCondition.java | 4 +- .../OpCanNotUseAirshipSkillCondition.java | 4 +- ...eTargetWithPrivateStoreSkillCondition.java | 4 +- .../OpChangeWeaponSkillCondition.java | 4 +- .../OpCheckAbnormalSkillCondition.java | 4 +- .../OpCheckAccountTypeSkillCondition.java | 4 +- .../OpCheckCastRangeSkillCondition.java | 4 +- .../OpCheckClassListSkillCondition.java | 4 +- .../OpCheckClassSkillCondition.java | 4 +- .../OpCheckCrtEffectSkillCondition.java | 4 +- .../OpCheckFlagSkillCondition.java | 4 +- ...eckOnGoingEventCampaignSkillCondition.java | 4 +- .../OpCheckPcbangPointSkillCondition.java | 4 +- .../OpCheckResidenceSkillCondition.java | 4 +- .../OpCheckSkillListSkillCondition.java | 4 +- .../OpCheckSkillSkillCondition.java | 4 +- .../OpCompanionSkillCondition.java | 4 +- .../OpEnchantRangeSkillCondition.java | 4 +- .../OpEncumberedSkillCondition.java | 4 +- .../OpEnergyMaxSkillCondition.java | 4 +- .../OpEquipItemSkillCondition.java | 4 +- .../OpExistNpcSkillCondition.java | 4 +- .../OpFishingCastSkillCondition.java | 4 +- .../OpFishingPumpingSkillCondition.java | 4 +- .../OpFishingReelingSkillCondition.java | 4 +- .../OpHaveSummonSkillCondition.java | 4 +- .../OpHaveSummonedNpcSkillCondition.java | 4 +- .../OpHomeSkillCondition.java | 4 +- .../OpInSiegeTimeSkillCondition.java | 4 +- .../OpInstantzoneSkillCondition.java | 4 +- .../OpMainjobSkillCondition.java | 4 +- .../OpNeedAgathionSkillCondition.java | 4 +- .../OpNeedSummonOrPetSkillCondition.java | 4 +- .../OpNotCursedSkillCondition.java | 4 +- .../OpNotInCeremonyOfChaosSkillCondition.java | 4 +- .../OpNotInPeacezoneSkillCondition.java | 4 +- .../OpNotInstantzoneSkillCondition.java | 4 +- .../OpNotOlympiadSkillCondition.java | 4 +- .../OpNotTerritorySkillCondition.java | 4 +- .../OpPeacezoneSkillCondition.java | 4 +- .../OpPkcountSkillCondition.java | 4 +- .../OpPledgeSkillCondition.java | 4 +- .../OpRestartPointSkillCondition.java | 4 +- .../OpResurrectionSkillCondition.java | 4 +- .../OpSiegeHammerSkillCondition.java | 4 +- .../OpSkillAcquireSkillCondition.java | 4 +- .../OpSkillSkillCondition.java | 4 +- .../OpSocialClassSkillCondition.java | 4 +- .../OpSoulMaxSkillCondition.java | 4 +- .../OpSubjobSkillCondition.java | 4 +- .../OpSweeperSkillCondition.java | 4 +- .../OpTargetAllItemTypeSkillCondition.java | 4 +- .../OpTargetArmorTypeSkillCondition.java | 4 +- .../OpTargetDoorSkillCondition.java | 4 +- ...OpTargetMyPledgeAcademySkillCondition.java | 4 +- .../OpTargetNpcSkillCondition.java | 4 +- .../OpTargetPcSkillCondition.java | 4 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../OpTerritorySkillCondition.java | 4 +- .../OpUnlockSkillCondition.java | 4 +- .../OpUseFirecrackerSkillCondition.java | 4 +- .../OpUsePraseedSkillCondition.java | 4 +- .../OpWyvernSkillCondition.java | 4 +- .../PossessHolythingSkillCondition.java | 4 +- .../RemainCpPerSkillCondition.java | 4 +- .../RemainHpPerSkillCondition.java | 4 +- .../RemainMpPerSkillCondition.java | 4 +- .../SoulSavedSkillCondition.java | 4 +- .../TargetItemCrystalTypeSkillCondition.java | 4 +- .../TargetMyMenteeSkillCondition.java | 4 +- .../TargetMyPartySkillCondition.java | 4 +- .../TargetMyPledgeSkillCondition.java | 4 +- .../TargetRaceSkillCondition.java | 4 +- .../ChambersOfDelusion/ChamberOfDelusion.java | 4 +- .../CrystalCavernsCoralGarden.java | 6 +- .../CrystalCavernsEmeraldSquare.java | 14 +- .../CrystalCavernsSteamCorridor.java | 14 +- .../DarkCloudMansion/DarkCloudMansion.java | 4 +- .../FaeronTrainingGrounds1.java | 6 +- .../FaeronTrainingGrounds2.java | 6 +- .../HarnakUndergroundRuins.java | 4 +- .../KartiasLabyrinth/KartiaBoss.java | 6 +- .../KartiasLabyrinth/KartiaHelperAdolph.java | 10 +- .../KartiasLabyrinth/KartiaHelperBarton.java | 6 +- .../KartiasLabyrinth/KartiaHelperElise.java | 12 +- .../KartiasLabyrinth/KartiaHelperEliyah.java | 4 +- .../KartiaHelperGuardian.java | 6 +- .../KartiasLabyrinth/KartiaHelperHayuk.java | 6 +- .../KartiasLabyrinth/KartiaSupportTroop.java | 4 +- .../KartiasLabyrinth/KartiasLabyrinth.java | 8 +- .../LabyrinthOfBelis/LabyrinthOfBelis.java | 4 +- .../MemoryOfDisaster/MemoryOfDisaster.java | 4 +- .../MuseumDungeon/MuseumDungeon.java | 4 +- .../scripts/instances/Nursery/Nursery.java | 16 +- .../PailakaInjuredDragon.java | 4 +- .../PrisonOfDarkness/PrisonOfDarkness.java | 12 +- .../TaintedDimension/TaintedDimension.java | 4 +- .../Q10771_VolatilePower.java | 4 +- .../Q10772_ReportsFromCrumaTowerPart1.java | 4 +- .../Q10776_TheWrathOfTheGiants.java | 4 +- .../Q10777_ReportsFromCrumaTowerPart2.java | 4 +- .../Q10787_ASpyMission.java | 4 +- .../gameserver/data/xml/impl/ActionData.java | 4 +- .../gameserver/data/xml/impl/AdminData.java | 8 +- .../gameserver/data/xml/impl/AlchemyData.java | 6 +- .../data/xml/impl/AppearanceItemData.java | 6 +- .../data/xml/impl/AttendanceRewardData.java | 4 +- .../data/xml/impl/BeautyShopData.java | 10 +- .../data/xml/impl/ClanHallData.java | 4 +- .../data/xml/impl/CombinationItemsData.java | 4 +- .../gameserver/data/xml/impl/CubicData.java | 6 +- .../data/xml/impl/DailyMissionData.java | 8 +- .../gameserver/data/xml/impl/DoorData.java | 14 +- .../data/xml/impl/EnchantItemData.java | 8 +- .../data/xml/impl/EnchantSkillGroupsData.java | 6 +- .../data/xml/impl/EventEngineData.java | 12 +- .../data/xml/impl/ExtendDropData.java | 26 +- .../data/xml/impl/FakePlayerData.java | 4 +- .../gameserver/data/xml/impl/FenceData.java | 4 +- .../gameserver/data/xml/impl/HennaData.java | 4 +- .../data/xml/impl/InitialEquipmentData.java | 4 +- .../data/xml/impl/LuckyGameData.java | 10 +- .../data/xml/impl/MultisellData.java | 4 +- .../gameserver/data/xml/impl/NpcData.java | 8 +- .../xml/impl/NpcNameLocalisationData.java | 4 +- .../gameserver/data/xml/impl/OptionData.java | 4 +- .../data/xml/impl/PetDataTable.java | 4 +- .../data/xml/impl/PlayerTemplateData.java | 4 +- .../data/xml/impl/PrimeShopData.java | 4 +- .../gameserver/data/xml/impl/RecipeData.java | 6 +- .../data/xml/impl/ResidenceFunctionsData.java | 6 +- .../xml/impl/SendMessageLocalisationData.java | 4 +- .../gameserver/data/xml/impl/ShuttleData.java | 8 +- .../data/xml/impl/SiegeScheduleData.java | 6 +- .../gameserver/data/xml/impl/SkillData.java | 86 +- .../data/xml/impl/SkillTreesData.java | 4 +- .../gameserver/data/xml/impl/SpawnsData.java | 16 +- .../data/xml/impl/StaticObjectData.java | 8 +- .../data/xml/impl/TeleportersData.java | 4 +- .../data/xml/impl/TransformData.java | 6 +- .../gameserver/engines/DocumentBase.java | 8 +- .../engines/DocumentBaseGeneral.java | 4 +- .../engines/items/DocumentItem.java | 8 +- .../engines/items/ItemDataHolder.java | 4 +- .../gameserver/handler/ConditionHandler.java | 8 +- .../gameserver/handler/EffectHandler.java | 8 +- .../handler/SkillConditionHandler.java | 8 +- .../instancemanager/AirShipManager.java | 18 +- .../instancemanager/BoatManager.java | 4 +- .../instancemanager/CastleManorManager.java | 6 +- .../CeremonyOfChaosManager.java | 6 +- .../instancemanager/DBSpawnManager.java | 20 +- .../FakePlayerChatManager.java | 4 +- .../instancemanager/GrandBossManager.java | 16 +- .../instancemanager/InstanceManager.java | 20 +- .../gameserver/model/AccessLevel.java | 2 +- .../gameserver/model/ActionDataHolder.java | 2 +- .../model/AdminCommandAccessRight.java | 2 +- .../model/DailyMissionDataHolder.java | 8 +- .../l2jmobius/gameserver/model/Location.java | 2 +- .../gameserver/model/PetLevelData.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../gameserver/model/SiegeScheduleDate.java | 2 +- .../gameserver/model/SkillLearn.java | 2 +- .../model/{StatsSet.java => StatSet.java} | 42 +- .../l2jmobius/gameserver/model/actor/Npc.java | 10 +- .../actor/templates/CreatureTemplate.java | 6 +- .../model/actor/templates/CubicTemplate.java | 4 +- .../model/actor/templates/DoorTemplate.java | 4 +- .../model/actor/templates/NpcTemplate.java | 14 +- .../model/actor/templates/PlayerTemplate.java | 4 +- .../model/actor/transform/Transform.java | 4 +- .../actor/transform/TransformLevelData.java | 4 +- .../actor/transform/TransformTemplate.java | 4 +- .../model/alchemy/AlchemyCraftData.java | 4 +- .../model/beautyshop/BeautyItem.java | 6 +- .../ceremonyofchaos/CeremonyOfChaosEvent.java | 8 +- .../gameserver/model/cubic/CubicSkill.java | 4 +- .../gameserver/model/entity/ClanHall.java | 4 +- .../gameserver/model/entity/Hero.java | 70 +- .../eventengine/AbstractEventManager.java | 10 +- .../model/eventengine/EventScheduler.java | 4 +- .../model/events/AbstractScript.java | 6 +- .../model/events/TimerExecutor.java | 8 +- .../model/events/timers/TimerHolder.java | 8 +- .../model/holders/AppearanceHolder.java | 4 +- .../model/holders/AttachSkillHolder.java | 4 +- .../model/holders/EnchantSkillHolder.java | 4 +- .../model/holders/ExtendDropDataHolder.java | 4 +- .../model/holders/FakePlayerHolder.java | 4 +- .../gameserver/model/holders/ItemHolder.java | 4 +- .../model/holders/ItemPointHolder.java | 4 +- .../model/holders/LuckyGameDataHolder.java | 4 +- .../model/holders/MinionHolder.java | 4 +- .../model/holders/MultisellListHolder.java | 4 +- .../model/holders/RecipeHolder.java | 4 +- .../model/instancezone/Instance.java | 8 +- .../model/instancezone/InstanceTemplate.java | 10 +- .../instancezone/conditions/Condition.java | 8 +- .../conditions/ConditionCommandChannel.java | 4 +- .../ConditionCommandChannelLeader.java | 4 +- .../conditions/ConditionDistance.java | 4 +- .../conditions/ConditionGroupMax.java | 4 +- .../conditions/ConditionGroupMin.java | 4 +- .../conditions/ConditionHasResidence.java | 6 +- .../conditions/ConditionItem.java | 4 +- .../conditions/ConditionLevel.java | 4 +- .../conditions/ConditionNoParty.java | 4 +- .../conditions/ConditionParty.java | 4 +- .../conditions/ConditionPartyLeader.java | 4 +- .../conditions/ConditionQuest.java | 4 +- .../conditions/ConditionReenter.java | 4 +- .../itemauction/AuctionDateGenerator.java | 4 +- .../model/itemauction/AuctionItem.java | 6 +- .../itemauction/ItemAuctionInstance.java | 6 +- .../gameserver/model/items/Armor.java | 8 +- .../gameserver/model/items/EtcItem.java | 8 +- .../gameserver/model/items/Henna.java | 4 +- .../gameserver/model/items/Item.java | 8 +- .../model/items/PlayerItemTemplate.java | 4 +- .../gameserver/model/items/Weapon.java | 8 +- .../items/appearance/AppearanceStone.java | 4 +- .../items/combination/CombinationItem.java | 4 +- .../items/enchant/AbstractEnchantItem.java | 4 +- .../model/items/enchant/EnchantScroll.java | 4 +- .../items/enchant/EnchantSupportItem.java | 4 +- .../gameserver/model/olympiad/Olympiad.java | 38 +- .../model/olympiad/Participant.java | 6 +- .../model/primeshop/PrimeShopGroup.java | 4 +- .../residences/ResidenceFunctionTemplate.java | 4 +- .../model/shuttle/ShuttleDataHolder.java | 4 +- .../gameserver/model/skills/Skill.java | 6 +- .../model/spawns/NpcSpawnTemplate.java | 16 +- .../gameserver/model/spawns/SpawnGroup.java | 12 +- .../model/spawns/SpawnTemplate.java | 12 +- .../model/teleporter/TeleportHolder.java | 4 +- .../model/teleporter/TeleportLocation.java | 4 +- .../model/variables/AbstractVariables.java | 18 +- .../network/serverpackets/ExHeroList.java | 6 +- .../gameserver/util/BypassParser.java | 4 +- .../ai/areas/BeastFarm/ImprovedBabyPets.java | 6 +- .../ai/areas/FairySettlement/Wisp.java | 6 +- .../EntrancePortalToCrystalCaverns.java | 4 +- .../ai/areas/SeedOfHellfire/Zofan.java | 4 +- .../areas/TalkingIsland/Walkers/Allada.java | 4 +- .../ai/areas/TalkingIsland/Walkers/Mei.java | 4 +- .../areas/TalkingIsland/Walkers/Remons.java | 4 +- .../ai/areas/TalkingIsland/Walkers/Rinne.java | 4 +- .../areas/TalkingIsland/Walkers/Rotina.java | 4 +- .../ai/areas/TalkingIsland/Walkers/Soros.java | 4 +- .../ElmoredenServantsGhost.java | 4 +- .../data/scripts/ai/bosses/Anakim/Anakim.java | 8 +- .../scripts/ai/bosses/Antharas/Antharas.java | 6 +- .../data/scripts/ai/bosses/Baium/Baium.java | 6 +- .../scripts/ai/bosses/Balok/BalokWarzone.java | 4 +- .../ai/bosses/Baylor/BaylorWarzone.java | 4 +- .../data/scripts/ai/bosses/Beleth/Beleth.java | 8 +- .../data/scripts/ai/bosses/Core/Core.java | 8 +- .../IceQueensCastleBattle.java | 8 +- .../data/scripts/ai/bosses/Helios/Helios.java | 8 +- .../ai/bosses/Istina/IstinaCavern.java | 14 +- .../data/scripts/ai/bosses/Kelbim/Kelbim.java | 8 +- .../ai/bosses/Kimerian/KimerianCommon.java | 8 +- .../data/scripts/ai/bosses/Lilith/Lilith.java | 8 +- .../scripts/ai/bosses/Lindvior/Lindvior.java | 10 +- .../ai/bosses/Lindvior/LionelHunter.java | 4 +- .../ai/bosses/Octavis/OctavisWarzone.java | 10 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 8 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 8 +- .../ai/bosses/Spezion/Cannon/Cannon.java | 4 +- .../ai/bosses/Teredor/TeredorWarzone.java | 14 +- .../scripts/ai/bosses/Trasken/Trasken.java | 8 +- .../scripts/ai/bosses/Valakas/Valakas.java | 8 +- .../Zaken/CavernOfThePirateCaptain.java | 6 +- .../data/scripts/ai/others/AreaSkillNpc.java | 4 +- .../CastleTeleporter/CastleTeleporter.java | 6 +- .../others/NpcBuffers/NpcBufferSkillData.java | 4 +- .../ai/others/NpcBuffers/NpcBuffersData.java | 6 +- .../scripts/ai/others/Servitors/ClanFlag.java | 4 +- .../Servitors/GateOfUnlimitedSummoning.java | 4 +- .../ai/others/Servitors/TreeOfLife.java | 4 +- .../ai/others/TersisHerald/TersisHerald.java | 4 +- .../admincommandhandlers/AdminGrandBoss.java | 4 +- .../admincommandhandlers/AdminOlympiad.java | 14 +- .../conditions/CategoryTypeCondition.java | 4 +- .../conditions/NpcLevelCondition.java | 4 +- .../conditions/PlayerLevelCondition.java | 4 +- .../effecthandlers/AbnormalShield.java | 4 +- .../effecthandlers/AbnormalTimeChange.java | 4 +- .../handlers/effecthandlers/AbsorbDamage.java | 4 +- .../AbstractConditionalHpEffect.java | 4 +- .../effecthandlers/AbstractStatAddEffect.java | 4 +- .../effecthandlers/AbstractStatEffect.java | 6 +- .../AbstractStatPercentEffect.java | 4 +- .../handlers/effecthandlers/Accuracy.java | 4 +- .../handlers/effecthandlers/AddHate.java | 4 +- .../effecthandlers/AddSkillBySkill.java | 4 +- .../AddTeleportBookmarkSlot.java | 4 +- .../effecthandlers/AdditionalPotionCp.java | 4 +- .../effecthandlers/AdditionalPotionHp.java | 4 +- .../effecthandlers/AdditionalPotionMp.java | 4 +- .../handlers/effecthandlers/AgathionSlot.java | 4 +- .../handlers/effecthandlers/AirBind.java | 4 +- .../handlers/effecthandlers/AreaDamage.java | 4 +- .../effecthandlers/AttackAttribute.java | 4 +- .../effecthandlers/AttackAttributeAdd.java | 4 +- .../handlers/effecthandlers/AttackBehind.java | 4 +- .../handlers/effecthandlers/AttackTrait.java | 4 +- .../handlers/effecthandlers/Backstab.java | 4 +- .../handlers/effecthandlers/Betray.java | 4 +- .../handlers/effecthandlers/Blink.java | 4 +- .../handlers/effecthandlers/BlinkSwap.java | 4 +- .../effecthandlers/BlockAbnormalSlot.java | 4 +- .../handlers/effecthandlers/BlockAction.java | 4 +- .../handlers/effecthandlers/BlockActions.java | 4 +- .../handlers/effecthandlers/BlockChat.java | 4 +- .../handlers/effecthandlers/BlockControl.java | 4 +- .../handlers/effecthandlers/BlockEscape.java | 4 +- .../handlers/effecthandlers/BlockMove.java | 4 +- .../handlers/effecthandlers/BlockParty.java | 4 +- .../effecthandlers/BlockResurrection.java | 4 +- .../handlers/effecthandlers/BlockSkill.java | 4 +- .../handlers/effecthandlers/BlockTarget.java | 4 +- .../handlers/effecthandlers/Bluff.java | 4 +- .../effecthandlers/BonusDropAmount.java | 4 +- .../effecthandlers/BonusDropRate.java | 4 +- .../effecthandlers/BonusSpoilRate.java | 4 +- .../handlers/effecthandlers/Breath.java | 4 +- .../handlers/effecthandlers/BuffBlock.java | 4 +- .../effecthandlers/CallLearnedSkill.java | 4 +- .../handlers/effecthandlers/CallParty.java | 4 +- .../handlers/effecthandlers/CallPc.java | 4 +- .../effecthandlers/CallRandomSkill.java | 4 +- .../handlers/effecthandlers/CallSkill.java | 4 +- .../effecthandlers/CallSkillOnActionTime.java | 4 +- .../effecthandlers/CallTargetParty.java | 4 +- .../effecthandlers/ChameleonRest.java | 4 +- .../handlers/effecthandlers/ChangeBody.java | 6 +- .../handlers/effecthandlers/ChangeFace.java | 4 +- .../effecthandlers/ChangeFishingMastery.java | 4 +- .../effecthandlers/ChangeHairColor.java | 4 +- .../effecthandlers/ChangeHairStyle.java | 4 +- .../handlers/effecthandlers/CheapShot.java | 4 +- .../handlers/effecthandlers/ClassChange.java | 4 +- .../handlers/effecthandlers/Compelling.java | 4 +- .../handlers/effecthandlers/Confuse.java | 4 +- .../handlers/effecthandlers/ConsumeBody.java | 4 +- .../handlers/effecthandlers/ConvertItem.java | 4 +- .../effecthandlers/CounterPhysicalSkill.java | 4 +- .../scripts/handlers/effecthandlers/Cp.java | 4 +- .../handlers/effecthandlers/CpHeal.java | 4 +- .../effecthandlers/CpHealOverTime.java | 4 +- .../effecthandlers/CpHealPercent.java | 4 +- .../handlers/effecthandlers/CpRegen.java | 4 +- .../effecthandlers/CraftingCritical.java | 4 +- .../effecthandlers/CreateCommonItem.java | 4 +- .../handlers/effecthandlers/CreateItem.java | 4 +- .../effecthandlers/CriticalDamage.java | 4 +- .../CriticalDamagePosition.java | 4 +- .../handlers/effecthandlers/CriticalRate.java | 4 +- .../CriticalRatePositionBonus.java | 4 +- .../effecthandlers/CrystalGradeModify.java | 4 +- .../handlers/effecthandlers/Crystallize.java | 4 +- .../handlers/effecthandlers/CubicMastery.java | 4 +- .../handlers/effecthandlers/DamOverTime.java | 4 +- .../effecthandlers/DamOverTimePercent.java | 4 +- .../handlers/effecthandlers/DamageBlock.java | 4 +- .../effecthandlers/DamageByAttack.java | 4 +- .../handlers/effecthandlers/DamageShield.java | 4 +- .../effecthandlers/DamageShieldResist.java | 4 +- .../handlers/effecthandlers/DeathLink.java | 4 +- .../handlers/effecthandlers/DebuffBlock.java | 4 +- .../effecthandlers/DefenceAttribute.java | 4 +- .../effecthandlers/DefenceCriticalDamage.java | 4 +- .../effecthandlers/DefenceCriticalRate.java | 4 +- .../DefenceMagicCriticalDamage.java | 4 +- .../DefenceMagicCriticalRate.java | 4 +- .../handlers/effecthandlers/DefenceTrait.java | 4 +- .../handlers/effecthandlers/DeleteHate.java | 4 +- .../effecthandlers/DeleteHateOfMe.java | 4 +- .../effecthandlers/DeleteTopAgro.java | 4 +- .../effecthandlers/DetectHiddenObjects.java | 4 +- .../handlers/effecthandlers/Detection.java | 4 +- .../handlers/effecthandlers/DisableSkill.java | 4 +- .../effecthandlers/DisableTargeting.java | 4 +- .../handlers/effecthandlers/Disarm.java | 4 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 4 +- .../effecthandlers/DispelByCategory.java | 4 +- .../handlers/effecthandlers/DispelBySlot.java | 4 +- .../effecthandlers/DispelBySlotMyself.java | 4 +- .../DispelBySlotProbability.java | 4 +- .../handlers/effecthandlers/DispelCaster.java | 4 +- .../handlers/effecthandlers/DoubleCast.java | 4 +- .../handlers/effecthandlers/DuelistFury.java | 4 +- .../handlers/effecthandlers/EnableCloak.java | 4 +- .../handlers/effecthandlers/EnergyAttack.java | 4 +- .../effecthandlers/EnlargeAbnormalSlot.java | 4 +- .../handlers/effecthandlers/EnlargeSlot.java | 4 +- .../handlers/effecthandlers/Escape.java | 4 +- .../handlers/effecthandlers/ExpModify.java | 4 +- .../handlers/effecthandlers/Faceoff.java | 4 +- .../handlers/effecthandlers/FakeDeath.java | 4 +- .../handlers/effecthandlers/FatalBlow.java | 4 +- .../effecthandlers/FatalBlowRate.java | 4 +- .../scripts/handlers/effecthandlers/Fear.java | 4 +- .../scripts/handlers/effecthandlers/Feed.java | 4 +- .../effecthandlers/FishingExpSpBonus.java | 4 +- .../scripts/handlers/effecthandlers/Flag.java | 4 +- .../handlers/effecthandlers/FlipBlock.java | 4 +- .../handlers/effecthandlers/FlyAway.java | 4 +- .../handlers/effecthandlers/FocusEnergy.java | 4 +- .../effecthandlers/FocusMaxMomentum.java | 4 +- .../effecthandlers/FocusMomentum.java | 4 +- .../handlers/effecthandlers/FocusSouls.java | 4 +- .../handlers/effecthandlers/GetAgro.java | 4 +- .../effecthandlers/GetDamageLimit.java | 4 +- .../handlers/effecthandlers/GetMomentum.java | 4 +- .../effecthandlers/GiveClanReputation.java | 4 +- .../handlers/effecthandlers/GiveExpAndSp.java | 4 +- .../handlers/effecthandlers/GiveFame.java | 4 +- .../effecthandlers/GiveRecommendation.java | 4 +- .../handlers/effecthandlers/GiveSp.java | 4 +- .../handlers/effecthandlers/GiveXp.java | 4 +- .../scripts/handlers/effecthandlers/Grow.java | 4 +- .../effecthandlers/HairAccessorySet.java | 4 +- .../handlers/effecthandlers/Harvesting.java | 4 +- .../handlers/effecthandlers/HateAttack.java | 4 +- .../effecthandlers/HeadquarterCreate.java | 4 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealEffect.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 4 +- .../handlers/effecthandlers/HealPercent.java | 4 +- .../scripts/handlers/effecthandlers/Hide.java | 4 +- .../handlers/effecthandlers/HitAtNight.java | 4 +- .../handlers/effecthandlers/HitNumber.java | 4 +- .../scripts/handlers/effecthandlers/Hp.java | 4 +- .../handlers/effecthandlers/HpByLevel.java | 4 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../effecthandlers/HpCpHealCritical.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 4 +- .../handlers/effecthandlers/HpRegen.java | 4 +- .../handlers/effecthandlers/HpToOwner.java | 4 +- .../handlers/effecthandlers/IgnoreDeath.java | 4 +- .../effecthandlers/ImmobilePetBuff.java | 4 +- .../effecthandlers/InstantKillResist.java | 4 +- .../handlers/effecthandlers/JewelSlot.java | 4 +- .../handlers/effecthandlers/KarmaCount.java | 4 +- .../handlers/effecthandlers/KnockBack.java | 4 +- .../handlers/effecthandlers/Lethal.java | 4 +- .../handlers/effecthandlers/LimitCp.java | 4 +- .../handlers/effecthandlers/LimitHp.java | 4 +- .../handlers/effecthandlers/LimitMp.java | 4 +- .../handlers/effecthandlers/LimitSkill.java | 4 +- .../handlers/effecthandlers/Lucky.java | 4 +- .../scripts/handlers/effecthandlers/MAtk.java | 4 +- .../effecthandlers/MagicAccuracy.java | 4 +- .../effecthandlers/MagicCriticalDamage.java | 4 +- .../effecthandlers/MagicCriticalRate.java | 4 +- .../handlers/effecthandlers/MagicMpCost.java | 4 +- .../MagicalAbnormalDispelAttack.java | 4 +- .../effecthandlers/MagicalAbnormalResist.java | 4 +- .../effecthandlers/MagicalAttack.java | 4 +- .../MagicalAttackByAbnormal.java | 4 +- .../MagicalAttackByAbnormalSlot.java | 4 +- .../effecthandlers/MagicalAttackMp.java | 4 +- .../effecthandlers/MagicalAttackRange.java | 4 +- .../effecthandlers/MagicalAttackSpeed.java | 4 +- .../effecthandlers/MagicalDamOverTime.java | 4 +- .../effecthandlers/MagicalDefence.java | 4 +- .../effecthandlers/MagicalEvasion.java | 4 +- .../effecthandlers/MagicalSkillPower.java | 4 +- .../effecthandlers/MagicalSoulAttack.java | 4 +- .../handlers/effecthandlers/ManaCharge.java | 4 +- .../effecthandlers/ManaDamOverTime.java | 4 +- .../handlers/effecthandlers/ManaHeal.java | 4 +- .../effecthandlers/ManaHealByLevel.java | 4 +- .../effecthandlers/ManaHealOverTime.java | 4 +- .../effecthandlers/ManaHealPercent.java | 4 +- .../handlers/effecthandlers/MaxCp.java | 4 +- .../handlers/effecthandlers/MaxHp.java | 4 +- .../handlers/effecthandlers/MaxMp.java | 4 +- .../handlers/effecthandlers/ModifyVital.java | 4 +- .../scripts/handlers/effecthandlers/Mp.java | 4 +- .../effecthandlers/MpConsumePerLevel.java | 4 +- .../handlers/effecthandlers/MpRegen.java | 4 +- .../handlers/effecthandlers/MpShield.java | 4 +- .../effecthandlers/MpVampiricAttack.java | 4 +- .../scripts/handlers/effecthandlers/Mute.java | 4 +- .../effecthandlers/NoblesseBless.java | 4 +- .../handlers/effecthandlers/OpenChest.java | 4 +- .../effecthandlers/OpenCommonRecipeBook.java | 4 +- .../handlers/effecthandlers/OpenDoor.java | 4 +- .../effecthandlers/OpenDwarfRecipeBook.java | 4 +- .../scripts/handlers/effecthandlers/PAtk.java | 4 +- .../handlers/effecthandlers/Passive.java | 4 +- .../PhysicalAbnormalResist.java | 4 +- .../effecthandlers/PhysicalAttack.java | 4 +- .../effecthandlers/PhysicalAttackHpLink.java | 4 +- .../effecthandlers/PhysicalAttackMute.java | 4 +- .../effecthandlers/PhysicalAttackRange.java | 4 +- .../effecthandlers/PhysicalAttackSaveHp.java | 4 +- .../effecthandlers/PhysicalAttackSpeed.java | 4 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../effecthandlers/PhysicalDefence.java | 4 +- .../effecthandlers/PhysicalEvasion.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 4 +- .../PhysicalShieldAngleAll.java | 4 +- .../effecthandlers/PhysicalSkillPower.java | 4 +- .../effecthandlers/PhysicalSoulAttack.java | 4 +- .../handlers/effecthandlers/PkCount.java | 4 +- .../handlers/effecthandlers/Plunder.java | 4 +- .../effecthandlers/PolearmSingleTarget.java | 4 +- .../effecthandlers/ProtectDeathPenalty.java | 4 +- .../effecthandlers/ProtectionBlessing.java | 4 +- .../handlers/effecthandlers/PullBack.java | 4 +- .../PveMagicalSkillDamageBonus.java | 4 +- .../PveMagicalSkillDefenceBonus.java | 4 +- .../PvePhysicalAttackDamageBonus.java | 4 +- .../PvePhysicalAttackDefenceBonus.java | 4 +- .../PvePhysicalSkillDamageBonus.java | 4 +- .../PvePhysicalSkillDefenceBonus.java | 4 +- .../PveRaidMagicalSkillDefenceBonus.java | 4 +- .../PveRaidPhysicalAttackDefenceBonus.java | 4 +- .../PveRaidPhysicalSkillDefenceBonus.java | 4 +- .../PvpMagicalSkillDamageBonus.java | 4 +- .../PvpMagicalSkillDefenceBonus.java | 4 +- .../PvpPhysicalAttackDamageBonus.java | 4 +- .../PvpPhysicalAttackDefenceBonus.java | 4 +- .../PvpPhysicalSkillDamageBonus.java | 4 +- .../PvpPhysicalSkillDefenceBonus.java | 4 +- .../effecthandlers/RandomizeHate.java | 4 +- .../handlers/effecthandlers/RealDamage.java | 4 +- .../handlers/effecthandlers/RearDamage.java | 4 +- .../handlers/effecthandlers/RebalanceHP.java | 4 +- .../effecthandlers/RebalanceHPSummon.java | 4 +- .../RecoverVitalityInPeaceZone.java | 4 +- .../handlers/effecthandlers/Recovery.java | 4 +- .../handlers/effecthandlers/ReduceCancel.java | 4 +- .../handlers/effecthandlers/ReduceDamage.java | 4 +- .../effecthandlers/ReduceDropPenalty.java | 4 +- .../handlers/effecthandlers/ReflectMagic.java | 4 +- .../handlers/effecthandlers/ReflectSkill.java | 4 +- .../effecthandlers/RefuelAirship.java | 4 +- .../handlers/effecthandlers/Relax.java | 4 +- .../effecthandlers/RemoveEquipPenalty.java | 4 +- .../effecthandlers/ReplaceSkillBySkill.java | 4 +- .../effecthandlers/ResetInstanceEntry.java | 4 +- .../ResistAbnormalByCategory.java | 4 +- .../effecthandlers/ResistDDMagic.java | 4 +- .../ResistDispelByCategory.java | 4 +- .../handlers/effecthandlers/ResistSkill.java | 4 +- .../handlers/effecthandlers/Restoration.java | 4 +- .../effecthandlers/RestorationRandom.java | 8 +- .../handlers/effecthandlers/Resurrection.java | 4 +- .../effecthandlers/ResurrectionSpecial.java | 4 +- .../handlers/effecthandlers/Reuse.java | 4 +- .../effecthandlers/ReuseSkillById.java | 4 +- .../scripts/handlers/effecthandlers/Root.java | 4 +- .../effecthandlers/SacrificeSummon.java | 4 +- .../effecthandlers/SafeFallHeight.java | 4 +- .../SendSystemMessageToClan.java | 4 +- .../effecthandlers/ServitorShare.java | 4 +- .../handlers/effecthandlers/SetHp.java | 4 +- .../handlers/effecthandlers/SetSkill.java | 4 +- .../effecthandlers/ShieldDefence.java | 4 +- .../effecthandlers/ShieldDefenceRate.java | 4 +- .../handlers/effecthandlers/SilentMove.java | 4 +- .../effecthandlers/SkillCritical.java | 4 +- .../effecthandlers/SkillCriticalDamage.java | 4 +- .../SkillCriticalProbability.java | 4 +- .../handlers/effecthandlers/SkillEvasion.java | 4 +- .../effecthandlers/SkillPowerAdd.java | 4 +- .../handlers/effecthandlers/SkillTurning.java | 4 +- .../effecthandlers/SkillTurningOverTime.java | 4 +- .../handlers/effecthandlers/SoulBlow.java | 4 +- .../handlers/effecthandlers/SoulEating.java | 4 +- .../scripts/handlers/effecthandlers/Sow.java | 4 +- .../handlers/effecthandlers/SpModify.java | 4 +- .../handlers/effecthandlers/Speed.java | 4 +- .../effecthandlers/SphericBarrier.java | 4 +- .../handlers/effecthandlers/Spoil.java | 4 +- .../StatBonusSkillCritical.java | 4 +- .../effecthandlers/StatBonusSpeed.java | 4 +- .../effecthandlers/StatByMoveType.java | 4 +- .../handlers/effecthandlers/StatUp.java | 4 +- .../effecthandlers/StealAbnormal.java | 4 +- .../handlers/effecthandlers/Summon.java | 4 +- .../effecthandlers/SummonAgathion.java | 4 +- .../handlers/effecthandlers/SummonCubic.java | 4 +- .../effecthandlers/SummonHallucination.java | 4 +- .../handlers/effecthandlers/SummonMulti.java | 4 +- .../handlers/effecthandlers/SummonNpc.java | 4 +- .../handlers/effecthandlers/SummonPet.java | 4 +- .../handlers/effecthandlers/SummonPoints.java | 4 +- .../handlers/effecthandlers/SummonTrap.java | 4 +- .../handlers/effecthandlers/Sweeper.java | 4 +- .../handlers/effecthandlers/Synergy.java | 4 +- .../handlers/effecthandlers/TakeCastle.java | 4 +- .../effecthandlers/TakeCastleStart.java | 4 +- .../handlers/effecthandlers/TakeFort.java | 4 +- .../effecthandlers/TakeFortStart.java | 4 +- .../handlers/effecthandlers/TalismanSlot.java | 4 +- .../handlers/effecthandlers/TargetCancel.java | 4 +- .../handlers/effecthandlers/TargetMe.java | 4 +- .../effecthandlers/TargetMeProbability.java | 4 +- .../handlers/effecthandlers/Teleport.java | 4 +- .../effecthandlers/TeleportToNpc.java | 4 +- .../effecthandlers/TeleportToPlayer.java | 4 +- .../effecthandlers/TeleportToSummon.java | 4 +- .../effecthandlers/TeleportToTarget.java | 4 +- .../effecthandlers/TrackLimitedSkill.java | 4 +- .../TransferDamageToPlayer.java | 4 +- .../TransferDamageToSummon.java | 4 +- .../handlers/effecthandlers/TransferHate.java | 4 +- .../effecthandlers/Transformation.java | 4 +- .../handlers/effecthandlers/TrapDetect.java | 4 +- .../handlers/effecthandlers/TrapRemove.java | 4 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 4 +- .../effecthandlers/TriggerSkillByDamage.java | 4 +- .../TriggerSkillByDeathBlow.java | 4 +- .../effecthandlers/TriggerSkillByKill.java | 4 +- .../TriggerSkillByMagicType.java | 4 +- .../effecthandlers/TriggerSkillBySkill.java | 4 +- .../TriggerSkillBySkillAttack.java | 4 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 4 +- .../effecthandlers/UnsummonAgathion.java | 4 +- .../effecthandlers/UnsummonServitors.java | 4 +- .../handlers/effecthandlers/Untargetable.java | 4 +- .../effecthandlers/VampiricAttack.java | 4 +- .../effecthandlers/VampiricDefence.java | 4 +- .../effecthandlers/VitalityExpRate.java | 4 +- .../effecthandlers/VitalityPointUp.java | 4 +- .../effecthandlers/VitalityPointsRate.java | 4 +- .../handlers/effecthandlers/WeightLimit.java | 4 +- .../effecthandlers/WeightPenalty.java | 4 +- .../effecthandlers/WorldChatPoints.java | 4 +- .../BuildAdvanceBaseSkillCondition.java | 4 +- .../BuildCampSkillCondition.java | 4 +- ...CanAddMaxEntranceInzoneSkillCondition.java | 4 +- .../CanBookmarkAddSlotSkillCondition.java | 4 +- ...CanChangeVitalItemCountSkillCondition.java | 4 +- .../CanEnchantAttributeSkillCondition.java | 4 +- .../CanMountForEventSkillCondition.java | 4 +- .../CanRefuelAirshipSkillCondition.java | 4 +- .../CanRestoreVitalPointSkillCondition.java | 4 +- .../CanSummonCubicSkillCondition.java | 4 +- .../CanSummonMultiSkillCondition.java | 4 +- .../CanSummonPetSkillCondition.java | 4 +- .../CanSummonSiegeGolemSkillCondition.java | 4 +- .../CanSummonSkillCondition.java | 4 +- .../CanTransformInDominionSkillCondition.java | 4 +- .../CanTransformSkillCondition.java | 4 +- .../CanUntransformSkillCondition.java | 4 +- .../CanUseInBattlefieldSkillCondition.java | 4 +- .../CanUseInDragonLairSkillCondition.java | 4 +- .../CanUseSwoopCannonSkillCondition.java | 4 +- ...nUseVitalityConsumeItemSkillCondition.java | 4 +- .../CannotUseInTransformSkillCondition.java | 4 +- .../CheckLevelSkillCondition.java | 4 +- .../CheckSexSkillCondition.java | 4 +- .../ConsumeBodySkillCondition.java | 4 +- .../EnergySavedSkillCondition.java | 4 +- .../EquipArmorSkillCondition.java | 4 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../NotFearedSkillCondition.java | 4 +- .../NotInUnderwaterSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 4 +- .../OpAffectedBySkillSkillCondition.java | 4 +- .../OpAgathionEnergySkillCondition.java | 4 +- .../OpAlignmentSkillCondition.java | 4 +- .../OpBlinkSkillCondition.java | 4 +- .../OpCallPcSkillCondition.java | 4 +- .../OpCanEscapeSkillCondition.java | 4 +- .../OpCanNotUseAirshipSkillCondition.java | 4 +- ...eTargetWithPrivateStoreSkillCondition.java | 4 +- .../OpChangeWeaponSkillCondition.java | 4 +- .../OpCheckAbnormalSkillCondition.java | 4 +- .../OpCheckAccountTypeSkillCondition.java | 4 +- .../OpCheckCastRangeSkillCondition.java | 4 +- .../OpCheckClassListSkillCondition.java | 4 +- .../OpCheckClassSkillCondition.java | 4 +- .../OpCheckCrtEffectSkillCondition.java | 4 +- .../OpCheckFlagSkillCondition.java | 4 +- ...eckOnGoingEventCampaignSkillCondition.java | 4 +- .../OpCheckPcbangPointSkillCondition.java | 4 +- .../OpCheckResidenceSkillCondition.java | 4 +- .../OpCheckSkillListSkillCondition.java | 4 +- .../OpCheckSkillSkillCondition.java | 4 +- .../OpCompanionSkillCondition.java | 4 +- .../OpEnchantRangeSkillCondition.java | 4 +- .../OpEncumberedSkillCondition.java | 4 +- .../OpEnergyMaxSkillCondition.java | 4 +- .../OpEquipItemSkillCondition.java | 4 +- .../OpExistNpcSkillCondition.java | 4 +- .../OpFishingCastSkillCondition.java | 4 +- .../OpFishingPumpingSkillCondition.java | 4 +- .../OpFishingReelingSkillCondition.java | 4 +- .../OpHaveSummonSkillCondition.java | 4 +- .../OpHaveSummonedNpcSkillCondition.java | 4 +- .../OpHomeSkillCondition.java | 4 +- .../OpInSiegeTimeSkillCondition.java | 4 +- .../OpInstantzoneSkillCondition.java | 4 +- .../OpMainjobSkillCondition.java | 4 +- .../OpNeedAgathionSkillCondition.java | 4 +- .../OpNeedSummonOrPetSkillCondition.java | 4 +- .../OpNotCursedSkillCondition.java | 4 +- .../OpNotInCeremonyOfChaosSkillCondition.java | 4 +- .../OpNotInPeacezoneSkillCondition.java | 4 +- .../OpNotInstantzoneSkillCondition.java | 4 +- .../OpNotOlympiadSkillCondition.java | 4 +- .../OpNotTerritorySkillCondition.java | 4 +- .../OpPeacezoneSkillCondition.java | 4 +- .../OpPkcountSkillCondition.java | 4 +- .../OpPledgeSkillCondition.java | 4 +- .../OpRestartPointSkillCondition.java | 4 +- .../OpResurrectionSkillCondition.java | 4 +- .../OpSiegeHammerSkillCondition.java | 4 +- .../OpSkillAcquireSkillCondition.java | 4 +- .../OpSkillSkillCondition.java | 4 +- .../OpSocialClassSkillCondition.java | 4 +- .../OpSoulMaxSkillCondition.java | 4 +- .../OpSubjobSkillCondition.java | 4 +- .../OpSweeperSkillCondition.java | 4 +- .../OpTargetAllItemTypeSkillCondition.java | 4 +- .../OpTargetArmorTypeSkillCondition.java | 4 +- .../OpTargetDoorSkillCondition.java | 4 +- ...OpTargetMyPledgeAcademySkillCondition.java | 4 +- .../OpTargetNpcSkillCondition.java | 4 +- .../OpTargetPcSkillCondition.java | 4 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../OpTerritorySkillCondition.java | 4 +- .../OpUnlockSkillCondition.java | 4 +- .../OpUseFirecrackerSkillCondition.java | 4 +- .../OpUsePraseedSkillCondition.java | 4 +- .../OpWyvernSkillCondition.java | 4 +- .../PossessHolythingSkillCondition.java | 4 +- .../RemainCpPerSkillCondition.java | 4 +- .../RemainHpPerSkillCondition.java | 4 +- .../RemainMpPerSkillCondition.java | 4 +- .../SoulSavedSkillCondition.java | 4 +- .../TargetItemCrystalTypeSkillCondition.java | 4 +- .../TargetMyMenteeSkillCondition.java | 4 +- .../TargetMyPartySkillCondition.java | 4 +- .../TargetMyPledgeSkillCondition.java | 4 +- .../TargetRaceSkillCondition.java | 4 +- .../ChambersOfDelusion/ChamberOfDelusion.java | 4 +- .../CrystalCavernsCoralGarden.java | 6 +- .../CrystalCavernsEmeraldSquare.java | 14 +- .../CrystalCavernsSteamCorridor.java | 14 +- .../DarkCloudMansion/DarkCloudMansion.java | 4 +- .../FaeronTrainingGrounds1.java | 6 +- .../FaeronTrainingGrounds2.java | 6 +- .../HarnakUndergroundRuins.java | 4 +- .../KartiasLabyrinth/KartiaBoss.java | 6 +- .../KartiasLabyrinth/KartiaHelperAdolph.java | 10 +- .../KartiasLabyrinth/KartiaHelperBarton.java | 6 +- .../KartiasLabyrinth/KartiaHelperElise.java | 12 +- .../KartiasLabyrinth/KartiaHelperEliyah.java | 4 +- .../KartiaHelperGuardian.java | 6 +- .../KartiasLabyrinth/KartiaHelperHayuk.java | 6 +- .../KartiasLabyrinth/KartiaSupportTroop.java | 4 +- .../KartiasLabyrinth/KartiasLabyrinth.java | 8 +- .../LabyrinthOfBelis/LabyrinthOfBelis.java | 4 +- .../MemoryOfDisaster/MemoryOfDisaster.java | 4 +- .../MuseumDungeon/MuseumDungeon.java | 4 +- .../scripts/instances/Nursery/Nursery.java | 16 +- .../PailakaInjuredDragon.java | 4 +- .../PrisonOfDarkness/PrisonOfDarkness.java | 12 +- .../TaintedDimension/TaintedDimension.java | 4 +- .../Q10771_VolatilePower.java | 4 +- .../Q10772_ReportsFromCrumaTowerPart1.java | 4 +- .../Q10776_TheWrathOfTheGiants.java | 4 +- .../Q10777_ReportsFromCrumaTowerPart2.java | 4 +- .../Q10787_ASpyMission.java | 4 +- .../gameserver/data/xml/impl/ActionData.java | 4 +- .../gameserver/data/xml/impl/AdminData.java | 8 +- .../gameserver/data/xml/impl/AlchemyData.java | 6 +- .../data/xml/impl/AppearanceItemData.java | 6 +- .../data/xml/impl/AttendanceRewardData.java | 4 +- .../data/xml/impl/BeautyShopData.java | 10 +- .../data/xml/impl/ClanHallData.java | 4 +- .../data/xml/impl/ClanMasteryData.java | 4 +- .../data/xml/impl/ClanShopData.java | 4 +- .../data/xml/impl/CombinationItemsData.java | 4 +- .../gameserver/data/xml/impl/CubicData.java | 6 +- .../data/xml/impl/DailyMissionData.java | 8 +- .../gameserver/data/xml/impl/DoorData.java | 14 +- .../data/xml/impl/EnchantItemData.java | 8 +- .../data/xml/impl/EnchantSkillGroupsData.java | 6 +- .../data/xml/impl/EventEngineData.java | 12 +- .../data/xml/impl/ExtendDropData.java | 26 +- .../data/xml/impl/FakePlayerData.java | 4 +- .../gameserver/data/xml/impl/FenceData.java | 4 +- .../gameserver/data/xml/impl/HennaData.java | 4 +- .../data/xml/impl/InitialEquipmentData.java | 4 +- .../data/xml/impl/LuckyGameData.java | 10 +- .../data/xml/impl/MultisellData.java | 4 +- .../gameserver/data/xml/impl/NpcData.java | 8 +- .../xml/impl/NpcNameLocalisationData.java | 4 +- .../gameserver/data/xml/impl/OptionData.java | 4 +- .../data/xml/impl/PetDataTable.java | 4 +- .../data/xml/impl/PlayerTemplateData.java | 4 +- .../data/xml/impl/PrimeShopData.java | 4 +- .../gameserver/data/xml/impl/RecipeData.java | 6 +- .../data/xml/impl/ResidenceFunctionsData.java | 6 +- .../xml/impl/SendMessageLocalisationData.java | 4 +- .../gameserver/data/xml/impl/ShuttleData.java | 8 +- .../data/xml/impl/SiegeScheduleData.java | 6 +- .../gameserver/data/xml/impl/SkillData.java | 86 +- .../data/xml/impl/SkillTreesData.java | 4 +- .../gameserver/data/xml/impl/SpawnsData.java | 16 +- .../data/xml/impl/StaticObjectData.java | 8 +- .../data/xml/impl/TeleportersData.java | 4 +- .../data/xml/impl/TransformData.java | 6 +- .../gameserver/engines/DocumentBase.java | 8 +- .../engines/DocumentBaseGeneral.java | 4 +- .../engines/items/DocumentItem.java | 8 +- .../engines/items/ItemDataHolder.java | 4 +- .../gameserver/handler/ConditionHandler.java | 8 +- .../gameserver/handler/EffectHandler.java | 8 +- .../handler/SkillConditionHandler.java | 8 +- .../instancemanager/AirShipManager.java | 18 +- .../instancemanager/BoatManager.java | 4 +- .../instancemanager/CastleManorManager.java | 6 +- .../CeremonyOfChaosManager.java | 6 +- .../instancemanager/DBSpawnManager.java | 20 +- .../FakePlayerChatManager.java | 4 +- .../instancemanager/GrandBossManager.java | 16 +- .../instancemanager/InstanceManager.java | 20 +- .../gameserver/model/AccessLevel.java | 2 +- .../gameserver/model/ActionDataHolder.java | 2 +- .../model/AdminCommandAccessRight.java | 2 +- .../model/DailyMissionDataHolder.java | 8 +- .../l2jmobius/gameserver/model/Location.java | 2 +- .../gameserver/model/PetLevelData.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../gameserver/model/SiegeScheduleDate.java | 2 +- .../gameserver/model/SkillLearn.java | 2 +- .../l2jmobius/gameserver/model/StatSet.java | 968 ++++++++++++++++++ .../l2jmobius/gameserver/model/StatsSet.java | 968 ------------------ .../l2jmobius/gameserver/model/actor/Npc.java | 10 +- .../actor/templates/CreatureTemplate.java | 6 +- .../model/actor/templates/CubicTemplate.java | 4 +- .../model/actor/templates/DoorTemplate.java | 4 +- .../model/actor/templates/NpcTemplate.java | 14 +- .../model/actor/templates/PlayerTemplate.java | 4 +- .../model/actor/transform/Transform.java | 4 +- .../actor/transform/TransformLevelData.java | 4 +- .../actor/transform/TransformTemplate.java | 4 +- .../model/alchemy/AlchemyCraftData.java | 4 +- .../model/beautyshop/BeautyItem.java | 6 +- .../ceremonyofchaos/CeremonyOfChaosEvent.java | 8 +- .../gameserver/model/cubic/CubicSkill.java | 4 +- .../gameserver/model/entity/ClanHall.java | 4 +- .../gameserver/model/entity/Hero.java | 70 +- .../eventengine/AbstractEventManager.java | 10 +- .../model/eventengine/EventScheduler.java | 4 +- .../model/events/AbstractScript.java | 6 +- .../model/events/TimerExecutor.java | 8 +- .../model/events/timers/TimerHolder.java | 8 +- .../model/holders/AppearanceHolder.java | 4 +- .../model/holders/AttachSkillHolder.java | 4 +- .../model/holders/EnchantSkillHolder.java | 4 +- .../model/holders/ExtendDropDataHolder.java | 4 +- .../model/holders/FakePlayerHolder.java | 4 +- .../gameserver/model/holders/ItemHolder.java | 4 +- .../model/holders/ItemPointHolder.java | 4 +- .../model/holders/LuckyGameDataHolder.java | 4 +- .../model/holders/MinionHolder.java | 4 +- .../model/holders/MultisellListHolder.java | 4 +- .../model/holders/RecipeHolder.java | 4 +- .../model/instancezone/Instance.java | 8 +- .../model/instancezone/InstanceTemplate.java | 10 +- .../instancezone/conditions/Condition.java | 8 +- .../conditions/ConditionCommandChannel.java | 4 +- .../ConditionCommandChannelLeader.java | 4 +- .../conditions/ConditionDistance.java | 4 +- .../conditions/ConditionGroupMax.java | 4 +- .../conditions/ConditionGroupMin.java | 4 +- .../conditions/ConditionHasResidence.java | 6 +- .../conditions/ConditionItem.java | 4 +- .../conditions/ConditionLevel.java | 4 +- .../conditions/ConditionNoParty.java | 4 +- .../conditions/ConditionParty.java | 4 +- .../conditions/ConditionPartyLeader.java | 4 +- .../conditions/ConditionQuest.java | 4 +- .../conditions/ConditionReenter.java | 4 +- .../itemauction/AuctionDateGenerator.java | 4 +- .../model/itemauction/AuctionItem.java | 6 +- .../itemauction/ItemAuctionInstance.java | 6 +- .../gameserver/model/items/Armor.java | 8 +- .../gameserver/model/items/EtcItem.java | 8 +- .../gameserver/model/items/Henna.java | 4 +- .../gameserver/model/items/Item.java | 8 +- .../model/items/PlayerItemTemplate.java | 4 +- .../gameserver/model/items/Weapon.java | 8 +- .../items/appearance/AppearanceStone.java | 4 +- .../items/combination/CombinationItem.java | 4 +- .../items/enchant/AbstractEnchantItem.java | 4 +- .../model/items/enchant/EnchantScroll.java | 4 +- .../items/enchant/EnchantSupportItem.java | 4 +- .../gameserver/model/olympiad/Olympiad.java | 38 +- .../model/olympiad/Participant.java | 6 +- .../model/primeshop/PrimeShopGroup.java | 4 +- .../residences/ResidenceFunctionTemplate.java | 4 +- .../model/shuttle/ShuttleDataHolder.java | 4 +- .../gameserver/model/skills/Skill.java | 6 +- .../model/spawns/NpcSpawnTemplate.java | 16 +- .../gameserver/model/spawns/SpawnGroup.java | 12 +- .../model/spawns/SpawnTemplate.java | 12 +- .../model/teleporter/TeleportHolder.java | 4 +- .../model/teleporter/TeleportLocation.java | 4 +- .../model/variables/AbstractVariables.java | 18 +- .../network/serverpackets/ExHeroList.java | 6 +- .../gameserver/util/BypassParser.java | 4 +- .../ai/areas/BeastFarm/ImprovedBabyPets.java | 6 +- .../ai/areas/FairySettlement/Wisp.java | 6 +- .../EntrancePortalToCrystalCaverns.java | 4 +- .../ai/areas/SeedOfHellfire/Zofan.java | 4 +- .../areas/TalkingIsland/Walkers/Allada.java | 4 +- .../ai/areas/TalkingIsland/Walkers/Mei.java | 4 +- .../areas/TalkingIsland/Walkers/Remons.java | 4 +- .../ai/areas/TalkingIsland/Walkers/Rinne.java | 4 +- .../areas/TalkingIsland/Walkers/Rotina.java | 4 +- .../ai/areas/TalkingIsland/Walkers/Soros.java | 4 +- .../ElmoredenServantsGhost.java | 4 +- .../data/scripts/ai/bosses/Anakim/Anakim.java | 8 +- .../scripts/ai/bosses/Antharas/Antharas.java | 6 +- .../data/scripts/ai/bosses/Baium/Baium.java | 6 +- .../scripts/ai/bosses/Balok/BalokWarzone.java | 4 +- .../ai/bosses/Baylor/BaylorWarzone.java | 4 +- .../data/scripts/ai/bosses/Beleth/Beleth.java | 8 +- .../data/scripts/ai/bosses/Core/Core.java | 8 +- .../IceQueensCastleBattle.java | 8 +- .../data/scripts/ai/bosses/Helios/Helios.java | 8 +- .../ai/bosses/Istina/IstinaCavern.java | 14 +- .../data/scripts/ai/bosses/Kelbim/Kelbim.java | 8 +- .../ai/bosses/Kimerian/KimerianCommon.java | 8 +- .../data/scripts/ai/bosses/Lilith/Lilith.java | 8 +- .../scripts/ai/bosses/Lindvior/Lindvior.java | 10 +- .../ai/bosses/Lindvior/LionelHunter.java | 4 +- .../ai/bosses/Octavis/OctavisWarzone.java | 10 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 8 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 8 +- .../ai/bosses/Spezion/Cannon/Cannon.java | 4 +- .../ai/bosses/Teredor/TeredorWarzone.java | 14 +- .../scripts/ai/bosses/Trasken/Trasken.java | 8 +- .../scripts/ai/bosses/Valakas/Valakas.java | 8 +- .../Zaken/CavernOfThePirateCaptain.java | 6 +- .../data/scripts/ai/others/AreaSkillNpc.java | 4 +- .../CastleTeleporter/CastleTeleporter.java | 6 +- .../others/NpcBuffers/NpcBufferSkillData.java | 4 +- .../ai/others/NpcBuffers/NpcBuffersData.java | 6 +- .../scripts/ai/others/Servitors/ClanFlag.java | 4 +- .../Servitors/GateOfUnlimitedSummoning.java | 4 +- .../ai/others/Servitors/TreeOfLife.java | 4 +- .../ai/others/TersisHerald/TersisHerald.java | 4 +- .../admincommandhandlers/AdminGrandBoss.java | 4 +- .../admincommandhandlers/AdminOlympiad.java | 14 +- .../conditions/CategoryTypeCondition.java | 4 +- .../conditions/NpcLevelCondition.java | 4 +- .../conditions/PlayerLevelCondition.java | 4 +- .../effecthandlers/AbnormalShield.java | 4 +- .../effecthandlers/AbnormalTimeChange.java | 4 +- .../handlers/effecthandlers/AbsorbDamage.java | 4 +- .../AbstractConditionalHpEffect.java | 4 +- .../effecthandlers/AbstractStatAddEffect.java | 4 +- .../effecthandlers/AbstractStatEffect.java | 6 +- .../AbstractStatPercentEffect.java | 4 +- .../handlers/effecthandlers/Accuracy.java | 4 +- .../handlers/effecthandlers/AddHate.java | 4 +- .../effecthandlers/AddSkillBySkill.java | 4 +- .../AddTeleportBookmarkSlot.java | 4 +- .../effecthandlers/AdditionalPotionCp.java | 4 +- .../effecthandlers/AdditionalPotionHp.java | 4 +- .../effecthandlers/AdditionalPotionMp.java | 4 +- .../handlers/effecthandlers/AgathionSlot.java | 4 +- .../handlers/effecthandlers/AirBind.java | 4 +- .../handlers/effecthandlers/AreaDamage.java | 4 +- .../handlers/effecthandlers/ArtifactSlot.java | 4 +- .../effecthandlers/AttackAttribute.java | 4 +- .../effecthandlers/AttackAttributeAdd.java | 4 +- .../handlers/effecthandlers/AttackBehind.java | 4 +- .../handlers/effecthandlers/AttackTrait.java | 4 +- .../handlers/effecthandlers/Backstab.java | 4 +- .../handlers/effecthandlers/Betray.java | 4 +- .../handlers/effecthandlers/Blink.java | 4 +- .../handlers/effecthandlers/BlinkSwap.java | 4 +- .../effecthandlers/BlockAbnormalSlot.java | 4 +- .../handlers/effecthandlers/BlockAction.java | 4 +- .../handlers/effecthandlers/BlockActions.java | 4 +- .../handlers/effecthandlers/BlockChat.java | 4 +- .../handlers/effecthandlers/BlockControl.java | 4 +- .../handlers/effecthandlers/BlockEscape.java | 4 +- .../handlers/effecthandlers/BlockMove.java | 4 +- .../handlers/effecthandlers/BlockParty.java | 4 +- .../effecthandlers/BlockResurrection.java | 4 +- .../handlers/effecthandlers/BlockSkill.java | 4 +- .../handlers/effecthandlers/BlockTarget.java | 4 +- .../handlers/effecthandlers/Bluff.java | 4 +- .../effecthandlers/BonusDropAmount.java | 4 +- .../effecthandlers/BonusDropRate.java | 4 +- .../effecthandlers/BonusSpoilRate.java | 4 +- .../handlers/effecthandlers/Breath.java | 4 +- .../handlers/effecthandlers/BuffBlock.java | 4 +- .../effecthandlers/CallLearnedSkill.java | 4 +- .../handlers/effecthandlers/CallParty.java | 4 +- .../handlers/effecthandlers/CallPc.java | 4 +- .../effecthandlers/CallRandomSkill.java | 4 +- .../handlers/effecthandlers/CallSkill.java | 4 +- .../effecthandlers/CallSkillOnActionTime.java | 4 +- .../effecthandlers/CallTargetParty.java | 4 +- .../effecthandlers/ChameleonRest.java | 4 +- .../handlers/effecthandlers/ChangeBody.java | 6 +- .../handlers/effecthandlers/ChangeFace.java | 4 +- .../effecthandlers/ChangeFishingMastery.java | 4 +- .../effecthandlers/ChangeHairColor.java | 4 +- .../effecthandlers/ChangeHairStyle.java | 4 +- .../handlers/effecthandlers/CheapShot.java | 4 +- .../handlers/effecthandlers/ClassChange.java | 4 +- .../handlers/effecthandlers/Compelling.java | 4 +- .../handlers/effecthandlers/Confuse.java | 4 +- .../handlers/effecthandlers/ConsumeBody.java | 4 +- .../handlers/effecthandlers/ConvertItem.java | 4 +- .../effecthandlers/CounterPhysicalSkill.java | 4 +- .../scripts/handlers/effecthandlers/Cp.java | 4 +- .../handlers/effecthandlers/CpHeal.java | 4 +- .../effecthandlers/CpHealOverTime.java | 4 +- .../effecthandlers/CpHealPercent.java | 4 +- .../handlers/effecthandlers/CpRegen.java | 4 +- .../effecthandlers/CraftingCritical.java | 4 +- .../effecthandlers/CreateCommonItem.java | 4 +- .../handlers/effecthandlers/CreateItem.java | 4 +- .../effecthandlers/CriticalDamage.java | 4 +- .../CriticalDamagePosition.java | 4 +- .../handlers/effecthandlers/CriticalRate.java | 4 +- .../CriticalRatePositionBonus.java | 4 +- .../effecthandlers/CrystalGradeModify.java | 4 +- .../handlers/effecthandlers/Crystallize.java | 4 +- .../handlers/effecthandlers/CubicMastery.java | 4 +- .../handlers/effecthandlers/DamOverTime.java | 4 +- .../effecthandlers/DamOverTimePercent.java | 4 +- .../handlers/effecthandlers/DamageBlock.java | 4 +- .../effecthandlers/DamageByAttack.java | 4 +- .../handlers/effecthandlers/DamageShield.java | 4 +- .../effecthandlers/DamageShieldResist.java | 4 +- .../handlers/effecthandlers/DeathLink.java | 4 +- .../handlers/effecthandlers/DebuffBlock.java | 4 +- .../effecthandlers/DefenceAttribute.java | 4 +- .../effecthandlers/DefenceCriticalDamage.java | 4 +- .../effecthandlers/DefenceCriticalRate.java | 4 +- .../DefenceMagicCriticalDamage.java | 4 +- .../DefenceMagicCriticalRate.java | 4 +- .../handlers/effecthandlers/DefenceTrait.java | 4 +- .../handlers/effecthandlers/DeleteHate.java | 4 +- .../effecthandlers/DeleteHateOfMe.java | 4 +- .../effecthandlers/DeleteTopAgro.java | 4 +- .../effecthandlers/DetectHiddenObjects.java | 4 +- .../handlers/effecthandlers/Detection.java | 4 +- .../handlers/effecthandlers/DisableSkill.java | 4 +- .../effecthandlers/DisableTargeting.java | 4 +- .../handlers/effecthandlers/Disarm.java | 4 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 4 +- .../effecthandlers/DispelByCategory.java | 4 +- .../handlers/effecthandlers/DispelBySlot.java | 4 +- .../effecthandlers/DispelBySlotMyself.java | 4 +- .../DispelBySlotProbability.java | 4 +- .../handlers/effecthandlers/DispelCaster.java | 4 +- .../handlers/effecthandlers/DoubleCast.java | 4 +- .../handlers/effecthandlers/DuelistFury.java | 4 +- .../handlers/effecthandlers/EnableCloak.java | 4 +- .../handlers/effecthandlers/EnergyAttack.java | 4 +- .../effecthandlers/EnlargeAbnormalSlot.java | 4 +- .../handlers/effecthandlers/EnlargeSlot.java | 4 +- .../handlers/effecthandlers/Escape.java | 4 +- .../handlers/effecthandlers/ExpModify.java | 4 +- .../handlers/effecthandlers/Faceoff.java | 4 +- .../handlers/effecthandlers/FakeDeath.java | 4 +- .../handlers/effecthandlers/FatalBlow.java | 4 +- .../effecthandlers/FatalBlowRate.java | 4 +- .../scripts/handlers/effecthandlers/Fear.java | 4 +- .../scripts/handlers/effecthandlers/Feed.java | 4 +- .../effecthandlers/FishingExpSpBonus.java | 4 +- .../scripts/handlers/effecthandlers/Flag.java | 4 +- .../handlers/effecthandlers/FlipBlock.java | 4 +- .../handlers/effecthandlers/FlyAway.java | 4 +- .../handlers/effecthandlers/FocusEnergy.java | 4 +- .../effecthandlers/FocusMaxMomentum.java | 4 +- .../effecthandlers/FocusMomentum.java | 4 +- .../handlers/effecthandlers/FocusSouls.java | 4 +- .../handlers/effecthandlers/GetAgro.java | 4 +- .../effecthandlers/GetDamageLimit.java | 4 +- .../handlers/effecthandlers/GetMomentum.java | 4 +- .../effecthandlers/GiveClanReputation.java | 4 +- .../handlers/effecthandlers/GiveExpAndSp.java | 4 +- .../handlers/effecthandlers/GiveFame.java | 4 +- .../effecthandlers/GiveRecommendation.java | 4 +- .../handlers/effecthandlers/GiveSp.java | 4 +- .../handlers/effecthandlers/GiveXp.java | 4 +- .../scripts/handlers/effecthandlers/Grow.java | 4 +- .../effecthandlers/HairAccessorySet.java | 4 +- .../handlers/effecthandlers/Harvesting.java | 4 +- .../handlers/effecthandlers/HateAttack.java | 4 +- .../effecthandlers/HeadquarterCreate.java | 4 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealEffect.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 4 +- .../handlers/effecthandlers/HealPercent.java | 4 +- .../scripts/handlers/effecthandlers/Hide.java | 4 +- .../handlers/effecthandlers/HitAtNight.java | 4 +- .../handlers/effecthandlers/HitNumber.java | 4 +- .../scripts/handlers/effecthandlers/Hp.java | 4 +- .../handlers/effecthandlers/HpByLevel.java | 4 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../effecthandlers/HpCpHealCritical.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 4 +- .../handlers/effecthandlers/HpRegen.java | 4 +- .../handlers/effecthandlers/HpToOwner.java | 4 +- .../handlers/effecthandlers/IgnoreDeath.java | 4 +- .../effecthandlers/ImmobilePetBuff.java | 4 +- .../effecthandlers/InstantKillResist.java | 4 +- .../handlers/effecthandlers/JewelSlot.java | 4 +- .../handlers/effecthandlers/KarmaCount.java | 4 +- .../handlers/effecthandlers/KnockBack.java | 4 +- .../handlers/effecthandlers/Lethal.java | 4 +- .../handlers/effecthandlers/LimitCp.java | 4 +- .../handlers/effecthandlers/LimitHp.java | 4 +- .../handlers/effecthandlers/LimitMp.java | 4 +- .../handlers/effecthandlers/LimitSkill.java | 4 +- .../handlers/effecthandlers/Lucky.java | 4 +- .../scripts/handlers/effecthandlers/MAtk.java | 4 +- .../effecthandlers/MagicAccuracy.java | 4 +- .../effecthandlers/MagicCriticalDamage.java | 4 +- .../effecthandlers/MagicCriticalRate.java | 4 +- .../handlers/effecthandlers/MagicMpCost.java | 4 +- .../MagicalAbnormalDispelAttack.java | 4 +- .../effecthandlers/MagicalAbnormalResist.java | 4 +- .../effecthandlers/MagicalAttack.java | 4 +- .../MagicalAttackByAbnormal.java | 4 +- .../MagicalAttackByAbnormalSlot.java | 4 +- .../effecthandlers/MagicalAttackMp.java | 4 +- .../effecthandlers/MagicalAttackRange.java | 4 +- .../effecthandlers/MagicalAttackSpeed.java | 4 +- .../effecthandlers/MagicalDamOverTime.java | 4 +- .../effecthandlers/MagicalDefence.java | 4 +- .../effecthandlers/MagicalEvasion.java | 4 +- .../effecthandlers/MagicalSkillPower.java | 4 +- .../effecthandlers/MagicalSoulAttack.java | 4 +- .../handlers/effecthandlers/ManaCharge.java | 4 +- .../effecthandlers/ManaDamOverTime.java | 4 +- .../handlers/effecthandlers/ManaHeal.java | 4 +- .../effecthandlers/ManaHealByLevel.java | 4 +- .../effecthandlers/ManaHealOverTime.java | 4 +- .../effecthandlers/ManaHealPercent.java | 4 +- .../handlers/effecthandlers/MaxCp.java | 4 +- .../handlers/effecthandlers/MaxHp.java | 4 +- .../handlers/effecthandlers/MaxMp.java | 4 +- .../handlers/effecthandlers/ModifyVital.java | 4 +- .../scripts/handlers/effecthandlers/Mp.java | 4 +- .../effecthandlers/MpConsumePerLevel.java | 4 +- .../handlers/effecthandlers/MpRegen.java | 4 +- .../handlers/effecthandlers/MpShield.java | 4 +- .../effecthandlers/MpVampiricAttack.java | 4 +- .../scripts/handlers/effecthandlers/Mute.java | 4 +- .../effecthandlers/NoblesseBless.java | 4 +- .../handlers/effecthandlers/OpenChest.java | 4 +- .../effecthandlers/OpenCommonRecipeBook.java | 4 +- .../handlers/effecthandlers/OpenDoor.java | 4 +- .../effecthandlers/OpenDwarfRecipeBook.java | 4 +- .../scripts/handlers/effecthandlers/PAtk.java | 4 +- .../handlers/effecthandlers/Passive.java | 4 +- .../PhysicalAbnormalResist.java | 4 +- .../effecthandlers/PhysicalAttack.java | 4 +- .../effecthandlers/PhysicalAttackHpLink.java | 4 +- .../effecthandlers/PhysicalAttackMute.java | 4 +- .../effecthandlers/PhysicalAttackRange.java | 4 +- .../effecthandlers/PhysicalAttackSaveHp.java | 4 +- .../effecthandlers/PhysicalAttackSpeed.java | 4 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../effecthandlers/PhysicalDefence.java | 4 +- .../effecthandlers/PhysicalEvasion.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 4 +- .../PhysicalShieldAngleAll.java | 4 +- .../effecthandlers/PhysicalSkillPower.java | 4 +- .../effecthandlers/PhysicalSoulAttack.java | 4 +- .../handlers/effecthandlers/PkCount.java | 4 +- .../handlers/effecthandlers/Plunder.java | 4 +- .../effecthandlers/PolearmSingleTarget.java | 4 +- .../effecthandlers/ProtectDeathPenalty.java | 4 +- .../effecthandlers/ProtectionBlessing.java | 4 +- .../handlers/effecthandlers/PullBack.java | 4 +- .../PveMagicalSkillDamageBonus.java | 4 +- .../PveMagicalSkillDefenceBonus.java | 4 +- .../PvePhysicalAttackDamageBonus.java | 4 +- .../PvePhysicalAttackDefenceBonus.java | 4 +- .../PvePhysicalSkillDamageBonus.java | 4 +- .../PvePhysicalSkillDefenceBonus.java | 4 +- .../PveRaidMagicalSkillDefenceBonus.java | 4 +- .../PveRaidPhysicalAttackDefenceBonus.java | 4 +- .../PveRaidPhysicalSkillDefenceBonus.java | 4 +- .../PvpMagicalSkillDamageBonus.java | 4 +- .../PvpMagicalSkillDefenceBonus.java | 4 +- .../PvpPhysicalAttackDamageBonus.java | 4 +- .../PvpPhysicalAttackDefenceBonus.java | 4 +- .../PvpPhysicalSkillDamageBonus.java | 4 +- .../PvpPhysicalSkillDefenceBonus.java | 4 +- .../effecthandlers/RandomizeHate.java | 4 +- .../handlers/effecthandlers/RealDamage.java | 4 +- .../handlers/effecthandlers/RearDamage.java | 4 +- .../handlers/effecthandlers/RebalanceHP.java | 4 +- .../effecthandlers/RebalanceHPSummon.java | 4 +- .../RecoverVitalityInPeaceZone.java | 4 +- .../handlers/effecthandlers/Recovery.java | 4 +- .../handlers/effecthandlers/ReduceCancel.java | 4 +- .../handlers/effecthandlers/ReduceDamage.java | 4 +- .../effecthandlers/ReduceDropPenalty.java | 4 +- .../handlers/effecthandlers/ReflectMagic.java | 4 +- .../handlers/effecthandlers/ReflectSkill.java | 4 +- .../effecthandlers/RefuelAirship.java | 4 +- .../handlers/effecthandlers/Relax.java | 4 +- .../effecthandlers/RemoveEquipPenalty.java | 4 +- .../effecthandlers/ReplaceSkillBySkill.java | 4 +- .../effecthandlers/ResetInstanceEntry.java | 4 +- .../ResistAbnormalByCategory.java | 4 +- .../effecthandlers/ResistDDMagic.java | 4 +- .../ResistDispelByCategory.java | 4 +- .../handlers/effecthandlers/ResistSkill.java | 4 +- .../handlers/effecthandlers/Restoration.java | 4 +- .../effecthandlers/RestorationRandom.java | 8 +- .../handlers/effecthandlers/Resurrection.java | 4 +- .../effecthandlers/ResurrectionSpecial.java | 4 +- .../handlers/effecthandlers/Reuse.java | 4 +- .../effecthandlers/ReuseSkillById.java | 4 +- .../scripts/handlers/effecthandlers/Root.java | 4 +- .../effecthandlers/SacrificeSummon.java | 4 +- .../effecthandlers/SafeFallHeight.java | 4 +- .../SendSystemMessageToClan.java | 4 +- .../effecthandlers/ServitorShare.java | 4 +- .../handlers/effecthandlers/SetHp.java | 4 +- .../handlers/effecthandlers/SetSkill.java | 4 +- .../effecthandlers/ShieldDefence.java | 4 +- .../effecthandlers/ShieldDefenceRate.java | 4 +- .../handlers/effecthandlers/SilentMove.java | 4 +- .../effecthandlers/SkillCritical.java | 4 +- .../effecthandlers/SkillCriticalDamage.java | 4 +- .../SkillCriticalProbability.java | 4 +- .../handlers/effecthandlers/SkillEvasion.java | 4 +- .../effecthandlers/SkillPowerAdd.java | 4 +- .../handlers/effecthandlers/SkillTurning.java | 4 +- .../effecthandlers/SkillTurningOverTime.java | 4 +- .../handlers/effecthandlers/SoulBlow.java | 4 +- .../handlers/effecthandlers/SoulEating.java | 4 +- .../scripts/handlers/effecthandlers/Sow.java | 4 +- .../handlers/effecthandlers/SpModify.java | 4 +- .../handlers/effecthandlers/Speed.java | 4 +- .../effecthandlers/SphericBarrier.java | 4 +- .../handlers/effecthandlers/Spoil.java | 4 +- .../StatBonusSkillCritical.java | 4 +- .../effecthandlers/StatBonusSpeed.java | 4 +- .../effecthandlers/StatByMoveType.java | 4 +- .../handlers/effecthandlers/StatUp.java | 4 +- .../effecthandlers/StealAbnormal.java | 4 +- .../handlers/effecthandlers/Summon.java | 4 +- .../effecthandlers/SummonAgathion.java | 4 +- .../handlers/effecthandlers/SummonCubic.java | 4 +- .../effecthandlers/SummonHallucination.java | 4 +- .../handlers/effecthandlers/SummonMulti.java | 4 +- .../handlers/effecthandlers/SummonNpc.java | 4 +- .../handlers/effecthandlers/SummonPet.java | 4 +- .../handlers/effecthandlers/SummonPoints.java | 4 +- .../handlers/effecthandlers/SummonTrap.java | 4 +- .../handlers/effecthandlers/Sweeper.java | 4 +- .../handlers/effecthandlers/Synergy.java | 4 +- .../handlers/effecthandlers/TakeCastle.java | 4 +- .../effecthandlers/TakeCastleStart.java | 4 +- .../handlers/effecthandlers/TakeFort.java | 4 +- .../effecthandlers/TakeFortStart.java | 4 +- .../handlers/effecthandlers/TalismanSlot.java | 4 +- .../handlers/effecthandlers/TargetCancel.java | 4 +- .../handlers/effecthandlers/TargetMe.java | 4 +- .../effecthandlers/TargetMeProbability.java | 4 +- .../handlers/effecthandlers/Teleport.java | 4 +- .../effecthandlers/TeleportToNpc.java | 4 +- .../effecthandlers/TeleportToPlayer.java | 4 +- .../effecthandlers/TeleportToSummon.java | 4 +- .../effecthandlers/TeleportToTarget.java | 4 +- .../effecthandlers/TrackLimitedSkill.java | 4 +- .../TransferDamageToPlayer.java | 4 +- .../TransferDamageToSummon.java | 4 +- .../handlers/effecthandlers/TransferHate.java | 4 +- .../effecthandlers/Transformation.java | 4 +- .../handlers/effecthandlers/TrapDetect.java | 4 +- .../handlers/effecthandlers/TrapRemove.java | 4 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 4 +- .../effecthandlers/TriggerSkillByDamage.java | 4 +- .../TriggerSkillByDeathBlow.java | 4 +- .../effecthandlers/TriggerSkillByKill.java | 4 +- .../TriggerSkillByMagicType.java | 4 +- .../effecthandlers/TriggerSkillBySkill.java | 4 +- .../TriggerSkillBySkillAttack.java | 4 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 4 +- .../effecthandlers/UnsummonAgathion.java | 4 +- .../effecthandlers/UnsummonServitors.java | 4 +- .../handlers/effecthandlers/Untargetable.java | 4 +- .../effecthandlers/VampiricAttack.java | 4 +- .../effecthandlers/VampiricDefence.java | 4 +- .../effecthandlers/VitalityExpRate.java | 4 +- .../effecthandlers/VitalityPointUp.java | 4 +- .../effecthandlers/VitalityPointsRate.java | 4 +- .../handlers/effecthandlers/WeightLimit.java | 4 +- .../effecthandlers/WeightPenalty.java | 4 +- .../effecthandlers/WorldChatPoints.java | 4 +- .../BuildAdvanceBaseSkillCondition.java | 4 +- .../BuildCampSkillCondition.java | 4 +- ...CanAddMaxEntranceInzoneSkillCondition.java | 4 +- .../CanBookmarkAddSlotSkillCondition.java | 4 +- ...CanChangeVitalItemCountSkillCondition.java | 4 +- .../CanEnchantAttributeSkillCondition.java | 4 +- .../CanMountForEventSkillCondition.java | 4 +- .../CanRefuelAirshipSkillCondition.java | 4 +- .../CanRestoreVitalPointSkillCondition.java | 4 +- .../CanSummonCubicSkillCondition.java | 4 +- .../CanSummonMultiSkillCondition.java | 4 +- .../CanSummonPetSkillCondition.java | 4 +- .../CanSummonSiegeGolemSkillCondition.java | 4 +- .../CanSummonSkillCondition.java | 4 +- .../CanTransformInDominionSkillCondition.java | 4 +- .../CanTransformSkillCondition.java | 4 +- .../CanUntransformSkillCondition.java | 4 +- .../CanUseInBattlefieldSkillCondition.java | 4 +- .../CanUseInDragonLairSkillCondition.java | 4 +- .../CanUseSwoopCannonSkillCondition.java | 4 +- ...nUseVitalityConsumeItemSkillCondition.java | 4 +- .../CannotUseInTransformSkillCondition.java | 4 +- .../CheckLevelSkillCondition.java | 4 +- .../CheckSexSkillCondition.java | 4 +- .../ConsumeBodySkillCondition.java | 4 +- .../EnergySavedSkillCondition.java | 4 +- .../EquipArmorSkillCondition.java | 4 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../NotFearedSkillCondition.java | 4 +- .../NotInUnderwaterSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 4 +- .../OpAffectedBySkillSkillCondition.java | 4 +- .../OpAgathionEnergySkillCondition.java | 4 +- .../OpAlignmentSkillCondition.java | 4 +- .../OpBlinkSkillCondition.java | 4 +- .../OpCallPcSkillCondition.java | 4 +- .../OpCanEscapeSkillCondition.java | 4 +- .../OpCanNotUseAirshipSkillCondition.java | 4 +- ...eTargetWithPrivateStoreSkillCondition.java | 4 +- .../OpChangeWeaponSkillCondition.java | 4 +- .../OpCheckAbnormalSkillCondition.java | 4 +- .../OpCheckAccountTypeSkillCondition.java | 4 +- .../OpCheckCastRangeSkillCondition.java | 4 +- .../OpCheckClassListSkillCondition.java | 4 +- .../OpCheckClassSkillCondition.java | 4 +- .../OpCheckCrtEffectSkillCondition.java | 4 +- .../OpCheckFlagSkillCondition.java | 4 +- ...eckOnGoingEventCampaignSkillCondition.java | 4 +- .../OpCheckPcbangPointSkillCondition.java | 4 +- .../OpCheckResidenceSkillCondition.java | 4 +- .../OpCheckSkillListSkillCondition.java | 4 +- .../OpCheckSkillSkillCondition.java | 4 +- .../OpCompanionSkillCondition.java | 4 +- .../OpEnchantRangeSkillCondition.java | 4 +- .../OpEncumberedSkillCondition.java | 4 +- .../OpEnergyMaxSkillCondition.java | 4 +- .../OpEquipItemSkillCondition.java | 4 +- .../OpExistNpcSkillCondition.java | 4 +- .../OpFishingCastSkillCondition.java | 4 +- .../OpFishingPumpingSkillCondition.java | 4 +- .../OpFishingReelingSkillCondition.java | 4 +- .../OpHaveSummonSkillCondition.java | 4 +- .../OpHaveSummonedNpcSkillCondition.java | 4 +- .../OpHomeSkillCondition.java | 4 +- .../OpInSiegeTimeSkillCondition.java | 4 +- .../OpInstantzoneSkillCondition.java | 4 +- .../OpMainjobSkillCondition.java | 4 +- .../OpNeedAgathionSkillCondition.java | 4 +- .../OpNeedSummonOrPetSkillCondition.java | 4 +- .../OpNotCursedSkillCondition.java | 4 +- .../OpNotInCeremonyOfChaosSkillCondition.java | 4 +- .../OpNotInPeacezoneSkillCondition.java | 4 +- .../OpNotInstantzoneSkillCondition.java | 4 +- .../OpNotOlympiadSkillCondition.java | 4 +- .../OpNotTerritorySkillCondition.java | 4 +- .../OpPeacezoneSkillCondition.java | 4 +- .../OpPkcountSkillCondition.java | 4 +- .../OpPledgeSkillCondition.java | 4 +- .../OpRestartPointSkillCondition.java | 4 +- .../OpResurrectionSkillCondition.java | 4 +- .../OpSiegeHammerSkillCondition.java | 4 +- .../OpSkillAcquireSkillCondition.java | 4 +- .../OpSkillSkillCondition.java | 4 +- .../OpSocialClassSkillCondition.java | 4 +- .../OpSoulMaxSkillCondition.java | 4 +- .../OpSubjobSkillCondition.java | 4 +- .../OpSweeperSkillCondition.java | 4 +- .../OpTargetAllItemTypeSkillCondition.java | 4 +- .../OpTargetArmorTypeSkillCondition.java | 4 +- .../OpTargetDoorSkillCondition.java | 4 +- ...OpTargetMyPledgeAcademySkillCondition.java | 4 +- .../OpTargetNpcSkillCondition.java | 4 +- .../OpTargetPcSkillCondition.java | 4 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../OpTerritorySkillCondition.java | 4 +- .../OpUnlockSkillCondition.java | 4 +- .../OpUseFirecrackerSkillCondition.java | 4 +- .../OpUsePraseedSkillCondition.java | 4 +- .../OpWyvernSkillCondition.java | 4 +- .../PossessHolythingSkillCondition.java | 4 +- .../RemainCpPerSkillCondition.java | 4 +- .../RemainHpPerSkillCondition.java | 4 +- .../RemainMpPerSkillCondition.java | 4 +- .../SoulSavedSkillCondition.java | 4 +- .../TargetItemCrystalTypeSkillCondition.java | 4 +- .../TargetMyMenteeSkillCondition.java | 4 +- .../TargetMyPartySkillCondition.java | 4 +- .../TargetMyPledgeSkillCondition.java | 4 +- .../TargetRaceSkillCondition.java | 4 +- .../ChambersOfDelusion/ChamberOfDelusion.java | 4 +- .../CrystalCavernsCoralGarden.java | 6 +- .../CrystalCavernsEmeraldSquare.java | 14 +- .../CrystalCavernsSteamCorridor.java | 14 +- .../DarkCloudMansion/DarkCloudMansion.java | 4 +- .../FaeronTrainingGrounds1.java | 6 +- .../FaeronTrainingGrounds2.java | 6 +- .../HarnakUndergroundRuins.java | 4 +- .../KartiasLabyrinth/KartiaBoss.java | 6 +- .../KartiasLabyrinth/KartiaHelperAdolph.java | 10 +- .../KartiasLabyrinth/KartiaHelperBarton.java | 6 +- .../KartiasLabyrinth/KartiaHelperElise.java | 12 +- .../KartiasLabyrinth/KartiaHelperEliyah.java | 4 +- .../KartiaHelperGuardian.java | 6 +- .../KartiasLabyrinth/KartiaHelperHayuk.java | 6 +- .../KartiasLabyrinth/KartiaSupportTroop.java | 4 +- .../KartiasLabyrinth/KartiasLabyrinth.java | 8 +- .../LabyrinthOfBelis/LabyrinthOfBelis.java | 4 +- .../MemoryOfDisaster/MemoryOfDisaster.java | 4 +- .../MuseumDungeon/MuseumDungeon.java | 4 +- .../scripts/instances/Nursery/Nursery.java | 16 +- .../PailakaInjuredDragon.java | 4 +- .../PrisonOfDarkness/PrisonOfDarkness.java | 12 +- .../TaintedDimension/TaintedDimension.java | 4 +- .../Q10771_VolatilePower.java | 4 +- .../Q10772_ReportsFromCrumaTowerPart1.java | 4 +- .../Q10776_TheWrathOfTheGiants.java | 4 +- .../Q10777_ReportsFromCrumaTowerPart2.java | 4 +- .../Q10787_ASpyMission.java | 4 +- .../gameserver/data/xml/impl/ActionData.java | 4 +- .../gameserver/data/xml/impl/AdminData.java | 8 +- .../gameserver/data/xml/impl/AlchemyData.java | 6 +- .../data/xml/impl/AppearanceItemData.java | 6 +- .../data/xml/impl/AttendanceRewardData.java | 4 +- .../data/xml/impl/BeautyShopData.java | 10 +- .../data/xml/impl/ClanHallData.java | 4 +- .../data/xml/impl/ClanMasteryData.java | 4 +- .../data/xml/impl/ClanShopData.java | 4 +- .../data/xml/impl/CombinationItemsData.java | 4 +- .../gameserver/data/xml/impl/CubicData.java | 6 +- .../data/xml/impl/DailyMissionData.java | 8 +- .../gameserver/data/xml/impl/DoorData.java | 14 +- .../data/xml/impl/EnchantItemData.java | 8 +- .../data/xml/impl/EnchantSkillGroupsData.java | 6 +- .../data/xml/impl/EventEngineData.java | 12 +- .../data/xml/impl/ExtendDropData.java | 26 +- .../data/xml/impl/FakePlayerData.java | 4 +- .../gameserver/data/xml/impl/FenceData.java | 4 +- .../gameserver/data/xml/impl/HennaData.java | 4 +- .../data/xml/impl/InitialEquipmentData.java | 4 +- .../data/xml/impl/LuckyGameData.java | 10 +- .../data/xml/impl/MultisellData.java | 4 +- .../gameserver/data/xml/impl/NpcData.java | 8 +- .../xml/impl/NpcNameLocalisationData.java | 4 +- .../gameserver/data/xml/impl/OptionData.java | 4 +- .../data/xml/impl/PetDataTable.java | 4 +- .../data/xml/impl/PlayerTemplateData.java | 4 +- .../data/xml/impl/PrimeShopData.java | 4 +- .../gameserver/data/xml/impl/RecipeData.java | 6 +- .../data/xml/impl/ResidenceFunctionsData.java | 6 +- .../xml/impl/SendMessageLocalisationData.java | 4 +- .../gameserver/data/xml/impl/ShuttleData.java | 8 +- .../data/xml/impl/SiegeScheduleData.java | 6 +- .../gameserver/data/xml/impl/SkillData.java | 86 +- .../data/xml/impl/SkillTreesData.java | 4 +- .../gameserver/data/xml/impl/SpawnsData.java | 16 +- .../data/xml/impl/StaticObjectData.java | 8 +- .../data/xml/impl/TeleportersData.java | 4 +- .../data/xml/impl/TransformData.java | 6 +- .../gameserver/engines/DocumentBase.java | 8 +- .../engines/DocumentBaseGeneral.java | 4 +- .../engines/items/DocumentItem.java | 8 +- .../engines/items/ItemDataHolder.java | 4 +- .../gameserver/handler/ConditionHandler.java | 8 +- .../gameserver/handler/EffectHandler.java | 8 +- .../handler/SkillConditionHandler.java | 8 +- .../instancemanager/AirShipManager.java | 18 +- .../instancemanager/BoatManager.java | 4 +- .../instancemanager/CastleManorManager.java | 6 +- .../CeremonyOfChaosManager.java | 6 +- .../instancemanager/DBSpawnManager.java | 20 +- .../FakePlayerChatManager.java | 4 +- .../instancemanager/GrandBossManager.java | 16 +- .../instancemanager/InstanceManager.java | 20 +- .../gameserver/model/AccessLevel.java | 2 +- .../gameserver/model/ActionDataHolder.java | 2 +- .../model/AdminCommandAccessRight.java | 2 +- .../model/DailyMissionDataHolder.java | 8 +- .../l2jmobius/gameserver/model/Location.java | 2 +- .../gameserver/model/PetLevelData.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../gameserver/model/SiegeScheduleDate.java | 2 +- .../gameserver/model/SkillLearn.java | 2 +- .../l2jmobius/gameserver/model/StatSet.java | 968 ++++++++++++++++++ .../l2jmobius/gameserver/model/StatsSet.java | 968 ------------------ .../l2jmobius/gameserver/model/actor/Npc.java | 10 +- .../actor/templates/CreatureTemplate.java | 6 +- .../model/actor/templates/CubicTemplate.java | 4 +- .../model/actor/templates/DoorTemplate.java | 4 +- .../model/actor/templates/NpcTemplate.java | 14 +- .../model/actor/templates/PlayerTemplate.java | 4 +- .../model/actor/transform/Transform.java | 4 +- .../actor/transform/TransformLevelData.java | 4 +- .../actor/transform/TransformTemplate.java | 4 +- .../model/alchemy/AlchemyCraftData.java | 4 +- .../model/beautyshop/BeautyItem.java | 6 +- .../ceremonyofchaos/CeremonyOfChaosEvent.java | 8 +- .../gameserver/model/cubic/CubicSkill.java | 4 +- .../gameserver/model/entity/ClanHall.java | 4 +- .../gameserver/model/entity/Hero.java | 70 +- .../eventengine/AbstractEventManager.java | 10 +- .../model/eventengine/EventScheduler.java | 4 +- .../model/events/AbstractScript.java | 6 +- .../model/events/TimerExecutor.java | 8 +- .../model/events/timers/TimerHolder.java | 8 +- .../model/holders/AppearanceHolder.java | 4 +- .../model/holders/AttachSkillHolder.java | 4 +- .../model/holders/EnchantSkillHolder.java | 4 +- .../model/holders/ExtendDropDataHolder.java | 4 +- .../model/holders/FakePlayerHolder.java | 4 +- .../gameserver/model/holders/ItemHolder.java | 4 +- .../model/holders/ItemPointHolder.java | 4 +- .../model/holders/LuckyGameDataHolder.java | 4 +- .../model/holders/MinionHolder.java | 4 +- .../model/holders/MultisellListHolder.java | 4 +- .../model/holders/RecipeHolder.java | 4 +- .../model/instancezone/Instance.java | 8 +- .../model/instancezone/InstanceTemplate.java | 10 +- .../instancezone/conditions/Condition.java | 8 +- .../conditions/ConditionCommandChannel.java | 4 +- .../ConditionCommandChannelLeader.java | 4 +- .../conditions/ConditionDistance.java | 4 +- .../conditions/ConditionGroupMax.java | 4 +- .../conditions/ConditionGroupMin.java | 4 +- .../conditions/ConditionHasResidence.java | 6 +- .../conditions/ConditionItem.java | 4 +- .../conditions/ConditionLevel.java | 4 +- .../conditions/ConditionNoParty.java | 4 +- .../conditions/ConditionParty.java | 4 +- .../conditions/ConditionPartyLeader.java | 4 +- .../conditions/ConditionQuest.java | 4 +- .../conditions/ConditionReenter.java | 4 +- .../itemauction/AuctionDateGenerator.java | 4 +- .../model/itemauction/AuctionItem.java | 6 +- .../itemauction/ItemAuctionInstance.java | 6 +- .../gameserver/model/items/Armor.java | 8 +- .../gameserver/model/items/EtcItem.java | 8 +- .../gameserver/model/items/Henna.java | 4 +- .../gameserver/model/items/Item.java | 8 +- .../model/items/PlayerItemTemplate.java | 4 +- .../gameserver/model/items/Weapon.java | 8 +- .../items/appearance/AppearanceStone.java | 4 +- .../items/combination/CombinationItem.java | 4 +- .../items/enchant/AbstractEnchantItem.java | 4 +- .../model/items/enchant/EnchantScroll.java | 4 +- .../items/enchant/EnchantSupportItem.java | 4 +- .../gameserver/model/olympiad/Olympiad.java | 38 +- .../model/olympiad/Participant.java | 6 +- .../model/primeshop/PrimeShopGroup.java | 4 +- .../residences/ResidenceFunctionTemplate.java | 4 +- .../model/shuttle/ShuttleDataHolder.java | 4 +- .../gameserver/model/skills/Skill.java | 6 +- .../model/spawns/NpcSpawnTemplate.java | 16 +- .../gameserver/model/spawns/SpawnGroup.java | 12 +- .../model/spawns/SpawnTemplate.java | 12 +- .../model/teleporter/TeleportHolder.java | 4 +- .../model/teleporter/TeleportLocation.java | 4 +- .../model/variables/AbstractVariables.java | 18 +- .../network/serverpackets/ExHeroList.java | 6 +- .../gameserver/util/BypassParser.java | 4 +- .../ai/areas/BeastFarm/ImprovedBabyPets.java | 6 +- .../ai/areas/FairySettlement/Wisp.java | 6 +- .../EntrancePortalToCrystalCaverns.java | 4 +- .../ai/areas/SeedOfHellfire/Zofan.java | 4 +- .../areas/TalkingIsland/Walkers/Allada.java | 4 +- .../ai/areas/TalkingIsland/Walkers/Mei.java | 4 +- .../areas/TalkingIsland/Walkers/Remons.java | 4 +- .../ai/areas/TalkingIsland/Walkers/Rinne.java | 4 +- .../areas/TalkingIsland/Walkers/Rotina.java | 4 +- .../ai/areas/TalkingIsland/Walkers/Soros.java | 4 +- .../ElmoredenServantsGhost.java | 4 +- .../data/scripts/ai/bosses/Anakim/Anakim.java | 8 +- .../scripts/ai/bosses/Antharas/Antharas.java | 6 +- .../data/scripts/ai/bosses/Baium/Baium.java | 6 +- .../scripts/ai/bosses/Balok/BalokWarzone.java | 4 +- .../ai/bosses/Baylor/BaylorWarzone.java | 4 +- .../data/scripts/ai/bosses/Beleth/Beleth.java | 8 +- .../data/scripts/ai/bosses/Core/Core.java | 8 +- .../scripts/ai/bosses/Fafurion/Fafurion.java | 8 +- .../IceQueensCastleBattle.java | 8 +- .../data/scripts/ai/bosses/Helios/Helios.java | 8 +- .../ai/bosses/Istina/IstinaCavern.java | 14 +- .../data/scripts/ai/bosses/Kelbim/Kelbim.java | 8 +- .../ai/bosses/Kimerian/KimerianCommon.java | 8 +- .../data/scripts/ai/bosses/Lilith/Lilith.java | 8 +- .../scripts/ai/bosses/Lindvior/Lindvior.java | 10 +- .../ai/bosses/Lindvior/LionelHunter.java | 4 +- .../ai/bosses/Octavis/OctavisWarzone.java | 10 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 8 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 8 +- .../ai/bosses/Spezion/Cannon/Cannon.java | 4 +- .../ai/bosses/Teredor/TeredorWarzone.java | 14 +- .../scripts/ai/bosses/Trasken/Trasken.java | 8 +- .../scripts/ai/bosses/Valakas/Valakas.java | 8 +- .../Zaken/CavernOfThePirateCaptain.java | 6 +- .../data/scripts/ai/others/AreaSkillNpc.java | 4 +- .../CastleTeleporter/CastleTeleporter.java | 6 +- .../others/NpcBuffers/NpcBufferSkillData.java | 4 +- .../ai/others/NpcBuffers/NpcBuffersData.java | 6 +- .../scripts/ai/others/Servitors/ClanFlag.java | 4 +- .../Servitors/GateOfUnlimitedSummoning.java | 4 +- .../ai/others/Servitors/TreeOfLife.java | 4 +- .../ai/others/TersisHerald/TersisHerald.java | 4 +- .../admincommandhandlers/AdminGrandBoss.java | 4 +- .../admincommandhandlers/AdminOlympiad.java | 14 +- .../conditions/CategoryTypeCondition.java | 4 +- .../conditions/NpcLevelCondition.java | 4 +- .../conditions/PlayerLevelCondition.java | 4 +- .../effecthandlers/AbnormalShield.java | 4 +- .../effecthandlers/AbnormalTimeChange.java | 4 +- .../handlers/effecthandlers/AbsorbDamage.java | 4 +- .../AbstractConditionalHpEffect.java | 4 +- .../effecthandlers/AbstractStatAddEffect.java | 4 +- .../effecthandlers/AbstractStatEffect.java | 6 +- .../AbstractStatPercentEffect.java | 4 +- .../handlers/effecthandlers/Accuracy.java | 4 +- .../handlers/effecthandlers/AddHate.java | 4 +- .../effecthandlers/AddSkillBySkill.java | 4 +- .../AddTeleportBookmarkSlot.java | 4 +- .../effecthandlers/AdditionalPotionCp.java | 4 +- .../effecthandlers/AdditionalPotionHp.java | 4 +- .../effecthandlers/AdditionalPotionMp.java | 4 +- .../handlers/effecthandlers/AgathionSlot.java | 4 +- .../handlers/effecthandlers/AirBind.java | 4 +- .../handlers/effecthandlers/AreaDamage.java | 4 +- .../handlers/effecthandlers/ArtifactSlot.java | 4 +- .../effecthandlers/AttackAttribute.java | 4 +- .../effecthandlers/AttackAttributeAdd.java | 4 +- .../handlers/effecthandlers/AttackBehind.java | 4 +- .../handlers/effecthandlers/AttackTrait.java | 4 +- .../handlers/effecthandlers/Backstab.java | 4 +- .../handlers/effecthandlers/Betray.java | 4 +- .../handlers/effecthandlers/Blink.java | 4 +- .../handlers/effecthandlers/BlinkSwap.java | 4 +- .../effecthandlers/BlockAbnormalSlot.java | 4 +- .../handlers/effecthandlers/BlockAction.java | 4 +- .../handlers/effecthandlers/BlockActions.java | 4 +- .../handlers/effecthandlers/BlockChat.java | 4 +- .../handlers/effecthandlers/BlockControl.java | 4 +- .../handlers/effecthandlers/BlockEscape.java | 4 +- .../handlers/effecthandlers/BlockMove.java | 4 +- .../handlers/effecthandlers/BlockParty.java | 4 +- .../effecthandlers/BlockResurrection.java | 4 +- .../handlers/effecthandlers/BlockSkill.java | 4 +- .../handlers/effecthandlers/BlockTarget.java | 4 +- .../handlers/effecthandlers/Bluff.java | 4 +- .../effecthandlers/BonusDropAmount.java | 4 +- .../effecthandlers/BonusDropRate.java | 4 +- .../effecthandlers/BonusSpoilRate.java | 4 +- .../handlers/effecthandlers/Breath.java | 4 +- .../handlers/effecthandlers/BuffBlock.java | 4 +- .../effecthandlers/CallLearnedSkill.java | 4 +- .../handlers/effecthandlers/CallParty.java | 4 +- .../handlers/effecthandlers/CallPc.java | 4 +- .../effecthandlers/CallRandomSkill.java | 4 +- .../handlers/effecthandlers/CallSkill.java | 4 +- .../effecthandlers/CallSkillOnActionTime.java | 4 +- .../effecthandlers/CallTargetParty.java | 4 +- .../effecthandlers/ChameleonRest.java | 4 +- .../handlers/effecthandlers/ChangeBody.java | 6 +- .../handlers/effecthandlers/ChangeFace.java | 4 +- .../effecthandlers/ChangeFishingMastery.java | 4 +- .../effecthandlers/ChangeHairColor.java | 4 +- .../effecthandlers/ChangeHairStyle.java | 4 +- .../handlers/effecthandlers/CheapShot.java | 4 +- .../handlers/effecthandlers/ClassChange.java | 4 +- .../handlers/effecthandlers/Compelling.java | 4 +- .../handlers/effecthandlers/Confuse.java | 4 +- .../handlers/effecthandlers/ConsumeBody.java | 4 +- .../handlers/effecthandlers/ConvertItem.java | 4 +- .../effecthandlers/CounterPhysicalSkill.java | 4 +- .../scripts/handlers/effecthandlers/Cp.java | 4 +- .../handlers/effecthandlers/CpHeal.java | 4 +- .../effecthandlers/CpHealOverTime.java | 4 +- .../effecthandlers/CpHealPercent.java | 4 +- .../handlers/effecthandlers/CpRegen.java | 4 +- .../effecthandlers/CraftingCritical.java | 4 +- .../effecthandlers/CreateCommonItem.java | 4 +- .../handlers/effecthandlers/CreateItem.java | 4 +- .../effecthandlers/CriticalDamage.java | 4 +- .../CriticalDamagePosition.java | 4 +- .../handlers/effecthandlers/CriticalRate.java | 4 +- .../CriticalRatePositionBonus.java | 4 +- .../effecthandlers/CrystalGradeModify.java | 4 +- .../handlers/effecthandlers/Crystallize.java | 4 +- .../handlers/effecthandlers/CubicMastery.java | 4 +- .../handlers/effecthandlers/DamOverTime.java | 4 +- .../effecthandlers/DamOverTimePercent.java | 4 +- .../handlers/effecthandlers/DamageBlock.java | 4 +- .../effecthandlers/DamageByAttack.java | 4 +- .../handlers/effecthandlers/DamageShield.java | 4 +- .../effecthandlers/DamageShieldResist.java | 4 +- .../handlers/effecthandlers/DeathLink.java | 4 +- .../handlers/effecthandlers/DebuffBlock.java | 4 +- .../effecthandlers/DefenceAttribute.java | 4 +- .../effecthandlers/DefenceCriticalDamage.java | 4 +- .../effecthandlers/DefenceCriticalRate.java | 4 +- .../DefenceMagicCriticalDamage.java | 4 +- .../DefenceMagicCriticalRate.java | 4 +- .../handlers/effecthandlers/DefenceTrait.java | 4 +- .../handlers/effecthandlers/DeleteHate.java | 4 +- .../effecthandlers/DeleteHateOfMe.java | 4 +- .../effecthandlers/DeleteTopAgro.java | 4 +- .../effecthandlers/DetectHiddenObjects.java | 4 +- .../handlers/effecthandlers/Detection.java | 4 +- .../handlers/effecthandlers/DisableSkill.java | 4 +- .../effecthandlers/DisableTargeting.java | 4 +- .../handlers/effecthandlers/Disarm.java | 4 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 4 +- .../effecthandlers/DispelByCategory.java | 4 +- .../handlers/effecthandlers/DispelBySlot.java | 4 +- .../effecthandlers/DispelBySlotMyself.java | 4 +- .../DispelBySlotProbability.java | 4 +- .../handlers/effecthandlers/DispelCaster.java | 4 +- .../handlers/effecthandlers/DoubleCast.java | 4 +- .../handlers/effecthandlers/DuelistFury.java | 4 +- .../handlers/effecthandlers/EnableCloak.java | 4 +- .../handlers/effecthandlers/EnergyAttack.java | 4 +- .../effecthandlers/EnlargeAbnormalSlot.java | 4 +- .../handlers/effecthandlers/EnlargeSlot.java | 4 +- .../handlers/effecthandlers/Escape.java | 4 +- .../handlers/effecthandlers/ExpModify.java | 4 +- .../handlers/effecthandlers/Faceoff.java | 4 +- .../handlers/effecthandlers/FakeDeath.java | 4 +- .../handlers/effecthandlers/FatalBlow.java | 4 +- .../effecthandlers/FatalBlowRate.java | 4 +- .../scripts/handlers/effecthandlers/Fear.java | 4 +- .../scripts/handlers/effecthandlers/Feed.java | 4 +- .../effecthandlers/FishingExpSpBonus.java | 4 +- .../scripts/handlers/effecthandlers/Flag.java | 4 +- .../handlers/effecthandlers/FlipBlock.java | 4 +- .../handlers/effecthandlers/FlyAway.java | 4 +- .../handlers/effecthandlers/FocusEnergy.java | 4 +- .../effecthandlers/FocusMaxMomentum.java | 4 +- .../effecthandlers/FocusMomentum.java | 4 +- .../handlers/effecthandlers/FocusSouls.java | 4 +- .../handlers/effecthandlers/GetAgro.java | 4 +- .../effecthandlers/GetDamageLimit.java | 4 +- .../handlers/effecthandlers/GetMomentum.java | 4 +- .../effecthandlers/GiveClanReputation.java | 4 +- .../handlers/effecthandlers/GiveExpAndSp.java | 4 +- .../handlers/effecthandlers/GiveFame.java | 4 +- .../effecthandlers/GiveRecommendation.java | 4 +- .../handlers/effecthandlers/GiveSp.java | 4 +- .../handlers/effecthandlers/GiveXp.java | 4 +- .../scripts/handlers/effecthandlers/Grow.java | 4 +- .../effecthandlers/HairAccessorySet.java | 4 +- .../handlers/effecthandlers/Harvesting.java | 4 +- .../handlers/effecthandlers/HateAttack.java | 4 +- .../effecthandlers/HeadquarterCreate.java | 4 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealEffect.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 4 +- .../handlers/effecthandlers/HealPercent.java | 4 +- .../scripts/handlers/effecthandlers/Hide.java | 4 +- .../handlers/effecthandlers/HitAtNight.java | 4 +- .../handlers/effecthandlers/HitNumber.java | 4 +- .../scripts/handlers/effecthandlers/Hp.java | 4 +- .../handlers/effecthandlers/HpByLevel.java | 4 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../effecthandlers/HpCpHealCritical.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 4 +- .../handlers/effecthandlers/HpRegen.java | 4 +- .../handlers/effecthandlers/HpToOwner.java | 4 +- .../handlers/effecthandlers/IgnoreDeath.java | 4 +- .../effecthandlers/ImmobilePetBuff.java | 4 +- .../effecthandlers/InstantKillResist.java | 4 +- .../handlers/effecthandlers/JewelSlot.java | 4 +- .../handlers/effecthandlers/KarmaCount.java | 4 +- .../handlers/effecthandlers/KnockBack.java | 4 +- .../handlers/effecthandlers/Lethal.java | 4 +- .../handlers/effecthandlers/LimitCp.java | 4 +- .../handlers/effecthandlers/LimitHp.java | 4 +- .../handlers/effecthandlers/LimitMp.java | 4 +- .../handlers/effecthandlers/LimitSkill.java | 4 +- .../handlers/effecthandlers/Lucky.java | 4 +- .../scripts/handlers/effecthandlers/MAtk.java | 4 +- .../effecthandlers/MagicAccuracy.java | 4 +- .../effecthandlers/MagicCriticalDamage.java | 4 +- .../effecthandlers/MagicCriticalRate.java | 4 +- .../handlers/effecthandlers/MagicMpCost.java | 4 +- .../MagicalAbnormalDispelAttack.java | 4 +- .../effecthandlers/MagicalAbnormalResist.java | 4 +- .../effecthandlers/MagicalAttack.java | 4 +- .../MagicalAttackByAbnormal.java | 4 +- .../MagicalAttackByAbnormalSlot.java | 4 +- .../effecthandlers/MagicalAttackMp.java | 4 +- .../effecthandlers/MagicalAttackRange.java | 4 +- .../effecthandlers/MagicalAttackSpeed.java | 4 +- .../effecthandlers/MagicalDamOverTime.java | 4 +- .../effecthandlers/MagicalDefence.java | 4 +- .../effecthandlers/MagicalEvasion.java | 4 +- .../effecthandlers/MagicalSkillPower.java | 4 +- .../effecthandlers/MagicalSoulAttack.java | 4 +- .../handlers/effecthandlers/ManaCharge.java | 4 +- .../effecthandlers/ManaDamOverTime.java | 4 +- .../handlers/effecthandlers/ManaHeal.java | 4 +- .../effecthandlers/ManaHealByLevel.java | 4 +- .../effecthandlers/ManaHealOverTime.java | 4 +- .../effecthandlers/ManaHealPercent.java | 4 +- .../handlers/effecthandlers/MaxCp.java | 4 +- .../handlers/effecthandlers/MaxHp.java | 4 +- .../handlers/effecthandlers/MaxMp.java | 4 +- .../handlers/effecthandlers/ModifyVital.java | 4 +- .../scripts/handlers/effecthandlers/Mp.java | 4 +- .../effecthandlers/MpConsumePerLevel.java | 4 +- .../handlers/effecthandlers/MpRegen.java | 4 +- .../handlers/effecthandlers/MpShield.java | 4 +- .../effecthandlers/MpVampiricAttack.java | 4 +- .../scripts/handlers/effecthandlers/Mute.java | 4 +- .../effecthandlers/NoblesseBless.java | 4 +- .../handlers/effecthandlers/OpenChest.java | 4 +- .../effecthandlers/OpenCommonRecipeBook.java | 4 +- .../handlers/effecthandlers/OpenDoor.java | 4 +- .../effecthandlers/OpenDwarfRecipeBook.java | 4 +- .../scripts/handlers/effecthandlers/PAtk.java | 4 +- .../handlers/effecthandlers/Passive.java | 4 +- .../PhysicalAbnormalResist.java | 4 +- .../effecthandlers/PhysicalAttack.java | 4 +- .../effecthandlers/PhysicalAttackHpLink.java | 4 +- .../effecthandlers/PhysicalAttackMute.java | 4 +- .../effecthandlers/PhysicalAttackRange.java | 4 +- .../effecthandlers/PhysicalAttackSaveHp.java | 4 +- .../effecthandlers/PhysicalAttackSpeed.java | 4 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../effecthandlers/PhysicalDefence.java | 4 +- .../effecthandlers/PhysicalEvasion.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 4 +- .../PhysicalShieldAngleAll.java | 4 +- .../effecthandlers/PhysicalSkillPower.java | 4 +- .../effecthandlers/PhysicalSoulAttack.java | 4 +- .../handlers/effecthandlers/PkCount.java | 4 +- .../handlers/effecthandlers/Plunder.java | 4 +- .../effecthandlers/PolearmSingleTarget.java | 4 +- .../effecthandlers/ProtectDeathPenalty.java | 4 +- .../effecthandlers/ProtectionBlessing.java | 4 +- .../handlers/effecthandlers/PullBack.java | 4 +- .../PveMagicalSkillDamageBonus.java | 4 +- .../PveMagicalSkillDefenceBonus.java | 4 +- .../PvePhysicalAttackDamageBonus.java | 4 +- .../PvePhysicalAttackDefenceBonus.java | 4 +- .../PvePhysicalSkillDamageBonus.java | 4 +- .../PvePhysicalSkillDefenceBonus.java | 4 +- .../PveRaidMagicalSkillDefenceBonus.java | 4 +- .../PveRaidPhysicalAttackDefenceBonus.java | 4 +- .../PveRaidPhysicalSkillDefenceBonus.java | 4 +- .../PvpMagicalSkillDamageBonus.java | 4 +- .../PvpMagicalSkillDefenceBonus.java | 4 +- .../PvpPhysicalAttackDamageBonus.java | 4 +- .../PvpPhysicalAttackDefenceBonus.java | 4 +- .../PvpPhysicalSkillDamageBonus.java | 4 +- .../PvpPhysicalSkillDefenceBonus.java | 4 +- .../effecthandlers/RandomizeHate.java | 4 +- .../handlers/effecthandlers/RealDamage.java | 4 +- .../handlers/effecthandlers/RearDamage.java | 4 +- .../handlers/effecthandlers/RebalanceHP.java | 4 +- .../effecthandlers/RebalanceHPSummon.java | 4 +- .../RecoverVitalityInPeaceZone.java | 4 +- .../handlers/effecthandlers/Recovery.java | 4 +- .../handlers/effecthandlers/ReduceCancel.java | 4 +- .../handlers/effecthandlers/ReduceDamage.java | 4 +- .../effecthandlers/ReduceDropPenalty.java | 4 +- .../handlers/effecthandlers/ReflectMagic.java | 4 +- .../handlers/effecthandlers/ReflectSkill.java | 4 +- .../effecthandlers/RefuelAirship.java | 4 +- .../handlers/effecthandlers/Relax.java | 4 +- .../effecthandlers/RemoveEquipPenalty.java | 4 +- .../effecthandlers/ReplaceSkillBySkill.java | 4 +- .../effecthandlers/ResetInstanceEntry.java | 4 +- .../ResistAbnormalByCategory.java | 4 +- .../effecthandlers/ResistDDMagic.java | 4 +- .../ResistDispelByCategory.java | 4 +- .../handlers/effecthandlers/ResistSkill.java | 4 +- .../handlers/effecthandlers/Restoration.java | 4 +- .../effecthandlers/RestorationRandom.java | 8 +- .../handlers/effecthandlers/Resurrection.java | 4 +- .../effecthandlers/ResurrectionSpecial.java | 4 +- .../handlers/effecthandlers/Reuse.java | 4 +- .../effecthandlers/ReuseSkillById.java | 4 +- .../scripts/handlers/effecthandlers/Root.java | 4 +- .../effecthandlers/SacrificeSummon.java | 4 +- .../effecthandlers/SafeFallHeight.java | 4 +- .../SendSystemMessageToClan.java | 4 +- .../effecthandlers/ServitorShare.java | 4 +- .../handlers/effecthandlers/SetHp.java | 4 +- .../handlers/effecthandlers/SetSkill.java | 4 +- .../effecthandlers/ShieldDefence.java | 4 +- .../effecthandlers/ShieldDefenceRate.java | 4 +- .../handlers/effecthandlers/SilentMove.java | 4 +- .../effecthandlers/SkillCritical.java | 4 +- .../effecthandlers/SkillCriticalDamage.java | 4 +- .../SkillCriticalProbability.java | 4 +- .../handlers/effecthandlers/SkillEvasion.java | 4 +- .../effecthandlers/SkillPowerAdd.java | 4 +- .../handlers/effecthandlers/SkillTurning.java | 4 +- .../effecthandlers/SkillTurningOverTime.java | 4 +- .../handlers/effecthandlers/SoulBlow.java | 4 +- .../handlers/effecthandlers/SoulEating.java | 4 +- .../scripts/handlers/effecthandlers/Sow.java | 4 +- .../handlers/effecthandlers/SpModify.java | 4 +- .../handlers/effecthandlers/Speed.java | 4 +- .../effecthandlers/SphericBarrier.java | 4 +- .../handlers/effecthandlers/Spoil.java | 4 +- .../StatBonusSkillCritical.java | 4 +- .../effecthandlers/StatBonusSpeed.java | 4 +- .../effecthandlers/StatByMoveType.java | 4 +- .../handlers/effecthandlers/StatUp.java | 4 +- .../effecthandlers/StealAbnormal.java | 4 +- .../handlers/effecthandlers/Summon.java | 4 +- .../effecthandlers/SummonAgathion.java | 4 +- .../handlers/effecthandlers/SummonCubic.java | 4 +- .../effecthandlers/SummonHallucination.java | 4 +- .../handlers/effecthandlers/SummonMulti.java | 4 +- .../handlers/effecthandlers/SummonNpc.java | 4 +- .../handlers/effecthandlers/SummonPet.java | 4 +- .../handlers/effecthandlers/SummonPoints.java | 4 +- .../handlers/effecthandlers/SummonTrap.java | 4 +- .../handlers/effecthandlers/Sweeper.java | 4 +- .../handlers/effecthandlers/Synergy.java | 4 +- .../handlers/effecthandlers/TakeCastle.java | 4 +- .../effecthandlers/TakeCastleStart.java | 4 +- .../handlers/effecthandlers/TakeFort.java | 4 +- .../effecthandlers/TakeFortStart.java | 4 +- .../handlers/effecthandlers/TalismanSlot.java | 4 +- .../handlers/effecthandlers/TargetCancel.java | 4 +- .../handlers/effecthandlers/TargetMe.java | 4 +- .../effecthandlers/TargetMeProbability.java | 4 +- .../handlers/effecthandlers/Teleport.java | 4 +- .../effecthandlers/TeleportToNpc.java | 4 +- .../effecthandlers/TeleportToPlayer.java | 4 +- .../effecthandlers/TeleportToSummon.java | 4 +- .../effecthandlers/TeleportToTarget.java | 4 +- .../effecthandlers/TrackLimitedSkill.java | 4 +- .../TransferDamageToPlayer.java | 4 +- .../TransferDamageToSummon.java | 4 +- .../handlers/effecthandlers/TransferHate.java | 4 +- .../effecthandlers/Transformation.java | 4 +- .../handlers/effecthandlers/TrapDetect.java | 4 +- .../handlers/effecthandlers/TrapRemove.java | 4 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 4 +- .../effecthandlers/TriggerSkillByDamage.java | 4 +- .../TriggerSkillByDeathBlow.java | 4 +- .../effecthandlers/TriggerSkillByKill.java | 4 +- .../TriggerSkillByMagicType.java | 4 +- .../effecthandlers/TriggerSkillBySkill.java | 4 +- .../TriggerSkillBySkillAttack.java | 4 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 4 +- .../effecthandlers/UnsummonAgathion.java | 4 +- .../effecthandlers/UnsummonServitors.java | 4 +- .../handlers/effecthandlers/Untargetable.java | 4 +- .../effecthandlers/VampiricAttack.java | 4 +- .../effecthandlers/VampiricDefence.java | 4 +- .../effecthandlers/VitalityExpRate.java | 4 +- .../effecthandlers/VitalityPointUp.java | 4 +- .../effecthandlers/VitalityPointsRate.java | 4 +- .../handlers/effecthandlers/WeightLimit.java | 4 +- .../effecthandlers/WeightPenalty.java | 4 +- .../effecthandlers/WorldChatPoints.java | 4 +- .../BuildAdvanceBaseSkillCondition.java | 4 +- .../BuildCampSkillCondition.java | 4 +- ...CanAddMaxEntranceInzoneSkillCondition.java | 4 +- .../CanBookmarkAddSlotSkillCondition.java | 4 +- ...CanChangeVitalItemCountSkillCondition.java | 4 +- .../CanEnchantAttributeSkillCondition.java | 4 +- .../CanMountForEventSkillCondition.java | 4 +- .../CanRefuelAirshipSkillCondition.java | 4 +- .../CanRestoreVitalPointSkillCondition.java | 4 +- .../CanSummonCubicSkillCondition.java | 4 +- .../CanSummonMultiSkillCondition.java | 4 +- .../CanSummonPetSkillCondition.java | 4 +- .../CanSummonSiegeGolemSkillCondition.java | 4 +- .../CanSummonSkillCondition.java | 4 +- .../CanTransformInDominionSkillCondition.java | 4 +- .../CanTransformSkillCondition.java | 4 +- .../CanUntransformSkillCondition.java | 4 +- .../CanUseInBattlefieldSkillCondition.java | 4 +- .../CanUseInDragonLairSkillCondition.java | 4 +- .../CanUseSwoopCannonSkillCondition.java | 4 +- ...nUseVitalityConsumeItemSkillCondition.java | 4 +- .../CannotUseInTransformSkillCondition.java | 4 +- .../CheckLevelSkillCondition.java | 4 +- .../CheckSexSkillCondition.java | 4 +- .../ConsumeBodySkillCondition.java | 4 +- .../EnergySavedSkillCondition.java | 4 +- .../EquipArmorSkillCondition.java | 4 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../NotFearedSkillCondition.java | 4 +- .../NotInUnderwaterSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 4 +- .../OpAffectedBySkillSkillCondition.java | 4 +- .../OpAgathionEnergySkillCondition.java | 4 +- .../OpAlignmentSkillCondition.java | 4 +- .../OpBlinkSkillCondition.java | 4 +- .../OpCallPcSkillCondition.java | 4 +- .../OpCanEscapeSkillCondition.java | 4 +- .../OpCanNotUseAirshipSkillCondition.java | 4 +- ...eTargetWithPrivateStoreSkillCondition.java | 4 +- .../OpChangeWeaponSkillCondition.java | 4 +- .../OpCheckAbnormalSkillCondition.java | 4 +- .../OpCheckAccountTypeSkillCondition.java | 4 +- .../OpCheckCastRangeSkillCondition.java | 4 +- .../OpCheckClassListSkillCondition.java | 4 +- .../OpCheckClassSkillCondition.java | 4 +- .../OpCheckCrtEffectSkillCondition.java | 4 +- .../OpCheckFlagSkillCondition.java | 4 +- ...eckOnGoingEventCampaignSkillCondition.java | 4 +- .../OpCheckPcbangPointSkillCondition.java | 4 +- .../OpCheckResidenceSkillCondition.java | 4 +- .../OpCheckSkillListSkillCondition.java | 4 +- .../OpCheckSkillSkillCondition.java | 4 +- .../OpCompanionSkillCondition.java | 4 +- .../OpEnchantRangeSkillCondition.java | 4 +- .../OpEncumberedSkillCondition.java | 4 +- .../OpEnergyMaxSkillCondition.java | 4 +- .../OpEquipItemSkillCondition.java | 4 +- .../OpExistNpcSkillCondition.java | 4 +- .../OpFishingCastSkillCondition.java | 4 +- .../OpFishingPumpingSkillCondition.java | 4 +- .../OpFishingReelingSkillCondition.java | 4 +- .../OpHaveSummonSkillCondition.java | 4 +- .../OpHaveSummonedNpcSkillCondition.java | 4 +- .../OpHomeSkillCondition.java | 4 +- .../OpInSiegeTimeSkillCondition.java | 4 +- .../OpInstantzoneSkillCondition.java | 4 +- .../OpMainjobSkillCondition.java | 4 +- .../OpNeedAgathionSkillCondition.java | 4 +- .../OpNeedSummonOrPetSkillCondition.java | 4 +- .../OpNotCursedSkillCondition.java | 4 +- .../OpNotInCeremonyOfChaosSkillCondition.java | 4 +- .../OpNotInPeacezoneSkillCondition.java | 4 +- .../OpNotInstantzoneSkillCondition.java | 4 +- .../OpNotOlympiadSkillCondition.java | 4 +- .../OpNotTerritorySkillCondition.java | 4 +- .../OpPeacezoneSkillCondition.java | 4 +- .../OpPkcountSkillCondition.java | 4 +- .../OpPledgeSkillCondition.java | 4 +- .../OpRestartPointSkillCondition.java | 4 +- .../OpResurrectionSkillCondition.java | 4 +- .../OpSiegeHammerSkillCondition.java | 4 +- .../OpSkillAcquireSkillCondition.java | 4 +- .../OpSkillSkillCondition.java | 4 +- .../OpSocialClassSkillCondition.java | 4 +- .../OpSoulMaxSkillCondition.java | 4 +- .../OpSubjobSkillCondition.java | 4 +- .../OpSweeperSkillCondition.java | 4 +- .../OpTargetAllItemTypeSkillCondition.java | 4 +- .../OpTargetArmorTypeSkillCondition.java | 4 +- .../OpTargetDoorSkillCondition.java | 4 +- ...OpTargetMyPledgeAcademySkillCondition.java | 4 +- .../OpTargetNpcSkillCondition.java | 4 +- .../OpTargetPcSkillCondition.java | 4 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../OpTerritorySkillCondition.java | 4 +- .../OpUnlockSkillCondition.java | 4 +- .../OpUseFirecrackerSkillCondition.java | 4 +- .../OpUsePraseedSkillCondition.java | 4 +- .../OpWyvernSkillCondition.java | 4 +- .../PossessHolythingSkillCondition.java | 4 +- .../RemainCpPerSkillCondition.java | 4 +- .../RemainHpPerSkillCondition.java | 4 +- .../RemainMpPerSkillCondition.java | 4 +- .../SoulSavedSkillCondition.java | 4 +- .../TargetItemCrystalTypeSkillCondition.java | 4 +- .../TargetMyMenteeSkillCondition.java | 4 +- .../TargetMyPartySkillCondition.java | 4 +- .../TargetMyPledgeSkillCondition.java | 4 +- .../TargetRaceSkillCondition.java | 4 +- .../ChambersOfDelusion/ChamberOfDelusion.java | 4 +- .../CrystalCavernsCoralGarden.java | 6 +- .../CrystalCavernsEmeraldSquare.java | 14 +- .../CrystalCavernsSteamCorridor.java | 14 +- .../DarkCloudMansion/DarkCloudMansion.java | 4 +- .../FaeronTrainingGrounds1.java | 6 +- .../FaeronTrainingGrounds2.java | 6 +- .../HarnakUndergroundRuins.java | 4 +- .../KartiasLabyrinth/KartiaBoss.java | 6 +- .../KartiasLabyrinth/KartiaHelperAdolph.java | 10 +- .../KartiasLabyrinth/KartiaHelperBarton.java | 6 +- .../KartiasLabyrinth/KartiaHelperElise.java | 12 +- .../KartiasLabyrinth/KartiaHelperEliyah.java | 4 +- .../KartiaHelperGuardian.java | 6 +- .../KartiasLabyrinth/KartiaHelperHayuk.java | 6 +- .../KartiasLabyrinth/KartiaSupportTroop.java | 4 +- .../KartiasLabyrinth/KartiasLabyrinth.java | 8 +- .../LabyrinthOfBelis/LabyrinthOfBelis.java | 4 +- .../MemoryOfDisaster/MemoryOfDisaster.java | 4 +- .../MuseumDungeon/MuseumDungeon.java | 4 +- .../scripts/instances/Nursery/Nursery.java | 16 +- .../PailakaInjuredDragon.java | 4 +- .../PrisonOfDarkness/PrisonOfDarkness.java | 12 +- .../TaintedDimension/TaintedDimension.java | 4 +- .../Q10771_VolatilePower.java | 4 +- .../Q10772_ReportsFromCrumaTowerPart1.java | 4 +- .../Q10776_TheWrathOfTheGiants.java | 4 +- .../Q10777_ReportsFromCrumaTowerPart2.java | 4 +- .../Q10787_ASpyMission.java | 4 +- .../gameserver/data/xml/impl/ActionData.java | 4 +- .../gameserver/data/xml/impl/AdminData.java | 8 +- .../gameserver/data/xml/impl/AlchemyData.java | 6 +- .../data/xml/impl/AppearanceItemData.java | 6 +- .../data/xml/impl/AttendanceRewardData.java | 4 +- .../data/xml/impl/BeautyShopData.java | 10 +- .../data/xml/impl/ClanHallData.java | 4 +- .../data/xml/impl/ClanMasteryData.java | 4 +- .../data/xml/impl/ClanShopData.java | 4 +- .../data/xml/impl/CombinationItemsData.java | 4 +- .../gameserver/data/xml/impl/CubicData.java | 6 +- .../data/xml/impl/DailyMissionData.java | 8 +- .../gameserver/data/xml/impl/DoorData.java | 14 +- .../data/xml/impl/EnchantItemData.java | 8 +- .../data/xml/impl/EnchantSkillGroupsData.java | 6 +- .../data/xml/impl/EquipmentUpgradeData.java | 4 +- .../data/xml/impl/EventEngineData.java | 12 +- .../data/xml/impl/ExtendDropData.java | 26 +- .../data/xml/impl/FakePlayerData.java | 4 +- .../gameserver/data/xml/impl/FenceData.java | 4 +- .../gameserver/data/xml/impl/HennaData.java | 4 +- .../data/xml/impl/InitialEquipmentData.java | 4 +- .../data/xml/impl/LuckyGameData.java | 10 +- .../data/xml/impl/MultisellData.java | 4 +- .../gameserver/data/xml/impl/NpcData.java | 8 +- .../xml/impl/NpcNameLocalisationData.java | 4 +- .../gameserver/data/xml/impl/OptionData.java | 4 +- .../data/xml/impl/PetDataTable.java | 4 +- .../data/xml/impl/PlayerTemplateData.java | 4 +- .../data/xml/impl/PrimeShopData.java | 4 +- .../gameserver/data/xml/impl/RecipeData.java | 6 +- .../data/xml/impl/ResidenceFunctionsData.java | 6 +- .../xml/impl/SendMessageLocalisationData.java | 4 +- .../gameserver/data/xml/impl/ShuttleData.java | 8 +- .../data/xml/impl/SiegeScheduleData.java | 6 +- .../gameserver/data/xml/impl/SkillData.java | 86 +- .../data/xml/impl/SkillTreesData.java | 4 +- .../gameserver/data/xml/impl/SpawnsData.java | 16 +- .../data/xml/impl/StaticObjectData.java | 8 +- .../data/xml/impl/TeleportersData.java | 4 +- .../data/xml/impl/TransformData.java | 6 +- .../gameserver/engines/DocumentBase.java | 8 +- .../engines/DocumentBaseGeneral.java | 4 +- .../engines/items/DocumentItem.java | 8 +- .../engines/items/ItemDataHolder.java | 4 +- .../gameserver/handler/ConditionHandler.java | 8 +- .../gameserver/handler/EffectHandler.java | 8 +- .../handler/SkillConditionHandler.java | 8 +- .../instancemanager/AirShipManager.java | 18 +- .../instancemanager/BoatManager.java | 4 +- .../instancemanager/CastleManorManager.java | 6 +- .../CeremonyOfChaosManager.java | 6 +- .../instancemanager/DBSpawnManager.java | 20 +- .../FakePlayerChatManager.java | 4 +- .../instancemanager/GrandBossManager.java | 16 +- .../instancemanager/InstanceManager.java | 20 +- .../gameserver/model/AccessLevel.java | 2 +- .../gameserver/model/ActionDataHolder.java | 2 +- .../model/AdminCommandAccessRight.java | 2 +- .../model/DailyMissionDataHolder.java | 8 +- .../l2jmobius/gameserver/model/Location.java | 2 +- .../gameserver/model/PetLevelData.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../gameserver/model/SiegeScheduleDate.java | 2 +- .../gameserver/model/SkillLearn.java | 2 +- .../l2jmobius/gameserver/model/StatSet.java | 968 ++++++++++++++++++ .../l2jmobius/gameserver/model/StatsSet.java | 968 ------------------ .../l2jmobius/gameserver/model/actor/Npc.java | 10 +- .../actor/templates/CreatureTemplate.java | 6 +- .../model/actor/templates/CubicTemplate.java | 4 +- .../model/actor/templates/DoorTemplate.java | 4 +- .../model/actor/templates/NpcTemplate.java | 14 +- .../model/actor/templates/PlayerTemplate.java | 4 +- .../model/actor/transform/Transform.java | 4 +- .../actor/transform/TransformLevelData.java | 4 +- .../actor/transform/TransformTemplate.java | 4 +- .../model/alchemy/AlchemyCraftData.java | 4 +- .../model/beautyshop/BeautyItem.java | 6 +- .../ceremonyofchaos/CeremonyOfChaosEvent.java | 8 +- .../gameserver/model/cubic/CubicSkill.java | 4 +- .../gameserver/model/entity/ClanHall.java | 4 +- .../gameserver/model/entity/Hero.java | 70 +- .../eventengine/AbstractEventManager.java | 10 +- .../model/eventengine/EventScheduler.java | 4 +- .../model/events/AbstractScript.java | 6 +- .../model/events/TimerExecutor.java | 8 +- .../model/events/timers/TimerHolder.java | 8 +- .../model/holders/AppearanceHolder.java | 4 +- .../model/holders/AttachSkillHolder.java | 4 +- .../model/holders/EnchantSkillHolder.java | 4 +- .../model/holders/ExtendDropDataHolder.java | 4 +- .../model/holders/FakePlayerHolder.java | 4 +- .../gameserver/model/holders/ItemHolder.java | 4 +- .../model/holders/ItemPointHolder.java | 4 +- .../model/holders/LuckyGameDataHolder.java | 4 +- .../model/holders/MinionHolder.java | 4 +- .../model/holders/MultisellListHolder.java | 4 +- .../model/holders/RecipeHolder.java | 4 +- .../model/instancezone/Instance.java | 8 +- .../model/instancezone/InstanceTemplate.java | 10 +- .../instancezone/conditions/Condition.java | 8 +- .../conditions/ConditionCommandChannel.java | 4 +- .../ConditionCommandChannelLeader.java | 4 +- .../conditions/ConditionDistance.java | 4 +- .../conditions/ConditionGroupMax.java | 4 +- .../conditions/ConditionGroupMin.java | 4 +- .../conditions/ConditionHasResidence.java | 6 +- .../conditions/ConditionItem.java | 4 +- .../conditions/ConditionLevel.java | 4 +- .../conditions/ConditionNoParty.java | 4 +- .../conditions/ConditionParty.java | 4 +- .../conditions/ConditionPartyLeader.java | 4 +- .../conditions/ConditionQuest.java | 4 +- .../conditions/ConditionReenter.java | 4 +- .../itemauction/AuctionDateGenerator.java | 4 +- .../model/itemauction/AuctionItem.java | 6 +- .../itemauction/ItemAuctionInstance.java | 6 +- .../gameserver/model/items/Armor.java | 8 +- .../gameserver/model/items/EtcItem.java | 8 +- .../gameserver/model/items/Henna.java | 4 +- .../gameserver/model/items/Item.java | 8 +- .../model/items/PlayerItemTemplate.java | 4 +- .../gameserver/model/items/Weapon.java | 8 +- .../items/appearance/AppearanceStone.java | 4 +- .../items/combination/CombinationItem.java | 4 +- .../items/enchant/AbstractEnchantItem.java | 4 +- .../model/items/enchant/EnchantScroll.java | 4 +- .../items/enchant/EnchantSupportItem.java | 4 +- .../gameserver/model/olympiad/Olympiad.java | 38 +- .../model/olympiad/Participant.java | 6 +- .../model/primeshop/PrimeShopGroup.java | 4 +- .../residences/ResidenceFunctionTemplate.java | 4 +- .../model/shuttle/ShuttleDataHolder.java | 4 +- .../gameserver/model/skills/Skill.java | 6 +- .../model/spawns/NpcSpawnTemplate.java | 16 +- .../gameserver/model/spawns/SpawnGroup.java | 12 +- .../model/spawns/SpawnTemplate.java | 12 +- .../model/teleporter/TeleportHolder.java | 4 +- .../model/teleporter/TeleportLocation.java | 4 +- .../model/variables/AbstractVariables.java | 18 +- .../network/serverpackets/ExHeroList.java | 6 +- .../gameserver/util/BypassParser.java | 4 +- .../ai/areas/BeastFarm/ImprovedBabyPets.java | 6 +- .../ai/areas/FairySettlement/Wisp.java | 6 +- .../EntrancePortalToCrystalCaverns.java | 4 +- .../ai/areas/SeedOfHellfire/Zofan.java | 4 +- .../areas/TalkingIsland/Walkers/Allada.java | 4 +- .../ai/areas/TalkingIsland/Walkers/Mei.java | 4 +- .../areas/TalkingIsland/Walkers/Remons.java | 4 +- .../ai/areas/TalkingIsland/Walkers/Rinne.java | 4 +- .../areas/TalkingIsland/Walkers/Rotina.java | 4 +- .../ai/areas/TalkingIsland/Walkers/Soros.java | 4 +- .../ElmoredenServantsGhost.java | 4 +- .../data/scripts/ai/bosses/Anakim/Anakim.java | 8 +- .../scripts/ai/bosses/Antharas/Antharas.java | 6 +- .../data/scripts/ai/bosses/Baium/Baium.java | 6 +- .../scripts/ai/bosses/Balok/BalokWarzone.java | 4 +- .../ai/bosses/Baylor/BaylorWarzone.java | 4 +- .../data/scripts/ai/bosses/Beleth/Beleth.java | 8 +- .../data/scripts/ai/bosses/Core/Core.java | 8 +- .../scripts/ai/bosses/Fafurion/Fafurion.java | 8 +- .../IceQueensCastleBattle.java | 8 +- .../data/scripts/ai/bosses/Helios/Helios.java | 8 +- .../ai/bosses/Istina/IstinaCavern.java | 14 +- .../data/scripts/ai/bosses/Kelbim/Kelbim.java | 8 +- .../ai/bosses/Kimerian/KimerianCommon.java | 8 +- .../data/scripts/ai/bosses/Lilith/Lilith.java | 8 +- .../scripts/ai/bosses/Lindvior/Lindvior.java | 10 +- .../ai/bosses/Lindvior/LionelHunter.java | 4 +- .../ai/bosses/Octavis/OctavisWarzone.java | 10 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 8 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 8 +- .../ai/bosses/Spezion/Cannon/Cannon.java | 4 +- .../ai/bosses/Teredor/TeredorWarzone.java | 14 +- .../scripts/ai/bosses/Trasken/Trasken.java | 8 +- .../scripts/ai/bosses/Valakas/Valakas.java | 8 +- .../Zaken/CavernOfThePirateCaptain.java | 6 +- .../data/scripts/ai/others/AreaSkillNpc.java | 4 +- .../CastleTeleporter/CastleTeleporter.java | 6 +- .../others/NpcBuffers/NpcBufferSkillData.java | 4 +- .../ai/others/NpcBuffers/NpcBuffersData.java | 6 +- .../scripts/ai/others/Servitors/ClanFlag.java | 4 +- .../Servitors/GateOfUnlimitedSummoning.java | 4 +- .../ai/others/Servitors/TreeOfLife.java | 4 +- .../ai/others/TersisHerald/TersisHerald.java | 4 +- .../admincommandhandlers/AdminGrandBoss.java | 4 +- .../admincommandhandlers/AdminOlympiad.java | 14 +- .../conditions/CategoryTypeCondition.java | 4 +- .../conditions/NpcLevelCondition.java | 4 +- .../conditions/PlayerLevelCondition.java | 4 +- .../effecthandlers/AbnormalShield.java | 4 +- .../effecthandlers/AbnormalTimeChange.java | 4 +- .../handlers/effecthandlers/AbsorbDamage.java | 4 +- .../AbstractConditionalHpEffect.java | 4 +- .../effecthandlers/AbstractStatAddEffect.java | 4 +- .../effecthandlers/AbstractStatEffect.java | 6 +- .../AbstractStatPercentEffect.java | 4 +- .../handlers/effecthandlers/Accuracy.java | 4 +- .../handlers/effecthandlers/AddHate.java | 4 +- .../effecthandlers/AddHuntingTime.java | 4 +- .../effecthandlers/AddSkillBySkill.java | 4 +- .../AddTeleportBookmarkSlot.java | 4 +- .../effecthandlers/AdditionalPotionCp.java | 4 +- .../effecthandlers/AdditionalPotionHp.java | 4 +- .../effecthandlers/AdditionalPotionMp.java | 4 +- .../handlers/effecthandlers/AgathionSlot.java | 4 +- .../handlers/effecthandlers/AirBind.java | 4 +- .../handlers/effecthandlers/AreaDamage.java | 4 +- .../handlers/effecthandlers/ArtifactSlot.java | 4 +- .../effecthandlers/AttackAttribute.java | 4 +- .../effecthandlers/AttackAttributeAdd.java | 4 +- .../handlers/effecthandlers/AttackBehind.java | 4 +- .../handlers/effecthandlers/AttackTrait.java | 4 +- .../handlers/effecthandlers/Backstab.java | 4 +- .../handlers/effecthandlers/Betray.java | 4 +- .../handlers/effecthandlers/Blink.java | 4 +- .../handlers/effecthandlers/BlinkSwap.java | 4 +- .../effecthandlers/BlockAbnormalSlot.java | 4 +- .../handlers/effecthandlers/BlockAction.java | 4 +- .../handlers/effecthandlers/BlockActions.java | 4 +- .../handlers/effecthandlers/BlockChat.java | 4 +- .../handlers/effecthandlers/BlockControl.java | 4 +- .../handlers/effecthandlers/BlockEscape.java | 4 +- .../handlers/effecthandlers/BlockMove.java | 4 +- .../handlers/effecthandlers/BlockParty.java | 4 +- .../effecthandlers/BlockResurrection.java | 4 +- .../handlers/effecthandlers/BlockSkill.java | 4 +- .../handlers/effecthandlers/BlockTarget.java | 4 +- .../handlers/effecthandlers/Bluff.java | 4 +- .../effecthandlers/BonusDropAmount.java | 4 +- .../effecthandlers/BonusDropRate.java | 4 +- .../effecthandlers/BonusSpoilRate.java | 4 +- .../handlers/effecthandlers/Breath.java | 4 +- .../handlers/effecthandlers/BuffBlock.java | 4 +- .../effecthandlers/CallLearnedSkill.java | 4 +- .../handlers/effecthandlers/CallParty.java | 4 +- .../handlers/effecthandlers/CallPc.java | 4 +- .../effecthandlers/CallRandomSkill.java | 4 +- .../handlers/effecthandlers/CallSkill.java | 4 +- .../effecthandlers/CallSkillOnActionTime.java | 4 +- .../effecthandlers/CallTargetParty.java | 4 +- .../effecthandlers/ChameleonRest.java | 4 +- .../handlers/effecthandlers/ChangeBody.java | 6 +- .../handlers/effecthandlers/ChangeFace.java | 4 +- .../effecthandlers/ChangeFishingMastery.java | 4 +- .../effecthandlers/ChangeHairColor.java | 4 +- .../effecthandlers/ChangeHairStyle.java | 4 +- .../handlers/effecthandlers/CheapShot.java | 4 +- .../handlers/effecthandlers/ClassChange.java | 4 +- .../handlers/effecthandlers/Compelling.java | 4 +- .../handlers/effecthandlers/Confuse.java | 4 +- .../handlers/effecthandlers/ConsumeBody.java | 4 +- .../handlers/effecthandlers/ConvertItem.java | 4 +- .../effecthandlers/CounterPhysicalSkill.java | 4 +- .../scripts/handlers/effecthandlers/Cp.java | 4 +- .../handlers/effecthandlers/CpHeal.java | 4 +- .../effecthandlers/CpHealOverTime.java | 4 +- .../effecthandlers/CpHealPercent.java | 4 +- .../handlers/effecthandlers/CpRegen.java | 4 +- .../effecthandlers/CraftingCritical.java | 4 +- .../effecthandlers/CreateCommonItem.java | 4 +- .../handlers/effecthandlers/CreateItem.java | 4 +- .../effecthandlers/CriticalDamage.java | 4 +- .../CriticalDamagePosition.java | 4 +- .../handlers/effecthandlers/CriticalRate.java | 4 +- .../CriticalRatePositionBonus.java | 4 +- .../handlers/effecthandlers/Crystallize.java | 4 +- .../handlers/effecthandlers/CubicMastery.java | 4 +- .../handlers/effecthandlers/DamOverTime.java | 4 +- .../effecthandlers/DamOverTimePercent.java | 4 +- .../handlers/effecthandlers/DamageBlock.java | 4 +- .../effecthandlers/DamageByAttack.java | 4 +- .../handlers/effecthandlers/DamageShield.java | 4 +- .../effecthandlers/DamageShieldResist.java | 4 +- .../handlers/effecthandlers/DeathLink.java | 4 +- .../handlers/effecthandlers/DebuffBlock.java | 4 +- .../effecthandlers/DefenceAttribute.java | 4 +- .../effecthandlers/DefenceCriticalDamage.java | 4 +- .../effecthandlers/DefenceCriticalRate.java | 4 +- .../DefenceMagicCriticalDamage.java | 4 +- .../DefenceMagicCriticalRate.java | 4 +- .../handlers/effecthandlers/DefenceTrait.java | 4 +- .../handlers/effecthandlers/DeleteHate.java | 4 +- .../effecthandlers/DeleteHateOfMe.java | 4 +- .../effecthandlers/DeleteTopAgro.java | 4 +- .../effecthandlers/DetectHiddenObjects.java | 4 +- .../handlers/effecthandlers/Detection.java | 4 +- .../handlers/effecthandlers/DisableSkill.java | 4 +- .../effecthandlers/DisableTargeting.java | 4 +- .../handlers/effecthandlers/Disarm.java | 4 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 4 +- .../effecthandlers/DispelByCategory.java | 4 +- .../handlers/effecthandlers/DispelBySlot.java | 4 +- .../effecthandlers/DispelBySlotMyself.java | 4 +- .../DispelBySlotProbability.java | 4 +- .../handlers/effecthandlers/DispelCaster.java | 4 +- .../handlers/effecthandlers/DoubleCast.java | 4 +- .../handlers/effecthandlers/DuelistFury.java | 4 +- .../handlers/effecthandlers/EnableCloak.java | 4 +- .../handlers/effecthandlers/EnergyAttack.java | 4 +- .../effecthandlers/EnlargeAbnormalSlot.java | 4 +- .../handlers/effecthandlers/EnlargeSlot.java | 4 +- .../handlers/effecthandlers/Escape.java | 4 +- .../handlers/effecthandlers/ExpModify.java | 4 +- .../handlers/effecthandlers/Faceoff.java | 4 +- .../handlers/effecthandlers/FakeDeath.java | 4 +- .../handlers/effecthandlers/FatalBlow.java | 4 +- .../effecthandlers/FatalBlowRate.java | 4 +- .../scripts/handlers/effecthandlers/Fear.java | 4 +- .../scripts/handlers/effecthandlers/Feed.java | 4 +- .../effecthandlers/FishingExpSpBonus.java | 4 +- .../scripts/handlers/effecthandlers/Flag.java | 4 +- .../handlers/effecthandlers/FlipBlock.java | 4 +- .../handlers/effecthandlers/FlyAway.java | 4 +- .../handlers/effecthandlers/FocusEnergy.java | 4 +- .../effecthandlers/FocusMaxMomentum.java | 4 +- .../effecthandlers/FocusMomentum.java | 4 +- .../handlers/effecthandlers/FocusSouls.java | 4 +- .../handlers/effecthandlers/GetAgro.java | 4 +- .../effecthandlers/GetDamageLimit.java | 4 +- .../handlers/effecthandlers/GetMomentum.java | 4 +- .../effecthandlers/GiveClanReputation.java | 4 +- .../handlers/effecthandlers/GiveExpAndSp.java | 4 +- .../handlers/effecthandlers/GiveFame.java | 4 +- .../effecthandlers/GiveRecommendation.java | 4 +- .../handlers/effecthandlers/GiveSp.java | 4 +- .../handlers/effecthandlers/GiveXp.java | 4 +- .../scripts/handlers/effecthandlers/Grow.java | 4 +- .../effecthandlers/HairAccessorySet.java | 4 +- .../handlers/effecthandlers/Harvesting.java | 4 +- .../handlers/effecthandlers/HateAttack.java | 4 +- .../effecthandlers/HeadquarterCreate.java | 4 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealEffect.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 4 +- .../handlers/effecthandlers/HealPercent.java | 4 +- .../scripts/handlers/effecthandlers/Hide.java | 4 +- .../handlers/effecthandlers/HitAtNight.java | 4 +- .../handlers/effecthandlers/HitNumber.java | 4 +- .../scripts/handlers/effecthandlers/Hp.java | 4 +- .../handlers/effecthandlers/HpByLevel.java | 4 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../effecthandlers/HpCpHealCritical.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 4 +- .../handlers/effecthandlers/HpRegen.java | 4 +- .../handlers/effecthandlers/HpToOwner.java | 4 +- .../handlers/effecthandlers/IgnoreDeath.java | 4 +- .../effecthandlers/ImmobilePetBuff.java | 4 +- .../effecthandlers/InstantKillResist.java | 4 +- .../handlers/effecthandlers/JewelSlot.java | 4 +- .../handlers/effecthandlers/KarmaCount.java | 4 +- .../handlers/effecthandlers/KnockBack.java | 4 +- .../handlers/effecthandlers/Lethal.java | 4 +- .../handlers/effecthandlers/LimitCp.java | 4 +- .../handlers/effecthandlers/LimitHp.java | 4 +- .../handlers/effecthandlers/LimitMp.java | 4 +- .../handlers/effecthandlers/LimitSkill.java | 4 +- .../handlers/effecthandlers/Lucky.java | 4 +- .../scripts/handlers/effecthandlers/MAtk.java | 4 +- .../effecthandlers/MagicAccuracy.java | 4 +- .../effecthandlers/MagicCriticalDamage.java | 4 +- .../effecthandlers/MagicCriticalRate.java | 4 +- .../handlers/effecthandlers/MagicMpCost.java | 4 +- .../MagicalAbnormalDispelAttack.java | 4 +- .../effecthandlers/MagicalAbnormalResist.java | 4 +- .../effecthandlers/MagicalAttack.java | 4 +- .../MagicalAttackByAbnormal.java | 4 +- .../MagicalAttackByAbnormalSlot.java | 4 +- .../effecthandlers/MagicalAttackMp.java | 4 +- .../effecthandlers/MagicalAttackRange.java | 4 +- .../effecthandlers/MagicalAttackSpeed.java | 4 +- .../effecthandlers/MagicalDamOverTime.java | 4 +- .../effecthandlers/MagicalDefence.java | 4 +- .../effecthandlers/MagicalEvasion.java | 4 +- .../effecthandlers/MagicalSkillPower.java | 4 +- .../effecthandlers/MagicalSoulAttack.java | 4 +- .../handlers/effecthandlers/ManaCharge.java | 4 +- .../effecthandlers/ManaDamOverTime.java | 4 +- .../handlers/effecthandlers/ManaHeal.java | 4 +- .../effecthandlers/ManaHealByLevel.java | 4 +- .../effecthandlers/ManaHealOverTime.java | 4 +- .../effecthandlers/ManaHealPercent.java | 4 +- .../handlers/effecthandlers/MaxCp.java | 4 +- .../handlers/effecthandlers/MaxHp.java | 4 +- .../handlers/effecthandlers/MaxMp.java | 4 +- .../handlers/effecthandlers/ModifyVital.java | 4 +- .../scripts/handlers/effecthandlers/Mp.java | 4 +- .../effecthandlers/MpConsumePerLevel.java | 4 +- .../handlers/effecthandlers/MpRegen.java | 4 +- .../handlers/effecthandlers/MpShield.java | 4 +- .../effecthandlers/MpVampiricAttack.java | 4 +- .../scripts/handlers/effecthandlers/Mute.java | 4 +- .../effecthandlers/NoblesseBless.java | 4 +- .../handlers/effecthandlers/OpenChest.java | 4 +- .../effecthandlers/OpenCommonRecipeBook.java | 4 +- .../handlers/effecthandlers/OpenDoor.java | 4 +- .../effecthandlers/OpenDwarfRecipeBook.java | 4 +- .../scripts/handlers/effecthandlers/PAtk.java | 4 +- .../handlers/effecthandlers/Passive.java | 4 +- .../PhysicalAbnormalResist.java | 4 +- .../effecthandlers/PhysicalAttack.java | 4 +- .../effecthandlers/PhysicalAttackHpLink.java | 4 +- .../effecthandlers/PhysicalAttackMute.java | 4 +- .../effecthandlers/PhysicalAttackRange.java | 4 +- .../effecthandlers/PhysicalAttackSaveHp.java | 4 +- .../effecthandlers/PhysicalAttackSpeed.java | 4 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../effecthandlers/PhysicalDefence.java | 4 +- .../effecthandlers/PhysicalEvasion.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 4 +- .../PhysicalShieldAngleAll.java | 4 +- .../effecthandlers/PhysicalSkillPower.java | 4 +- .../effecthandlers/PhysicalSoulAttack.java | 4 +- .../handlers/effecthandlers/PkCount.java | 4 +- .../handlers/effecthandlers/Plunder.java | 4 +- .../effecthandlers/PolearmSingleTarget.java | 4 +- .../effecthandlers/ProtectDeathPenalty.java | 4 +- .../effecthandlers/ProtectionBlessing.java | 4 +- .../handlers/effecthandlers/PullBack.java | 4 +- .../PveMagicalSkillDamageBonus.java | 4 +- .../PveMagicalSkillDefenceBonus.java | 4 +- .../PvePhysicalAttackDamageBonus.java | 4 +- .../PvePhysicalAttackDefenceBonus.java | 4 +- .../PvePhysicalSkillDamageBonus.java | 4 +- .../PvePhysicalSkillDefenceBonus.java | 4 +- .../PveRaidMagicalSkillDefenceBonus.java | 4 +- .../PveRaidPhysicalAttackDefenceBonus.java | 4 +- .../PveRaidPhysicalSkillDefenceBonus.java | 4 +- .../PvpMagicalSkillDamageBonus.java | 4 +- .../PvpMagicalSkillDefenceBonus.java | 4 +- .../PvpPhysicalAttackDamageBonus.java | 4 +- .../PvpPhysicalAttackDefenceBonus.java | 4 +- .../PvpPhysicalSkillDamageBonus.java | 4 +- .../PvpPhysicalSkillDefenceBonus.java | 4 +- .../effecthandlers/RandomizeHate.java | 4 +- .../handlers/effecthandlers/RealDamage.java | 4 +- .../handlers/effecthandlers/RearDamage.java | 4 +- .../handlers/effecthandlers/RebalanceHP.java | 4 +- .../effecthandlers/RebalanceHPSummon.java | 4 +- .../RecoverVitalityInPeaceZone.java | 4 +- .../handlers/effecthandlers/Recovery.java | 4 +- .../handlers/effecthandlers/ReduceCancel.java | 4 +- .../handlers/effecthandlers/ReduceDamage.java | 4 +- .../effecthandlers/ReduceDropPenalty.java | 4 +- .../handlers/effecthandlers/ReflectMagic.java | 4 +- .../handlers/effecthandlers/ReflectSkill.java | 4 +- .../effecthandlers/RefuelAirship.java | 4 +- .../handlers/effecthandlers/Relax.java | 4 +- .../effecthandlers/ReplaceSkillBySkill.java | 4 +- .../effecthandlers/ResetInstanceEntry.java | 4 +- .../ResistAbnormalByCategory.java | 4 +- .../effecthandlers/ResistDDMagic.java | 4 +- .../ResistDispelByCategory.java | 4 +- .../handlers/effecthandlers/ResistSkill.java | 4 +- .../handlers/effecthandlers/Restoration.java | 4 +- .../effecthandlers/RestorationRandom.java | 8 +- .../effecthandlers/RestoreSymbolSeal.java | 4 +- .../handlers/effecthandlers/Resurrection.java | 4 +- .../effecthandlers/ResurrectionSpecial.java | 4 +- .../handlers/effecthandlers/Reuse.java | 4 +- .../effecthandlers/ReuseSkillById.java | 4 +- .../scripts/handlers/effecthandlers/Root.java | 4 +- .../effecthandlers/SacrificeSummon.java | 4 +- .../effecthandlers/SafeFallHeight.java | 4 +- .../SendSystemMessageToClan.java | 4 +- .../effecthandlers/ServitorShare.java | 4 +- .../handlers/effecthandlers/SetHp.java | 4 +- .../handlers/effecthandlers/SetSkill.java | 4 +- .../effecthandlers/ShieldDefence.java | 4 +- .../effecthandlers/ShieldDefenceRate.java | 4 +- .../handlers/effecthandlers/SilentMove.java | 4 +- .../effecthandlers/SkillCritical.java | 4 +- .../effecthandlers/SkillCriticalDamage.java | 4 +- .../SkillCriticalProbability.java | 4 +- .../handlers/effecthandlers/SkillEvasion.java | 4 +- .../effecthandlers/SkillPowerAdd.java | 4 +- .../handlers/effecthandlers/SkillTurning.java | 4 +- .../effecthandlers/SkillTurningOverTime.java | 4 +- .../handlers/effecthandlers/SoulBlow.java | 4 +- .../handlers/effecthandlers/SoulEating.java | 4 +- .../scripts/handlers/effecthandlers/Sow.java | 4 +- .../handlers/effecthandlers/SpModify.java | 4 +- .../handlers/effecthandlers/Speed.java | 4 +- .../effecthandlers/SphericBarrier.java | 4 +- .../handlers/effecthandlers/Spoil.java | 4 +- .../StatBonusSkillCritical.java | 4 +- .../effecthandlers/StatBonusSpeed.java | 4 +- .../effecthandlers/StatByMoveType.java | 4 +- .../handlers/effecthandlers/StatUp.java | 4 +- .../effecthandlers/StealAbnormal.java | 4 +- .../handlers/effecthandlers/Summon.java | 4 +- .../effecthandlers/SummonAgathion.java | 4 +- .../handlers/effecthandlers/SummonCubic.java | 4 +- .../effecthandlers/SummonHallucination.java | 4 +- .../handlers/effecthandlers/SummonMulti.java | 4 +- .../handlers/effecthandlers/SummonNpc.java | 4 +- .../handlers/effecthandlers/SummonPet.java | 4 +- .../handlers/effecthandlers/SummonPoints.java | 4 +- .../handlers/effecthandlers/SummonTrap.java | 4 +- .../handlers/effecthandlers/Sweeper.java | 4 +- .../handlers/effecthandlers/Synergy.java | 4 +- .../handlers/effecthandlers/TakeCastle.java | 4 +- .../effecthandlers/TakeCastleStart.java | 4 +- .../handlers/effecthandlers/TakeFort.java | 4 +- .../effecthandlers/TakeFortStart.java | 4 +- .../handlers/effecthandlers/TalismanSlot.java | 4 +- .../handlers/effecthandlers/TargetCancel.java | 4 +- .../handlers/effecthandlers/TargetMe.java | 4 +- .../effecthandlers/TargetMeProbability.java | 4 +- .../handlers/effecthandlers/Teleport.java | 4 +- .../effecthandlers/TeleportToNpc.java | 4 +- .../effecthandlers/TeleportToPlayer.java | 4 +- .../effecthandlers/TeleportToSummon.java | 4 +- .../effecthandlers/TeleportToTarget.java | 4 +- .../effecthandlers/TrackLimitedSkill.java | 4 +- .../TransferDamageToPlayer.java | 4 +- .../TransferDamageToSummon.java | 4 +- .../handlers/effecthandlers/TransferHate.java | 4 +- .../effecthandlers/Transformation.java | 4 +- .../handlers/effecthandlers/TrapDetect.java | 4 +- .../handlers/effecthandlers/TrapRemove.java | 4 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 4 +- .../effecthandlers/TriggerSkillByDamage.java | 4 +- .../TriggerSkillByDeathBlow.java | 4 +- .../effecthandlers/TriggerSkillByKill.java | 4 +- .../TriggerSkillByMagicType.java | 4 +- .../effecthandlers/TriggerSkillBySkill.java | 4 +- .../TriggerSkillBySkillAttack.java | 4 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 4 +- .../effecthandlers/UnsummonAgathion.java | 4 +- .../effecthandlers/UnsummonServitors.java | 4 +- .../handlers/effecthandlers/Untargetable.java | 4 +- .../effecthandlers/VampiricAttack.java | 4 +- .../effecthandlers/VampiricDefence.java | 4 +- .../effecthandlers/VitalityExpRate.java | 4 +- .../effecthandlers/VitalityPointUp.java | 4 +- .../effecthandlers/VitalityPointsRate.java | 4 +- .../handlers/effecthandlers/WeightLimit.java | 4 +- .../effecthandlers/WeightPenalty.java | 4 +- .../effecthandlers/WorldChatPoints.java | 4 +- .../BuildAdvanceBaseSkillCondition.java | 4 +- .../BuildCampSkillCondition.java | 4 +- ...CanAddMaxEntranceInzoneSkillCondition.java | 4 +- .../CanBookmarkAddSlotSkillCondition.java | 4 +- ...CanChangeVitalItemCountSkillCondition.java | 4 +- .../CanEnchantAttributeSkillCondition.java | 4 +- .../CanMountForEventSkillCondition.java | 4 +- .../CanRefuelAirshipSkillCondition.java | 4 +- .../CanRestoreVitalPointSkillCondition.java | 4 +- .../CanSummonCubicSkillCondition.java | 4 +- .../CanSummonMultiSkillCondition.java | 4 +- .../CanSummonPetSkillCondition.java | 4 +- .../CanSummonSiegeGolemSkillCondition.java | 4 +- .../CanSummonSkillCondition.java | 4 +- .../CanTransformInDominionSkillCondition.java | 4 +- .../CanTransformSkillCondition.java | 4 +- .../CanUntransformSkillCondition.java | 4 +- .../CanUseInBattlefieldSkillCondition.java | 4 +- .../CanUseInDragonLairSkillCondition.java | 4 +- .../CanUseSwoopCannonSkillCondition.java | 4 +- ...nUseVitalityConsumeItemSkillCondition.java | 4 +- .../CannotUseInTransformSkillCondition.java | 4 +- .../CheckLevelSkillCondition.java | 4 +- .../CheckSexSkillCondition.java | 4 +- .../ConsumeBodySkillCondition.java | 4 +- .../EnergySavedSkillCondition.java | 4 +- .../EquipArmorSkillCondition.java | 4 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../NotFearedSkillCondition.java | 4 +- .../NotInUnderwaterSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 4 +- .../OpAffectedBySkillSkillCondition.java | 4 +- .../OpAgathionEnergySkillCondition.java | 4 +- .../OpAlignmentSkillCondition.java | 4 +- .../OpBlinkSkillCondition.java | 4 +- .../OpCallPcSkillCondition.java | 4 +- .../OpCanEscapeSkillCondition.java | 4 +- .../OpCanNotUseAirshipSkillCondition.java | 4 +- ...eTargetWithPrivateStoreSkillCondition.java | 4 +- .../OpChangeWeaponSkillCondition.java | 4 +- .../OpCheckAbnormalSkillCondition.java | 4 +- .../OpCheckAccountTypeSkillCondition.java | 4 +- .../OpCheckCastRangeSkillCondition.java | 4 +- .../OpCheckClassListSkillCondition.java | 4 +- .../OpCheckClassSkillCondition.java | 4 +- .../OpCheckCrtEffectSkillCondition.java | 4 +- .../OpCheckFlagSkillCondition.java | 4 +- ...eckOnGoingEventCampaignSkillCondition.java | 4 +- .../OpCheckPcbangPointSkillCondition.java | 4 +- .../OpCheckResidenceSkillCondition.java | 4 +- .../OpCheckSkillListSkillCondition.java | 4 +- .../OpCheckSkillSkillCondition.java | 4 +- .../OpCompanionSkillCondition.java | 4 +- .../OpEnchantRangeSkillCondition.java | 4 +- .../OpEncumberedSkillCondition.java | 4 +- .../OpEnergyMaxSkillCondition.java | 4 +- .../OpEquipItemSkillCondition.java | 4 +- .../OpExistNpcSkillCondition.java | 4 +- .../OpFishingCastSkillCondition.java | 4 +- .../OpFishingPumpingSkillCondition.java | 4 +- .../OpFishingReelingSkillCondition.java | 4 +- .../OpHaveSummonSkillCondition.java | 4 +- .../OpHaveSummonedNpcSkillCondition.java | 4 +- .../OpHomeSkillCondition.java | 4 +- .../OpInSiegeTimeSkillCondition.java | 4 +- .../OpInstantzoneSkillCondition.java | 4 +- .../OpMainjobSkillCondition.java | 4 +- .../OpNeedAgathionSkillCondition.java | 4 +- .../OpNeedSummonOrPetSkillCondition.java | 4 +- .../OpNotCursedSkillCondition.java | 4 +- .../OpNotInCeremonyOfChaosSkillCondition.java | 4 +- .../OpNotInPeacezoneSkillCondition.java | 4 +- .../OpNotInstantzoneSkillCondition.java | 4 +- .../OpNotOlympiadSkillCondition.java | 4 +- .../OpNotTerritorySkillCondition.java | 4 +- .../OpPeacezoneSkillCondition.java | 4 +- .../OpPkcountSkillCondition.java | 4 +- .../OpPledgeSkillCondition.java | 4 +- .../OpRestartPointSkillCondition.java | 4 +- .../OpResurrectionSkillCondition.java | 4 +- .../OpSiegeHammerSkillCondition.java | 4 +- .../OpSkillAcquireSkillCondition.java | 4 +- .../OpSkillSkillCondition.java | 4 +- .../OpSocialClassSkillCondition.java | 4 +- .../OpSoulMaxSkillCondition.java | 4 +- .../OpSubjobSkillCondition.java | 4 +- .../OpSweeperSkillCondition.java | 4 +- .../OpTargetAllItemTypeSkillCondition.java | 4 +- .../OpTargetArmorTypeSkillCondition.java | 4 +- .../OpTargetDoorSkillCondition.java | 4 +- ...OpTargetMyPledgeAcademySkillCondition.java | 4 +- .../OpTargetNpcSkillCondition.java | 4 +- .../OpTargetPcSkillCondition.java | 4 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../OpTerritorySkillCondition.java | 4 +- .../OpUnlockSkillCondition.java | 4 +- .../OpUseFirecrackerSkillCondition.java | 4 +- .../OpUsePraseedSkillCondition.java | 4 +- .../OpWyvernSkillCondition.java | 4 +- .../PossessHolythingSkillCondition.java | 4 +- .../RemainCpPerSkillCondition.java | 4 +- .../RemainHpPerSkillCondition.java | 4 +- .../RemainMpPerSkillCondition.java | 4 +- .../SoulSavedSkillCondition.java | 4 +- .../TargetItemCrystalTypeSkillCondition.java | 4 +- .../TargetMyMenteeSkillCondition.java | 4 +- .../TargetMyPartySkillCondition.java | 4 +- .../TargetMyPledgeSkillCondition.java | 4 +- .../TargetRaceSkillCondition.java | 4 +- .../ChambersOfDelusion/ChamberOfDelusion.java | 4 +- .../CrystalCavernsCoralGarden.java | 6 +- .../CrystalCavernsEmeraldSquare.java | 14 +- .../CrystalCavernsSteamCorridor.java | 14 +- .../DarkCloudMansion/DarkCloudMansion.java | 4 +- .../EvilIncubator/EvilIncubator.java | 4 +- .../KartiasLabyrinth/KartiaBoss.java | 6 +- .../KartiasLabyrinth/KartiaHelperAdolph.java | 10 +- .../KartiasLabyrinth/KartiaHelperBarton.java | 6 +- .../KartiasLabyrinth/KartiaHelperElise.java | 12 +- .../KartiasLabyrinth/KartiaHelperEliyah.java | 4 +- .../KartiaHelperGuardian.java | 6 +- .../KartiasLabyrinth/KartiaHelperHayuk.java | 6 +- .../KartiasLabyrinth/KartiaSupportTroop.java | 4 +- .../KartiasLabyrinth/KartiasLabyrinth.java | 8 +- .../scripts/instances/Nursery/Nursery.java | 16 +- .../PrisonOfDarkness/PrisonOfDarkness.java | 12 +- .../gameserver/data/xml/impl/ActionData.java | 4 +- .../gameserver/data/xml/impl/AdminData.java | 8 +- .../gameserver/data/xml/impl/AlchemyData.java | 6 +- .../data/xml/impl/AppearanceItemData.java | 6 +- .../data/xml/impl/AttendanceRewardData.java | 4 +- .../data/xml/impl/BeautyShopData.java | 10 +- .../data/xml/impl/ClanHallData.java | 4 +- .../data/xml/impl/ClanMasteryData.java | 4 +- .../data/xml/impl/ClanShopData.java | 4 +- .../data/xml/impl/CombinationItemsData.java | 4 +- .../gameserver/data/xml/impl/CubicData.java | 6 +- .../data/xml/impl/DailyMissionData.java | 8 +- .../gameserver/data/xml/impl/DoorData.java | 14 +- .../data/xml/impl/EnchantItemData.java | 8 +- .../data/xml/impl/EnchantSkillGroupsData.java | 6 +- .../data/xml/impl/EquipmentUpgradeData.java | 4 +- .../data/xml/impl/EventEngineData.java | 12 +- .../data/xml/impl/ExtendDropData.java | 26 +- .../data/xml/impl/FakePlayerData.java | 4 +- .../gameserver/data/xml/impl/FenceData.java | 4 +- .../gameserver/data/xml/impl/HennaData.java | 4 +- .../data/xml/impl/InitialEquipmentData.java | 4 +- .../data/xml/impl/LuckyGameData.java | 10 +- .../data/xml/impl/MultisellData.java | 4 +- .../gameserver/data/xml/impl/NpcData.java | 8 +- .../xml/impl/NpcNameLocalisationData.java | 4 +- .../gameserver/data/xml/impl/OptionData.java | 4 +- .../data/xml/impl/PetDataTable.java | 4 +- .../data/xml/impl/PlayerTemplateData.java | 4 +- .../data/xml/impl/PrimeShopData.java | 4 +- .../gameserver/data/xml/impl/RecipeData.java | 6 +- .../data/xml/impl/ResidenceFunctionsData.java | 6 +- .../xml/impl/SendMessageLocalisationData.java | 4 +- .../gameserver/data/xml/impl/ShuttleData.java | 8 +- .../data/xml/impl/SiegeScheduleData.java | 6 +- .../gameserver/data/xml/impl/SkillData.java | 86 +- .../data/xml/impl/SkillTreesData.java | 4 +- .../gameserver/data/xml/impl/SpawnsData.java | 16 +- .../data/xml/impl/StaticObjectData.java | 8 +- .../data/xml/impl/TeleportListData.java | 4 +- .../data/xml/impl/TeleportersData.java | 4 +- .../data/xml/impl/TransformData.java | 6 +- .../gameserver/engines/DocumentBase.java | 8 +- .../engines/DocumentBaseGeneral.java | 4 +- .../engines/items/DocumentItem.java | 8 +- .../engines/items/ItemDataHolder.java | 4 +- .../gameserver/handler/ConditionHandler.java | 8 +- .../gameserver/handler/EffectHandler.java | 8 +- .../handler/SkillConditionHandler.java | 8 +- .../instancemanager/AirShipManager.java | 18 +- .../instancemanager/BoatManager.java | 4 +- .../instancemanager/CastleManorManager.java | 6 +- .../CeremonyOfChaosManager.java | 6 +- .../instancemanager/DBSpawnManager.java | 20 +- .../FakePlayerChatManager.java | 4 +- .../instancemanager/GrandBossManager.java | 16 +- .../instancemanager/InstanceManager.java | 20 +- .../instancemanager/RankManager.java | 34 +- .../gameserver/model/AccessLevel.java | 2 +- .../gameserver/model/ActionDataHolder.java | 2 +- .../model/AdminCommandAccessRight.java | 2 +- .../model/DailyMissionDataHolder.java | 8 +- .../l2jmobius/gameserver/model/Location.java | 2 +- .../gameserver/model/PetLevelData.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../gameserver/model/SiegeScheduleDate.java | 2 +- .../gameserver/model/SkillLearn.java | 2 +- .../l2jmobius/gameserver/model/StatSet.java | 968 ++++++++++++++++++ .../l2jmobius/gameserver/model/StatsSet.java | 968 ------------------ .../l2jmobius/gameserver/model/actor/Npc.java | 10 +- .../actor/templates/CreatureTemplate.java | 6 +- .../model/actor/templates/CubicTemplate.java | 4 +- .../model/actor/templates/DoorTemplate.java | 4 +- .../model/actor/templates/NpcTemplate.java | 14 +- .../model/actor/templates/PlayerTemplate.java | 4 +- .../model/actor/transform/Transform.java | 4 +- .../actor/transform/TransformLevelData.java | 4 +- .../actor/transform/TransformTemplate.java | 4 +- .../model/alchemy/AlchemyCraftData.java | 4 +- .../model/beautyshop/BeautyItem.java | 6 +- .../ceremonyofchaos/CeremonyOfChaosEvent.java | 8 +- .../gameserver/model/cubic/CubicSkill.java | 4 +- .../gameserver/model/entity/ClanHall.java | 4 +- .../gameserver/model/entity/Hero.java | 72 +- .../eventengine/AbstractEventManager.java | 10 +- .../model/eventengine/EventScheduler.java | 4 +- .../model/events/AbstractScript.java | 6 +- .../model/events/TimerExecutor.java | 8 +- .../model/events/timers/TimerHolder.java | 8 +- .../model/holders/AppearanceHolder.java | 4 +- .../model/holders/AttachSkillHolder.java | 4 +- .../model/holders/EnchantSkillHolder.java | 4 +- .../model/holders/ExtendDropDataHolder.java | 4 +- .../model/holders/FakePlayerHolder.java | 4 +- .../gameserver/model/holders/ItemHolder.java | 4 +- .../model/holders/ItemPointHolder.java | 4 +- .../model/holders/LuckyGameDataHolder.java | 4 +- .../model/holders/MinionHolder.java | 4 +- .../model/holders/MultisellListHolder.java | 4 +- .../model/holders/RecipeHolder.java | 4 +- .../model/instancezone/Instance.java | 8 +- .../model/instancezone/InstanceTemplate.java | 10 +- .../instancezone/conditions/Condition.java | 8 +- .../conditions/ConditionCommandChannel.java | 4 +- .../ConditionCommandChannelLeader.java | 4 +- .../conditions/ConditionDistance.java | 4 +- .../conditions/ConditionGroupMax.java | 4 +- .../conditions/ConditionGroupMin.java | 4 +- .../conditions/ConditionHasResidence.java | 6 +- .../conditions/ConditionItem.java | 4 +- .../conditions/ConditionLevel.java | 4 +- .../conditions/ConditionNoParty.java | 4 +- .../conditions/ConditionParty.java | 4 +- .../conditions/ConditionPartyLeader.java | 4 +- .../conditions/ConditionQuest.java | 4 +- .../conditions/ConditionReenter.java | 4 +- .../itemauction/AuctionDateGenerator.java | 4 +- .../model/itemauction/AuctionItem.java | 6 +- .../itemauction/ItemAuctionInstance.java | 6 +- .../gameserver/model/items/Armor.java | 8 +- .../gameserver/model/items/EtcItem.java | 8 +- .../gameserver/model/items/Henna.java | 4 +- .../gameserver/model/items/Item.java | 8 +- .../model/items/PlayerItemTemplate.java | 4 +- .../gameserver/model/items/Weapon.java | 8 +- .../items/appearance/AppearanceStone.java | 4 +- .../items/combination/CombinationItem.java | 4 +- .../items/enchant/AbstractEnchantItem.java | 4 +- .../model/items/enchant/EnchantScroll.java | 4 +- .../items/enchant/EnchantSupportItem.java | 4 +- .../gameserver/model/olympiad/Olympiad.java | 38 +- .../model/olympiad/Participant.java | 6 +- .../model/primeshop/PrimeShopGroup.java | 4 +- .../residences/ResidenceFunctionTemplate.java | 4 +- .../model/shuttle/ShuttleDataHolder.java | 4 +- .../gameserver/model/skills/Skill.java | 6 +- .../model/spawns/NpcSpawnTemplate.java | 16 +- .../gameserver/model/spawns/SpawnGroup.java | 12 +- .../model/spawns/SpawnTemplate.java | 12 +- .../model/teleporter/TeleportHolder.java | 4 +- .../model/teleporter/TeleportLocation.java | 4 +- .../model/variables/AbstractVariables.java | 18 +- .../network/serverpackets/ExHeroList.java | 6 +- .../ranking/ExOlympiadMyRankingInfo.java | 4 +- .../ranking/ExOlympiadRankingInfo.java | 34 +- .../ranking/ExRankingCharInfo.java | 10 +- .../ranking/ExRankingCharRankers.java | 50 +- .../gameserver/util/BypassParser.java | 4 +- .../game/data/scripts/ai/bosses/Antharas.java | 12 +- .../game/data/scripts/ai/bosses/Baium.java | 8 +- .../game/data/scripts/ai/bosses/Core.java | 8 +- .../data/scripts/ai/bosses/Frintezza.java | 8 +- .../game/data/scripts/ai/bosses/Orfen.java | 14 +- .../game/data/scripts/ai/bosses/QueenAnt.java | 8 +- .../game/data/scripts/ai/bosses/Valakas.java | 8 +- .../data/scripts/ai/bosses/VanHalter.java | 8 +- .../game/data/scripts/ai/bosses/Zaken.java | 8 +- .../datatables/sql/CharTemplateTable.java | 4 +- .../datatables/sql/HelperBuffTable.java | 4 +- .../gameserver/datatables/sql/NpcTable.java | 6 +- .../gameserver/datatables/xml/AdminData.java | 8 +- .../gameserver/datatables/xml/DoorData.java | 8 +- .../gameserver/datatables/xml/FishData.java | 6 +- .../gameserver/datatables/xml/HennaData.java | 6 +- .../gameserver/engines/DocumentBase.java | 8 +- .../gameserver/engines/DocumentItem.java | 6 +- .../gameserver/engines/DocumentSkill.java | 16 +- .../gameserver/engines/ItemDataHolder.java | 4 +- .../gameserver/engines/SkillDataHolder.java | 8 +- .../admincommandhandlers/AdminEditNpc.java | 4 +- .../admincommandhandlers/AdminSpawn.java | 2 +- .../instancemanager/BoatManager.java | 4 +- .../instancemanager/GrandBossManager.java | 20 +- .../instancemanager/RaidBossSpawnManager.java | 18 +- .../gameserver/model/ChanceCondition.java | 2 +- .../org/l2jmobius/gameserver/model/Fish.java | 2 +- .../gameserver/model/NpcWalkerNode.java | 4 +- .../org/l2jmobius/gameserver/model/Skill.java | 6 +- .../model/{StatsSet.java => StatSet.java} | 44 +- .../gameserver/model/actor/Creature.java | 8 +- .../actor/instance/FestivalGuideInstance.java | 8 +- .../actor/instance/VillageMasterInstance.java | 4 +- .../actor/templates/CreatureTemplate.java | 4 +- .../model/actor/templates/NpcTemplate.java | 14 +- .../model/actor/templates/PlayerTemplate.java | 4 +- .../gameserver/model/entity/ClanHall.java | 6 +- .../gameserver/model/entity/Hero.java | 32 +- .../model/entity/olympiad/Olympiad.java | 54 +- .../model/entity/olympiad/OlympiadGame.java | 6 +- .../model/entity/sevensigns/SevenSigns.java | 28 +- .../entity/sevensigns/SevenSignsFestival.java | 42 +- .../gameserver/model/entity/siege/Castle.java | 6 +- .../gameserver/model/entity/siege/Fort.java | 6 +- .../gameserver/model/entity/siege/Siege.java | 2 +- .../model/holders/HelperBuffHolder.java | 4 +- .../gameserver/model/items/Armor.java | 6 +- .../gameserver/model/items/EtcItem.java | 6 +- .../gameserver/model/items/Henna.java | 4 +- .../gameserver/model/items/Item.java | 6 +- .../gameserver/model/items/Weapon.java | 6 +- .../model/skills/handlers/SkillCharge.java | 4 +- .../model/skills/handlers/SkillChargeDmg.java | 4 +- .../skills/handlers/SkillChargeEffect.java | 4 +- .../skills/handlers/SkillCreateItem.java | 4 +- .../model/skills/handlers/SkillDefault.java | 4 +- .../model/skills/handlers/SkillDrain.java | 4 +- .../model/skills/handlers/SkillElemental.java | 4 +- .../model/skills/handlers/SkillSeed.java | 4 +- .../model/skills/handlers/SkillSignet.java | 4 +- .../skills/handlers/SkillSignetCasttime.java | 4 +- .../model/skills/handlers/SkillSummon.java | 4 +- .../model/variables/AbstractVariables.java | 16 +- .../network/serverpackets/ExHeroList.java | 6 +- .../network/serverpackets/SSQStatus.java | 4 +- .../scripts/ai/bosses/Antharas/Antharas.java | 6 +- .../data/scripts/ai/bosses/Baium/Baium.java | 6 +- .../data/scripts/ai/bosses/Beleth/Beleth.java | 8 +- .../data/scripts/ai/bosses/Core/Core.java | 8 +- .../scripts/ai/bosses/DrChaos/DrChaos.java | 8 +- .../ai/bosses/Frintezza/Frintezza.java | 8 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 8 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 8 +- .../scripts/ai/bosses/Valakas/Valakas.java | 8 +- .../others/NpcBuffers/NpcBufferSkillData.java | 4 +- .../ai/others/NpcBuffers/NpcBuffersData.java | 6 +- .../admincommandhandlers/AdminGrandBoss.java | 4 +- .../handlers/bypasshandlers/Festival.java | 8 +- .../handlers/effecthandlers/AddHate.java | 4 +- .../handlers/effecthandlers/AttackTrait.java | 4 +- .../handlers/effecthandlers/Backstab.java | 4 +- .../handlers/effecthandlers/Betray.java | 4 +- .../handlers/effecthandlers/Blink.java | 4 +- .../handlers/effecthandlers/BlockAction.java | 4 +- .../effecthandlers/BlockBuffSlot.java | 4 +- .../handlers/effecthandlers/BlockChat.java | 4 +- .../handlers/effecthandlers/BlockParty.java | 4 +- .../effecthandlers/BlockResurrection.java | 4 +- .../handlers/effecthandlers/Bluff.java | 4 +- .../scripts/handlers/effecthandlers/Buff.java | 4 +- .../handlers/effecthandlers/CallParty.java | 4 +- .../handlers/effecthandlers/CallPc.java | 4 +- .../handlers/effecthandlers/CallSkill.java | 4 +- .../effecthandlers/ChameleonRest.java | 4 +- .../handlers/effecthandlers/ChangeFace.java | 4 +- .../effecthandlers/ChangeFishingMastery.java | 4 +- .../effecthandlers/ChangeHairColor.java | 4 +- .../effecthandlers/ChangeHairStyle.java | 4 +- .../handlers/effecthandlers/ClanGate.java | 4 +- .../handlers/effecthandlers/Confuse.java | 4 +- .../handlers/effecthandlers/ConsumeBody.java | 4 +- .../handlers/effecthandlers/ConvertItem.java | 4 +- .../handlers/effecthandlers/CpDamPercent.java | 4 +- .../handlers/effecthandlers/CpHeal.java | 4 +- .../effecthandlers/CpHealOverTime.java | 4 +- .../effecthandlers/CpHealPercent.java | 4 +- .../effecthandlers/CrystalGradeModify.java | 4 +- .../handlers/effecthandlers/CubicMastery.java | 4 +- .../handlers/effecthandlers/DamOverTime.java | 4 +- .../effecthandlers/DamOverTimePercent.java | 4 +- .../handlers/effecthandlers/DeathLink.java | 4 +- .../handlers/effecthandlers/Debuff.java | 4 +- .../handlers/effecthandlers/DefenceTrait.java | 4 +- .../handlers/effecthandlers/DeleteHate.java | 4 +- .../effecthandlers/DeleteHateOfMe.java | 4 +- .../effecthandlers/DetectHiddenObjects.java | 4 +- .../handlers/effecthandlers/Detection.java | 4 +- .../handlers/effecthandlers/Disarm.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 4 +- .../effecthandlers/DispelByCategory.java | 4 +- .../handlers/effecthandlers/DispelBySlot.java | 4 +- .../DispelBySlotProbability.java | 4 +- .../handlers/effecthandlers/EnableCloak.java | 4 +- .../handlers/effecthandlers/EnemyCharge.java | 4 +- .../handlers/effecthandlers/EnergyAttack.java | 4 +- .../effecthandlers/EnlargeAbnormalSlot.java | 4 +- .../handlers/effecthandlers/Escape.java | 4 +- .../handlers/effecthandlers/FakeDeath.java | 4 +- .../handlers/effecthandlers/FatalBlow.java | 4 +- .../scripts/handlers/effecthandlers/Fear.java | 4 +- .../handlers/effecthandlers/Fishing.java | 4 +- .../scripts/handlers/effecthandlers/Flag.java | 4 +- .../handlers/effecthandlers/FocusEnergy.java | 4 +- .../effecthandlers/FocusMaxEnergy.java | 4 +- .../handlers/effecthandlers/FocusSouls.java | 4 +- .../handlers/effecthandlers/GetAgro.java | 4 +- .../effecthandlers/GiveRecommendation.java | 4 +- .../handlers/effecthandlers/GiveSp.java | 4 +- .../scripts/handlers/effecthandlers/Grow.java | 4 +- .../handlers/effecthandlers/Harvesting.java | 4 +- .../effecthandlers/HeadquarterCreate.java | 4 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 4 +- .../handlers/effecthandlers/HealPercent.java | 4 +- .../scripts/handlers/effecthandlers/Hide.java | 4 +- .../handlers/effecthandlers/HpByLevel.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 4 +- .../handlers/effecthandlers/ImmobileBuff.java | 4 +- .../effecthandlers/ImmobilePetBuff.java | 4 +- .../handlers/effecthandlers/Invincible.java | 4 +- .../handlers/effecthandlers/Lethal.java | 4 +- .../handlers/effecthandlers/Lucky.java | 4 +- .../effecthandlers/MagicalAttack.java | 4 +- .../MagicalAttackByAbnormal.java | 4 +- .../effecthandlers/MagicalAttackMp.java | 4 +- .../effecthandlers/MagicalSoulAttack.java | 4 +- .../effecthandlers/ManaDamOverTime.java | 4 +- .../handlers/effecthandlers/ManaHeal.java | 4 +- .../effecthandlers/ManaHealByLevel.java | 4 +- .../effecthandlers/ManaHealOverTime.java | 4 +- .../effecthandlers/ManaHealPercent.java | 4 +- .../handlers/effecthandlers/MaxCp.java | 4 +- .../handlers/effecthandlers/MaxHp.java | 4 +- .../effecthandlers/MpConsumePerLevel.java | 4 +- .../scripts/handlers/effecthandlers/Mute.java | 4 +- .../effecthandlers/NoblesseBless.java | 4 +- .../handlers/effecthandlers/OpenChest.java | 4 +- .../effecthandlers/OpenCommonRecipeBook.java | 4 +- .../handlers/effecthandlers/OpenDoor.java | 4 +- .../effecthandlers/OpenDwarfRecipeBook.java | 4 +- .../effecthandlers/OutpostCreate.java | 4 +- .../effecthandlers/OutpostDestroy.java | 4 +- .../handlers/effecthandlers/Paralyze.java | 4 +- .../handlers/effecthandlers/Passive.java | 4 +- .../effecthandlers/Petrification.java | 4 +- .../effecthandlers/PhysicalAttack.java | 4 +- .../effecthandlers/PhysicalAttackHpLink.java | 4 +- .../effecthandlers/PhysicalAttackMute.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 4 +- .../effecthandlers/PhysicalSoulAttack.java | 4 +- .../effecthandlers/ProtectionBlessing.java | 4 +- .../handlers/effecthandlers/Pumping.java | 4 +- .../effecthandlers/RandomizeHate.java | 4 +- .../handlers/effecthandlers/RebalanceHP.java | 4 +- .../handlers/effecthandlers/Recovery.java | 4 +- .../handlers/effecthandlers/Reeling.java | 4 +- .../effecthandlers/RefuelAirship.java | 4 +- .../handlers/effecthandlers/Relax.java | 4 +- .../handlers/effecthandlers/ResistSkill.java | 4 +- .../handlers/effecthandlers/Restoration.java | 4 +- .../effecthandlers/RestorationRandom.java | 4 +- .../handlers/effecthandlers/Resurrection.java | 4 +- .../effecthandlers/ResurrectionSpecial.java | 4 +- .../scripts/handlers/effecthandlers/Root.java | 4 +- .../handlers/effecthandlers/RunAway.java | 4 +- .../effecthandlers/ServitorShare.java | 4 +- .../handlers/effecthandlers/SetSkill.java | 4 +- .../handlers/effecthandlers/SilentMove.java | 4 +- .../handlers/effecthandlers/SkillTurning.java | 4 +- .../handlers/effecthandlers/Sleep.java | 4 +- .../handlers/effecthandlers/SoulBlow.java | 4 +- .../handlers/effecthandlers/SoulEating.java | 4 +- .../scripts/handlers/effecthandlers/Sow.java | 4 +- .../handlers/effecthandlers/Spoil.java | 4 +- .../handlers/effecthandlers/StaticDamage.java | 4 +- .../effecthandlers/StealAbnormal.java | 4 +- .../scripts/handlers/effecthandlers/Stun.java | 4 +- .../handlers/effecthandlers/Summon.java | 4 +- .../effecthandlers/SummonAgathion.java | 4 +- .../handlers/effecthandlers/SummonCubic.java | 4 +- .../handlers/effecthandlers/SummonNpc.java | 4 +- .../handlers/effecthandlers/SummonPet.java | 4 +- .../handlers/effecthandlers/SummonTrap.java | 4 +- .../handlers/effecthandlers/Sweeper.java | 4 +- .../handlers/effecthandlers/TakeCastle.java | 4 +- .../handlers/effecthandlers/TakeFort.java | 4 +- .../effecthandlers/TakeFortStart.java | 4 +- .../effecthandlers/TakeTerritoryFlag.java | 4 +- .../handlers/effecthandlers/TalismanSlot.java | 4 +- .../handlers/effecthandlers/TargetCancel.java | 4 +- .../handlers/effecthandlers/TargetMe.java | 4 +- .../effecthandlers/TargetMeProbability.java | 4 +- .../handlers/effecthandlers/Teleport.java | 4 +- .../effecthandlers/TeleportToTarget.java | 4 +- .../handlers/effecthandlers/ThrowUp.java | 4 +- .../effecthandlers/TransferDamage.java | 4 +- .../handlers/effecthandlers/TransferHate.java | 4 +- .../effecthandlers/Transformation.java | 4 +- .../handlers/effecthandlers/TrapDetect.java | 4 +- .../handlers/effecthandlers/TrapRemove.java | 4 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 4 +- .../effecthandlers/TriggerSkillByDamage.java | 4 +- .../effecthandlers/TriggerSkillBySkill.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 4 +- .../effecthandlers/UnsummonAgathion.java | 4 +- .../effecthandlers/VitalityPointUp.java | 4 +- .../org/l2jmobius/gameserver/SevenSigns.java | 36 +- .../gameserver/SevenSignsFestival.java | 46 +- .../gameserver/data/xml/impl/AdminData.java | 8 +- .../gameserver/data/xml/impl/DoorData.java | 12 +- .../data/xml/impl/EnchantItemData.java | 8 +- .../data/xml/impl/EnchantSkillGroupsData.java | 4 +- .../data/xml/impl/FakePlayerData.java | 4 +- .../gameserver/data/xml/impl/FenceData.java | 4 +- .../gameserver/data/xml/impl/FishData.java | 4 +- .../data/xml/impl/FishingMonstersData.java | 4 +- .../data/xml/impl/FishingRodsData.java | 4 +- .../gameserver/data/xml/impl/HennaData.java | 4 +- .../data/xml/impl/InitialEquipmentData.java | 4 +- .../data/xml/impl/MultisellData.java | 8 +- .../gameserver/data/xml/impl/NpcData.java | 6 +- .../xml/impl/NpcNameLocalisationData.java | 4 +- .../data/xml/impl/PetDataTable.java | 4 +- .../data/xml/impl/PlayerTemplateData.java | 4 +- .../data/xml/impl/PrimeShopData.java | 6 +- .../gameserver/data/xml/impl/RecipeData.java | 4 +- .../xml/impl/SendMessageLocalisationData.java | 4 +- .../data/xml/impl/SiegeScheduleData.java | 6 +- .../data/xml/impl/SkillTreesData.java | 4 +- .../data/xml/impl/StaticObjectData.java | 8 +- .../data/xml/impl/TransformData.java | 6 +- .../gameserver/datatables/SpawnTable.java | 8 +- .../gameserver/engines/DocumentBase.java | 20 +- .../engines/items/DocumentItem.java | 8 +- .../engines/items/ItemDataHolder.java | 4 +- .../engines/skills/DocumentSkill.java | 42 +- .../engines/skills/SkillDataHolder.java | 20 +- .../instancemanager/AirShipManager.java | 18 +- .../instancemanager/BoatManager.java | 4 +- .../instancemanager/CHSiegeManager.java | 4 +- .../instancemanager/CastleManorManager.java | 6 +- .../instancemanager/ClanHallManager.java | 4 +- .../FakePlayerChatManager.java | 4 +- .../instancemanager/GrandBossManager.java | 16 +- .../instancemanager/RaidBossSpawnManager.java | 18 +- .../gameserver/model/AccessLevel.java | 2 +- .../model/AdminCommandAccessRight.java | 2 +- .../gameserver/model/EnchantSkillGroup.java | 2 +- .../gameserver/model/PetLevelData.java | 2 +- .../gameserver/model/RecipeList.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../gameserver/model/SiegeScheduleDate.java | 2 +- .../gameserver/model/SkillLearn.java | 2 +- .../l2jmobius/gameserver/model/StatSet.java | 968 ++++++++++++++++++ .../l2jmobius/gameserver/model/StatsSet.java | 968 ------------------ .../actor/templates/CreatureTemplate.java | 6 +- .../model/actor/templates/DoorTemplate.java | 4 +- .../model/actor/templates/NpcTemplate.java | 14 +- .../model/actor/templates/PlayerTemplate.java | 4 +- .../model/actor/transform/Transform.java | 4 +- .../actor/transform/TransformLevelData.java | 4 +- .../actor/transform/TransformTemplate.java | 4 +- .../model/effects/AbstractEffect.java | 8 +- .../gameserver/model/entity/ClanHall.java | 4 +- .../gameserver/model/entity/Hero.java | 70 +- .../entity/clanhall/AuctionableHall.java | 4 +- .../model/entity/clanhall/SiegableHall.java | 4 +- .../gameserver/model/fishing/Fish.java | 4 +- .../model/fishing/FishingMonster.java | 4 +- .../gameserver/model/fishing/FishingRod.java | 4 +- .../model/holders/FakePlayerHolder.java | 4 +- .../model/instancezone/Instance.java | 20 +- .../model/instancezone/InstanceWorld.java | 6 +- .../itemauction/AuctionDateGenerator.java | 4 +- .../model/itemauction/AuctionItem.java | 6 +- .../itemauction/ItemAuctionInstance.java | 6 +- .../gameserver/model/items/Armor.java | 8 +- .../gameserver/model/items/EtcItem.java | 8 +- .../gameserver/model/items/Henna.java | 4 +- .../gameserver/model/items/Item.java | 8 +- .../model/items/PlayerItemTemplate.java | 4 +- .../gameserver/model/items/Weapon.java | 8 +- .../items/enchant/AbstractEnchantItem.java | 4 +- .../model/items/enchant/EnchantScroll.java | 4 +- .../items/enchant/EnchantSupportItem.java | 4 +- .../model/multisell/Ingredient.java | 4 +- .../gameserver/model/olympiad/Olympiad.java | 56 +- .../model/olympiad/OlympiadGame.java | 6 +- .../gameserver/model/skills/Skill.java | 4 +- .../model/variables/AbstractVariables.java | 18 +- .../network/serverpackets/ExHeroList.java | 6 +- .../network/serverpackets/SSQStatus.java | 4 +- .../scripts/ai/bosses/Antharas/Antharas.java | 6 +- .../data/scripts/ai/bosses/Baium/Baium.java | 6 +- .../data/scripts/ai/bosses/Beleth/Beleth.java | 8 +- .../data/scripts/ai/bosses/Core/Core.java | 8 +- .../scripts/ai/bosses/DrChaos/DrChaos.java | 8 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 8 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 8 +- .../scripts/ai/bosses/Valakas/Valakas.java | 8 +- .../others/NpcBuffers/NpcBufferSkillData.java | 4 +- .../ai/others/NpcBuffers/NpcBuffersData.java | 6 +- .../admincommandhandlers/AdminGrandBoss.java | 4 +- .../handlers/bypasshandlers/Festival.java | 8 +- .../handlers/effecthandlers/AddHate.java | 4 +- .../handlers/effecthandlers/AttackTrait.java | 4 +- .../handlers/effecthandlers/Backstab.java | 4 +- .../handlers/effecthandlers/Betray.java | 4 +- .../handlers/effecthandlers/Blink.java | 4 +- .../handlers/effecthandlers/BlockAction.java | 4 +- .../effecthandlers/BlockBuffSlot.java | 4 +- .../handlers/effecthandlers/BlockChat.java | 4 +- .../handlers/effecthandlers/BlockParty.java | 4 +- .../effecthandlers/BlockResurrection.java | 4 +- .../handlers/effecthandlers/Bluff.java | 4 +- .../scripts/handlers/effecthandlers/Buff.java | 4 +- .../handlers/effecthandlers/CallParty.java | 4 +- .../handlers/effecthandlers/CallPc.java | 4 +- .../handlers/effecthandlers/CallSkill.java | 4 +- .../effecthandlers/ChameleonRest.java | 4 +- .../handlers/effecthandlers/ChangeFace.java | 4 +- .../effecthandlers/ChangeFishingMastery.java | 4 +- .../effecthandlers/ChangeHairColor.java | 4 +- .../effecthandlers/ChangeHairStyle.java | 4 +- .../handlers/effecthandlers/ClanGate.java | 4 +- .../handlers/effecthandlers/Confuse.java | 4 +- .../handlers/effecthandlers/ConsumeBody.java | 4 +- .../handlers/effecthandlers/ConvertItem.java | 4 +- .../handlers/effecthandlers/CpDamPercent.java | 4 +- .../handlers/effecthandlers/CpHeal.java | 4 +- .../effecthandlers/CpHealOverTime.java | 4 +- .../effecthandlers/CpHealPercent.java | 4 +- .../effecthandlers/CrystalGradeModify.java | 4 +- .../handlers/effecthandlers/CubicMastery.java | 4 +- .../handlers/effecthandlers/DamOverTime.java | 4 +- .../effecthandlers/DamOverTimePercent.java | 4 +- .../handlers/effecthandlers/DeathLink.java | 4 +- .../handlers/effecthandlers/Debuff.java | 4 +- .../handlers/effecthandlers/DefenceTrait.java | 4 +- .../handlers/effecthandlers/DeleteHate.java | 4 +- .../effecthandlers/DeleteHateOfMe.java | 4 +- .../effecthandlers/DetectHiddenObjects.java | 4 +- .../handlers/effecthandlers/Detection.java | 4 +- .../handlers/effecthandlers/Disarm.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 4 +- .../effecthandlers/DispelByCategory.java | 4 +- .../handlers/effecthandlers/DispelBySlot.java | 4 +- .../DispelBySlotProbability.java | 4 +- .../handlers/effecthandlers/EnableCloak.java | 4 +- .../handlers/effecthandlers/EnemyCharge.java | 4 +- .../handlers/effecthandlers/EnergyAttack.java | 4 +- .../effecthandlers/EnlargeAbnormalSlot.java | 4 +- .../handlers/effecthandlers/Escape.java | 4 +- .../handlers/effecthandlers/FakeDeath.java | 4 +- .../handlers/effecthandlers/FatalBlow.java | 4 +- .../scripts/handlers/effecthandlers/Fear.java | 4 +- .../handlers/effecthandlers/Fishing.java | 4 +- .../scripts/handlers/effecthandlers/Flag.java | 4 +- .../handlers/effecthandlers/FocusEnergy.java | 4 +- .../effecthandlers/FocusMaxEnergy.java | 4 +- .../handlers/effecthandlers/FocusSouls.java | 4 +- .../handlers/effecthandlers/GetAgro.java | 4 +- .../effecthandlers/GiveRecommendation.java | 4 +- .../handlers/effecthandlers/GiveSp.java | 4 +- .../scripts/handlers/effecthandlers/Grow.java | 4 +- .../handlers/effecthandlers/Harvesting.java | 4 +- .../effecthandlers/HeadquarterCreate.java | 4 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 4 +- .../handlers/effecthandlers/HealPercent.java | 4 +- .../scripts/handlers/effecthandlers/Hide.java | 4 +- .../handlers/effecthandlers/HpByLevel.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 4 +- .../handlers/effecthandlers/ImmobileBuff.java | 4 +- .../effecthandlers/ImmobilePetBuff.java | 4 +- .../handlers/effecthandlers/Invincible.java | 4 +- .../handlers/effecthandlers/Lethal.java | 4 +- .../handlers/effecthandlers/Lucky.java | 4 +- .../effecthandlers/MagicalAttack.java | 4 +- .../MagicalAttackByAbnormal.java | 4 +- .../effecthandlers/MagicalAttackMp.java | 4 +- .../effecthandlers/MagicalSoulAttack.java | 4 +- .../effecthandlers/ManaDamOverTime.java | 4 +- .../handlers/effecthandlers/ManaHeal.java | 4 +- .../effecthandlers/ManaHealByLevel.java | 4 +- .../effecthandlers/ManaHealOverTime.java | 4 +- .../effecthandlers/ManaHealPercent.java | 4 +- .../handlers/effecthandlers/MaxCp.java | 4 +- .../handlers/effecthandlers/MaxHp.java | 4 +- .../effecthandlers/MpConsumePerLevel.java | 4 +- .../scripts/handlers/effecthandlers/Mute.java | 4 +- .../effecthandlers/NevitsHourglass.java | 4 +- .../effecthandlers/NoblesseBless.java | 4 +- .../handlers/effecthandlers/OpenChest.java | 4 +- .../effecthandlers/OpenCommonRecipeBook.java | 4 +- .../handlers/effecthandlers/OpenDoor.java | 4 +- .../effecthandlers/OpenDwarfRecipeBook.java | 4 +- .../effecthandlers/OutpostCreate.java | 4 +- .../effecthandlers/OutpostDestroy.java | 4 +- .../handlers/effecthandlers/Paralyze.java | 4 +- .../handlers/effecthandlers/Passive.java | 4 +- .../effecthandlers/Petrification.java | 4 +- .../effecthandlers/PhysicalAttack.java | 4 +- .../effecthandlers/PhysicalAttackHpLink.java | 4 +- .../effecthandlers/PhysicalAttackMute.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 4 +- .../effecthandlers/PhysicalSoulAttack.java | 4 +- .../effecthandlers/ProtectionBlessing.java | 4 +- .../handlers/effecthandlers/Pumping.java | 4 +- .../effecthandlers/RandomizeHate.java | 4 +- .../handlers/effecthandlers/RebalanceHP.java | 4 +- .../handlers/effecthandlers/Recovery.java | 4 +- .../handlers/effecthandlers/Reeling.java | 4 +- .../effecthandlers/RefuelAirship.java | 4 +- .../handlers/effecthandlers/Relax.java | 4 +- .../handlers/effecthandlers/ResistSkill.java | 4 +- .../handlers/effecthandlers/Restoration.java | 4 +- .../effecthandlers/RestorationRandom.java | 4 +- .../handlers/effecthandlers/Resurrection.java | 4 +- .../effecthandlers/ResurrectionSpecial.java | 4 +- .../scripts/handlers/effecthandlers/Root.java | 4 +- .../handlers/effecthandlers/RunAway.java | 4 +- .../effecthandlers/ServitorShare.java | 4 +- .../handlers/effecthandlers/SetSkill.java | 4 +- .../handlers/effecthandlers/SilentMove.java | 4 +- .../handlers/effecthandlers/SkillTurning.java | 4 +- .../handlers/effecthandlers/Sleep.java | 4 +- .../handlers/effecthandlers/SoulBlow.java | 4 +- .../handlers/effecthandlers/SoulEating.java | 4 +- .../scripts/handlers/effecthandlers/Sow.java | 4 +- .../handlers/effecthandlers/Spoil.java | 4 +- .../handlers/effecthandlers/StaticDamage.java | 4 +- .../effecthandlers/StealAbnormal.java | 4 +- .../scripts/handlers/effecthandlers/Stun.java | 4 +- .../handlers/effecthandlers/Summon.java | 4 +- .../effecthandlers/SummonAgathion.java | 4 +- .../handlers/effecthandlers/SummonCubic.java | 4 +- .../handlers/effecthandlers/SummonNpc.java | 4 +- .../handlers/effecthandlers/SummonPet.java | 4 +- .../handlers/effecthandlers/SummonTrap.java | 4 +- .../handlers/effecthandlers/Sweeper.java | 4 +- .../handlers/effecthandlers/TakeCastle.java | 4 +- .../handlers/effecthandlers/TakeFort.java | 4 +- .../effecthandlers/TakeFortStart.java | 4 +- .../effecthandlers/TakeTerritoryFlag.java | 4 +- .../handlers/effecthandlers/TalismanSlot.java | 4 +- .../handlers/effecthandlers/TargetCancel.java | 4 +- .../handlers/effecthandlers/TargetMe.java | 4 +- .../effecthandlers/TargetMeProbability.java | 4 +- .../handlers/effecthandlers/Teleport.java | 4 +- .../effecthandlers/TeleportToTarget.java | 4 +- .../handlers/effecthandlers/ThrowUp.java | 4 +- .../effecthandlers/TransferDamage.java | 4 +- .../handlers/effecthandlers/TransferHate.java | 4 +- .../effecthandlers/Transformation.java | 4 +- .../handlers/effecthandlers/TrapDetect.java | 4 +- .../handlers/effecthandlers/TrapRemove.java | 4 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 4 +- .../effecthandlers/TriggerSkillByDamage.java | 4 +- .../effecthandlers/TriggerSkillBySkill.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 4 +- .../effecthandlers/UnsummonAgathion.java | 4 +- .../effecthandlers/VitalityPointUp.java | 4 +- .../IceQueensCastleBattle.java | 8 +- .../org/l2jmobius/gameserver/SevenSigns.java | 36 +- .../gameserver/SevenSignsFestival.java | 46 +- .../gameserver/data/xml/impl/AdminData.java | 8 +- .../gameserver/data/xml/impl/DoorData.java | 12 +- .../data/xml/impl/EnchantItemData.java | 8 +- .../data/xml/impl/EnchantSkillGroupsData.java | 4 +- .../data/xml/impl/FakePlayerData.java | 4 +- .../gameserver/data/xml/impl/FenceData.java | 4 +- .../gameserver/data/xml/impl/FishData.java | 4 +- .../data/xml/impl/FishingMonstersData.java | 4 +- .../data/xml/impl/FishingRodsData.java | 4 +- .../gameserver/data/xml/impl/HennaData.java | 4 +- .../data/xml/impl/InitialEquipmentData.java | 4 +- .../data/xml/impl/MultisellData.java | 8 +- .../gameserver/data/xml/impl/NpcData.java | 6 +- .../xml/impl/NpcNameLocalisationData.java | 4 +- .../data/xml/impl/PetDataTable.java | 4 +- .../data/xml/impl/PlayerTemplateData.java | 4 +- .../data/xml/impl/PrimeShopData.java | 6 +- .../gameserver/data/xml/impl/RecipeData.java | 4 +- .../xml/impl/SendMessageLocalisationData.java | 4 +- .../data/xml/impl/SiegeScheduleData.java | 6 +- .../data/xml/impl/SkillTreesData.java | 4 +- .../data/xml/impl/StaticObjectData.java | 8 +- .../data/xml/impl/TransformData.java | 6 +- .../gameserver/datatables/SpawnTable.java | 8 +- .../gameserver/engines/DocumentBase.java | 20 +- .../engines/items/DocumentItem.java | 8 +- .../engines/items/ItemDataHolder.java | 4 +- .../engines/skills/DocumentSkill.java | 42 +- .../engines/skills/SkillDataHolder.java | 20 +- .../instancemanager/AirShipManager.java | 18 +- .../instancemanager/BoatManager.java | 4 +- .../instancemanager/CHSiegeManager.java | 4 +- .../instancemanager/CastleManorManager.java | 6 +- .../instancemanager/ClanHallManager.java | 4 +- .../FakePlayerChatManager.java | 4 +- .../instancemanager/GrandBossManager.java | 16 +- .../instancemanager/RaidBossSpawnManager.java | 18 +- .../gameserver/model/AccessLevel.java | 2 +- .../model/AdminCommandAccessRight.java | 2 +- .../gameserver/model/EnchantSkillGroup.java | 2 +- .../gameserver/model/PetLevelData.java | 2 +- .../gameserver/model/RecipeList.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../gameserver/model/SiegeScheduleDate.java | 2 +- .../gameserver/model/SkillLearn.java | 2 +- .../l2jmobius/gameserver/model/StatSet.java | 968 ++++++++++++++++++ .../l2jmobius/gameserver/model/StatsSet.java | 968 ------------------ .../actor/templates/CreatureTemplate.java | 6 +- .../model/actor/templates/DoorTemplate.java | 4 +- .../model/actor/templates/NpcTemplate.java | 14 +- .../model/actor/templates/PlayerTemplate.java | 4 +- .../model/actor/transform/Transform.java | 4 +- .../actor/transform/TransformLevelData.java | 4 +- .../actor/transform/TransformTemplate.java | 4 +- .../model/effects/AbstractEffect.java | 8 +- .../gameserver/model/entity/ClanHall.java | 4 +- .../gameserver/model/entity/Hero.java | 70 +- .../entity/clanhall/AuctionableHall.java | 4 +- .../model/entity/clanhall/SiegableHall.java | 4 +- .../gameserver/model/fishing/Fish.java | 4 +- .../model/fishing/FishingMonster.java | 4 +- .../gameserver/model/fishing/FishingRod.java | 4 +- .../model/holders/FakePlayerHolder.java | 4 +- .../model/instancezone/Instance.java | 20 +- .../model/instancezone/InstanceWorld.java | 6 +- .../itemauction/AuctionDateGenerator.java | 4 +- .../model/itemauction/AuctionItem.java | 6 +- .../itemauction/ItemAuctionInstance.java | 6 +- .../gameserver/model/items/Armor.java | 8 +- .../gameserver/model/items/EtcItem.java | 8 +- .../gameserver/model/items/Henna.java | 4 +- .../gameserver/model/items/Item.java | 8 +- .../model/items/PlayerItemTemplate.java | 4 +- .../gameserver/model/items/Weapon.java | 8 +- .../items/enchant/AbstractEnchantItem.java | 4 +- .../model/items/enchant/EnchantScroll.java | 4 +- .../items/enchant/EnchantSupportItem.java | 4 +- .../model/multisell/Ingredient.java | 4 +- .../gameserver/model/olympiad/Olympiad.java | 50 +- .../model/olympiad/OlympiadManager.java | 6 +- .../model/olympiad/Participant.java | 6 +- .../gameserver/model/skills/Skill.java | 4 +- .../model/variables/AbstractVariables.java | 18 +- .../network/serverpackets/ExHeroList.java | 6 +- .../network/serverpackets/SSQStatus.java | 4 +- .../scripts/ai/bosses/Antharas/Antharas.java | 6 +- .../data/scripts/ai/bosses/Baium/Baium.java | 6 +- .../data/scripts/ai/bosses/Core/Core.java | 8 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 8 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 8 +- .../CastleTeleporter/CastleTeleporter.java | 6 +- .../ai/others/Servitors/TreeOfLife.java | 4 +- .../admincommandhandlers/AdminGrandBoss.java | 4 +- .../admincommandhandlers/AdminOlympiad.java | 14 +- .../conditions/CategoryTypeCondition.java | 4 +- .../conditions/NpcLevelCondition.java | 4 +- .../conditions/PlayerLevelCondition.java | 4 +- .../effecthandlers/AbnormalShield.java | 4 +- .../effecthandlers/AbnormalTimeChange.java | 4 +- .../handlers/effecthandlers/AbsorbDamage.java | 4 +- .../AbstractConditionalHpEffect.java | 4 +- .../effecthandlers/AbstractStatAddEffect.java | 4 +- .../effecthandlers/AbstractStatEffect.java | 6 +- .../AbstractStatPercentEffect.java | 4 +- .../handlers/effecthandlers/Accuracy.java | 4 +- .../handlers/effecthandlers/AddHate.java | 4 +- .../effecthandlers/AddSkillBySkill.java | 4 +- .../AddTeleportBookmarkSlot.java | 4 +- .../effecthandlers/AdditionalPotionCp.java | 4 +- .../effecthandlers/AdditionalPotionHp.java | 4 +- .../effecthandlers/AdditionalPotionMp.java | 4 +- .../handlers/effecthandlers/AreaDamage.java | 4 +- .../effecthandlers/AttackAttribute.java | 4 +- .../effecthandlers/AttackAttributeAdd.java | 4 +- .../handlers/effecthandlers/AttackBehind.java | 4 +- .../handlers/effecthandlers/AttackTrait.java | 4 +- .../handlers/effecthandlers/Backstab.java | 4 +- .../handlers/effecthandlers/Betray.java | 4 +- .../handlers/effecthandlers/Blink.java | 4 +- .../handlers/effecthandlers/BlinkSwap.java | 4 +- .../effecthandlers/BlockAbnormalSlot.java | 4 +- .../handlers/effecthandlers/BlockAction.java | 4 +- .../handlers/effecthandlers/BlockActions.java | 4 +- .../handlers/effecthandlers/BlockChat.java | 4 +- .../handlers/effecthandlers/BlockControl.java | 4 +- .../handlers/effecthandlers/BlockEscape.java | 4 +- .../handlers/effecthandlers/BlockMove.java | 4 +- .../handlers/effecthandlers/BlockParty.java | 4 +- .../effecthandlers/BlockResurrection.java | 4 +- .../handlers/effecthandlers/BlockSkill.java | 4 +- .../handlers/effecthandlers/BlockTarget.java | 4 +- .../handlers/effecthandlers/Bluff.java | 4 +- .../effecthandlers/BonusDropAmount.java | 4 +- .../effecthandlers/BonusDropRate.java | 4 +- .../effecthandlers/BonusSpoilRate.java | 4 +- .../handlers/effecthandlers/Breath.java | 4 +- .../handlers/effecthandlers/BuffBlock.java | 4 +- .../effecthandlers/CallLearnedSkill.java | 4 +- .../handlers/effecthandlers/CallParty.java | 4 +- .../handlers/effecthandlers/CallPc.java | 4 +- .../effecthandlers/CallRandomSkill.java | 4 +- .../handlers/effecthandlers/CallSkill.java | 4 +- .../effecthandlers/CallSkillOnActionTime.java | 4 +- .../effecthandlers/CallTargetParty.java | 4 +- .../effecthandlers/ChameleonRest.java | 4 +- .../handlers/effecthandlers/ChangeBody.java | 6 +- .../handlers/effecthandlers/ChangeFace.java | 4 +- .../effecthandlers/ChangeFishingMastery.java | 4 +- .../effecthandlers/ChangeHairColor.java | 4 +- .../effecthandlers/ChangeHairStyle.java | 4 +- .../handlers/effecthandlers/CheapShot.java | 4 +- .../handlers/effecthandlers/ClassChange.java | 4 +- .../handlers/effecthandlers/Compelling.java | 4 +- .../handlers/effecthandlers/Confuse.java | 4 +- .../handlers/effecthandlers/ConsumeBody.java | 4 +- .../handlers/effecthandlers/ConvertItem.java | 4 +- .../effecthandlers/CounterPhysicalSkill.java | 4 +- .../scripts/handlers/effecthandlers/Cp.java | 4 +- .../handlers/effecthandlers/CpHeal.java | 4 +- .../effecthandlers/CpHealOverTime.java | 4 +- .../effecthandlers/CpHealPercent.java | 4 +- .../handlers/effecthandlers/CpRegen.java | 4 +- .../effecthandlers/CriticalDamage.java | 4 +- .../CriticalDamagePosition.java | 4 +- .../handlers/effecthandlers/CriticalRate.java | 4 +- .../CriticalRatePositionBonus.java | 4 +- .../effecthandlers/CrystalGradeModify.java | 4 +- .../handlers/effecthandlers/CubicMastery.java | 4 +- .../handlers/effecthandlers/DamOverTime.java | 4 +- .../effecthandlers/DamOverTimePercent.java | 4 +- .../handlers/effecthandlers/DamageBlock.java | 4 +- .../effecthandlers/DamageByAttack.java | 4 +- .../handlers/effecthandlers/DamageShield.java | 4 +- .../effecthandlers/DamageShieldResist.java | 4 +- .../handlers/effecthandlers/DeathLink.java | 4 +- .../handlers/effecthandlers/DebuffBlock.java | 4 +- .../effecthandlers/DefenceAttribute.java | 4 +- .../effecthandlers/DefenceCriticalDamage.java | 4 +- .../effecthandlers/DefenceCriticalRate.java | 4 +- .../DefenceMagicCriticalDamage.java | 4 +- .../DefenceMagicCriticalRate.java | 4 +- .../handlers/effecthandlers/DefenceTrait.java | 4 +- .../handlers/effecthandlers/DeleteHate.java | 4 +- .../effecthandlers/DeleteHateOfMe.java | 4 +- .../effecthandlers/DeleteTopAgro.java | 4 +- .../effecthandlers/DetectHiddenObjects.java | 4 +- .../handlers/effecthandlers/Detection.java | 4 +- .../effecthandlers/DisableTargeting.java | 4 +- .../handlers/effecthandlers/Disarm.java | 4 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 4 +- .../effecthandlers/DispelByCategory.java | 4 +- .../handlers/effecthandlers/DispelBySlot.java | 4 +- .../effecthandlers/DispelBySlotMyself.java | 4 +- .../DispelBySlotProbability.java | 4 +- .../handlers/effecthandlers/DoubleCast.java | 4 +- .../handlers/effecthandlers/DuelistFury.java | 4 +- .../handlers/effecthandlers/EnableCloak.java | 4 +- .../handlers/effecthandlers/EnergyAttack.java | 4 +- .../effecthandlers/EnlargeAbnormalSlot.java | 4 +- .../handlers/effecthandlers/EnlargeSlot.java | 4 +- .../handlers/effecthandlers/Escape.java | 4 +- .../handlers/effecthandlers/ExpModify.java | 4 +- .../handlers/effecthandlers/Faceoff.java | 4 +- .../handlers/effecthandlers/FakeDeath.java | 4 +- .../handlers/effecthandlers/FatalBlow.java | 4 +- .../effecthandlers/FatalBlowRate.java | 4 +- .../scripts/handlers/effecthandlers/Fear.java | 4 +- .../scripts/handlers/effecthandlers/Feed.java | 4 +- .../effecthandlers/FishingExpSpBonus.java | 4 +- .../scripts/handlers/effecthandlers/Flag.java | 4 +- .../handlers/effecthandlers/FlipBlock.java | 4 +- .../handlers/effecthandlers/FlyAway.java | 4 +- .../handlers/effecthandlers/FocusEnergy.java | 4 +- .../effecthandlers/FocusMaxMomentum.java | 4 +- .../effecthandlers/FocusMomentum.java | 4 +- .../handlers/effecthandlers/FocusSouls.java | 4 +- .../handlers/effecthandlers/GetAgro.java | 4 +- .../effecthandlers/GetDamageLimit.java | 4 +- .../handlers/effecthandlers/GetMomentum.java | 4 +- .../effecthandlers/GiveClanReputation.java | 4 +- .../handlers/effecthandlers/GiveExpAndSp.java | 4 +- .../handlers/effecthandlers/GiveFame.java | 4 +- .../effecthandlers/GiveRecommendation.java | 4 +- .../handlers/effecthandlers/GiveSp.java | 4 +- .../handlers/effecthandlers/GiveXp.java | 4 +- .../scripts/handlers/effecthandlers/Grow.java | 4 +- .../effecthandlers/HairAccessorySet.java | 4 +- .../handlers/effecthandlers/Harvesting.java | 4 +- .../handlers/effecthandlers/HateAttack.java | 4 +- .../effecthandlers/HeadquarterCreate.java | 4 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealEffect.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 4 +- .../handlers/effecthandlers/HealPercent.java | 4 +- .../scripts/handlers/effecthandlers/Hide.java | 4 +- .../handlers/effecthandlers/HitAtNight.java | 4 +- .../handlers/effecthandlers/HitNumber.java | 4 +- .../scripts/handlers/effecthandlers/Hp.java | 4 +- .../handlers/effecthandlers/HpByLevel.java | 4 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../effecthandlers/HpCpHealCritical.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 4 +- .../handlers/effecthandlers/HpRegen.java | 4 +- .../handlers/effecthandlers/HpToOwner.java | 4 +- .../handlers/effecthandlers/IgnoreDeath.java | 4 +- .../effecthandlers/ImmobilePetBuff.java | 4 +- .../effecthandlers/InstantKillResist.java | 4 +- .../handlers/effecthandlers/JewelSlot.java | 4 +- .../handlers/effecthandlers/KarmaCount.java | 4 +- .../handlers/effecthandlers/KnockBack.java | 4 +- .../handlers/effecthandlers/Lethal.java | 4 +- .../handlers/effecthandlers/LimitCp.java | 4 +- .../handlers/effecthandlers/LimitHp.java | 4 +- .../handlers/effecthandlers/LimitMp.java | 4 +- .../handlers/effecthandlers/Lucky.java | 4 +- .../scripts/handlers/effecthandlers/MAtk.java | 4 +- .../effecthandlers/MagicAccuracy.java | 4 +- .../effecthandlers/MagicCriticalDamage.java | 4 +- .../effecthandlers/MagicCriticalRate.java | 4 +- .../handlers/effecthandlers/MagicMpCost.java | 4 +- .../MagicalAbnormalDispelAttack.java | 4 +- .../effecthandlers/MagicalAbnormalResist.java | 4 +- .../effecthandlers/MagicalAttack.java | 4 +- .../MagicalAttackByAbnormal.java | 4 +- .../MagicalAttackByAbnormalSlot.java | 4 +- .../effecthandlers/MagicalAttackMp.java | 4 +- .../effecthandlers/MagicalAttackRange.java | 4 +- .../effecthandlers/MagicalAttackSpeed.java | 4 +- .../effecthandlers/MagicalDamOverTime.java | 4 +- .../effecthandlers/MagicalDefence.java | 4 +- .../effecthandlers/MagicalEvasion.java | 4 +- .../effecthandlers/MagicalSkillPower.java | 4 +- .../effecthandlers/MagicalSoulAttack.java | 4 +- .../handlers/effecthandlers/ManaCharge.java | 4 +- .../effecthandlers/ManaDamOverTime.java | 4 +- .../handlers/effecthandlers/ManaHeal.java | 4 +- .../effecthandlers/ManaHealByLevel.java | 4 +- .../effecthandlers/ManaHealOverTime.java | 4 +- .../effecthandlers/ManaHealPercent.java | 4 +- .../handlers/effecthandlers/MaxCp.java | 4 +- .../handlers/effecthandlers/MaxHp.java | 4 +- .../handlers/effecthandlers/MaxMp.java | 4 +- .../handlers/effecthandlers/ModifyVital.java | 4 +- .../scripts/handlers/effecthandlers/Mp.java | 4 +- .../effecthandlers/MpConsumePerLevel.java | 4 +- .../handlers/effecthandlers/MpRegen.java | 4 +- .../handlers/effecthandlers/MpShield.java | 4 +- .../effecthandlers/MpVampiricAttack.java | 4 +- .../scripts/handlers/effecthandlers/Mute.java | 4 +- .../effecthandlers/NoblesseBless.java | 4 +- .../handlers/effecthandlers/OpenChest.java | 4 +- .../effecthandlers/OpenCommonRecipeBook.java | 4 +- .../handlers/effecthandlers/OpenDoor.java | 4 +- .../effecthandlers/OpenDwarfRecipeBook.java | 4 +- .../scripts/handlers/effecthandlers/PAtk.java | 4 +- .../handlers/effecthandlers/Passive.java | 4 +- .../PhysicalAbnormalResist.java | 4 +- .../effecthandlers/PhysicalAttack.java | 4 +- .../effecthandlers/PhysicalAttackHpLink.java | 4 +- .../effecthandlers/PhysicalAttackMute.java | 4 +- .../effecthandlers/PhysicalAttackRange.java | 4 +- .../effecthandlers/PhysicalAttackSaveHp.java | 4 +- .../effecthandlers/PhysicalAttackSpeed.java | 4 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../effecthandlers/PhysicalDefence.java | 4 +- .../effecthandlers/PhysicalEvasion.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 4 +- .../PhysicalShieldAngleAll.java | 4 +- .../effecthandlers/PhysicalSkillPower.java | 4 +- .../effecthandlers/PhysicalSoulAttack.java | 4 +- .../handlers/effecthandlers/PkCount.java | 4 +- .../handlers/effecthandlers/Plunder.java | 4 +- .../effecthandlers/PolearmSingleTarget.java | 4 +- .../effecthandlers/ProtectDeathPenalty.java | 4 +- .../effecthandlers/ProtectionBlessing.java | 4 +- .../handlers/effecthandlers/PullBack.java | 4 +- .../PveMagicalSkillDamageBonus.java | 4 +- .../PveMagicalSkillDefenceBonus.java | 4 +- .../PvePhysicalAttackDamageBonus.java | 4 +- .../PvePhysicalAttackDefenceBonus.java | 4 +- .../PvePhysicalSkillDamageBonus.java | 4 +- .../PvePhysicalSkillDefenceBonus.java | 4 +- .../PveRaidMagicalSkillDefenceBonus.java | 4 +- .../PveRaidPhysicalAttackDefenceBonus.java | 4 +- .../PveRaidPhysicalSkillDefenceBonus.java | 4 +- .../PvpMagicalSkillDamageBonus.java | 4 +- .../PvpMagicalSkillDefenceBonus.java | 4 +- .../PvpPhysicalAttackDamageBonus.java | 4 +- .../PvpPhysicalAttackDefenceBonus.java | 4 +- .../PvpPhysicalSkillDamageBonus.java | 4 +- .../PvpPhysicalSkillDefenceBonus.java | 4 +- .../effecthandlers/RandomizeHate.java | 4 +- .../handlers/effecthandlers/RealDamage.java | 4 +- .../handlers/effecthandlers/RearDamage.java | 4 +- .../handlers/effecthandlers/RebalanceHP.java | 4 +- .../effecthandlers/RebalanceHPSummon.java | 4 +- .../RecoverVitalityInPeaceZone.java | 4 +- .../handlers/effecthandlers/ReduceCancel.java | 4 +- .../handlers/effecthandlers/ReduceDamage.java | 4 +- .../effecthandlers/ReduceDropPenalty.java | 4 +- .../handlers/effecthandlers/ReflectMagic.java | 4 +- .../handlers/effecthandlers/ReflectSkill.java | 4 +- .../effecthandlers/RefuelAirship.java | 4 +- .../handlers/effecthandlers/Relax.java | 4 +- .../effecthandlers/ResetInstanceEntry.java | 4 +- .../ResistAbnormalByCategory.java | 4 +- .../effecthandlers/ResistDDMagic.java | 4 +- .../ResistDispelByCategory.java | 4 +- .../handlers/effecthandlers/ResistSkill.java | 4 +- .../handlers/effecthandlers/Restoration.java | 4 +- .../effecthandlers/RestorationRandom.java | 8 +- .../handlers/effecthandlers/Resurrection.java | 4 +- .../effecthandlers/ResurrectionSpecial.java | 4 +- .../handlers/effecthandlers/Reuse.java | 4 +- .../effecthandlers/ReuseSkillById.java | 4 +- .../scripts/handlers/effecthandlers/Root.java | 4 +- .../effecthandlers/SacrificeSummon.java | 4 +- .../effecthandlers/SafeFallHeight.java | 4 +- .../SendSystemMessageToClan.java | 4 +- .../effecthandlers/ServitorShare.java | 4 +- .../handlers/effecthandlers/SetHp.java | 4 +- .../handlers/effecthandlers/SetSkill.java | 4 +- .../effecthandlers/ShieldDefence.java | 4 +- .../effecthandlers/ShieldDefenceRate.java | 4 +- .../handlers/effecthandlers/SilentMove.java | 4 +- .../effecthandlers/SkillCritical.java | 4 +- .../effecthandlers/SkillCriticalDamage.java | 4 +- .../SkillCriticalProbability.java | 4 +- .../handlers/effecthandlers/SkillEvasion.java | 4 +- .../effecthandlers/SkillPowerAdd.java | 4 +- .../handlers/effecthandlers/SkillTurning.java | 4 +- .../effecthandlers/SkillTurningOverTime.java | 4 +- .../handlers/effecthandlers/SoulBlow.java | 4 +- .../handlers/effecthandlers/SoulEating.java | 4 +- .../scripts/handlers/effecthandlers/Sow.java | 4 +- .../handlers/effecthandlers/SpModify.java | 4 +- .../handlers/effecthandlers/Speed.java | 4 +- .../effecthandlers/SphericBarrier.java | 4 +- .../handlers/effecthandlers/Spoil.java | 4 +- .../StatBonusSkillCritical.java | 4 +- .../effecthandlers/StatBonusSpeed.java | 4 +- .../effecthandlers/StatByMoveType.java | 4 +- .../handlers/effecthandlers/StatUp.java | 4 +- .../effecthandlers/StealAbnormal.java | 4 +- .../handlers/effecthandlers/Summon.java | 4 +- .../effecthandlers/SummonAgathion.java | 4 +- .../handlers/effecthandlers/SummonCubic.java | 4 +- .../effecthandlers/SummonHallucination.java | 4 +- .../handlers/effecthandlers/SummonMulti.java | 4 +- .../handlers/effecthandlers/SummonNpc.java | 4 +- .../handlers/effecthandlers/SummonPet.java | 4 +- .../handlers/effecthandlers/SummonPoints.java | 4 +- .../handlers/effecthandlers/SummonTrap.java | 4 +- .../handlers/effecthandlers/Sweeper.java | 4 +- .../handlers/effecthandlers/Synergy.java | 4 +- .../handlers/effecthandlers/TakeCastle.java | 4 +- .../effecthandlers/TakeCastleStart.java | 4 +- .../handlers/effecthandlers/TakeFort.java | 4 +- .../effecthandlers/TakeFortStart.java | 4 +- .../handlers/effecthandlers/TalismanSlot.java | 4 +- .../handlers/effecthandlers/TargetCancel.java | 4 +- .../handlers/effecthandlers/TargetMe.java | 4 +- .../effecthandlers/TargetMeProbability.java | 4 +- .../handlers/effecthandlers/Teleport.java | 4 +- .../effecthandlers/TeleportToNpc.java | 4 +- .../effecthandlers/TeleportToPlayer.java | 4 +- .../effecthandlers/TeleportToSummon.java | 4 +- .../effecthandlers/TeleportToTarget.java | 4 +- .../TransferDamageToPlayer.java | 4 +- .../TransferDamageToSummon.java | 4 +- .../handlers/effecthandlers/TransferHate.java | 4 +- .../effecthandlers/Transformation.java | 4 +- .../handlers/effecthandlers/TrapDetect.java | 4 +- .../handlers/effecthandlers/TrapRemove.java | 4 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 4 +- .../effecthandlers/TriggerSkillByDamage.java | 4 +- .../TriggerSkillByDeathBlow.java | 4 +- .../effecthandlers/TriggerSkillByKill.java | 4 +- .../TriggerSkillByMagicType.java | 4 +- .../effecthandlers/TriggerSkillBySkill.java | 4 +- .../TriggerSkillBySkillAttack.java | 4 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 4 +- .../effecthandlers/UnsummonAgathion.java | 4 +- .../effecthandlers/UnsummonServitors.java | 4 +- .../handlers/effecthandlers/Untargetable.java | 4 +- .../effecthandlers/VampiricAttack.java | 4 +- .../effecthandlers/VampiricDefence.java | 4 +- .../effecthandlers/VitalityExpRate.java | 4 +- .../effecthandlers/VitalityPointUp.java | 4 +- .../effecthandlers/VitalityPointsRate.java | 4 +- .../handlers/effecthandlers/WeightLimit.java | 4 +- .../effecthandlers/WeightPenalty.java | 4 +- .../effecthandlers/WorldChatPoints.java | 4 +- .../BuildAdvanceBaseSkillCondition.java | 4 +- .../BuildCampSkillCondition.java | 4 +- ...CanAddMaxEntranceInzoneSkillCondition.java | 4 +- .../CanBookmarkAddSlotSkillCondition.java | 4 +- ...CanChangeVitalItemCountSkillCondition.java | 4 +- .../CanEnchantAttributeSkillCondition.java | 4 +- .../CanMountForEventSkillCondition.java | 4 +- .../CanRefuelAirshipSkillCondition.java | 4 +- .../CanRestoreVitalPointSkillCondition.java | 4 +- .../CanSummonCubicSkillCondition.java | 4 +- .../CanSummonMultiSkillCondition.java | 4 +- .../CanSummonPetSkillCondition.java | 4 +- .../CanSummonSiegeGolemSkillCondition.java | 4 +- .../CanSummonSkillCondition.java | 4 +- .../CanTransformInDominionSkillCondition.java | 4 +- .../CanTransformSkillCondition.java | 4 +- .../CanUntransformSkillCondition.java | 4 +- .../CanUseInBattlefieldSkillCondition.java | 4 +- .../CanUseInDragonLairSkillCondition.java | 4 +- .../CanUseSwoopCannonSkillCondition.java | 4 +- ...nUseVitalityConsumeItemSkillCondition.java | 4 +- .../CannotUseInTransformSkillCondition.java | 4 +- .../CheckLevelSkillCondition.java | 4 +- .../CheckSexSkillCondition.java | 4 +- .../ConsumeBodySkillCondition.java | 4 +- .../EnergySavedSkillCondition.java | 4 +- .../EquipArmorSkillCondition.java | 4 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../NotFearedSkillCondition.java | 4 +- .../NotInUnderwaterSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 4 +- .../OpAffectedBySkillSkillCondition.java | 4 +- .../OpAgathionEnergySkillCondition.java | 4 +- .../OpAlignmentSkillCondition.java | 4 +- .../OpBlinkSkillCondition.java | 4 +- .../OpCallPcSkillCondition.java | 4 +- .../OpCanEscapeSkillCondition.java | 4 +- .../OpCanNotUseAirshipSkillCondition.java | 4 +- ...eTargetWithPrivateStoreSkillCondition.java | 4 +- .../OpChangeWeaponSkillCondition.java | 4 +- .../OpCheckAbnormalSkillCondition.java | 4 +- .../OpCheckAccountTypeSkillCondition.java | 4 +- .../OpCheckCastRangeSkillCondition.java | 4 +- .../OpCheckClassListSkillCondition.java | 4 +- .../OpCheckClassSkillCondition.java | 4 +- .../OpCheckCrtEffectSkillCondition.java | 4 +- .../OpCheckFlagSkillCondition.java | 4 +- ...eckOnGoingEventCampaignSkillCondition.java | 4 +- .../OpCheckPcbangPointSkillCondition.java | 4 +- .../OpCheckResidenceSkillCondition.java | 4 +- .../OpCheckSkillListSkillCondition.java | 4 +- .../OpCheckSkillSkillCondition.java | 4 +- .../OpCompanionSkillCondition.java | 4 +- .../OpEnchantRangeSkillCondition.java | 4 +- .../OpEncumberedSkillCondition.java | 4 +- .../OpEnergyMaxSkillCondition.java | 4 +- .../OpEquipItemSkillCondition.java | 4 +- .../OpExistNpcSkillCondition.java | 4 +- .../OpFishingCastSkillCondition.java | 4 +- .../OpFishingPumpingSkillCondition.java | 4 +- .../OpFishingReelingSkillCondition.java | 4 +- .../OpHaveSummonSkillCondition.java | 4 +- .../OpHaveSummonedNpcSkillCondition.java | 4 +- .../OpHomeSkillCondition.java | 4 +- .../OpInSiegeTimeSkillCondition.java | 4 +- .../OpInstantzoneSkillCondition.java | 4 +- .../OpMainjobSkillCondition.java | 4 +- .../OpNeedAgathionSkillCondition.java | 4 +- .../OpNeedSummonOrPetSkillCondition.java | 4 +- .../OpNotCursedSkillCondition.java | 4 +- .../OpNotInPeacezoneSkillCondition.java | 4 +- .../OpNotInstantzoneSkillCondition.java | 4 +- .../OpNotOlympiadSkillCondition.java | 4 +- .../OpNotTerritorySkillCondition.java | 4 +- .../OpPeacezoneSkillCondition.java | 4 +- .../OpPkcountSkillCondition.java | 4 +- .../OpPledgeSkillCondition.java | 4 +- .../OpRestartPointSkillCondition.java | 4 +- .../OpResurrectionSkillCondition.java | 4 +- .../OpSiegeHammerSkillCondition.java | 4 +- .../OpSkillAcquireSkillCondition.java | 4 +- .../OpSkillSkillCondition.java | 4 +- .../OpSocialClassSkillCondition.java | 4 +- .../OpSoulMaxSkillCondition.java | 4 +- .../OpSubjobSkillCondition.java | 4 +- .../OpSweeperSkillCondition.java | 4 +- .../OpTargetAllItemTypeSkillCondition.java | 4 +- .../OpTargetArmorTypeSkillCondition.java | 4 +- .../OpTargetDoorSkillCondition.java | 4 +- ...OpTargetMyPledgeAcademySkillCondition.java | 4 +- .../OpTargetNpcSkillCondition.java | 4 +- .../OpTargetPcSkillCondition.java | 4 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../OpTerritorySkillCondition.java | 4 +- .../OpUnlockSkillCondition.java | 4 +- .../OpUseFirecrackerSkillCondition.java | 4 +- .../OpUsePraseedSkillCondition.java | 4 +- .../OpWyvernSkillCondition.java | 4 +- .../PossessHolythingSkillCondition.java | 4 +- .../RemainCpPerSkillCondition.java | 4 +- .../RemainHpPerSkillCondition.java | 4 +- .../RemainMpPerSkillCondition.java | 4 +- .../SoulSavedSkillCondition.java | 4 +- .../TargetItemCrystalTypeSkillCondition.java | 4 +- .../TargetMyMenteeSkillCondition.java | 4 +- .../TargetMyPartySkillCondition.java | 4 +- .../TargetMyPledgeSkillCondition.java | 4 +- .../TargetRaceSkillCondition.java | 4 +- .../gameserver/data/xml/impl/ActionData.java | 4 +- .../gameserver/data/xml/impl/AdminData.java | 8 +- .../data/xml/impl/AppearanceItemData.java | 6 +- .../data/xml/impl/AttendanceRewardData.java | 4 +- .../data/xml/impl/BeautyShopData.java | 10 +- .../data/xml/impl/ClanHallData.java | 4 +- .../data/xml/impl/CombinationItemsData.java | 4 +- .../gameserver/data/xml/impl/CubicData.java | 6 +- .../data/xml/impl/DailyMissionData.java | 8 +- .../gameserver/data/xml/impl/DoorData.java | 14 +- .../data/xml/impl/EnchantItemData.java | 8 +- .../data/xml/impl/EnchantSkillGroupsData.java | 6 +- .../data/xml/impl/EventEngineData.java | 12 +- .../data/xml/impl/ExtendDropData.java | 26 +- .../data/xml/impl/FakePlayerData.java | 4 +- .../gameserver/data/xml/impl/FenceData.java | 4 +- .../gameserver/data/xml/impl/HennaData.java | 4 +- .../data/xml/impl/InitialEquipmentData.java | 4 +- .../data/xml/impl/LuckyGameData.java | 10 +- .../data/xml/impl/MultisellData.java | 4 +- .../gameserver/data/xml/impl/NpcData.java | 8 +- .../xml/impl/NpcNameLocalisationData.java | 4 +- .../gameserver/data/xml/impl/OptionData.java | 4 +- .../data/xml/impl/PetDataTable.java | 4 +- .../data/xml/impl/PlayerTemplateData.java | 4 +- .../data/xml/impl/PrimeShopData.java | 4 +- .../gameserver/data/xml/impl/RecipeData.java | 4 +- .../data/xml/impl/ResidenceFunctionsData.java | 6 +- .../xml/impl/SendMessageLocalisationData.java | 4 +- .../gameserver/data/xml/impl/ShuttleData.java | 8 +- .../data/xml/impl/SiegeScheduleData.java | 6 +- .../gameserver/data/xml/impl/SkillData.java | 86 +- .../data/xml/impl/SkillTreesData.java | 4 +- .../gameserver/data/xml/impl/SpawnsData.java | 16 +- .../data/xml/impl/StaticObjectData.java | 8 +- .../data/xml/impl/TeleportersData.java | 4 +- .../data/xml/impl/TransformData.java | 6 +- .../gameserver/engines/DocumentBase.java | 8 +- .../engines/DocumentBaseGeneral.java | 4 +- .../engines/items/DocumentItem.java | 8 +- .../engines/items/ItemDataHolder.java | 4 +- .../gameserver/handler/ConditionHandler.java | 8 +- .../gameserver/handler/EffectHandler.java | 8 +- .../handler/SkillConditionHandler.java | 8 +- .../instancemanager/AirShipManager.java | 18 +- .../instancemanager/BoatManager.java | 4 +- .../instancemanager/CastleManorManager.java | 6 +- .../CeremonyOfChaosManager.java | 6 +- .../instancemanager/DBSpawnManager.java | 20 +- .../FakePlayerChatManager.java | 4 +- .../instancemanager/GrandBossManager.java | 16 +- .../instancemanager/InstanceManager.java | 20 +- .../gameserver/model/AccessLevel.java | 2 +- .../gameserver/model/ActionDataHolder.java | 2 +- .../model/AdminCommandAccessRight.java | 2 +- .../model/DailyMissionDataHolder.java | 8 +- .../l2jmobius/gameserver/model/Location.java | 2 +- .../gameserver/model/PetLevelData.java | 2 +- .../gameserver/model/RecipeList.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../gameserver/model/SiegeScheduleDate.java | 2 +- .../gameserver/model/SkillLearn.java | 2 +- .../l2jmobius/gameserver/model/StatSet.java | 968 ++++++++++++++++++ .../l2jmobius/gameserver/model/StatsSet.java | 968 ------------------ .../l2jmobius/gameserver/model/actor/Npc.java | 10 +- .../actor/templates/CreatureTemplate.java | 6 +- .../model/actor/templates/CubicTemplate.java | 4 +- .../model/actor/templates/DoorTemplate.java | 4 +- .../model/actor/templates/NpcTemplate.java | 14 +- .../model/actor/templates/PlayerTemplate.java | 4 +- .../model/actor/transform/Transform.java | 4 +- .../actor/transform/TransformLevelData.java | 4 +- .../actor/transform/TransformTemplate.java | 4 +- .../model/alchemy/AlchemyCraftData.java | 4 +- .../model/beautyshop/BeautyItem.java | 6 +- .../ceremonyofchaos/CeremonyOfChaosEvent.java | 8 +- .../gameserver/model/cubic/CubicSkill.java | 4 +- .../gameserver/model/entity/ClanHall.java | 4 +- .../gameserver/model/entity/Hero.java | 70 +- .../eventengine/AbstractEventManager.java | 10 +- .../model/eventengine/EventScheduler.java | 4 +- .../model/events/AbstractScript.java | 6 +- .../model/events/TimerExecutor.java | 8 +- .../model/events/timers/TimerHolder.java | 8 +- .../model/holders/AppearanceHolder.java | 4 +- .../model/holders/AttachSkillHolder.java | 4 +- .../model/holders/EnchantSkillHolder.java | 4 +- .../model/holders/ExtendDropDataHolder.java | 4 +- .../model/holders/FakePlayerHolder.java | 4 +- .../gameserver/model/holders/ItemHolder.java | 4 +- .../model/holders/ItemPointHolder.java | 4 +- .../model/holders/LuckyGameDataHolder.java | 4 +- .../model/holders/MinionHolder.java | 4 +- .../model/holders/MultisellListHolder.java | 4 +- .../model/instancezone/Instance.java | 8 +- .../model/instancezone/InstanceTemplate.java | 10 +- .../instancezone/conditions/Condition.java | 8 +- .../conditions/ConditionCommandChannel.java | 4 +- .../ConditionCommandChannelLeader.java | 4 +- .../conditions/ConditionDistance.java | 4 +- .../conditions/ConditionGroupMax.java | 4 +- .../conditions/ConditionGroupMin.java | 4 +- .../conditions/ConditionHasResidence.java | 6 +- .../conditions/ConditionItem.java | 4 +- .../conditions/ConditionLevel.java | 4 +- .../conditions/ConditionNoParty.java | 4 +- .../conditions/ConditionParty.java | 4 +- .../conditions/ConditionPartyLeader.java | 4 +- .../conditions/ConditionQuest.java | 4 +- .../conditions/ConditionReenter.java | 4 +- .../itemauction/AuctionDateGenerator.java | 4 +- .../model/itemauction/AuctionItem.java | 6 +- .../itemauction/ItemAuctionInstance.java | 6 +- .../gameserver/model/items/Armor.java | 8 +- .../gameserver/model/items/EtcItem.java | 8 +- .../gameserver/model/items/Henna.java | 4 +- .../gameserver/model/items/Item.java | 8 +- .../model/items/PlayerItemTemplate.java | 4 +- .../gameserver/model/items/Weapon.java | 8 +- .../items/appearance/AppearanceStone.java | 4 +- .../items/combination/CombinationItem.java | 4 +- .../items/enchant/AbstractEnchantItem.java | 4 +- .../model/items/enchant/EnchantScroll.java | 4 +- .../items/enchant/EnchantSupportItem.java | 4 +- .../gameserver/model/olympiad/Olympiad.java | 38 +- .../model/olympiad/Participant.java | 6 +- .../model/primeshop/PrimeShopGroup.java | 4 +- .../residences/ResidenceFunctionTemplate.java | 4 +- .../model/shuttle/ShuttleDataHolder.java | 4 +- .../gameserver/model/skills/Skill.java | 6 +- .../model/spawns/NpcSpawnTemplate.java | 16 +- .../gameserver/model/spawns/SpawnGroup.java | 12 +- .../model/spawns/SpawnTemplate.java | 12 +- .../model/teleporter/TeleportHolder.java | 4 +- .../model/teleporter/TeleportLocation.java | 4 +- .../model/variables/AbstractVariables.java | 18 +- .../network/serverpackets/ExHeroList.java | 6 +- .../gameserver/util/BypassParser.java | 4 +- .../scripts/ai/bosses/Antharas/Antharas.java | 6 +- .../data/scripts/ai/bosses/Baium/Baium.java | 6 +- .../data/scripts/ai/bosses/Core/Core.java | 8 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 8 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 8 +- .../data/scripts/ai/bosses/Zaken/Zaken.java | 8 +- .../CastleTeleporter/CastleTeleporter.java | 6 +- .../ai/others/Servitors/TreeOfLife.java | 4 +- .../admincommandhandlers/AdminGrandBoss.java | 4 +- .../admincommandhandlers/AdminOlympiad.java | 14 +- .../conditions/CategoryTypeCondition.java | 4 +- .../conditions/NpcLevelCondition.java | 4 +- .../conditions/PlayerLevelCondition.java | 4 +- .../effecthandlers/AbnormalShield.java | 4 +- .../effecthandlers/AbnormalTimeChange.java | 4 +- .../handlers/effecthandlers/AbsorbDamage.java | 4 +- .../AbstractConditionalHpEffect.java | 4 +- .../effecthandlers/AbstractStatAddEffect.java | 4 +- .../effecthandlers/AbstractStatEffect.java | 6 +- .../AbstractStatPercentEffect.java | 4 +- .../handlers/effecthandlers/Accuracy.java | 4 +- .../handlers/effecthandlers/AddHate.java | 4 +- .../effecthandlers/AddSkillBySkill.java | 4 +- .../AddTeleportBookmarkSlot.java | 4 +- .../effecthandlers/AdditionalPotionCp.java | 4 +- .../effecthandlers/AdditionalPotionHp.java | 4 +- .../effecthandlers/AdditionalPotionMp.java | 4 +- .../handlers/effecthandlers/AreaDamage.java | 4 +- .../effecthandlers/AttackAttribute.java | 4 +- .../effecthandlers/AttackAttributeAdd.java | 4 +- .../handlers/effecthandlers/AttackBehind.java | 4 +- .../handlers/effecthandlers/AttackTrait.java | 4 +- .../handlers/effecthandlers/Backstab.java | 4 +- .../handlers/effecthandlers/Betray.java | 4 +- .../handlers/effecthandlers/Blink.java | 4 +- .../handlers/effecthandlers/BlinkSwap.java | 4 +- .../effecthandlers/BlockAbnormalSlot.java | 4 +- .../handlers/effecthandlers/BlockAction.java | 4 +- .../handlers/effecthandlers/BlockActions.java | 4 +- .../handlers/effecthandlers/BlockChat.java | 4 +- .../handlers/effecthandlers/BlockControl.java | 4 +- .../handlers/effecthandlers/BlockEscape.java | 4 +- .../handlers/effecthandlers/BlockMove.java | 4 +- .../handlers/effecthandlers/BlockParty.java | 4 +- .../effecthandlers/BlockResurrection.java | 4 +- .../handlers/effecthandlers/BlockSkill.java | 4 +- .../handlers/effecthandlers/BlockTarget.java | 4 +- .../handlers/effecthandlers/Bluff.java | 4 +- .../effecthandlers/BonusDropAmount.java | 4 +- .../effecthandlers/BonusDropRate.java | 4 +- .../effecthandlers/BonusSpoilRate.java | 4 +- .../handlers/effecthandlers/Breath.java | 4 +- .../handlers/effecthandlers/BuffBlock.java | 4 +- .../effecthandlers/CallLearnedSkill.java | 4 +- .../handlers/effecthandlers/CallParty.java | 4 +- .../handlers/effecthandlers/CallPc.java | 4 +- .../effecthandlers/CallRandomSkill.java | 4 +- .../handlers/effecthandlers/CallSkill.java | 4 +- .../effecthandlers/CallSkillOnActionTime.java | 4 +- .../effecthandlers/CallTargetParty.java | 4 +- .../effecthandlers/ChameleonRest.java | 4 +- .../handlers/effecthandlers/ChangeBody.java | 6 +- .../handlers/effecthandlers/ChangeFace.java | 4 +- .../effecthandlers/ChangeFishingMastery.java | 4 +- .../effecthandlers/ChangeHairColor.java | 4 +- .../effecthandlers/ChangeHairStyle.java | 4 +- .../handlers/effecthandlers/CheapShot.java | 4 +- .../handlers/effecthandlers/ClassChange.java | 4 +- .../handlers/effecthandlers/Compelling.java | 4 +- .../handlers/effecthandlers/Confuse.java | 4 +- .../handlers/effecthandlers/ConsumeBody.java | 4 +- .../handlers/effecthandlers/ConvertItem.java | 4 +- .../effecthandlers/CounterPhysicalSkill.java | 4 +- .../scripts/handlers/effecthandlers/Cp.java | 4 +- .../handlers/effecthandlers/CpHeal.java | 4 +- .../effecthandlers/CpHealOverTime.java | 4 +- .../effecthandlers/CpHealPercent.java | 4 +- .../handlers/effecthandlers/CpRegen.java | 4 +- .../effecthandlers/CriticalDamage.java | 4 +- .../CriticalDamagePosition.java | 4 +- .../handlers/effecthandlers/CriticalRate.java | 4 +- .../CriticalRatePositionBonus.java | 4 +- .../effecthandlers/CrystalGradeModify.java | 4 +- .../handlers/effecthandlers/CubicMastery.java | 4 +- .../handlers/effecthandlers/DamOverTime.java | 4 +- .../effecthandlers/DamOverTimePercent.java | 4 +- .../handlers/effecthandlers/DamageBlock.java | 4 +- .../effecthandlers/DamageByAttack.java | 4 +- .../handlers/effecthandlers/DamageShield.java | 4 +- .../effecthandlers/DamageShieldResist.java | 4 +- .../handlers/effecthandlers/DeathLink.java | 4 +- .../handlers/effecthandlers/DebuffBlock.java | 4 +- .../effecthandlers/DefenceAttribute.java | 4 +- .../effecthandlers/DefenceCriticalDamage.java | 4 +- .../effecthandlers/DefenceCriticalRate.java | 4 +- .../DefenceMagicCriticalDamage.java | 4 +- .../DefenceMagicCriticalRate.java | 4 +- .../handlers/effecthandlers/DefenceTrait.java | 4 +- .../handlers/effecthandlers/DeleteHate.java | 4 +- .../effecthandlers/DeleteHateOfMe.java | 4 +- .../effecthandlers/DeleteTopAgro.java | 4 +- .../effecthandlers/DetectHiddenObjects.java | 4 +- .../handlers/effecthandlers/Detection.java | 4 +- .../effecthandlers/DisableTargeting.java | 4 +- .../handlers/effecthandlers/Disarm.java | 4 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 4 +- .../effecthandlers/DispelByCategory.java | 4 +- .../handlers/effecthandlers/DispelBySlot.java | 4 +- .../effecthandlers/DispelBySlotMyself.java | 4 +- .../DispelBySlotProbability.java | 4 +- .../handlers/effecthandlers/DoubleCast.java | 4 +- .../handlers/effecthandlers/DuelistFury.java | 4 +- .../handlers/effecthandlers/EnableCloak.java | 4 +- .../handlers/effecthandlers/EnergyAttack.java | 4 +- .../effecthandlers/EnlargeAbnormalSlot.java | 4 +- .../handlers/effecthandlers/EnlargeSlot.java | 4 +- .../handlers/effecthandlers/Escape.java | 4 +- .../handlers/effecthandlers/ExpModify.java | 4 +- .../handlers/effecthandlers/Faceoff.java | 4 +- .../handlers/effecthandlers/FakeDeath.java | 4 +- .../handlers/effecthandlers/FatalBlow.java | 4 +- .../effecthandlers/FatalBlowRate.java | 4 +- .../scripts/handlers/effecthandlers/Fear.java | 4 +- .../scripts/handlers/effecthandlers/Feed.java | 4 +- .../effecthandlers/FishingExpSpBonus.java | 4 +- .../scripts/handlers/effecthandlers/Flag.java | 4 +- .../handlers/effecthandlers/FlipBlock.java | 4 +- .../handlers/effecthandlers/FlyAway.java | 4 +- .../handlers/effecthandlers/FocusEnergy.java | 4 +- .../effecthandlers/FocusMaxMomentum.java | 4 +- .../effecthandlers/FocusMomentum.java | 4 +- .../handlers/effecthandlers/FocusSouls.java | 4 +- .../handlers/effecthandlers/GetAgro.java | 4 +- .../effecthandlers/GetDamageLimit.java | 4 +- .../handlers/effecthandlers/GetMomentum.java | 4 +- .../effecthandlers/GiveClanReputation.java | 4 +- .../handlers/effecthandlers/GiveExpAndSp.java | 4 +- .../handlers/effecthandlers/GiveFame.java | 4 +- .../effecthandlers/GiveRecommendation.java | 4 +- .../handlers/effecthandlers/GiveSp.java | 4 +- .../handlers/effecthandlers/GiveXp.java | 4 +- .../scripts/handlers/effecthandlers/Grow.java | 4 +- .../effecthandlers/HairAccessorySet.java | 4 +- .../handlers/effecthandlers/Harvesting.java | 4 +- .../handlers/effecthandlers/HateAttack.java | 4 +- .../effecthandlers/HeadquarterCreate.java | 4 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealEffect.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 4 +- .../handlers/effecthandlers/HealPercent.java | 4 +- .../scripts/handlers/effecthandlers/Hide.java | 4 +- .../handlers/effecthandlers/HitAtNight.java | 4 +- .../handlers/effecthandlers/HitNumber.java | 4 +- .../scripts/handlers/effecthandlers/Hp.java | 4 +- .../handlers/effecthandlers/HpByLevel.java | 4 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../effecthandlers/HpCpHealCritical.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 4 +- .../handlers/effecthandlers/HpRegen.java | 4 +- .../handlers/effecthandlers/HpToOwner.java | 4 +- .../handlers/effecthandlers/IgnoreDeath.java | 4 +- .../effecthandlers/ImmobilePetBuff.java | 4 +- .../effecthandlers/InstantKillResist.java | 4 +- .../handlers/effecthandlers/JewelSlot.java | 4 +- .../handlers/effecthandlers/KarmaCount.java | 4 +- .../handlers/effecthandlers/KnockBack.java | 4 +- .../handlers/effecthandlers/Lethal.java | 4 +- .../handlers/effecthandlers/LimitCp.java | 4 +- .../handlers/effecthandlers/LimitHp.java | 4 +- .../handlers/effecthandlers/LimitMp.java | 4 +- .../handlers/effecthandlers/Lucky.java | 4 +- .../scripts/handlers/effecthandlers/MAtk.java | 4 +- .../effecthandlers/MagicAccuracy.java | 4 +- .../effecthandlers/MagicCriticalDamage.java | 4 +- .../effecthandlers/MagicCriticalRate.java | 4 +- .../handlers/effecthandlers/MagicMpCost.java | 4 +- .../MagicalAbnormalDispelAttack.java | 4 +- .../effecthandlers/MagicalAbnormalResist.java | 4 +- .../effecthandlers/MagicalAttack.java | 4 +- .../MagicalAttackByAbnormal.java | 4 +- .../MagicalAttackByAbnormalSlot.java | 4 +- .../effecthandlers/MagicalAttackMp.java | 4 +- .../effecthandlers/MagicalAttackRange.java | 4 +- .../effecthandlers/MagicalAttackSpeed.java | 4 +- .../effecthandlers/MagicalDamOverTime.java | 4 +- .../effecthandlers/MagicalDefence.java | 4 +- .../effecthandlers/MagicalEvasion.java | 4 +- .../effecthandlers/MagicalSkillPower.java | 4 +- .../effecthandlers/MagicalSoulAttack.java | 4 +- .../handlers/effecthandlers/ManaCharge.java | 4 +- .../effecthandlers/ManaDamOverTime.java | 4 +- .../handlers/effecthandlers/ManaHeal.java | 4 +- .../effecthandlers/ManaHealByLevel.java | 4 +- .../effecthandlers/ManaHealOverTime.java | 4 +- .../effecthandlers/ManaHealPercent.java | 4 +- .../handlers/effecthandlers/MaxCp.java | 4 +- .../handlers/effecthandlers/MaxHp.java | 4 +- .../handlers/effecthandlers/MaxMp.java | 4 +- .../handlers/effecthandlers/ModifyVital.java | 4 +- .../scripts/handlers/effecthandlers/Mp.java | 4 +- .../effecthandlers/MpConsumePerLevel.java | 4 +- .../handlers/effecthandlers/MpRegen.java | 4 +- .../handlers/effecthandlers/MpShield.java | 4 +- .../effecthandlers/MpVampiricAttack.java | 4 +- .../scripts/handlers/effecthandlers/Mute.java | 4 +- .../effecthandlers/NoblesseBless.java | 4 +- .../handlers/effecthandlers/OpenChest.java | 4 +- .../effecthandlers/OpenCommonRecipeBook.java | 4 +- .../handlers/effecthandlers/OpenDoor.java | 4 +- .../effecthandlers/OpenDwarfRecipeBook.java | 4 +- .../scripts/handlers/effecthandlers/PAtk.java | 4 +- .../handlers/effecthandlers/Passive.java | 4 +- .../PhysicalAbnormalResist.java | 4 +- .../effecthandlers/PhysicalAttack.java | 4 +- .../effecthandlers/PhysicalAttackHpLink.java | 4 +- .../effecthandlers/PhysicalAttackMute.java | 4 +- .../effecthandlers/PhysicalAttackRange.java | 4 +- .../effecthandlers/PhysicalAttackSaveHp.java | 4 +- .../effecthandlers/PhysicalAttackSpeed.java | 4 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../effecthandlers/PhysicalDefence.java | 4 +- .../effecthandlers/PhysicalEvasion.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 4 +- .../PhysicalShieldAngleAll.java | 4 +- .../effecthandlers/PhysicalSkillPower.java | 4 +- .../effecthandlers/PhysicalSoulAttack.java | 4 +- .../handlers/effecthandlers/PkCount.java | 4 +- .../handlers/effecthandlers/Plunder.java | 4 +- .../effecthandlers/PolearmSingleTarget.java | 4 +- .../effecthandlers/ProtectDeathPenalty.java | 4 +- .../effecthandlers/ProtectionBlessing.java | 4 +- .../handlers/effecthandlers/PullBack.java | 4 +- .../PveMagicalSkillDamageBonus.java | 4 +- .../PveMagicalSkillDefenceBonus.java | 4 +- .../PvePhysicalAttackDamageBonus.java | 4 +- .../PvePhysicalAttackDefenceBonus.java | 4 +- .../PvePhysicalSkillDamageBonus.java | 4 +- .../PvePhysicalSkillDefenceBonus.java | 4 +- .../PveRaidMagicalSkillDefenceBonus.java | 4 +- .../PveRaidPhysicalAttackDefenceBonus.java | 4 +- .../PveRaidPhysicalSkillDefenceBonus.java | 4 +- .../PvpMagicalSkillDamageBonus.java | 4 +- .../PvpMagicalSkillDefenceBonus.java | 4 +- .../PvpPhysicalAttackDamageBonus.java | 4 +- .../PvpPhysicalAttackDefenceBonus.java | 4 +- .../PvpPhysicalSkillDamageBonus.java | 4 +- .../PvpPhysicalSkillDefenceBonus.java | 4 +- .../effecthandlers/RandomizeHate.java | 4 +- .../handlers/effecthandlers/RealDamage.java | 4 +- .../handlers/effecthandlers/RearDamage.java | 4 +- .../handlers/effecthandlers/RebalanceHP.java | 4 +- .../effecthandlers/RebalanceHPSummon.java | 4 +- .../RecoverVitalityInPeaceZone.java | 4 +- .../handlers/effecthandlers/ReduceCancel.java | 4 +- .../handlers/effecthandlers/ReduceDamage.java | 4 +- .../effecthandlers/ReduceDropPenalty.java | 4 +- .../handlers/effecthandlers/ReflectMagic.java | 4 +- .../handlers/effecthandlers/ReflectSkill.java | 4 +- .../effecthandlers/RefuelAirship.java | 4 +- .../handlers/effecthandlers/Relax.java | 4 +- .../effecthandlers/ResetInstanceEntry.java | 4 +- .../ResistAbnormalByCategory.java | 4 +- .../effecthandlers/ResistDDMagic.java | 4 +- .../ResistDispelByCategory.java | 4 +- .../handlers/effecthandlers/ResistSkill.java | 4 +- .../handlers/effecthandlers/Restoration.java | 4 +- .../effecthandlers/RestorationRandom.java | 8 +- .../handlers/effecthandlers/Resurrection.java | 4 +- .../effecthandlers/ResurrectionSpecial.java | 4 +- .../handlers/effecthandlers/Reuse.java | 4 +- .../effecthandlers/ReuseSkillById.java | 4 +- .../scripts/handlers/effecthandlers/Root.java | 4 +- .../effecthandlers/SacrificeSummon.java | 4 +- .../effecthandlers/SafeFallHeight.java | 4 +- .../SendSystemMessageToClan.java | 4 +- .../effecthandlers/ServitorShare.java | 4 +- .../handlers/effecthandlers/SetHp.java | 4 +- .../handlers/effecthandlers/SetSkill.java | 4 +- .../effecthandlers/ShieldDefence.java | 4 +- .../effecthandlers/ShieldDefenceRate.java | 4 +- .../handlers/effecthandlers/SilentMove.java | 4 +- .../effecthandlers/SkillCritical.java | 4 +- .../effecthandlers/SkillCriticalDamage.java | 4 +- .../SkillCriticalProbability.java | 4 +- .../handlers/effecthandlers/SkillEvasion.java | 4 +- .../effecthandlers/SkillPowerAdd.java | 4 +- .../handlers/effecthandlers/SkillTurning.java | 4 +- .../effecthandlers/SkillTurningOverTime.java | 4 +- .../handlers/effecthandlers/SoulBlow.java | 4 +- .../handlers/effecthandlers/SoulEating.java | 4 +- .../scripts/handlers/effecthandlers/Sow.java | 4 +- .../handlers/effecthandlers/SpModify.java | 4 +- .../handlers/effecthandlers/Speed.java | 4 +- .../effecthandlers/SphericBarrier.java | 4 +- .../handlers/effecthandlers/Spoil.java | 4 +- .../StatBonusSkillCritical.java | 4 +- .../effecthandlers/StatBonusSpeed.java | 4 +- .../effecthandlers/StatByMoveType.java | 4 +- .../handlers/effecthandlers/StatUp.java | 4 +- .../effecthandlers/StealAbnormal.java | 4 +- .../handlers/effecthandlers/Summon.java | 4 +- .../effecthandlers/SummonAgathion.java | 4 +- .../handlers/effecthandlers/SummonCubic.java | 4 +- .../effecthandlers/SummonHallucination.java | 4 +- .../handlers/effecthandlers/SummonMulti.java | 4 +- .../handlers/effecthandlers/SummonNpc.java | 4 +- .../handlers/effecthandlers/SummonPet.java | 4 +- .../handlers/effecthandlers/SummonPoints.java | 4 +- .../handlers/effecthandlers/SummonTrap.java | 4 +- .../handlers/effecthandlers/Sweeper.java | 4 +- .../handlers/effecthandlers/Synergy.java | 4 +- .../handlers/effecthandlers/TakeCastle.java | 4 +- .../effecthandlers/TakeCastleStart.java | 4 +- .../handlers/effecthandlers/TakeFort.java | 4 +- .../effecthandlers/TakeFortStart.java | 4 +- .../handlers/effecthandlers/TalismanSlot.java | 4 +- .../handlers/effecthandlers/TargetCancel.java | 4 +- .../handlers/effecthandlers/TargetMe.java | 4 +- .../effecthandlers/TargetMeProbability.java | 4 +- .../handlers/effecthandlers/Teleport.java | 4 +- .../effecthandlers/TeleportToNpc.java | 4 +- .../effecthandlers/TeleportToPlayer.java | 4 +- .../effecthandlers/TeleportToSummon.java | 4 +- .../effecthandlers/TeleportToTarget.java | 4 +- .../TransferDamageToPlayer.java | 4 +- .../TransferDamageToSummon.java | 4 +- .../handlers/effecthandlers/TransferHate.java | 4 +- .../effecthandlers/Transformation.java | 4 +- .../handlers/effecthandlers/TrapDetect.java | 4 +- .../handlers/effecthandlers/TrapRemove.java | 4 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 4 +- .../effecthandlers/TriggerSkillByDamage.java | 4 +- .../TriggerSkillByDeathBlow.java | 4 +- .../effecthandlers/TriggerSkillByKill.java | 4 +- .../TriggerSkillByMagicType.java | 4 +- .../effecthandlers/TriggerSkillBySkill.java | 4 +- .../TriggerSkillBySkillAttack.java | 4 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 4 +- .../effecthandlers/UnsummonAgathion.java | 4 +- .../effecthandlers/UnsummonServitors.java | 4 +- .../handlers/effecthandlers/Untargetable.java | 4 +- .../effecthandlers/VampiricAttack.java | 4 +- .../effecthandlers/VampiricDefence.java | 4 +- .../effecthandlers/VitalityExpRate.java | 4 +- .../effecthandlers/VitalityPointUp.java | 4 +- .../effecthandlers/VitalityPointsRate.java | 4 +- .../handlers/effecthandlers/WeightLimit.java | 4 +- .../effecthandlers/WeightPenalty.java | 4 +- .../effecthandlers/WorldChatPoints.java | 4 +- .../BuildAdvanceBaseSkillCondition.java | 4 +- .../BuildCampSkillCondition.java | 4 +- ...CanAddMaxEntranceInzoneSkillCondition.java | 4 +- .../CanBookmarkAddSlotSkillCondition.java | 4 +- ...CanChangeVitalItemCountSkillCondition.java | 4 +- .../CanEnchantAttributeSkillCondition.java | 4 +- .../CanMountForEventSkillCondition.java | 4 +- .../CanRefuelAirshipSkillCondition.java | 4 +- .../CanRestoreVitalPointSkillCondition.java | 4 +- .../CanSummonCubicSkillCondition.java | 4 +- .../CanSummonMultiSkillCondition.java | 4 +- .../CanSummonPetSkillCondition.java | 4 +- .../CanSummonSiegeGolemSkillCondition.java | 4 +- .../CanSummonSkillCondition.java | 4 +- .../CanTransformInDominionSkillCondition.java | 4 +- .../CanTransformSkillCondition.java | 4 +- .../CanUntransformSkillCondition.java | 4 +- .../CanUseInBattlefieldSkillCondition.java | 4 +- .../CanUseInDragonLairSkillCondition.java | 4 +- .../CanUseSwoopCannonSkillCondition.java | 4 +- ...nUseVitalityConsumeItemSkillCondition.java | 4 +- .../CannotUseInTransformSkillCondition.java | 4 +- .../CheckLevelSkillCondition.java | 4 +- .../CheckSexSkillCondition.java | 4 +- .../ConsumeBodySkillCondition.java | 4 +- .../EnergySavedSkillCondition.java | 4 +- .../EquipArmorSkillCondition.java | 4 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../NotFearedSkillCondition.java | 4 +- .../NotInUnderwaterSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 4 +- .../OpAffectedBySkillSkillCondition.java | 4 +- .../OpAgathionEnergySkillCondition.java | 4 +- .../OpAlignmentSkillCondition.java | 4 +- .../OpBlinkSkillCondition.java | 4 +- .../OpCallPcSkillCondition.java | 4 +- .../OpCanEscapeSkillCondition.java | 4 +- .../OpCanNotUseAirshipSkillCondition.java | 4 +- ...eTargetWithPrivateStoreSkillCondition.java | 4 +- .../OpChangeWeaponSkillCondition.java | 4 +- .../OpCheckAbnormalSkillCondition.java | 4 +- .../OpCheckAccountTypeSkillCondition.java | 4 +- .../OpCheckCastRangeSkillCondition.java | 4 +- .../OpCheckClassListSkillCondition.java | 4 +- .../OpCheckClassSkillCondition.java | 4 +- .../OpCheckCrtEffectSkillCondition.java | 4 +- .../OpCheckFlagSkillCondition.java | 4 +- ...eckOnGoingEventCampaignSkillCondition.java | 4 +- .../OpCheckPcbangPointSkillCondition.java | 4 +- .../OpCheckResidenceSkillCondition.java | 4 +- .../OpCheckSkillListSkillCondition.java | 4 +- .../OpCheckSkillSkillCondition.java | 4 +- .../OpCompanionSkillCondition.java | 4 +- .../OpEnchantRangeSkillCondition.java | 4 +- .../OpEncumberedSkillCondition.java | 4 +- .../OpEnergyMaxSkillCondition.java | 4 +- .../OpEquipItemSkillCondition.java | 4 +- .../OpExistNpcSkillCondition.java | 4 +- .../OpFishingCastSkillCondition.java | 4 +- .../OpFishingPumpingSkillCondition.java | 4 +- .../OpFishingReelingSkillCondition.java | 4 +- .../OpHaveSummonSkillCondition.java | 4 +- .../OpHaveSummonedNpcSkillCondition.java | 4 +- .../OpHomeSkillCondition.java | 4 +- .../OpInSiegeTimeSkillCondition.java | 4 +- .../OpInstantzoneSkillCondition.java | 4 +- .../OpMainjobSkillCondition.java | 4 +- .../OpNeedAgathionSkillCondition.java | 4 +- .../OpNeedSummonOrPetSkillCondition.java | 4 +- .../OpNotCursedSkillCondition.java | 4 +- .../OpNotInPeacezoneSkillCondition.java | 4 +- .../OpNotInstantzoneSkillCondition.java | 4 +- .../OpNotOlympiadSkillCondition.java | 4 +- .../OpNotTerritorySkillCondition.java | 4 +- .../OpPeacezoneSkillCondition.java | 4 +- .../OpPkcountSkillCondition.java | 4 +- .../OpPledgeSkillCondition.java | 4 +- .../OpRestartPointSkillCondition.java | 4 +- .../OpResurrectionSkillCondition.java | 4 +- .../OpSiegeHammerSkillCondition.java | 4 +- .../OpSkillAcquireSkillCondition.java | 4 +- .../OpSkillSkillCondition.java | 4 +- .../OpSocialClassSkillCondition.java | 4 +- .../OpSoulMaxSkillCondition.java | 4 +- .../OpSubjobSkillCondition.java | 4 +- .../OpSweeperSkillCondition.java | 4 +- .../OpTargetAllItemTypeSkillCondition.java | 4 +- .../OpTargetArmorTypeSkillCondition.java | 4 +- .../OpTargetDoorSkillCondition.java | 4 +- ...OpTargetMyPledgeAcademySkillCondition.java | 4 +- .../OpTargetNpcSkillCondition.java | 4 +- .../OpTargetPcSkillCondition.java | 4 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../OpTerritorySkillCondition.java | 4 +- .../OpUnlockSkillCondition.java | 4 +- .../OpUseFirecrackerSkillCondition.java | 4 +- .../OpUsePraseedSkillCondition.java | 4 +- .../OpWyvernSkillCondition.java | 4 +- .../PossessHolythingSkillCondition.java | 4 +- .../RemainCpPerSkillCondition.java | 4 +- .../RemainHpPerSkillCondition.java | 4 +- .../RemainMpPerSkillCondition.java | 4 +- .../SoulSavedSkillCondition.java | 4 +- .../TargetItemCrystalTypeSkillCondition.java | 4 +- .../TargetMyMenteeSkillCondition.java | 4 +- .../TargetMyPartySkillCondition.java | 4 +- .../TargetMyPledgeSkillCondition.java | 4 +- .../TargetRaceSkillCondition.java | 4 +- .../gameserver/data/xml/impl/ActionData.java | 4 +- .../gameserver/data/xml/impl/AdminData.java | 8 +- .../data/xml/impl/AppearanceItemData.java | 6 +- .../data/xml/impl/AttendanceRewardData.java | 4 +- .../data/xml/impl/BeautyShopData.java | 10 +- .../data/xml/impl/ClanHallData.java | 4 +- .../data/xml/impl/CombinationItemsData.java | 4 +- .../gameserver/data/xml/impl/CubicData.java | 6 +- .../data/xml/impl/DailyMissionData.java | 8 +- .../gameserver/data/xml/impl/DoorData.java | 14 +- .../data/xml/impl/EnchantItemData.java | 8 +- .../data/xml/impl/EnchantSkillGroupsData.java | 6 +- .../data/xml/impl/EventEngineData.java | 12 +- .../data/xml/impl/ExtendDropData.java | 26 +- .../data/xml/impl/FakePlayerData.java | 4 +- .../gameserver/data/xml/impl/FenceData.java | 4 +- .../gameserver/data/xml/impl/HennaData.java | 4 +- .../data/xml/impl/InitialEquipmentData.java | 4 +- .../data/xml/impl/LuckyGameData.java | 10 +- .../data/xml/impl/MultisellData.java | 4 +- .../gameserver/data/xml/impl/NpcData.java | 8 +- .../xml/impl/NpcNameLocalisationData.java | 4 +- .../gameserver/data/xml/impl/OptionData.java | 4 +- .../data/xml/impl/PetDataTable.java | 4 +- .../data/xml/impl/PlayerTemplateData.java | 4 +- .../data/xml/impl/PrimeShopData.java | 4 +- .../gameserver/data/xml/impl/RecipeData.java | 4 +- .../data/xml/impl/ResidenceFunctionsData.java | 6 +- .../xml/impl/SendMessageLocalisationData.java | 4 +- .../gameserver/data/xml/impl/ShuttleData.java | 8 +- .../data/xml/impl/SiegeScheduleData.java | 6 +- .../gameserver/data/xml/impl/SkillData.java | 86 +- .../data/xml/impl/SkillTreesData.java | 4 +- .../gameserver/data/xml/impl/SpawnsData.java | 16 +- .../data/xml/impl/StaticObjectData.java | 8 +- .../data/xml/impl/TeleportersData.java | 4 +- .../data/xml/impl/TransformData.java | 6 +- .../gameserver/engines/DocumentBase.java | 8 +- .../engines/DocumentBaseGeneral.java | 4 +- .../engines/items/DocumentItem.java | 8 +- .../engines/items/ItemDataHolder.java | 4 +- .../gameserver/handler/ConditionHandler.java | 8 +- .../gameserver/handler/EffectHandler.java | 8 +- .../handler/SkillConditionHandler.java | 8 +- .../instancemanager/AirShipManager.java | 18 +- .../instancemanager/BoatManager.java | 4 +- .../instancemanager/CastleManorManager.java | 6 +- .../CeremonyOfChaosManager.java | 6 +- .../instancemanager/DBSpawnManager.java | 20 +- .../FakePlayerChatManager.java | 4 +- .../instancemanager/GrandBossManager.java | 16 +- .../instancemanager/InstanceManager.java | 20 +- .../gameserver/model/AccessLevel.java | 2 +- .../gameserver/model/ActionDataHolder.java | 2 +- .../model/AdminCommandAccessRight.java | 2 +- .../model/DailyMissionDataHolder.java | 8 +- .../l2jmobius/gameserver/model/Location.java | 2 +- .../gameserver/model/PetLevelData.java | 2 +- .../gameserver/model/RecipeList.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../gameserver/model/SiegeScheduleDate.java | 2 +- .../gameserver/model/SkillLearn.java | 2 +- .../l2jmobius/gameserver/model/StatSet.java | 968 ++++++++++++++++++ .../l2jmobius/gameserver/model/StatsSet.java | 968 ------------------ .../l2jmobius/gameserver/model/actor/Npc.java | 10 +- .../actor/templates/CreatureTemplate.java | 6 +- .../model/actor/templates/CubicTemplate.java | 4 +- .../model/actor/templates/DoorTemplate.java | 4 +- .../model/actor/templates/NpcTemplate.java | 14 +- .../model/actor/templates/PlayerTemplate.java | 4 +- .../model/actor/transform/Transform.java | 4 +- .../actor/transform/TransformLevelData.java | 4 +- .../actor/transform/TransformTemplate.java | 4 +- .../model/alchemy/AlchemyCraftData.java | 4 +- .../model/beautyshop/BeautyItem.java | 6 +- .../ceremonyofchaos/CeremonyOfChaosEvent.java | 8 +- .../gameserver/model/cubic/CubicSkill.java | 4 +- .../gameserver/model/entity/ClanHall.java | 4 +- .../gameserver/model/entity/Hero.java | 70 +- .../eventengine/AbstractEventManager.java | 10 +- .../model/eventengine/EventScheduler.java | 4 +- .../model/events/AbstractScript.java | 6 +- .../model/events/TimerExecutor.java | 8 +- .../model/events/timers/TimerHolder.java | 8 +- .../model/holders/AppearanceHolder.java | 4 +- .../model/holders/AttachSkillHolder.java | 4 +- .../model/holders/EnchantSkillHolder.java | 4 +- .../model/holders/ExtendDropDataHolder.java | 4 +- .../model/holders/FakePlayerHolder.java | 4 +- .../gameserver/model/holders/ItemHolder.java | 4 +- .../model/holders/ItemPointHolder.java | 4 +- .../model/holders/LuckyGameDataHolder.java | 4 +- .../model/holders/MinionHolder.java | 4 +- .../model/holders/MultisellListHolder.java | 4 +- .../model/instancezone/Instance.java | 8 +- .../model/instancezone/InstanceTemplate.java | 10 +- .../instancezone/conditions/Condition.java | 8 +- .../conditions/ConditionCommandChannel.java | 4 +- .../ConditionCommandChannelLeader.java | 4 +- .../conditions/ConditionDistance.java | 4 +- .../conditions/ConditionGroupMax.java | 4 +- .../conditions/ConditionGroupMin.java | 4 +- .../conditions/ConditionHasResidence.java | 6 +- .../conditions/ConditionItem.java | 4 +- .../conditions/ConditionLevel.java | 4 +- .../conditions/ConditionNoParty.java | 4 +- .../conditions/ConditionParty.java | 4 +- .../conditions/ConditionPartyLeader.java | 4 +- .../conditions/ConditionQuest.java | 4 +- .../conditions/ConditionReenter.java | 4 +- .../itemauction/AuctionDateGenerator.java | 4 +- .../model/itemauction/AuctionItem.java | 6 +- .../itemauction/ItemAuctionInstance.java | 6 +- .../gameserver/model/items/Armor.java | 8 +- .../gameserver/model/items/EtcItem.java | 8 +- .../gameserver/model/items/Henna.java | 4 +- .../gameserver/model/items/Item.java | 8 +- .../model/items/PlayerItemTemplate.java | 4 +- .../gameserver/model/items/Weapon.java | 8 +- .../items/appearance/AppearanceStone.java | 4 +- .../items/combination/CombinationItem.java | 4 +- .../items/enchant/AbstractEnchantItem.java | 4 +- .../model/items/enchant/EnchantScroll.java | 4 +- .../items/enchant/EnchantSupportItem.java | 4 +- .../gameserver/model/olympiad/Olympiad.java | 38 +- .../model/olympiad/Participant.java | 6 +- .../model/primeshop/PrimeShopGroup.java | 4 +- .../residences/ResidenceFunctionTemplate.java | 4 +- .../model/shuttle/ShuttleDataHolder.java | 4 +- .../gameserver/model/skills/Skill.java | 6 +- .../model/spawns/NpcSpawnTemplate.java | 16 +- .../gameserver/model/spawns/SpawnGroup.java | 12 +- .../model/spawns/SpawnTemplate.java | 12 +- .../model/teleporter/TeleportHolder.java | 4 +- .../model/teleporter/TeleportLocation.java | 4 +- .../model/variables/AbstractVariables.java | 18 +- .../network/serverpackets/ExHeroList.java | 6 +- .../gameserver/util/BypassParser.java | 4 +- .../scripts/ai/bosses/Antharas/Antharas.java | 6 +- .../data/scripts/ai/bosses/Baium/Baium.java | 6 +- .../data/scripts/ai/bosses/Core/Core.java | 8 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 8 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 8 +- .../data/scripts/ai/bosses/Zaken/Zaken.java | 8 +- .../CastleTeleporter/CastleTeleporter.java | 6 +- .../ai/others/Servitors/TreeOfLife.java | 4 +- .../admincommandhandlers/AdminGrandBoss.java | 4 +- .../admincommandhandlers/AdminOlympiad.java | 14 +- .../conditions/CategoryTypeCondition.java | 4 +- .../conditions/NpcLevelCondition.java | 4 +- .../conditions/PlayerLevelCondition.java | 4 +- .../effecthandlers/AbnormalShield.java | 4 +- .../effecthandlers/AbnormalTimeChange.java | 4 +- .../handlers/effecthandlers/AbsorbDamage.java | 4 +- .../AbstractConditionalHpEffect.java | 4 +- .../effecthandlers/AbstractStatAddEffect.java | 4 +- .../effecthandlers/AbstractStatEffect.java | 6 +- .../AbstractStatPercentEffect.java | 4 +- .../handlers/effecthandlers/Accuracy.java | 4 +- .../handlers/effecthandlers/AddHate.java | 4 +- .../effecthandlers/AddSkillBySkill.java | 4 +- .../AddTeleportBookmarkSlot.java | 4 +- .../effecthandlers/AdditionalPotionCp.java | 4 +- .../effecthandlers/AdditionalPotionHp.java | 4 +- .../effecthandlers/AdditionalPotionMp.java | 4 +- .../handlers/effecthandlers/AgathionSlot.java | 4 +- .../handlers/effecthandlers/AreaDamage.java | 4 +- .../effecthandlers/AttackAttribute.java | 4 +- .../effecthandlers/AttackAttributeAdd.java | 4 +- .../handlers/effecthandlers/AttackBehind.java | 4 +- .../handlers/effecthandlers/AttackTrait.java | 4 +- .../handlers/effecthandlers/Backstab.java | 4 +- .../handlers/effecthandlers/Betray.java | 4 +- .../handlers/effecthandlers/Blink.java | 4 +- .../handlers/effecthandlers/BlinkSwap.java | 4 +- .../effecthandlers/BlockAbnormalSlot.java | 4 +- .../handlers/effecthandlers/BlockAction.java | 4 +- .../handlers/effecthandlers/BlockActions.java | 4 +- .../handlers/effecthandlers/BlockChat.java | 4 +- .../handlers/effecthandlers/BlockControl.java | 4 +- .../handlers/effecthandlers/BlockEscape.java | 4 +- .../handlers/effecthandlers/BlockMove.java | 4 +- .../handlers/effecthandlers/BlockParty.java | 4 +- .../effecthandlers/BlockResurrection.java | 4 +- .../handlers/effecthandlers/BlockSkill.java | 4 +- .../handlers/effecthandlers/BlockTarget.java | 4 +- .../handlers/effecthandlers/Bluff.java | 4 +- .../effecthandlers/BonusDropAmount.java | 4 +- .../effecthandlers/BonusDropRate.java | 4 +- .../effecthandlers/BonusSpoilRate.java | 4 +- .../handlers/effecthandlers/Breath.java | 4 +- .../handlers/effecthandlers/BuffBlock.java | 4 +- .../effecthandlers/CallLearnedSkill.java | 4 +- .../handlers/effecthandlers/CallParty.java | 4 +- .../handlers/effecthandlers/CallPc.java | 4 +- .../effecthandlers/CallRandomSkill.java | 4 +- .../handlers/effecthandlers/CallSkill.java | 4 +- .../effecthandlers/CallSkillOnActionTime.java | 4 +- .../effecthandlers/CallTargetParty.java | 4 +- .../effecthandlers/ChameleonRest.java | 4 +- .../handlers/effecthandlers/ChangeBody.java | 6 +- .../handlers/effecthandlers/ChangeFace.java | 4 +- .../effecthandlers/ChangeFishingMastery.java | 4 +- .../effecthandlers/ChangeHairColor.java | 4 +- .../effecthandlers/ChangeHairStyle.java | 4 +- .../handlers/effecthandlers/CheapShot.java | 4 +- .../handlers/effecthandlers/ClassChange.java | 4 +- .../handlers/effecthandlers/Compelling.java | 4 +- .../handlers/effecthandlers/Confuse.java | 4 +- .../handlers/effecthandlers/ConsumeBody.java | 4 +- .../handlers/effecthandlers/ConvertItem.java | 4 +- .../effecthandlers/CounterPhysicalSkill.java | 4 +- .../scripts/handlers/effecthandlers/Cp.java | 4 +- .../handlers/effecthandlers/CpHeal.java | 4 +- .../effecthandlers/CpHealOverTime.java | 4 +- .../effecthandlers/CpHealPercent.java | 4 +- .../handlers/effecthandlers/CpRegen.java | 4 +- .../effecthandlers/CriticalDamage.java | 4 +- .../CriticalDamagePosition.java | 4 +- .../handlers/effecthandlers/CriticalRate.java | 4 +- .../CriticalRatePositionBonus.java | 4 +- .../effecthandlers/CrystalGradeModify.java | 4 +- .../handlers/effecthandlers/CubicMastery.java | 4 +- .../handlers/effecthandlers/DamOverTime.java | 4 +- .../effecthandlers/DamOverTimePercent.java | 4 +- .../handlers/effecthandlers/DamageBlock.java | 4 +- .../effecthandlers/DamageByAttack.java | 4 +- .../handlers/effecthandlers/DamageShield.java | 4 +- .../effecthandlers/DamageShieldResist.java | 4 +- .../handlers/effecthandlers/DeathLink.java | 4 +- .../handlers/effecthandlers/DebuffBlock.java | 4 +- .../effecthandlers/DefenceAttribute.java | 4 +- .../effecthandlers/DefenceCriticalDamage.java | 4 +- .../effecthandlers/DefenceCriticalRate.java | 4 +- .../DefenceMagicCriticalDamage.java | 4 +- .../DefenceMagicCriticalRate.java | 4 +- .../handlers/effecthandlers/DefenceTrait.java | 4 +- .../handlers/effecthandlers/DeleteHate.java | 4 +- .../effecthandlers/DeleteHateOfMe.java | 4 +- .../effecthandlers/DeleteTopAgro.java | 4 +- .../effecthandlers/DetectHiddenObjects.java | 4 +- .../handlers/effecthandlers/Detection.java | 4 +- .../effecthandlers/DisableTargeting.java | 4 +- .../handlers/effecthandlers/Disarm.java | 4 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 4 +- .../effecthandlers/DispelByCategory.java | 4 +- .../handlers/effecthandlers/DispelBySlot.java | 4 +- .../effecthandlers/DispelBySlotMyself.java | 4 +- .../DispelBySlotProbability.java | 4 +- .../handlers/effecthandlers/DoubleCast.java | 4 +- .../handlers/effecthandlers/DuelistFury.java | 4 +- .../handlers/effecthandlers/EnableCloak.java | 4 +- .../handlers/effecthandlers/EnergyAttack.java | 4 +- .../effecthandlers/EnlargeAbnormalSlot.java | 4 +- .../handlers/effecthandlers/EnlargeSlot.java | 4 +- .../handlers/effecthandlers/Escape.java | 4 +- .../handlers/effecthandlers/ExpModify.java | 4 +- .../handlers/effecthandlers/Faceoff.java | 4 +- .../handlers/effecthandlers/FakeDeath.java | 4 +- .../handlers/effecthandlers/FatalBlow.java | 4 +- .../effecthandlers/FatalBlowRate.java | 4 +- .../scripts/handlers/effecthandlers/Fear.java | 4 +- .../scripts/handlers/effecthandlers/Feed.java | 4 +- .../effecthandlers/FishingExpSpBonus.java | 4 +- .../scripts/handlers/effecthandlers/Flag.java | 4 +- .../handlers/effecthandlers/FlipBlock.java | 4 +- .../handlers/effecthandlers/FlyAway.java | 4 +- .../handlers/effecthandlers/FocusEnergy.java | 4 +- .../effecthandlers/FocusMaxMomentum.java | 4 +- .../effecthandlers/FocusMomentum.java | 4 +- .../handlers/effecthandlers/FocusSouls.java | 4 +- .../handlers/effecthandlers/GetAgro.java | 4 +- .../effecthandlers/GetDamageLimit.java | 4 +- .../handlers/effecthandlers/GetMomentum.java | 4 +- .../effecthandlers/GiveClanReputation.java | 4 +- .../handlers/effecthandlers/GiveExpAndSp.java | 4 +- .../handlers/effecthandlers/GiveFame.java | 4 +- .../effecthandlers/GiveRecommendation.java | 4 +- .../handlers/effecthandlers/GiveSp.java | 4 +- .../handlers/effecthandlers/GiveXp.java | 4 +- .../scripts/handlers/effecthandlers/Grow.java | 4 +- .../effecthandlers/HairAccessorySet.java | 4 +- .../handlers/effecthandlers/Harvesting.java | 4 +- .../handlers/effecthandlers/HateAttack.java | 4 +- .../effecthandlers/HeadquarterCreate.java | 4 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealEffect.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 4 +- .../handlers/effecthandlers/HealPercent.java | 4 +- .../scripts/handlers/effecthandlers/Hide.java | 4 +- .../handlers/effecthandlers/HitAtNight.java | 4 +- .../handlers/effecthandlers/HitNumber.java | 4 +- .../scripts/handlers/effecthandlers/Hp.java | 4 +- .../handlers/effecthandlers/HpByLevel.java | 4 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../effecthandlers/HpCpHealCritical.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 4 +- .../handlers/effecthandlers/HpRegen.java | 4 +- .../handlers/effecthandlers/HpToOwner.java | 4 +- .../handlers/effecthandlers/IgnoreDeath.java | 4 +- .../effecthandlers/ImmobilePetBuff.java | 4 +- .../effecthandlers/InstantKillResist.java | 4 +- .../handlers/effecthandlers/JewelSlot.java | 4 +- .../handlers/effecthandlers/KarmaCount.java | 4 +- .../handlers/effecthandlers/KnockBack.java | 4 +- .../handlers/effecthandlers/Lethal.java | 4 +- .../handlers/effecthandlers/LimitCp.java | 4 +- .../handlers/effecthandlers/LimitHp.java | 4 +- .../handlers/effecthandlers/LimitMp.java | 4 +- .../handlers/effecthandlers/Lucky.java | 4 +- .../scripts/handlers/effecthandlers/MAtk.java | 4 +- .../effecthandlers/MagicAccuracy.java | 4 +- .../effecthandlers/MagicCriticalDamage.java | 4 +- .../effecthandlers/MagicCriticalRate.java | 4 +- .../handlers/effecthandlers/MagicMpCost.java | 4 +- .../MagicalAbnormalDispelAttack.java | 4 +- .../effecthandlers/MagicalAbnormalResist.java | 4 +- .../effecthandlers/MagicalAttack.java | 4 +- .../MagicalAttackByAbnormal.java | 4 +- .../MagicalAttackByAbnormalSlot.java | 4 +- .../effecthandlers/MagicalAttackMp.java | 4 +- .../effecthandlers/MagicalAttackRange.java | 4 +- .../effecthandlers/MagicalAttackSpeed.java | 4 +- .../effecthandlers/MagicalDamOverTime.java | 4 +- .../effecthandlers/MagicalDefence.java | 4 +- .../effecthandlers/MagicalEvasion.java | 4 +- .../effecthandlers/MagicalSkillPower.java | 4 +- .../effecthandlers/MagicalSoulAttack.java | 4 +- .../handlers/effecthandlers/ManaCharge.java | 4 +- .../effecthandlers/ManaDamOverTime.java | 4 +- .../handlers/effecthandlers/ManaHeal.java | 4 +- .../effecthandlers/ManaHealByLevel.java | 4 +- .../effecthandlers/ManaHealOverTime.java | 4 +- .../effecthandlers/ManaHealPercent.java | 4 +- .../handlers/effecthandlers/MaxCp.java | 4 +- .../handlers/effecthandlers/MaxHp.java | 4 +- .../handlers/effecthandlers/MaxMp.java | 4 +- .../handlers/effecthandlers/ModifyVital.java | 4 +- .../scripts/handlers/effecthandlers/Mp.java | 4 +- .../effecthandlers/MpConsumePerLevel.java | 4 +- .../handlers/effecthandlers/MpRegen.java | 4 +- .../handlers/effecthandlers/MpShield.java | 4 +- .../effecthandlers/MpVampiricAttack.java | 4 +- .../scripts/handlers/effecthandlers/Mute.java | 4 +- .../effecthandlers/NoblesseBless.java | 4 +- .../handlers/effecthandlers/OpenChest.java | 4 +- .../effecthandlers/OpenCommonRecipeBook.java | 4 +- .../handlers/effecthandlers/OpenDoor.java | 4 +- .../effecthandlers/OpenDwarfRecipeBook.java | 4 +- .../scripts/handlers/effecthandlers/PAtk.java | 4 +- .../handlers/effecthandlers/Passive.java | 4 +- .../PhysicalAbnormalResist.java | 4 +- .../effecthandlers/PhysicalAttack.java | 4 +- .../effecthandlers/PhysicalAttackHpLink.java | 4 +- .../effecthandlers/PhysicalAttackMute.java | 4 +- .../effecthandlers/PhysicalAttackRange.java | 4 +- .../effecthandlers/PhysicalAttackSaveHp.java | 4 +- .../effecthandlers/PhysicalAttackSpeed.java | 4 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../effecthandlers/PhysicalDefence.java | 4 +- .../effecthandlers/PhysicalEvasion.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 4 +- .../PhysicalShieldAngleAll.java | 4 +- .../effecthandlers/PhysicalSkillPower.java | 4 +- .../effecthandlers/PhysicalSoulAttack.java | 4 +- .../handlers/effecthandlers/PkCount.java | 4 +- .../handlers/effecthandlers/Plunder.java | 4 +- .../effecthandlers/PolearmSingleTarget.java | 4 +- .../effecthandlers/ProtectDeathPenalty.java | 4 +- .../effecthandlers/ProtectionBlessing.java | 4 +- .../handlers/effecthandlers/PullBack.java | 4 +- .../PveMagicalSkillDamageBonus.java | 4 +- .../PveMagicalSkillDefenceBonus.java | 4 +- .../PvePhysicalAttackDamageBonus.java | 4 +- .../PvePhysicalAttackDefenceBonus.java | 4 +- .../PvePhysicalSkillDamageBonus.java | 4 +- .../PvePhysicalSkillDefenceBonus.java | 4 +- .../PveRaidMagicalSkillDefenceBonus.java | 4 +- .../PveRaidPhysicalAttackDefenceBonus.java | 4 +- .../PveRaidPhysicalSkillDefenceBonus.java | 4 +- .../PvpMagicalSkillDamageBonus.java | 4 +- .../PvpMagicalSkillDefenceBonus.java | 4 +- .../PvpPhysicalAttackDamageBonus.java | 4 +- .../PvpPhysicalAttackDefenceBonus.java | 4 +- .../PvpPhysicalSkillDamageBonus.java | 4 +- .../PvpPhysicalSkillDefenceBonus.java | 4 +- .../effecthandlers/RandomizeHate.java | 4 +- .../handlers/effecthandlers/RealDamage.java | 4 +- .../handlers/effecthandlers/RearDamage.java | 4 +- .../handlers/effecthandlers/RebalanceHP.java | 4 +- .../effecthandlers/RebalanceHPSummon.java | 4 +- .../RecoverVitalityInPeaceZone.java | 4 +- .../handlers/effecthandlers/ReduceCancel.java | 4 +- .../handlers/effecthandlers/ReduceDamage.java | 4 +- .../effecthandlers/ReduceDropPenalty.java | 4 +- .../handlers/effecthandlers/ReflectMagic.java | 4 +- .../handlers/effecthandlers/ReflectSkill.java | 4 +- .../effecthandlers/RefuelAirship.java | 4 +- .../handlers/effecthandlers/Relax.java | 4 +- .../effecthandlers/ResetInstanceEntry.java | 4 +- .../ResistAbnormalByCategory.java | 4 +- .../effecthandlers/ResistDDMagic.java | 4 +- .../ResistDispelByCategory.java | 4 +- .../handlers/effecthandlers/ResistSkill.java | 4 +- .../handlers/effecthandlers/Restoration.java | 4 +- .../effecthandlers/RestorationRandom.java | 8 +- .../handlers/effecthandlers/Resurrection.java | 4 +- .../effecthandlers/ResurrectionSpecial.java | 4 +- .../handlers/effecthandlers/Reuse.java | 4 +- .../effecthandlers/ReuseSkillById.java | 4 +- .../scripts/handlers/effecthandlers/Root.java | 4 +- .../effecthandlers/SacrificeSummon.java | 4 +- .../effecthandlers/SafeFallHeight.java | 4 +- .../SendSystemMessageToClan.java | 4 +- .../effecthandlers/ServitorShare.java | 4 +- .../handlers/effecthandlers/SetHp.java | 4 +- .../handlers/effecthandlers/SetSkill.java | 4 +- .../effecthandlers/ShieldDefence.java | 4 +- .../effecthandlers/ShieldDefenceRate.java | 4 +- .../handlers/effecthandlers/SilentMove.java | 4 +- .../effecthandlers/SkillCritical.java | 4 +- .../effecthandlers/SkillCriticalDamage.java | 4 +- .../SkillCriticalProbability.java | 4 +- .../handlers/effecthandlers/SkillEvasion.java | 4 +- .../effecthandlers/SkillPowerAdd.java | 4 +- .../handlers/effecthandlers/SkillTurning.java | 4 +- .../effecthandlers/SkillTurningOverTime.java | 4 +- .../handlers/effecthandlers/SoulBlow.java | 4 +- .../handlers/effecthandlers/SoulEating.java | 4 +- .../scripts/handlers/effecthandlers/Sow.java | 4 +- .../handlers/effecthandlers/SpModify.java | 4 +- .../handlers/effecthandlers/Speed.java | 4 +- .../effecthandlers/SphericBarrier.java | 4 +- .../handlers/effecthandlers/Spoil.java | 4 +- .../StatBonusSkillCritical.java | 4 +- .../effecthandlers/StatBonusSpeed.java | 4 +- .../effecthandlers/StatByMoveType.java | 4 +- .../handlers/effecthandlers/StatUp.java | 4 +- .../effecthandlers/StealAbnormal.java | 4 +- .../handlers/effecthandlers/Summon.java | 4 +- .../effecthandlers/SummonAgathion.java | 4 +- .../handlers/effecthandlers/SummonCubic.java | 4 +- .../effecthandlers/SummonHallucination.java | 4 +- .../handlers/effecthandlers/SummonMulti.java | 4 +- .../handlers/effecthandlers/SummonNpc.java | 4 +- .../handlers/effecthandlers/SummonPet.java | 4 +- .../handlers/effecthandlers/SummonPoints.java | 4 +- .../handlers/effecthandlers/SummonTrap.java | 4 +- .../handlers/effecthandlers/Sweeper.java | 4 +- .../handlers/effecthandlers/Synergy.java | 4 +- .../handlers/effecthandlers/TakeCastle.java | 4 +- .../effecthandlers/TakeCastleStart.java | 4 +- .../handlers/effecthandlers/TakeFort.java | 4 +- .../effecthandlers/TakeFortStart.java | 4 +- .../handlers/effecthandlers/TalismanSlot.java | 4 +- .../handlers/effecthandlers/TargetCancel.java | 4 +- .../handlers/effecthandlers/TargetMe.java | 4 +- .../effecthandlers/TargetMeProbability.java | 4 +- .../handlers/effecthandlers/Teleport.java | 4 +- .../effecthandlers/TeleportToNpc.java | 4 +- .../effecthandlers/TeleportToPlayer.java | 4 +- .../effecthandlers/TeleportToSummon.java | 4 +- .../effecthandlers/TeleportToTarget.java | 4 +- .../TransferDamageToPlayer.java | 4 +- .../TransferDamageToSummon.java | 4 +- .../handlers/effecthandlers/TransferHate.java | 4 +- .../effecthandlers/Transformation.java | 4 +- .../handlers/effecthandlers/TrapDetect.java | 4 +- .../handlers/effecthandlers/TrapRemove.java | 4 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 4 +- .../effecthandlers/TriggerSkillByDamage.java | 4 +- .../TriggerSkillByDeathBlow.java | 4 +- .../effecthandlers/TriggerSkillByKill.java | 4 +- .../TriggerSkillByMagicType.java | 4 +- .../effecthandlers/TriggerSkillBySkill.java | 4 +- .../TriggerSkillBySkillAttack.java | 4 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 4 +- .../effecthandlers/UnsummonAgathion.java | 4 +- .../effecthandlers/UnsummonServitors.java | 4 +- .../handlers/effecthandlers/Untargetable.java | 4 +- .../effecthandlers/VampiricAttack.java | 4 +- .../effecthandlers/VampiricDefence.java | 4 +- .../effecthandlers/VitalityExpRate.java | 4 +- .../effecthandlers/VitalityPointUp.java | 4 +- .../effecthandlers/VitalityPointsRate.java | 4 +- .../handlers/effecthandlers/WeightLimit.java | 4 +- .../effecthandlers/WeightPenalty.java | 4 +- .../effecthandlers/WorldChatPoints.java | 4 +- .../BuildAdvanceBaseSkillCondition.java | 4 +- .../BuildCampSkillCondition.java | 4 +- ...CanAddMaxEntranceInzoneSkillCondition.java | 4 +- .../CanBookmarkAddSlotSkillCondition.java | 4 +- ...CanChangeVitalItemCountSkillCondition.java | 4 +- .../CanEnchantAttributeSkillCondition.java | 4 +- .../CanMountForEventSkillCondition.java | 4 +- .../CanRefuelAirshipSkillCondition.java | 4 +- .../CanRestoreVitalPointSkillCondition.java | 4 +- .../CanSummonCubicSkillCondition.java | 4 +- .../CanSummonMultiSkillCondition.java | 4 +- .../CanSummonPetSkillCondition.java | 4 +- .../CanSummonSiegeGolemSkillCondition.java | 4 +- .../CanSummonSkillCondition.java | 4 +- .../CanTransformInDominionSkillCondition.java | 4 +- .../CanTransformSkillCondition.java | 4 +- .../CanUntransformSkillCondition.java | 4 +- .../CanUseInBattlefieldSkillCondition.java | 4 +- .../CanUseInDragonLairSkillCondition.java | 4 +- .../CanUseSwoopCannonSkillCondition.java | 4 +- ...nUseVitalityConsumeItemSkillCondition.java | 4 +- .../CannotUseInTransformSkillCondition.java | 4 +- .../CheckLevelSkillCondition.java | 4 +- .../CheckSexSkillCondition.java | 4 +- .../ConsumeBodySkillCondition.java | 4 +- .../EnergySavedSkillCondition.java | 4 +- .../EquipArmorSkillCondition.java | 4 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../NotFearedSkillCondition.java | 4 +- .../NotInUnderwaterSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 4 +- .../OpAffectedBySkillSkillCondition.java | 4 +- .../OpAgathionEnergySkillCondition.java | 4 +- .../OpAlignmentSkillCondition.java | 4 +- .../OpBlinkSkillCondition.java | 4 +- .../OpCallPcSkillCondition.java | 4 +- .../OpCanEscapeSkillCondition.java | 4 +- .../OpCanNotUseAirshipSkillCondition.java | 4 +- ...eTargetWithPrivateStoreSkillCondition.java | 4 +- .../OpChangeWeaponSkillCondition.java | 4 +- .../OpCheckAbnormalSkillCondition.java | 4 +- .../OpCheckAccountTypeSkillCondition.java | 4 +- .../OpCheckCastRangeSkillCondition.java | 4 +- .../OpCheckClassListSkillCondition.java | 4 +- .../OpCheckClassSkillCondition.java | 4 +- .../OpCheckCrtEffectSkillCondition.java | 4 +- .../OpCheckFlagSkillCondition.java | 4 +- ...eckOnGoingEventCampaignSkillCondition.java | 4 +- .../OpCheckPcbangPointSkillCondition.java | 4 +- .../OpCheckResidenceSkillCondition.java | 4 +- .../OpCheckSkillListSkillCondition.java | 4 +- .../OpCheckSkillSkillCondition.java | 4 +- .../OpCompanionSkillCondition.java | 4 +- .../OpEnchantRangeSkillCondition.java | 4 +- .../OpEncumberedSkillCondition.java | 4 +- .../OpEnergyMaxSkillCondition.java | 4 +- .../OpEquipItemSkillCondition.java | 4 +- .../OpExistNpcSkillCondition.java | 4 +- .../OpFishingCastSkillCondition.java | 4 +- .../OpFishingPumpingSkillCondition.java | 4 +- .../OpFishingReelingSkillCondition.java | 4 +- .../OpHaveSummonSkillCondition.java | 4 +- .../OpHaveSummonedNpcSkillCondition.java | 4 +- .../OpHomeSkillCondition.java | 4 +- .../OpInSiegeTimeSkillCondition.java | 4 +- .../OpInstantzoneSkillCondition.java | 4 +- .../OpMainjobSkillCondition.java | 4 +- .../OpNeedAgathionSkillCondition.java | 4 +- .../OpNeedSummonOrPetSkillCondition.java | 4 +- .../OpNotCursedSkillCondition.java | 4 +- .../OpNotInPeacezoneSkillCondition.java | 4 +- .../OpNotInstantzoneSkillCondition.java | 4 +- .../OpNotOlympiadSkillCondition.java | 4 +- .../OpNotTerritorySkillCondition.java | 4 +- .../OpPeacezoneSkillCondition.java | 4 +- .../OpPkcountSkillCondition.java | 4 +- .../OpPledgeSkillCondition.java | 4 +- .../OpRestartPointSkillCondition.java | 4 +- .../OpResurrectionSkillCondition.java | 4 +- .../OpSiegeHammerSkillCondition.java | 4 +- .../OpSkillAcquireSkillCondition.java | 4 +- .../OpSkillSkillCondition.java | 4 +- .../OpSocialClassSkillCondition.java | 4 +- .../OpSoulMaxSkillCondition.java | 4 +- .../OpSubjobSkillCondition.java | 4 +- .../OpSweeperSkillCondition.java | 4 +- .../OpTargetAllItemTypeSkillCondition.java | 4 +- .../OpTargetArmorTypeSkillCondition.java | 4 +- .../OpTargetDoorSkillCondition.java | 4 +- ...OpTargetMyPledgeAcademySkillCondition.java | 4 +- .../OpTargetNpcSkillCondition.java | 4 +- .../OpTargetPcSkillCondition.java | 4 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../OpTerritorySkillCondition.java | 4 +- .../OpUnlockSkillCondition.java | 4 +- .../OpUseFirecrackerSkillCondition.java | 4 +- .../OpUsePraseedSkillCondition.java | 4 +- .../OpWyvernSkillCondition.java | 4 +- .../PossessHolythingSkillCondition.java | 4 +- .../RemainCpPerSkillCondition.java | 4 +- .../RemainHpPerSkillCondition.java | 4 +- .../RemainMpPerSkillCondition.java | 4 +- .../SoulSavedSkillCondition.java | 4 +- .../TargetItemCrystalTypeSkillCondition.java | 4 +- .../TargetMyMenteeSkillCondition.java | 4 +- .../TargetMyPartySkillCondition.java | 4 +- .../TargetMyPledgeSkillCondition.java | 4 +- .../TargetRaceSkillCondition.java | 4 +- .../gameserver/data/xml/impl/ActionData.java | 4 +- .../gameserver/data/xml/impl/AdminData.java | 8 +- .../data/xml/impl/AppearanceItemData.java | 6 +- .../data/xml/impl/AttendanceRewardData.java | 4 +- .../data/xml/impl/BeautyShopData.java | 10 +- .../data/xml/impl/ClanHallData.java | 4 +- .../data/xml/impl/CombinationItemsData.java | 4 +- .../gameserver/data/xml/impl/CubicData.java | 6 +- .../data/xml/impl/DailyMissionData.java | 8 +- .../gameserver/data/xml/impl/DoorData.java | 14 +- .../data/xml/impl/EnchantItemData.java | 8 +- .../data/xml/impl/EnchantSkillGroupsData.java | 6 +- .../data/xml/impl/EventEngineData.java | 12 +- .../data/xml/impl/ExtendDropData.java | 26 +- .../data/xml/impl/FakePlayerData.java | 4 +- .../gameserver/data/xml/impl/FenceData.java | 4 +- .../gameserver/data/xml/impl/HennaData.java | 4 +- .../data/xml/impl/InitialEquipmentData.java | 4 +- .../data/xml/impl/LuckyGameData.java | 10 +- .../data/xml/impl/MultisellData.java | 4 +- .../gameserver/data/xml/impl/NpcData.java | 8 +- .../xml/impl/NpcNameLocalisationData.java | 4 +- .../gameserver/data/xml/impl/OptionData.java | 4 +- .../data/xml/impl/PetDataTable.java | 4 +- .../data/xml/impl/PlayerTemplateData.java | 4 +- .../data/xml/impl/PrimeShopData.java | 4 +- .../gameserver/data/xml/impl/RecipeData.java | 4 +- .../data/xml/impl/ResidenceFunctionsData.java | 6 +- .../xml/impl/SendMessageLocalisationData.java | 4 +- .../gameserver/data/xml/impl/ShuttleData.java | 8 +- .../data/xml/impl/SiegeScheduleData.java | 6 +- .../gameserver/data/xml/impl/SkillData.java | 86 +- .../data/xml/impl/SkillTreesData.java | 4 +- .../gameserver/data/xml/impl/SpawnsData.java | 16 +- .../data/xml/impl/StaticObjectData.java | 8 +- .../data/xml/impl/TeleportersData.java | 4 +- .../data/xml/impl/TransformData.java | 6 +- .../gameserver/engines/DocumentBase.java | 8 +- .../engines/DocumentBaseGeneral.java | 4 +- .../engines/items/DocumentItem.java | 8 +- .../engines/items/ItemDataHolder.java | 4 +- .../gameserver/handler/ConditionHandler.java | 8 +- .../gameserver/handler/EffectHandler.java | 8 +- .../handler/SkillConditionHandler.java | 8 +- .../instancemanager/AirShipManager.java | 18 +- .../instancemanager/BoatManager.java | 4 +- .../instancemanager/CastleManorManager.java | 6 +- .../CeremonyOfChaosManager.java | 6 +- .../instancemanager/DBSpawnManager.java | 20 +- .../FakePlayerChatManager.java | 4 +- .../instancemanager/GrandBossManager.java | 16 +- .../instancemanager/InstanceManager.java | 20 +- .../gameserver/model/AccessLevel.java | 2 +- .../gameserver/model/ActionDataHolder.java | 2 +- .../model/AdminCommandAccessRight.java | 2 +- .../model/DailyMissionDataHolder.java | 8 +- .../l2jmobius/gameserver/model/Location.java | 2 +- .../gameserver/model/PetLevelData.java | 2 +- .../gameserver/model/RecipeList.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../gameserver/model/SiegeScheduleDate.java | 2 +- .../gameserver/model/SkillLearn.java | 2 +- .../l2jmobius/gameserver/model/StatSet.java | 968 ++++++++++++++++++ .../l2jmobius/gameserver/model/StatsSet.java | 968 ------------------ .../l2jmobius/gameserver/model/actor/Npc.java | 10 +- .../actor/templates/CreatureTemplate.java | 6 +- .../model/actor/templates/CubicTemplate.java | 4 +- .../model/actor/templates/DoorTemplate.java | 4 +- .../model/actor/templates/NpcTemplate.java | 14 +- .../model/actor/templates/PlayerTemplate.java | 4 +- .../model/actor/transform/Transform.java | 4 +- .../actor/transform/TransformLevelData.java | 4 +- .../actor/transform/TransformTemplate.java | 4 +- .../model/alchemy/AlchemyCraftData.java | 4 +- .../model/beautyshop/BeautyItem.java | 6 +- .../ceremonyofchaos/CeremonyOfChaosEvent.java | 8 +- .../gameserver/model/cubic/CubicSkill.java | 4 +- .../gameserver/model/entity/ClanHall.java | 4 +- .../gameserver/model/entity/Hero.java | 70 +- .../eventengine/AbstractEventManager.java | 10 +- .../model/eventengine/EventScheduler.java | 4 +- .../model/events/AbstractScript.java | 6 +- .../model/events/TimerExecutor.java | 8 +- .../model/events/timers/TimerHolder.java | 8 +- .../model/holders/AppearanceHolder.java | 4 +- .../model/holders/AttachSkillHolder.java | 4 +- .../model/holders/EnchantSkillHolder.java | 4 +- .../model/holders/ExtendDropDataHolder.java | 4 +- .../model/holders/FakePlayerHolder.java | 4 +- .../gameserver/model/holders/ItemHolder.java | 4 +- .../model/holders/ItemPointHolder.java | 4 +- .../model/holders/LuckyGameDataHolder.java | 4 +- .../model/holders/MinionHolder.java | 4 +- .../model/holders/MultisellListHolder.java | 4 +- .../model/instancezone/Instance.java | 8 +- .../model/instancezone/InstanceTemplate.java | 10 +- .../instancezone/conditions/Condition.java | 8 +- .../conditions/ConditionCommandChannel.java | 4 +- .../ConditionCommandChannelLeader.java | 4 +- .../conditions/ConditionDistance.java | 4 +- .../conditions/ConditionGroupMax.java | 4 +- .../conditions/ConditionGroupMin.java | 4 +- .../conditions/ConditionHasResidence.java | 6 +- .../conditions/ConditionItem.java | 4 +- .../conditions/ConditionLevel.java | 4 +- .../conditions/ConditionNoParty.java | 4 +- .../conditions/ConditionParty.java | 4 +- .../conditions/ConditionPartyLeader.java | 4 +- .../conditions/ConditionQuest.java | 4 +- .../conditions/ConditionReenter.java | 4 +- .../itemauction/AuctionDateGenerator.java | 4 +- .../model/itemauction/AuctionItem.java | 6 +- .../itemauction/ItemAuctionInstance.java | 6 +- .../gameserver/model/items/Armor.java | 8 +- .../gameserver/model/items/EtcItem.java | 8 +- .../gameserver/model/items/Henna.java | 4 +- .../gameserver/model/items/Item.java | 8 +- .../model/items/PlayerItemTemplate.java | 4 +- .../gameserver/model/items/Weapon.java | 8 +- .../items/appearance/AppearanceStone.java | 4 +- .../items/combination/CombinationItem.java | 4 +- .../items/enchant/AbstractEnchantItem.java | 4 +- .../model/items/enchant/EnchantScroll.java | 4 +- .../items/enchant/EnchantSupportItem.java | 4 +- .../gameserver/model/olympiad/Olympiad.java | 38 +- .../model/olympiad/Participant.java | 6 +- .../model/primeshop/PrimeShopGroup.java | 4 +- .../residences/ResidenceFunctionTemplate.java | 4 +- .../model/shuttle/ShuttleDataHolder.java | 4 +- .../gameserver/model/skills/Skill.java | 6 +- .../model/spawns/NpcSpawnTemplate.java | 16 +- .../gameserver/model/spawns/SpawnGroup.java | 12 +- .../model/spawns/SpawnTemplate.java | 12 +- .../model/teleporter/TeleportHolder.java | 4 +- .../model/teleporter/TeleportLocation.java | 4 +- .../model/variables/AbstractVariables.java | 18 +- .../network/serverpackets/ExHeroList.java | 6 +- .../gameserver/util/BypassParser.java | 4 +- .../scripts/ai/bosses/Antharas/Antharas.java | 6 +- .../data/scripts/ai/bosses/Baium/Baium.java | 6 +- .../data/scripts/ai/bosses/Core/Core.java | 8 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 8 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 8 +- .../data/scripts/ai/bosses/Zaken/Zaken.java | 8 +- .../CastleTeleporter/CastleTeleporter.java | 6 +- .../ai/others/Servitors/TreeOfLife.java | 4 +- .../admincommandhandlers/AdminGrandBoss.java | 4 +- .../admincommandhandlers/AdminOlympiad.java | 14 +- .../conditions/CategoryTypeCondition.java | 4 +- .../conditions/NpcLevelCondition.java | 4 +- .../conditions/PlayerLevelCondition.java | 4 +- .../effecthandlers/AbnormalShield.java | 4 +- .../effecthandlers/AbnormalTimeChange.java | 4 +- .../handlers/effecthandlers/AbsorbDamage.java | 4 +- .../AbstractConditionalHpEffect.java | 4 +- .../effecthandlers/AbstractStatAddEffect.java | 4 +- .../effecthandlers/AbstractStatEffect.java | 6 +- .../AbstractStatPercentEffect.java | 4 +- .../handlers/effecthandlers/Accuracy.java | 4 +- .../handlers/effecthandlers/AddHate.java | 4 +- .../effecthandlers/AddSkillBySkill.java | 4 +- .../AddTeleportBookmarkSlot.java | 4 +- .../effecthandlers/AdditionalPotionCp.java | 4 +- .../effecthandlers/AdditionalPotionHp.java | 4 +- .../effecthandlers/AdditionalPotionMp.java | 4 +- .../handlers/effecthandlers/AgathionSlot.java | 4 +- .../handlers/effecthandlers/AreaDamage.java | 4 +- .../handlers/effecthandlers/ArtifactSlot.java | 4 +- .../effecthandlers/AttackAttribute.java | 4 +- .../effecthandlers/AttackAttributeAdd.java | 4 +- .../handlers/effecthandlers/AttackBehind.java | 4 +- .../handlers/effecthandlers/AttackTrait.java | 4 +- .../handlers/effecthandlers/Backstab.java | 4 +- .../handlers/effecthandlers/Betray.java | 4 +- .../handlers/effecthandlers/Blink.java | 4 +- .../handlers/effecthandlers/BlinkSwap.java | 4 +- .../effecthandlers/BlockAbnormalSlot.java | 4 +- .../handlers/effecthandlers/BlockAction.java | 4 +- .../handlers/effecthandlers/BlockActions.java | 4 +- .../handlers/effecthandlers/BlockChat.java | 4 +- .../handlers/effecthandlers/BlockControl.java | 4 +- .../handlers/effecthandlers/BlockEscape.java | 4 +- .../handlers/effecthandlers/BlockMove.java | 4 +- .../handlers/effecthandlers/BlockParty.java | 4 +- .../effecthandlers/BlockResurrection.java | 4 +- .../handlers/effecthandlers/BlockSkill.java | 4 +- .../handlers/effecthandlers/BlockTarget.java | 4 +- .../handlers/effecthandlers/Bluff.java | 4 +- .../effecthandlers/BonusDropAmount.java | 4 +- .../effecthandlers/BonusDropRate.java | 4 +- .../effecthandlers/BonusSpoilRate.java | 4 +- .../handlers/effecthandlers/Breath.java | 4 +- .../handlers/effecthandlers/BuffBlock.java | 4 +- .../effecthandlers/CallLearnedSkill.java | 4 +- .../handlers/effecthandlers/CallParty.java | 4 +- .../handlers/effecthandlers/CallPc.java | 4 +- .../effecthandlers/CallRandomSkill.java | 4 +- .../handlers/effecthandlers/CallSkill.java | 4 +- .../effecthandlers/CallSkillOnActionTime.java | 4 +- .../effecthandlers/CallTargetParty.java | 4 +- .../effecthandlers/ChameleonRest.java | 4 +- .../handlers/effecthandlers/ChangeBody.java | 6 +- .../handlers/effecthandlers/ChangeFace.java | 4 +- .../effecthandlers/ChangeFishingMastery.java | 4 +- .../effecthandlers/ChangeHairColor.java | 4 +- .../effecthandlers/ChangeHairStyle.java | 4 +- .../handlers/effecthandlers/CheapShot.java | 4 +- .../handlers/effecthandlers/ClassChange.java | 4 +- .../handlers/effecthandlers/Compelling.java | 4 +- .../handlers/effecthandlers/Confuse.java | 4 +- .../handlers/effecthandlers/ConsumeBody.java | 4 +- .../handlers/effecthandlers/ConvertItem.java | 4 +- .../effecthandlers/CounterPhysicalSkill.java | 4 +- .../scripts/handlers/effecthandlers/Cp.java | 4 +- .../handlers/effecthandlers/CpHeal.java | 4 +- .../effecthandlers/CpHealOverTime.java | 4 +- .../effecthandlers/CpHealPercent.java | 4 +- .../handlers/effecthandlers/CpRegen.java | 4 +- .../effecthandlers/CriticalDamage.java | 4 +- .../CriticalDamagePosition.java | 4 +- .../handlers/effecthandlers/CriticalRate.java | 4 +- .../CriticalRatePositionBonus.java | 4 +- .../effecthandlers/CrystalGradeModify.java | 4 +- .../handlers/effecthandlers/CubicMastery.java | 4 +- .../handlers/effecthandlers/DamOverTime.java | 4 +- .../effecthandlers/DamOverTimePercent.java | 4 +- .../handlers/effecthandlers/DamageBlock.java | 4 +- .../effecthandlers/DamageByAttack.java | 4 +- .../handlers/effecthandlers/DamageShield.java | 4 +- .../effecthandlers/DamageShieldResist.java | 4 +- .../handlers/effecthandlers/DeathLink.java | 4 +- .../handlers/effecthandlers/DebuffBlock.java | 4 +- .../effecthandlers/DefenceAttribute.java | 4 +- .../effecthandlers/DefenceCriticalDamage.java | 4 +- .../effecthandlers/DefenceCriticalRate.java | 4 +- .../DefenceMagicCriticalDamage.java | 4 +- .../DefenceMagicCriticalRate.java | 4 +- .../handlers/effecthandlers/DefenceTrait.java | 4 +- .../handlers/effecthandlers/DeleteHate.java | 4 +- .../effecthandlers/DeleteHateOfMe.java | 4 +- .../effecthandlers/DeleteTopAgro.java | 4 +- .../effecthandlers/DetectHiddenObjects.java | 4 +- .../handlers/effecthandlers/Detection.java | 4 +- .../effecthandlers/DisableTargeting.java | 4 +- .../handlers/effecthandlers/Disarm.java | 4 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 4 +- .../effecthandlers/DispelByCategory.java | 4 +- .../handlers/effecthandlers/DispelBySlot.java | 4 +- .../effecthandlers/DispelBySlotMyself.java | 4 +- .../DispelBySlotProbability.java | 4 +- .../handlers/effecthandlers/DoubleCast.java | 4 +- .../handlers/effecthandlers/DuelistFury.java | 4 +- .../effecthandlers/ElementalSpiritAttack.java | 4 +- .../ElementalSpiritDefense.java | 4 +- .../handlers/effecthandlers/EnableCloak.java | 4 +- .../handlers/effecthandlers/EnergyAttack.java | 4 +- .../effecthandlers/EnlargeAbnormalSlot.java | 4 +- .../handlers/effecthandlers/EnlargeSlot.java | 4 +- .../handlers/effecthandlers/Escape.java | 4 +- .../handlers/effecthandlers/ExpModify.java | 4 +- .../handlers/effecthandlers/Faceoff.java | 4 +- .../handlers/effecthandlers/FakeDeath.java | 4 +- .../handlers/effecthandlers/FatalBlow.java | 4 +- .../effecthandlers/FatalBlowRate.java | 4 +- .../scripts/handlers/effecthandlers/Fear.java | 4 +- .../scripts/handlers/effecthandlers/Feed.java | 4 +- .../effecthandlers/FishingExpSpBonus.java | 4 +- .../scripts/handlers/effecthandlers/Flag.java | 4 +- .../handlers/effecthandlers/FlipBlock.java | 4 +- .../handlers/effecthandlers/FlyAway.java | 4 +- .../handlers/effecthandlers/FocusEnergy.java | 4 +- .../effecthandlers/FocusMaxMomentum.java | 4 +- .../effecthandlers/FocusMomentum.java | 4 +- .../handlers/effecthandlers/FocusSouls.java | 4 +- .../handlers/effecthandlers/GetAgro.java | 4 +- .../effecthandlers/GetDamageLimit.java | 4 +- .../handlers/effecthandlers/GetMomentum.java | 4 +- .../effecthandlers/GiveClanReputation.java | 4 +- .../handlers/effecthandlers/GiveExpAndSp.java | 4 +- .../handlers/effecthandlers/GiveFame.java | 4 +- .../effecthandlers/GiveRecommendation.java | 4 +- .../handlers/effecthandlers/GiveSp.java | 4 +- .../handlers/effecthandlers/GiveXp.java | 4 +- .../scripts/handlers/effecthandlers/Grow.java | 4 +- .../effecthandlers/HairAccessorySet.java | 4 +- .../handlers/effecthandlers/Harvesting.java | 4 +- .../handlers/effecthandlers/HateAttack.java | 4 +- .../effecthandlers/HeadquarterCreate.java | 4 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealEffect.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 4 +- .../handlers/effecthandlers/HealPercent.java | 4 +- .../scripts/handlers/effecthandlers/Hide.java | 4 +- .../handlers/effecthandlers/HitAtNight.java | 4 +- .../handlers/effecthandlers/HitNumber.java | 4 +- .../scripts/handlers/effecthandlers/Hp.java | 4 +- .../handlers/effecthandlers/HpByLevel.java | 4 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../effecthandlers/HpCpHealCritical.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 4 +- .../handlers/effecthandlers/HpRegen.java | 4 +- .../handlers/effecthandlers/HpToOwner.java | 4 +- .../handlers/effecthandlers/IgnoreDeath.java | 4 +- .../effecthandlers/ImmobilePetBuff.java | 4 +- .../effecthandlers/InstantKillResist.java | 4 +- .../handlers/effecthandlers/JewelSlot.java | 4 +- .../handlers/effecthandlers/KarmaCount.java | 4 +- .../handlers/effecthandlers/KnockBack.java | 4 +- .../handlers/effecthandlers/Lethal.java | 4 +- .../handlers/effecthandlers/LimitCp.java | 4 +- .../handlers/effecthandlers/LimitHp.java | 4 +- .../handlers/effecthandlers/LimitMp.java | 4 +- .../handlers/effecthandlers/Lucky.java | 4 +- .../scripts/handlers/effecthandlers/MAtk.java | 4 +- .../effecthandlers/MagicAccuracy.java | 4 +- .../effecthandlers/MagicCriticalDamage.java | 4 +- .../effecthandlers/MagicCriticalRate.java | 4 +- .../handlers/effecthandlers/MagicMpCost.java | 4 +- .../MagicalAbnormalDispelAttack.java | 4 +- .../effecthandlers/MagicalAbnormalResist.java | 4 +- .../effecthandlers/MagicalAttack.java | 4 +- .../MagicalAttackByAbnormal.java | 4 +- .../MagicalAttackByAbnormalSlot.java | 4 +- .../effecthandlers/MagicalAttackMp.java | 4 +- .../effecthandlers/MagicalAttackRange.java | 4 +- .../effecthandlers/MagicalAttackSpeed.java | 4 +- .../effecthandlers/MagicalDamOverTime.java | 4 +- .../effecthandlers/MagicalDefence.java | 4 +- .../effecthandlers/MagicalEvasion.java | 4 +- .../effecthandlers/MagicalSkillPower.java | 4 +- .../effecthandlers/MagicalSoulAttack.java | 4 +- .../handlers/effecthandlers/ManaCharge.java | 4 +- .../effecthandlers/ManaDamOverTime.java | 4 +- .../handlers/effecthandlers/ManaHeal.java | 4 +- .../effecthandlers/ManaHealByLevel.java | 4 +- .../effecthandlers/ManaHealOverTime.java | 4 +- .../effecthandlers/ManaHealPercent.java | 4 +- .../handlers/effecthandlers/MaxCp.java | 4 +- .../handlers/effecthandlers/MaxHp.java | 4 +- .../handlers/effecthandlers/MaxMp.java | 4 +- .../handlers/effecthandlers/ModifyVital.java | 4 +- .../scripts/handlers/effecthandlers/Mp.java | 4 +- .../effecthandlers/MpConsumePerLevel.java | 4 +- .../handlers/effecthandlers/MpRegen.java | 4 +- .../handlers/effecthandlers/MpShield.java | 4 +- .../effecthandlers/MpVampiricAttack.java | 4 +- .../scripts/handlers/effecthandlers/Mute.java | 4 +- .../effecthandlers/NoblesseBless.java | 4 +- .../handlers/effecthandlers/OpenChest.java | 4 +- .../effecthandlers/OpenCommonRecipeBook.java | 4 +- .../handlers/effecthandlers/OpenDoor.java | 4 +- .../effecthandlers/OpenDwarfRecipeBook.java | 4 +- .../scripts/handlers/effecthandlers/PAtk.java | 4 +- .../handlers/effecthandlers/Passive.java | 4 +- .../PhysicalAbnormalResist.java | 4 +- .../effecthandlers/PhysicalAttack.java | 4 +- .../effecthandlers/PhysicalAttackHpLink.java | 4 +- .../effecthandlers/PhysicalAttackMute.java | 4 +- .../effecthandlers/PhysicalAttackRange.java | 4 +- .../effecthandlers/PhysicalAttackSaveHp.java | 4 +- .../effecthandlers/PhysicalAttackSpeed.java | 4 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../effecthandlers/PhysicalDefence.java | 4 +- .../effecthandlers/PhysicalEvasion.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 4 +- .../PhysicalShieldAngleAll.java | 4 +- .../effecthandlers/PhysicalSkillPower.java | 4 +- .../effecthandlers/PhysicalSoulAttack.java | 4 +- .../handlers/effecthandlers/PkCount.java | 4 +- .../handlers/effecthandlers/Plunder.java | 4 +- .../effecthandlers/PolearmSingleTarget.java | 4 +- .../effecthandlers/ProtectDeathPenalty.java | 4 +- .../effecthandlers/ProtectionBlessing.java | 4 +- .../handlers/effecthandlers/PullBack.java | 4 +- .../PveMagicalSkillDamageBonus.java | 4 +- .../PveMagicalSkillDefenceBonus.java | 4 +- .../PvePhysicalAttackDamageBonus.java | 4 +- .../PvePhysicalAttackDefenceBonus.java | 4 +- .../PvePhysicalSkillDamageBonus.java | 4 +- .../PvePhysicalSkillDefenceBonus.java | 4 +- .../PveRaidMagicalSkillDefenceBonus.java | 4 +- .../PveRaidPhysicalAttackDefenceBonus.java | 4 +- .../PveRaidPhysicalSkillDefenceBonus.java | 4 +- .../PvpMagicalSkillDamageBonus.java | 4 +- .../PvpMagicalSkillDefenceBonus.java | 4 +- .../PvpPhysicalAttackDamageBonus.java | 4 +- .../PvpPhysicalAttackDefenceBonus.java | 4 +- .../PvpPhysicalSkillDamageBonus.java | 4 +- .../PvpPhysicalSkillDefenceBonus.java | 4 +- .../effecthandlers/RandomizeHate.java | 4 +- .../handlers/effecthandlers/RealDamage.java | 4 +- .../handlers/effecthandlers/RearDamage.java | 4 +- .../handlers/effecthandlers/RebalanceHP.java | 4 +- .../effecthandlers/RebalanceHPSummon.java | 4 +- .../RecoverVitalityInPeaceZone.java | 4 +- .../handlers/effecthandlers/ReduceCancel.java | 4 +- .../handlers/effecthandlers/ReduceDamage.java | 4 +- .../effecthandlers/ReduceDropPenalty.java | 4 +- .../handlers/effecthandlers/ReflectMagic.java | 4 +- .../handlers/effecthandlers/ReflectSkill.java | 4 +- .../effecthandlers/RefuelAirship.java | 4 +- .../handlers/effecthandlers/Relax.java | 4 +- .../effecthandlers/ResetInstanceEntry.java | 4 +- .../ResistAbnormalByCategory.java | 4 +- .../effecthandlers/ResistDDMagic.java | 4 +- .../ResistDispelByCategory.java | 4 +- .../handlers/effecthandlers/ResistSkill.java | 4 +- .../handlers/effecthandlers/Restoration.java | 4 +- .../effecthandlers/RestorationRandom.java | 8 +- .../handlers/effecthandlers/Resurrection.java | 4 +- .../effecthandlers/ResurrectionSpecial.java | 4 +- .../handlers/effecthandlers/Reuse.java | 4 +- .../effecthandlers/ReuseSkillById.java | 4 +- .../scripts/handlers/effecthandlers/Root.java | 4 +- .../effecthandlers/SacrificeSummon.java | 4 +- .../effecthandlers/SafeFallHeight.java | 4 +- .../SendSystemMessageToClan.java | 4 +- .../effecthandlers/ServitorShare.java | 4 +- .../handlers/effecthandlers/SetHp.java | 4 +- .../handlers/effecthandlers/SetSkill.java | 4 +- .../effecthandlers/ShieldDefence.java | 4 +- .../effecthandlers/ShieldDefenceRate.java | 4 +- .../handlers/effecthandlers/SilentMove.java | 4 +- .../effecthandlers/SkillCritical.java | 4 +- .../effecthandlers/SkillCriticalDamage.java | 4 +- .../SkillCriticalProbability.java | 4 +- .../handlers/effecthandlers/SkillEvasion.java | 4 +- .../effecthandlers/SkillPowerAdd.java | 4 +- .../handlers/effecthandlers/SkillTurning.java | 4 +- .../effecthandlers/SkillTurningOverTime.java | 4 +- .../handlers/effecthandlers/SoulBlow.java | 4 +- .../handlers/effecthandlers/SoulEating.java | 4 +- .../scripts/handlers/effecthandlers/Sow.java | 4 +- .../handlers/effecthandlers/SpModify.java | 4 +- .../handlers/effecthandlers/Speed.java | 4 +- .../effecthandlers/SphericBarrier.java | 4 +- .../effecthandlers/SpiritExpModify.java | 4 +- .../handlers/effecthandlers/Spoil.java | 4 +- .../StatBonusSkillCritical.java | 4 +- .../effecthandlers/StatBonusSpeed.java | 4 +- .../effecthandlers/StatByMoveType.java | 4 +- .../handlers/effecthandlers/StatUp.java | 4 +- .../effecthandlers/StealAbnormal.java | 4 +- .../handlers/effecthandlers/Summon.java | 4 +- .../effecthandlers/SummonAgathion.java | 4 +- .../handlers/effecthandlers/SummonCubic.java | 4 +- .../effecthandlers/SummonHallucination.java | 4 +- .../handlers/effecthandlers/SummonMulti.java | 4 +- .../handlers/effecthandlers/SummonNpc.java | 4 +- .../handlers/effecthandlers/SummonPet.java | 4 +- .../handlers/effecthandlers/SummonPoints.java | 4 +- .../handlers/effecthandlers/SummonTrap.java | 4 +- .../handlers/effecthandlers/Sweeper.java | 4 +- .../handlers/effecthandlers/Synergy.java | 4 +- .../handlers/effecthandlers/TakeCastle.java | 4 +- .../effecthandlers/TakeCastleStart.java | 4 +- .../handlers/effecthandlers/TakeFort.java | 4 +- .../effecthandlers/TakeFortStart.java | 4 +- .../handlers/effecthandlers/TalismanSlot.java | 4 +- .../handlers/effecthandlers/TargetCancel.java | 4 +- .../handlers/effecthandlers/TargetMe.java | 4 +- .../effecthandlers/TargetMeProbability.java | 4 +- .../handlers/effecthandlers/Teleport.java | 4 +- .../effecthandlers/TeleportToNpc.java | 4 +- .../effecthandlers/TeleportToPlayer.java | 4 +- .../effecthandlers/TeleportToSummon.java | 4 +- .../effecthandlers/TeleportToTarget.java | 4 +- .../TransferDamageToPlayer.java | 4 +- .../TransferDamageToSummon.java | 4 +- .../handlers/effecthandlers/TransferHate.java | 4 +- .../effecthandlers/Transformation.java | 4 +- .../handlers/effecthandlers/TrapDetect.java | 4 +- .../handlers/effecthandlers/TrapRemove.java | 4 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 4 +- .../effecthandlers/TriggerSkillByDamage.java | 4 +- .../TriggerSkillByDeathBlow.java | 4 +- .../effecthandlers/TriggerSkillByKill.java | 4 +- .../TriggerSkillByMagicType.java | 4 +- .../effecthandlers/TriggerSkillBySkill.java | 4 +- .../TriggerSkillBySkillAttack.java | 4 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 4 +- .../effecthandlers/UnsummonAgathion.java | 4 +- .../effecthandlers/UnsummonServitors.java | 4 +- .../handlers/effecthandlers/Untargetable.java | 4 +- .../effecthandlers/VampiricAttack.java | 4 +- .../effecthandlers/VampiricDefence.java | 4 +- .../effecthandlers/VitalityExpRate.java | 4 +- .../effecthandlers/VitalityPointUp.java | 4 +- .../effecthandlers/VitalityPointsRate.java | 4 +- .../handlers/effecthandlers/WeightLimit.java | 4 +- .../effecthandlers/WeightPenalty.java | 4 +- .../effecthandlers/WorldChatPoints.java | 4 +- .../BuildAdvanceBaseSkillCondition.java | 4 +- .../BuildCampSkillCondition.java | 4 +- ...CanAddMaxEntranceInzoneSkillCondition.java | 4 +- .../CanBookmarkAddSlotSkillCondition.java | 4 +- ...CanChangeVitalItemCountSkillCondition.java | 4 +- .../CanEnchantAttributeSkillCondition.java | 4 +- .../CanMountForEventSkillCondition.java | 4 +- .../CanRefuelAirshipSkillCondition.java | 4 +- .../CanRestoreVitalPointSkillCondition.java | 4 +- .../CanSummonCubicSkillCondition.java | 4 +- .../CanSummonMultiSkillCondition.java | 4 +- .../CanSummonPetSkillCondition.java | 4 +- .../CanSummonSiegeGolemSkillCondition.java | 4 +- .../CanSummonSkillCondition.java | 4 +- .../CanTransformInDominionSkillCondition.java | 4 +- .../CanTransformSkillCondition.java | 4 +- .../CanUntransformSkillCondition.java | 4 +- .../CanUseInBattlefieldSkillCondition.java | 4 +- .../CanUseInDragonLairSkillCondition.java | 4 +- .../CanUseSwoopCannonSkillCondition.java | 4 +- ...nUseVitalityConsumeItemSkillCondition.java | 4 +- .../CannotUseInTransformSkillCondition.java | 4 +- .../CheckLevelSkillCondition.java | 4 +- .../CheckSexSkillCondition.java | 4 +- .../ConsumeBodySkillCondition.java | 4 +- .../EnergySavedSkillCondition.java | 4 +- .../EquipArmorSkillCondition.java | 4 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../NotFearedSkillCondition.java | 4 +- .../NotInUnderwaterSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 4 +- .../OpAffectedBySkillSkillCondition.java | 4 +- .../OpAgathionEnergySkillCondition.java | 4 +- .../OpAlignmentSkillCondition.java | 4 +- .../OpBlinkSkillCondition.java | 4 +- .../OpCallPcSkillCondition.java | 4 +- .../OpCanEscapeSkillCondition.java | 4 +- .../OpCanNotUseAirshipSkillCondition.java | 4 +- ...eTargetWithPrivateStoreSkillCondition.java | 4 +- .../OpChangeWeaponSkillCondition.java | 4 +- .../OpCheckAbnormalSkillCondition.java | 4 +- .../OpCheckAccountTypeSkillCondition.java | 4 +- .../OpCheckCastRangeSkillCondition.java | 4 +- .../OpCheckClassListSkillCondition.java | 4 +- .../OpCheckClassSkillCondition.java | 4 +- .../OpCheckCrtEffectSkillCondition.java | 4 +- .../OpCheckFlagSkillCondition.java | 4 +- ...eckOnGoingEventCampaignSkillCondition.java | 4 +- .../OpCheckPcbangPointSkillCondition.java | 4 +- .../OpCheckResidenceSkillCondition.java | 4 +- .../OpCheckSkillListSkillCondition.java | 4 +- .../OpCheckSkillSkillCondition.java | 4 +- .../OpCompanionSkillCondition.java | 4 +- .../OpEnchantRangeSkillCondition.java | 4 +- .../OpEncumberedSkillCondition.java | 4 +- .../OpEnergyMaxSkillCondition.java | 4 +- .../OpEquipItemSkillCondition.java | 4 +- .../OpExistNpcSkillCondition.java | 4 +- .../OpFishingCastSkillCondition.java | 4 +- .../OpFishingPumpingSkillCondition.java | 4 +- .../OpFishingReelingSkillCondition.java | 4 +- .../OpHaveSummonSkillCondition.java | 4 +- .../OpHaveSummonedNpcSkillCondition.java | 4 +- .../OpHomeSkillCondition.java | 4 +- .../OpInSiegeTimeSkillCondition.java | 4 +- .../OpInstantzoneSkillCondition.java | 4 +- .../OpMainjobSkillCondition.java | 4 +- .../OpNeedAgathionSkillCondition.java | 4 +- .../OpNeedSummonOrPetSkillCondition.java | 4 +- .../OpNotCursedSkillCondition.java | 4 +- .../OpNotInPeacezoneSkillCondition.java | 4 +- .../OpNotInstantzoneSkillCondition.java | 4 +- .../OpNotOlympiadSkillCondition.java | 4 +- .../OpNotTerritorySkillCondition.java | 4 +- .../OpPeacezoneSkillCondition.java | 4 +- .../OpPkcountSkillCondition.java | 4 +- .../OpPledgeSkillCondition.java | 4 +- .../OpRestartPointSkillCondition.java | 4 +- .../OpResurrectionSkillCondition.java | 4 +- .../OpSiegeHammerSkillCondition.java | 4 +- .../OpSkillAcquireSkillCondition.java | 4 +- .../OpSkillSkillCondition.java | 4 +- .../OpSocialClassSkillCondition.java | 4 +- .../OpSoulMaxSkillCondition.java | 4 +- .../OpSubjobSkillCondition.java | 4 +- .../OpSweeperSkillCondition.java | 4 +- .../OpTargetAllItemTypeSkillCondition.java | 4 +- .../OpTargetArmorTypeSkillCondition.java | 4 +- .../OpTargetDoorSkillCondition.java | 4 +- ...OpTargetMyPledgeAcademySkillCondition.java | 4 +- .../OpTargetNpcSkillCondition.java | 4 +- .../OpTargetPcSkillCondition.java | 4 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../OpTerritorySkillCondition.java | 4 +- .../OpUnlockSkillCondition.java | 4 +- .../OpUseFirecrackerSkillCondition.java | 4 +- .../OpUsePraseedSkillCondition.java | 4 +- .../OpWyvernSkillCondition.java | 4 +- .../PossessHolythingSkillCondition.java | 4 +- .../RemainCpPerSkillCondition.java | 4 +- .../RemainHpPerSkillCondition.java | 4 +- .../RemainMpPerSkillCondition.java | 4 +- .../SoulSavedSkillCondition.java | 4 +- .../TargetItemCrystalTypeSkillCondition.java | 4 +- .../TargetMyMenteeSkillCondition.java | 4 +- .../TargetMyPartySkillCondition.java | 4 +- .../TargetMyPledgeSkillCondition.java | 4 +- .../TargetRaceSkillCondition.java | 4 +- .../gameserver/data/xml/impl/ActionData.java | 4 +- .../gameserver/data/xml/impl/AdminData.java | 8 +- .../data/xml/impl/AppearanceItemData.java | 6 +- .../data/xml/impl/AttendanceRewardData.java | 4 +- .../data/xml/impl/BeautyShopData.java | 10 +- .../data/xml/impl/ClanHallData.java | 4 +- .../data/xml/impl/CombinationItemsData.java | 4 +- .../gameserver/data/xml/impl/CubicData.java | 6 +- .../data/xml/impl/DailyMissionData.java | 8 +- .../gameserver/data/xml/impl/DoorData.java | 14 +- .../data/xml/impl/EnchantItemData.java | 8 +- .../data/xml/impl/EnchantSkillGroupsData.java | 6 +- .../data/xml/impl/EventEngineData.java | 12 +- .../data/xml/impl/ExtendDropData.java | 26 +- .../data/xml/impl/FakePlayerData.java | 4 +- .../gameserver/data/xml/impl/FenceData.java | 4 +- .../gameserver/data/xml/impl/HennaData.java | 4 +- .../data/xml/impl/InitialEquipmentData.java | 4 +- .../data/xml/impl/LuckyGameData.java | 10 +- .../data/xml/impl/MultisellData.java | 4 +- .../gameserver/data/xml/impl/NpcData.java | 8 +- .../xml/impl/NpcNameLocalisationData.java | 4 +- .../gameserver/data/xml/impl/OptionData.java | 4 +- .../data/xml/impl/PetDataTable.java | 4 +- .../data/xml/impl/PlayerTemplateData.java | 4 +- .../data/xml/impl/PrimeShopData.java | 4 +- .../gameserver/data/xml/impl/RecipeData.java | 4 +- .../data/xml/impl/ResidenceFunctionsData.java | 6 +- .../xml/impl/SendMessageLocalisationData.java | 4 +- .../gameserver/data/xml/impl/ShuttleData.java | 8 +- .../data/xml/impl/SiegeScheduleData.java | 6 +- .../gameserver/data/xml/impl/SkillData.java | 86 +- .../data/xml/impl/SkillTreesData.java | 4 +- .../gameserver/data/xml/impl/SpawnsData.java | 16 +- .../data/xml/impl/StaticObjectData.java | 8 +- .../data/xml/impl/TeleportersData.java | 4 +- .../data/xml/impl/TransformData.java | 6 +- .../gameserver/engines/DocumentBase.java | 8 +- .../engines/DocumentBaseGeneral.java | 4 +- .../engines/items/DocumentItem.java | 8 +- .../engines/items/ItemDataHolder.java | 4 +- .../gameserver/handler/ConditionHandler.java | 8 +- .../gameserver/handler/EffectHandler.java | 8 +- .../handler/SkillConditionHandler.java | 8 +- .../instancemanager/AirShipManager.java | 18 +- .../instancemanager/BoatManager.java | 4 +- .../instancemanager/CastleManorManager.java | 6 +- .../CeremonyOfChaosManager.java | 6 +- .../instancemanager/DBSpawnManager.java | 20 +- .../FakePlayerChatManager.java | 4 +- .../instancemanager/GrandBossManager.java | 16 +- .../instancemanager/InstanceManager.java | 20 +- .../gameserver/model/AccessLevel.java | 2 +- .../gameserver/model/ActionDataHolder.java | 2 +- .../model/AdminCommandAccessRight.java | 2 +- .../model/DailyMissionDataHolder.java | 8 +- .../l2jmobius/gameserver/model/Location.java | 2 +- .../gameserver/model/PetLevelData.java | 2 +- .../gameserver/model/RecipeList.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../gameserver/model/SiegeScheduleDate.java | 2 +- .../gameserver/model/SkillLearn.java | 2 +- .../l2jmobius/gameserver/model/StatSet.java | 968 ++++++++++++++++++ .../l2jmobius/gameserver/model/StatsSet.java | 968 ------------------ .../l2jmobius/gameserver/model/actor/Npc.java | 10 +- .../actor/templates/CreatureTemplate.java | 6 +- .../model/actor/templates/CubicTemplate.java | 4 +- .../model/actor/templates/DoorTemplate.java | 4 +- .../model/actor/templates/NpcTemplate.java | 14 +- .../model/actor/templates/PlayerTemplate.java | 4 +- .../model/actor/transform/Transform.java | 4 +- .../actor/transform/TransformLevelData.java | 4 +- .../actor/transform/TransformTemplate.java | 4 +- .../model/alchemy/AlchemyCraftData.java | 4 +- .../model/beautyshop/BeautyItem.java | 6 +- .../ceremonyofchaos/CeremonyOfChaosEvent.java | 8 +- .../gameserver/model/cubic/CubicSkill.java | 4 +- .../gameserver/model/entity/ClanHall.java | 4 +- .../gameserver/model/entity/Hero.java | 70 +- .../eventengine/AbstractEventManager.java | 10 +- .../model/eventengine/EventScheduler.java | 4 +- .../model/events/AbstractScript.java | 6 +- .../model/events/TimerExecutor.java | 8 +- .../model/events/timers/TimerHolder.java | 8 +- .../model/holders/AppearanceHolder.java | 4 +- .../model/holders/AttachSkillHolder.java | 4 +- .../model/holders/EnchantSkillHolder.java | 4 +- .../model/holders/ExtendDropDataHolder.java | 4 +- .../model/holders/FakePlayerHolder.java | 4 +- .../gameserver/model/holders/ItemHolder.java | 4 +- .../model/holders/ItemPointHolder.java | 4 +- .../model/holders/LuckyGameDataHolder.java | 4 +- .../model/holders/MinionHolder.java | 4 +- .../model/holders/MultisellListHolder.java | 4 +- .../model/instancezone/Instance.java | 8 +- .../model/instancezone/InstanceTemplate.java | 10 +- .../instancezone/conditions/Condition.java | 8 +- .../conditions/ConditionCommandChannel.java | 4 +- .../ConditionCommandChannelLeader.java | 4 +- .../conditions/ConditionDistance.java | 4 +- .../conditions/ConditionGroupMax.java | 4 +- .../conditions/ConditionGroupMin.java | 4 +- .../conditions/ConditionHasResidence.java | 6 +- .../conditions/ConditionItem.java | 4 +- .../conditions/ConditionLevel.java | 4 +- .../conditions/ConditionNoParty.java | 4 +- .../conditions/ConditionParty.java | 4 +- .../conditions/ConditionPartyLeader.java | 4 +- .../conditions/ConditionQuest.java | 4 +- .../conditions/ConditionReenter.java | 4 +- .../itemauction/AuctionDateGenerator.java | 4 +- .../model/itemauction/AuctionItem.java | 6 +- .../itemauction/ItemAuctionInstance.java | 6 +- .../gameserver/model/items/Armor.java | 8 +- .../gameserver/model/items/EtcItem.java | 8 +- .../gameserver/model/items/Henna.java | 4 +- .../gameserver/model/items/Item.java | 8 +- .../model/items/PlayerItemTemplate.java | 4 +- .../gameserver/model/items/Weapon.java | 8 +- .../items/appearance/AppearanceStone.java | 4 +- .../items/combination/CombinationItem.java | 4 +- .../items/enchant/AbstractEnchantItem.java | 4 +- .../model/items/enchant/EnchantScroll.java | 4 +- .../items/enchant/EnchantSupportItem.java | 4 +- .../gameserver/model/olympiad/Olympiad.java | 38 +- .../model/olympiad/Participant.java | 6 +- .../model/primeshop/PrimeShopGroup.java | 4 +- .../residences/ResidenceFunctionTemplate.java | 4 +- .../model/shuttle/ShuttleDataHolder.java | 4 +- .../gameserver/model/skills/Skill.java | 6 +- .../model/spawns/NpcSpawnTemplate.java | 16 +- .../gameserver/model/spawns/SpawnGroup.java | 12 +- .../model/spawns/SpawnTemplate.java | 12 +- .../model/teleporter/TeleportHolder.java | 4 +- .../model/teleporter/TeleportLocation.java | 4 +- .../model/variables/AbstractVariables.java | 18 +- .../network/serverpackets/ExHeroList.java | 6 +- .../gameserver/util/BypassParser.java | 4 +- .../scripts/ai/bosses/Antharas/Antharas.java | 6 +- .../data/scripts/ai/bosses/Baium/Baium.java | 6 +- .../data/scripts/ai/bosses/Core/Core.java | 8 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 8 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 8 +- .../data/scripts/ai/bosses/Zaken/Zaken.java | 8 +- .../CastleTeleporter/CastleTeleporter.java | 6 +- .../ai/others/Servitors/TreeOfLife.java | 4 +- .../admincommandhandlers/AdminGrandBoss.java | 4 +- .../admincommandhandlers/AdminOlympiad.java | 14 +- .../conditions/CategoryTypeCondition.java | 4 +- .../conditions/NpcLevelCondition.java | 4 +- .../conditions/PlayerLevelCondition.java | 4 +- .../effecthandlers/AbnormalShield.java | 4 +- .../effecthandlers/AbnormalTimeChange.java | 4 +- .../handlers/effecthandlers/AbsorbDamage.java | 4 +- .../AbstractConditionalHpEffect.java | 4 +- .../effecthandlers/AbstractStatAddEffect.java | 4 +- .../effecthandlers/AbstractStatEffect.java | 6 +- .../AbstractStatPercentEffect.java | 4 +- .../handlers/effecthandlers/Accuracy.java | 4 +- .../handlers/effecthandlers/AddHate.java | 4 +- .../effecthandlers/AddSkillBySkill.java | 4 +- .../AddTeleportBookmarkSlot.java | 4 +- .../effecthandlers/AdditionalPotionCp.java | 4 +- .../effecthandlers/AdditionalPotionHp.java | 4 +- .../effecthandlers/AdditionalPotionMp.java | 4 +- .../handlers/effecthandlers/AgathionSlot.java | 4 +- .../handlers/effecthandlers/AreaDamage.java | 4 +- .../handlers/effecthandlers/ArtifactSlot.java | 4 +- .../effecthandlers/AttackAttribute.java | 4 +- .../effecthandlers/AttackAttributeAdd.java | 4 +- .../handlers/effecthandlers/AttackBehind.java | 4 +- .../handlers/effecthandlers/AttackTrait.java | 4 +- .../handlers/effecthandlers/Backstab.java | 4 +- .../handlers/effecthandlers/Betray.java | 4 +- .../handlers/effecthandlers/Blink.java | 4 +- .../handlers/effecthandlers/BlinkSwap.java | 4 +- .../effecthandlers/BlockAbnormalSlot.java | 4 +- .../handlers/effecthandlers/BlockAction.java | 4 +- .../handlers/effecthandlers/BlockActions.java | 4 +- .../handlers/effecthandlers/BlockChat.java | 4 +- .../handlers/effecthandlers/BlockControl.java | 4 +- .../handlers/effecthandlers/BlockEscape.java | 4 +- .../handlers/effecthandlers/BlockMove.java | 4 +- .../handlers/effecthandlers/BlockParty.java | 4 +- .../effecthandlers/BlockResurrection.java | 4 +- .../handlers/effecthandlers/BlockSkill.java | 4 +- .../handlers/effecthandlers/BlockTarget.java | 4 +- .../handlers/effecthandlers/Bluff.java | 4 +- .../effecthandlers/BonusDropAmount.java | 4 +- .../effecthandlers/BonusDropRate.java | 4 +- .../effecthandlers/BonusSpoilRate.java | 4 +- .../handlers/effecthandlers/Breath.java | 4 +- .../handlers/effecthandlers/BuffBlock.java | 4 +- .../effecthandlers/CallLearnedSkill.java | 4 +- .../handlers/effecthandlers/CallParty.java | 4 +- .../handlers/effecthandlers/CallPc.java | 4 +- .../effecthandlers/CallRandomSkill.java | 4 +- .../handlers/effecthandlers/CallSkill.java | 4 +- .../effecthandlers/CallSkillOnActionTime.java | 4 +- .../effecthandlers/CallTargetParty.java | 4 +- .../effecthandlers/ChameleonRest.java | 4 +- .../handlers/effecthandlers/ChangeBody.java | 6 +- .../handlers/effecthandlers/ChangeFace.java | 4 +- .../effecthandlers/ChangeFishingMastery.java | 4 +- .../effecthandlers/ChangeHairColor.java | 4 +- .../effecthandlers/ChangeHairStyle.java | 4 +- .../handlers/effecthandlers/CheapShot.java | 4 +- .../handlers/effecthandlers/ClassChange.java | 4 +- .../handlers/effecthandlers/Compelling.java | 4 +- .../handlers/effecthandlers/Confuse.java | 4 +- .../handlers/effecthandlers/ConsumeBody.java | 4 +- .../handlers/effecthandlers/ConvertItem.java | 4 +- .../effecthandlers/CounterPhysicalSkill.java | 4 +- .../scripts/handlers/effecthandlers/Cp.java | 4 +- .../handlers/effecthandlers/CpHeal.java | 4 +- .../effecthandlers/CpHealOverTime.java | 4 +- .../effecthandlers/CpHealPercent.java | 4 +- .../handlers/effecthandlers/CpRegen.java | 4 +- .../effecthandlers/CriticalDamage.java | 4 +- .../CriticalDamagePosition.java | 4 +- .../handlers/effecthandlers/CriticalRate.java | 4 +- .../CriticalRatePositionBonus.java | 4 +- .../effecthandlers/CrystalGradeModify.java | 4 +- .../handlers/effecthandlers/CubicMastery.java | 4 +- .../handlers/effecthandlers/DamOverTime.java | 4 +- .../effecthandlers/DamOverTimePercent.java | 4 +- .../handlers/effecthandlers/DamageBlock.java | 4 +- .../effecthandlers/DamageByAttack.java | 4 +- .../handlers/effecthandlers/DamageShield.java | 4 +- .../effecthandlers/DamageShieldResist.java | 4 +- .../handlers/effecthandlers/DeathLink.java | 4 +- .../handlers/effecthandlers/DebuffBlock.java | 4 +- .../effecthandlers/DefenceAttribute.java | 4 +- .../effecthandlers/DefenceCriticalDamage.java | 4 +- .../effecthandlers/DefenceCriticalRate.java | 4 +- .../DefenceMagicCriticalDamage.java | 4 +- .../DefenceMagicCriticalRate.java | 4 +- .../handlers/effecthandlers/DefenceTrait.java | 4 +- .../handlers/effecthandlers/DeleteHate.java | 4 +- .../effecthandlers/DeleteHateOfMe.java | 4 +- .../effecthandlers/DeleteTopAgro.java | 4 +- .../effecthandlers/DetectHiddenObjects.java | 4 +- .../handlers/effecthandlers/Detection.java | 4 +- .../effecthandlers/DisableTargeting.java | 4 +- .../handlers/effecthandlers/Disarm.java | 4 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 4 +- .../effecthandlers/DispelByCategory.java | 4 +- .../handlers/effecthandlers/DispelBySlot.java | 4 +- .../effecthandlers/DispelBySlotMyself.java | 4 +- .../DispelBySlotProbability.java | 4 +- .../handlers/effecthandlers/DoubleCast.java | 4 +- .../handlers/effecthandlers/DuelistFury.java | 4 +- .../effecthandlers/ElementalSpiritAttack.java | 4 +- .../ElementalSpiritDefense.java | 4 +- .../handlers/effecthandlers/EnableCloak.java | 4 +- .../handlers/effecthandlers/EnergyAttack.java | 4 +- .../effecthandlers/EnlargeAbnormalSlot.java | 4 +- .../handlers/effecthandlers/EnlargeSlot.java | 4 +- .../handlers/effecthandlers/Escape.java | 4 +- .../handlers/effecthandlers/ExpModify.java | 4 +- .../handlers/effecthandlers/Faceoff.java | 4 +- .../handlers/effecthandlers/FakeDeath.java | 4 +- .../handlers/effecthandlers/FatalBlow.java | 4 +- .../effecthandlers/FatalBlowRate.java | 4 +- .../scripts/handlers/effecthandlers/Fear.java | 4 +- .../scripts/handlers/effecthandlers/Feed.java | 4 +- .../effecthandlers/FishingExpSpBonus.java | 4 +- .../scripts/handlers/effecthandlers/Flag.java | 4 +- .../handlers/effecthandlers/FlipBlock.java | 4 +- .../handlers/effecthandlers/FlyAway.java | 4 +- .../handlers/effecthandlers/FocusEnergy.java | 4 +- .../effecthandlers/FocusMaxMomentum.java | 4 +- .../effecthandlers/FocusMomentum.java | 4 +- .../handlers/effecthandlers/FocusSouls.java | 4 +- .../handlers/effecthandlers/GetAgro.java | 4 +- .../effecthandlers/GetDamageLimit.java | 4 +- .../handlers/effecthandlers/GetMomentum.java | 4 +- .../effecthandlers/GiveClanReputation.java | 4 +- .../handlers/effecthandlers/GiveExpAndSp.java | 4 +- .../handlers/effecthandlers/GiveFame.java | 4 +- .../effecthandlers/GiveRecommendation.java | 4 +- .../handlers/effecthandlers/GiveSp.java | 4 +- .../handlers/effecthandlers/GiveXp.java | 4 +- .../scripts/handlers/effecthandlers/Grow.java | 4 +- .../effecthandlers/HairAccessorySet.java | 4 +- .../handlers/effecthandlers/Harvesting.java | 4 +- .../handlers/effecthandlers/HateAttack.java | 4 +- .../effecthandlers/HeadquarterCreate.java | 4 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealEffect.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 4 +- .../handlers/effecthandlers/HealPercent.java | 4 +- .../scripts/handlers/effecthandlers/Hide.java | 4 +- .../handlers/effecthandlers/HitAtNight.java | 4 +- .../handlers/effecthandlers/HitNumber.java | 4 +- .../scripts/handlers/effecthandlers/Hp.java | 4 +- .../handlers/effecthandlers/HpByLevel.java | 4 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../effecthandlers/HpCpHealCritical.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 4 +- .../handlers/effecthandlers/HpRegen.java | 4 +- .../handlers/effecthandlers/HpToOwner.java | 4 +- .../handlers/effecthandlers/IgnoreDeath.java | 4 +- .../effecthandlers/ImmobilePetBuff.java | 4 +- .../effecthandlers/InstantKillResist.java | 4 +- .../handlers/effecthandlers/JewelSlot.java | 4 +- .../handlers/effecthandlers/KarmaCount.java | 4 +- .../handlers/effecthandlers/KnockBack.java | 4 +- .../handlers/effecthandlers/Lethal.java | 4 +- .../handlers/effecthandlers/LimitCp.java | 4 +- .../handlers/effecthandlers/LimitHp.java | 4 +- .../handlers/effecthandlers/LimitMp.java | 4 +- .../handlers/effecthandlers/Lucky.java | 4 +- .../scripts/handlers/effecthandlers/MAtk.java | 4 +- .../effecthandlers/MagicAccuracy.java | 4 +- .../effecthandlers/MagicCriticalDamage.java | 4 +- .../effecthandlers/MagicCriticalRate.java | 4 +- .../handlers/effecthandlers/MagicMpCost.java | 4 +- .../MagicalAbnormalDispelAttack.java | 4 +- .../effecthandlers/MagicalAbnormalResist.java | 4 +- .../effecthandlers/MagicalAttack.java | 4 +- .../MagicalAttackByAbnormal.java | 4 +- .../MagicalAttackByAbnormalSlot.java | 4 +- .../effecthandlers/MagicalAttackMp.java | 4 +- .../effecthandlers/MagicalAttackRange.java | 4 +- .../effecthandlers/MagicalAttackSpeed.java | 4 +- .../effecthandlers/MagicalDamOverTime.java | 4 +- .../effecthandlers/MagicalDefence.java | 4 +- .../effecthandlers/MagicalEvasion.java | 4 +- .../effecthandlers/MagicalSkillPower.java | 4 +- .../effecthandlers/MagicalSoulAttack.java | 4 +- .../handlers/effecthandlers/ManaCharge.java | 4 +- .../effecthandlers/ManaDamOverTime.java | 4 +- .../handlers/effecthandlers/ManaHeal.java | 4 +- .../effecthandlers/ManaHealByLevel.java | 4 +- .../effecthandlers/ManaHealOverTime.java | 4 +- .../effecthandlers/ManaHealPercent.java | 4 +- .../handlers/effecthandlers/MaxCp.java | 4 +- .../handlers/effecthandlers/MaxHp.java | 4 +- .../handlers/effecthandlers/MaxMp.java | 4 +- .../handlers/effecthandlers/ModifyVital.java | 4 +- .../scripts/handlers/effecthandlers/Mp.java | 4 +- .../effecthandlers/MpConsumePerLevel.java | 4 +- .../handlers/effecthandlers/MpRegen.java | 4 +- .../handlers/effecthandlers/MpShield.java | 4 +- .../effecthandlers/MpVampiricAttack.java | 4 +- .../scripts/handlers/effecthandlers/Mute.java | 4 +- .../effecthandlers/NoblesseBless.java | 4 +- .../handlers/effecthandlers/OpenChest.java | 4 +- .../effecthandlers/OpenCommonRecipeBook.java | 4 +- .../handlers/effecthandlers/OpenDoor.java | 4 +- .../effecthandlers/OpenDwarfRecipeBook.java | 4 +- .../scripts/handlers/effecthandlers/PAtk.java | 4 +- .../handlers/effecthandlers/Passive.java | 4 +- .../PhysicalAbnormalResist.java | 4 +- .../effecthandlers/PhysicalAttack.java | 4 +- .../effecthandlers/PhysicalAttackHpLink.java | 4 +- .../effecthandlers/PhysicalAttackMute.java | 4 +- .../effecthandlers/PhysicalAttackRange.java | 4 +- .../effecthandlers/PhysicalAttackSaveHp.java | 4 +- .../effecthandlers/PhysicalAttackSpeed.java | 4 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../effecthandlers/PhysicalDefence.java | 4 +- .../effecthandlers/PhysicalEvasion.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 4 +- .../PhysicalShieldAngleAll.java | 4 +- .../effecthandlers/PhysicalSkillPower.java | 4 +- .../effecthandlers/PhysicalSoulAttack.java | 4 +- .../handlers/effecthandlers/PkCount.java | 4 +- .../handlers/effecthandlers/Plunder.java | 4 +- .../effecthandlers/PolearmSingleTarget.java | 4 +- .../effecthandlers/ProtectDeathPenalty.java | 4 +- .../effecthandlers/ProtectionBlessing.java | 4 +- .../handlers/effecthandlers/PullBack.java | 4 +- .../PveMagicalSkillDamageBonus.java | 4 +- .../PveMagicalSkillDefenceBonus.java | 4 +- .../PvePhysicalAttackDamageBonus.java | 4 +- .../PvePhysicalAttackDefenceBonus.java | 4 +- .../PvePhysicalSkillDamageBonus.java | 4 +- .../PvePhysicalSkillDefenceBonus.java | 4 +- .../PveRaidMagicalSkillDefenceBonus.java | 4 +- .../PveRaidPhysicalAttackDefenceBonus.java | 4 +- .../PveRaidPhysicalSkillDefenceBonus.java | 4 +- .../PvpMagicalSkillDamageBonus.java | 4 +- .../PvpMagicalSkillDefenceBonus.java | 4 +- .../PvpPhysicalAttackDamageBonus.java | 4 +- .../PvpPhysicalAttackDefenceBonus.java | 4 +- .../PvpPhysicalSkillDamageBonus.java | 4 +- .../PvpPhysicalSkillDefenceBonus.java | 4 +- .../effecthandlers/RandomizeHate.java | 4 +- .../handlers/effecthandlers/RealDamage.java | 4 +- .../handlers/effecthandlers/RearDamage.java | 4 +- .../handlers/effecthandlers/RebalanceHP.java | 4 +- .../effecthandlers/RebalanceHPSummon.java | 4 +- .../RecoverVitalityInPeaceZone.java | 4 +- .../handlers/effecthandlers/ReduceCancel.java | 4 +- .../handlers/effecthandlers/ReduceDamage.java | 4 +- .../effecthandlers/ReduceDropPenalty.java | 4 +- .../handlers/effecthandlers/ReflectMagic.java | 4 +- .../handlers/effecthandlers/ReflectSkill.java | 4 +- .../effecthandlers/RefuelAirship.java | 4 +- .../handlers/effecthandlers/Relax.java | 4 +- .../effecthandlers/ResetInstanceEntry.java | 4 +- .../ResistAbnormalByCategory.java | 4 +- .../effecthandlers/ResistDDMagic.java | 4 +- .../ResistDispelByCategory.java | 4 +- .../handlers/effecthandlers/ResistSkill.java | 4 +- .../handlers/effecthandlers/Restoration.java | 4 +- .../effecthandlers/RestorationRandom.java | 8 +- .../handlers/effecthandlers/Resurrection.java | 4 +- .../effecthandlers/ResurrectionSpecial.java | 4 +- .../handlers/effecthandlers/Reuse.java | 4 +- .../effecthandlers/ReuseSkillById.java | 4 +- .../scripts/handlers/effecthandlers/Root.java | 4 +- .../effecthandlers/SacrificeSummon.java | 4 +- .../effecthandlers/SafeFallHeight.java | 4 +- .../SendSystemMessageToClan.java | 4 +- .../effecthandlers/ServitorShare.java | 4 +- .../handlers/effecthandlers/SetHp.java | 4 +- .../handlers/effecthandlers/SetSkill.java | 4 +- .../effecthandlers/ShieldDefence.java | 4 +- .../effecthandlers/ShieldDefenceRate.java | 4 +- .../handlers/effecthandlers/SilentMove.java | 4 +- .../effecthandlers/SkillCritical.java | 4 +- .../effecthandlers/SkillCriticalDamage.java | 4 +- .../SkillCriticalProbability.java | 4 +- .../handlers/effecthandlers/SkillEvasion.java | 4 +- .../effecthandlers/SkillPowerAdd.java | 4 +- .../handlers/effecthandlers/SkillTurning.java | 4 +- .../effecthandlers/SkillTurningOverTime.java | 4 +- .../handlers/effecthandlers/SoulBlow.java | 4 +- .../handlers/effecthandlers/SoulEating.java | 4 +- .../scripts/handlers/effecthandlers/Sow.java | 4 +- .../handlers/effecthandlers/SpModify.java | 4 +- .../handlers/effecthandlers/Speed.java | 4 +- .../effecthandlers/SphericBarrier.java | 4 +- .../effecthandlers/SpiritExpModify.java | 4 +- .../handlers/effecthandlers/Spoil.java | 4 +- .../StatBonusSkillCritical.java | 4 +- .../effecthandlers/StatBonusSpeed.java | 4 +- .../effecthandlers/StatByMoveType.java | 4 +- .../handlers/effecthandlers/StatUp.java | 4 +- .../effecthandlers/StealAbnormal.java | 4 +- .../handlers/effecthandlers/Summon.java | 4 +- .../effecthandlers/SummonAgathion.java | 4 +- .../handlers/effecthandlers/SummonCubic.java | 4 +- .../effecthandlers/SummonHallucination.java | 4 +- .../handlers/effecthandlers/SummonMulti.java | 4 +- .../handlers/effecthandlers/SummonNpc.java | 4 +- .../handlers/effecthandlers/SummonPet.java | 4 +- .../handlers/effecthandlers/SummonPoints.java | 4 +- .../handlers/effecthandlers/SummonTrap.java | 4 +- .../handlers/effecthandlers/Sweeper.java | 4 +- .../handlers/effecthandlers/Synergy.java | 4 +- .../handlers/effecthandlers/TakeCastle.java | 4 +- .../effecthandlers/TakeCastleStart.java | 4 +- .../handlers/effecthandlers/TakeFort.java | 4 +- .../effecthandlers/TakeFortStart.java | 4 +- .../handlers/effecthandlers/TalismanSlot.java | 4 +- .../handlers/effecthandlers/TargetCancel.java | 4 +- .../handlers/effecthandlers/TargetMe.java | 4 +- .../effecthandlers/TargetMeProbability.java | 4 +- .../handlers/effecthandlers/Teleport.java | 4 +- .../effecthandlers/TeleportToNpc.java | 4 +- .../effecthandlers/TeleportToPlayer.java | 4 +- .../effecthandlers/TeleportToSummon.java | 4 +- .../effecthandlers/TeleportToTarget.java | 4 +- .../TransferDamageToPlayer.java | 4 +- .../TransferDamageToSummon.java | 4 +- .../handlers/effecthandlers/TransferHate.java | 4 +- .../effecthandlers/Transformation.java | 4 +- .../handlers/effecthandlers/TrapDetect.java | 4 +- .../handlers/effecthandlers/TrapRemove.java | 4 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 4 +- .../effecthandlers/TriggerSkillByDamage.java | 4 +- .../TriggerSkillByDeathBlow.java | 4 +- .../effecthandlers/TriggerSkillByKill.java | 4 +- .../TriggerSkillByMagicType.java | 4 +- .../effecthandlers/TriggerSkillBySkill.java | 4 +- .../TriggerSkillBySkillAttack.java | 4 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 4 +- .../effecthandlers/UnsummonAgathion.java | 4 +- .../effecthandlers/UnsummonServitors.java | 4 +- .../handlers/effecthandlers/Untargetable.java | 4 +- .../effecthandlers/VampiricAttack.java | 4 +- .../effecthandlers/VampiricDefence.java | 4 +- .../effecthandlers/VitalityExpRate.java | 4 +- .../effecthandlers/VitalityPointUp.java | 4 +- .../effecthandlers/VitalityPointsRate.java | 4 +- .../handlers/effecthandlers/WeightLimit.java | 4 +- .../effecthandlers/WeightPenalty.java | 4 +- .../effecthandlers/WorldChatPoints.java | 4 +- .../BuildAdvanceBaseSkillCondition.java | 4 +- .../BuildCampSkillCondition.java | 4 +- ...CanAddMaxEntranceInzoneSkillCondition.java | 4 +- .../CanBookmarkAddSlotSkillCondition.java | 4 +- ...CanChangeVitalItemCountSkillCondition.java | 4 +- .../CanEnchantAttributeSkillCondition.java | 4 +- .../CanMountForEventSkillCondition.java | 4 +- .../CanRefuelAirshipSkillCondition.java | 4 +- .../CanRestoreVitalPointSkillCondition.java | 4 +- .../CanSummonCubicSkillCondition.java | 4 +- .../CanSummonMultiSkillCondition.java | 4 +- .../CanSummonPetSkillCondition.java | 4 +- .../CanSummonSiegeGolemSkillCondition.java | 4 +- .../CanSummonSkillCondition.java | 4 +- .../CanTransformInDominionSkillCondition.java | 4 +- .../CanTransformSkillCondition.java | 4 +- .../CanUntransformSkillCondition.java | 4 +- .../CanUseInBattlefieldSkillCondition.java | 4 +- .../CanUseInDragonLairSkillCondition.java | 4 +- .../CanUseSwoopCannonSkillCondition.java | 4 +- ...nUseVitalityConsumeItemSkillCondition.java | 4 +- .../CannotUseInTransformSkillCondition.java | 4 +- .../CheckLevelSkillCondition.java | 4 +- .../CheckSexSkillCondition.java | 4 +- .../ConsumeBodySkillCondition.java | 4 +- .../EnergySavedSkillCondition.java | 4 +- .../EquipArmorSkillCondition.java | 4 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../NotFearedSkillCondition.java | 4 +- .../NotInUnderwaterSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 4 +- .../OpAffectedBySkillSkillCondition.java | 4 +- .../OpAgathionEnergySkillCondition.java | 4 +- .../OpAlignmentSkillCondition.java | 4 +- .../OpBlinkSkillCondition.java | 4 +- .../OpCallPcSkillCondition.java | 4 +- .../OpCanEscapeSkillCondition.java | 4 +- .../OpCanNotUseAirshipSkillCondition.java | 4 +- ...eTargetWithPrivateStoreSkillCondition.java | 4 +- .../OpChangeWeaponSkillCondition.java | 4 +- .../OpCheckAbnormalSkillCondition.java | 4 +- .../OpCheckAccountTypeSkillCondition.java | 4 +- .../OpCheckCastRangeSkillCondition.java | 4 +- .../OpCheckClassListSkillCondition.java | 4 +- .../OpCheckClassSkillCondition.java | 4 +- .../OpCheckCrtEffectSkillCondition.java | 4 +- .../OpCheckFlagSkillCondition.java | 4 +- ...eckOnGoingEventCampaignSkillCondition.java | 4 +- .../OpCheckPcbangPointSkillCondition.java | 4 +- .../OpCheckResidenceSkillCondition.java | 4 +- .../OpCheckSkillListSkillCondition.java | 4 +- .../OpCheckSkillSkillCondition.java | 4 +- .../OpCompanionSkillCondition.java | 4 +- .../OpEnchantRangeSkillCondition.java | 4 +- .../OpEncumberedSkillCondition.java | 4 +- .../OpEnergyMaxSkillCondition.java | 4 +- .../OpEquipItemSkillCondition.java | 4 +- .../OpExistNpcSkillCondition.java | 4 +- .../OpFishingCastSkillCondition.java | 4 +- .../OpFishingPumpingSkillCondition.java | 4 +- .../OpFishingReelingSkillCondition.java | 4 +- .../OpHaveSummonSkillCondition.java | 4 +- .../OpHaveSummonedNpcSkillCondition.java | 4 +- .../OpHomeSkillCondition.java | 4 +- .../OpInSiegeTimeSkillCondition.java | 4 +- .../OpInstantzoneSkillCondition.java | 4 +- .../OpMainjobSkillCondition.java | 4 +- .../OpNeedAgathionSkillCondition.java | 4 +- .../OpNeedSummonOrPetSkillCondition.java | 4 +- .../OpNotCursedSkillCondition.java | 4 +- .../OpNotInPeacezoneSkillCondition.java | 4 +- .../OpNotInstantzoneSkillCondition.java | 4 +- .../OpNotOlympiadSkillCondition.java | 4 +- .../OpNotTerritorySkillCondition.java | 4 +- .../OpPeacezoneSkillCondition.java | 4 +- .../OpPkcountSkillCondition.java | 4 +- .../OpPledgeSkillCondition.java | 4 +- .../OpRestartPointSkillCondition.java | 4 +- .../OpResurrectionSkillCondition.java | 4 +- .../OpSiegeHammerSkillCondition.java | 4 +- .../OpSkillAcquireSkillCondition.java | 4 +- .../OpSkillSkillCondition.java | 4 +- .../OpSocialClassSkillCondition.java | 4 +- .../OpSoulMaxSkillCondition.java | 4 +- .../OpSubjobSkillCondition.java | 4 +- .../OpSweeperSkillCondition.java | 4 +- .../OpTargetAllItemTypeSkillCondition.java | 4 +- .../OpTargetArmorTypeSkillCondition.java | 4 +- .../OpTargetDoorSkillCondition.java | 4 +- ...OpTargetMyPledgeAcademySkillCondition.java | 4 +- .../OpTargetNpcSkillCondition.java | 4 +- .../OpTargetPcSkillCondition.java | 4 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../OpTerritorySkillCondition.java | 4 +- .../OpUnlockSkillCondition.java | 4 +- .../OpUseFirecrackerSkillCondition.java | 4 +- .../OpUsePraseedSkillCondition.java | 4 +- .../OpWyvernSkillCondition.java | 4 +- .../PossessHolythingSkillCondition.java | 4 +- .../RemainCpPerSkillCondition.java | 4 +- .../RemainHpPerSkillCondition.java | 4 +- .../RemainMpPerSkillCondition.java | 4 +- .../SoulSavedSkillCondition.java | 4 +- .../TargetItemCrystalTypeSkillCondition.java | 4 +- .../TargetMyMenteeSkillCondition.java | 4 +- .../TargetMyPartySkillCondition.java | 4 +- .../TargetMyPledgeSkillCondition.java | 4 +- .../TargetRaceSkillCondition.java | 4 +- .../gameserver/data/xml/impl/ActionData.java | 4 +- .../gameserver/data/xml/impl/AdminData.java | 8 +- .../data/xml/impl/AppearanceItemData.java | 6 +- .../data/xml/impl/AttendanceRewardData.java | 4 +- .../data/xml/impl/BeautyShopData.java | 10 +- .../data/xml/impl/ClanHallData.java | 4 +- .../data/xml/impl/CombinationItemsData.java | 4 +- .../gameserver/data/xml/impl/CubicData.java | 6 +- .../data/xml/impl/DailyMissionData.java | 8 +- .../gameserver/data/xml/impl/DoorData.java | 14 +- .../data/xml/impl/EnchantItemData.java | 8 +- .../data/xml/impl/EnchantSkillGroupsData.java | 6 +- .../data/xml/impl/EquipmentUpgradeData.java | 4 +- .../data/xml/impl/EventEngineData.java | 12 +- .../data/xml/impl/ExtendDropData.java | 26 +- .../data/xml/impl/FakePlayerData.java | 4 +- .../gameserver/data/xml/impl/FenceData.java | 4 +- .../gameserver/data/xml/impl/HennaData.java | 4 +- .../data/xml/impl/InitialEquipmentData.java | 4 +- .../data/xml/impl/LuckyGameData.java | 10 +- .../data/xml/impl/MultisellData.java | 4 +- .../gameserver/data/xml/impl/NpcData.java | 8 +- .../xml/impl/NpcNameLocalisationData.java | 4 +- .../gameserver/data/xml/impl/OptionData.java | 4 +- .../data/xml/impl/PetDataTable.java | 4 +- .../data/xml/impl/PlayerTemplateData.java | 4 +- .../data/xml/impl/PrimeShopData.java | 4 +- .../gameserver/data/xml/impl/RecipeData.java | 4 +- .../data/xml/impl/ResidenceFunctionsData.java | 6 +- .../xml/impl/SendMessageLocalisationData.java | 4 +- .../gameserver/data/xml/impl/ShuttleData.java | 8 +- .../data/xml/impl/SiegeScheduleData.java | 6 +- .../gameserver/data/xml/impl/SkillData.java | 86 +- .../data/xml/impl/SkillTreesData.java | 4 +- .../gameserver/data/xml/impl/SpawnsData.java | 16 +- .../data/xml/impl/StaticObjectData.java | 8 +- .../data/xml/impl/TeleportersData.java | 4 +- .../data/xml/impl/TransformData.java | 6 +- .../gameserver/engines/DocumentBase.java | 8 +- .../engines/DocumentBaseGeneral.java | 4 +- .../engines/items/DocumentItem.java | 8 +- .../engines/items/ItemDataHolder.java | 4 +- .../gameserver/handler/ConditionHandler.java | 8 +- .../gameserver/handler/EffectHandler.java | 8 +- .../handler/SkillConditionHandler.java | 8 +- .../instancemanager/AirShipManager.java | 18 +- .../instancemanager/BoatManager.java | 4 +- .../instancemanager/CastleManorManager.java | 6 +- .../CeremonyOfChaosManager.java | 6 +- .../instancemanager/DBSpawnManager.java | 20 +- .../FakePlayerChatManager.java | 4 +- .../instancemanager/GrandBossManager.java | 16 +- .../instancemanager/InstanceManager.java | 20 +- .../gameserver/model/AccessLevel.java | 2 +- .../gameserver/model/ActionDataHolder.java | 2 +- .../model/AdminCommandAccessRight.java | 2 +- .../model/DailyMissionDataHolder.java | 8 +- .../l2jmobius/gameserver/model/Location.java | 2 +- .../gameserver/model/PetLevelData.java | 2 +- .../gameserver/model/RecipeList.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../gameserver/model/SiegeScheduleDate.java | 2 +- .../gameserver/model/SkillLearn.java | 2 +- .../l2jmobius/gameserver/model/StatSet.java | 968 ++++++++++++++++++ .../l2jmobius/gameserver/model/StatsSet.java | 968 ------------------ .../l2jmobius/gameserver/model/actor/Npc.java | 10 +- .../actor/templates/CreatureTemplate.java | 6 +- .../model/actor/templates/CubicTemplate.java | 4 +- .../model/actor/templates/DoorTemplate.java | 4 +- .../model/actor/templates/NpcTemplate.java | 14 +- .../model/actor/templates/PlayerTemplate.java | 4 +- .../model/actor/transform/Transform.java | 4 +- .../actor/transform/TransformLevelData.java | 4 +- .../actor/transform/TransformTemplate.java | 4 +- .../model/alchemy/AlchemyCraftData.java | 4 +- .../model/beautyshop/BeautyItem.java | 6 +- .../ceremonyofchaos/CeremonyOfChaosEvent.java | 8 +- .../gameserver/model/cubic/CubicSkill.java | 4 +- .../gameserver/model/entity/ClanHall.java | 4 +- .../gameserver/model/entity/Hero.java | 70 +- .../eventengine/AbstractEventManager.java | 10 +- .../model/eventengine/EventScheduler.java | 4 +- .../model/events/AbstractScript.java | 6 +- .../model/events/TimerExecutor.java | 8 +- .../model/events/timers/TimerHolder.java | 8 +- .../model/holders/AppearanceHolder.java | 4 +- .../model/holders/AttachSkillHolder.java | 4 +- .../model/holders/EnchantSkillHolder.java | 4 +- .../model/holders/ExtendDropDataHolder.java | 4 +- .../model/holders/FakePlayerHolder.java | 4 +- .../gameserver/model/holders/ItemHolder.java | 4 +- .../model/holders/ItemPointHolder.java | 4 +- .../model/holders/LuckyGameDataHolder.java | 4 +- .../model/holders/MinionHolder.java | 4 +- .../model/holders/MultisellListHolder.java | 4 +- .../model/instancezone/Instance.java | 8 +- .../model/instancezone/InstanceTemplate.java | 10 +- .../instancezone/conditions/Condition.java | 8 +- .../conditions/ConditionCommandChannel.java | 4 +- .../ConditionCommandChannelLeader.java | 4 +- .../conditions/ConditionDistance.java | 4 +- .../conditions/ConditionGroupMax.java | 4 +- .../conditions/ConditionGroupMin.java | 4 +- .../conditions/ConditionHasResidence.java | 6 +- .../conditions/ConditionItem.java | 4 +- .../conditions/ConditionLevel.java | 4 +- .../conditions/ConditionNoParty.java | 4 +- .../conditions/ConditionParty.java | 4 +- .../conditions/ConditionPartyLeader.java | 4 +- .../conditions/ConditionQuest.java | 4 +- .../conditions/ConditionReenter.java | 4 +- .../itemauction/AuctionDateGenerator.java | 4 +- .../model/itemauction/AuctionItem.java | 6 +- .../itemauction/ItemAuctionInstance.java | 6 +- .../gameserver/model/items/Armor.java | 8 +- .../gameserver/model/items/EtcItem.java | 8 +- .../gameserver/model/items/Henna.java | 4 +- .../gameserver/model/items/Item.java | 8 +- .../model/items/PlayerItemTemplate.java | 4 +- .../gameserver/model/items/Weapon.java | 8 +- .../items/appearance/AppearanceStone.java | 4 +- .../items/combination/CombinationItem.java | 4 +- .../items/enchant/AbstractEnchantItem.java | 4 +- .../model/items/enchant/EnchantScroll.java | 4 +- .../items/enchant/EnchantSupportItem.java | 4 +- .../gameserver/model/olympiad/Olympiad.java | 38 +- .../model/olympiad/Participant.java | 6 +- .../model/primeshop/PrimeShopGroup.java | 4 +- .../residences/ResidenceFunctionTemplate.java | 4 +- .../model/shuttle/ShuttleDataHolder.java | 4 +- .../gameserver/model/skills/Skill.java | 6 +- .../model/spawns/NpcSpawnTemplate.java | 16 +- .../gameserver/model/spawns/SpawnGroup.java | 12 +- .../model/spawns/SpawnTemplate.java | 12 +- .../model/teleporter/TeleportHolder.java | 4 +- .../model/teleporter/TeleportLocation.java | 4 +- .../model/variables/AbstractVariables.java | 18 +- .../network/serverpackets/ExHeroList.java | 6 +- .../gameserver/util/BypassParser.java | 4 +- .../scripts/ai/bosses/Antharas/Antharas.java | 6 +- .../data/scripts/ai/bosses/Baium/Baium.java | 6 +- .../data/scripts/ai/bosses/Core/Core.java | 8 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 8 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 8 +- .../data/scripts/ai/bosses/Zaken/Zaken.java | 8 +- .../CastleTeleporter/CastleTeleporter.java | 6 +- .../ai/others/Servitors/TreeOfLife.java | 4 +- .../admincommandhandlers/AdminGrandBoss.java | 4 +- .../admincommandhandlers/AdminOlympiad.java | 14 +- .../conditions/CategoryTypeCondition.java | 4 +- .../conditions/NpcLevelCondition.java | 4 +- .../conditions/PlayerLevelCondition.java | 4 +- .../effecthandlers/AbnormalShield.java | 4 +- .../effecthandlers/AbnormalTimeChange.java | 4 +- .../handlers/effecthandlers/AbsorbDamage.java | 4 +- .../AbstractConditionalHpEffect.java | 4 +- .../effecthandlers/AbstractStatAddEffect.java | 4 +- .../effecthandlers/AbstractStatEffect.java | 6 +- .../AbstractStatPercentEffect.java | 4 +- .../handlers/effecthandlers/Accuracy.java | 4 +- .../handlers/effecthandlers/AddHate.java | 4 +- .../effecthandlers/AddHuntingTime.java | 4 +- .../effecthandlers/AddSkillBySkill.java | 4 +- .../AddTeleportBookmarkSlot.java | 4 +- .../effecthandlers/AdditionalPotionCp.java | 4 +- .../effecthandlers/AdditionalPotionHp.java | 4 +- .../effecthandlers/AdditionalPotionMp.java | 4 +- .../handlers/effecthandlers/AgathionSlot.java | 4 +- .../handlers/effecthandlers/AreaDamage.java | 4 +- .../handlers/effecthandlers/ArtifactSlot.java | 4 +- .../effecthandlers/AttackAttribute.java | 4 +- .../effecthandlers/AttackAttributeAdd.java | 4 +- .../handlers/effecthandlers/AttackBehind.java | 4 +- .../handlers/effecthandlers/AttackTrait.java | 4 +- .../handlers/effecthandlers/Backstab.java | 4 +- .../handlers/effecthandlers/Betray.java | 4 +- .../handlers/effecthandlers/Blink.java | 4 +- .../handlers/effecthandlers/BlinkSwap.java | 4 +- .../effecthandlers/BlockAbnormalSlot.java | 4 +- .../handlers/effecthandlers/BlockAction.java | 4 +- .../handlers/effecthandlers/BlockActions.java | 4 +- .../handlers/effecthandlers/BlockChat.java | 4 +- .../handlers/effecthandlers/BlockControl.java | 4 +- .../handlers/effecthandlers/BlockEscape.java | 4 +- .../handlers/effecthandlers/BlockMove.java | 4 +- .../handlers/effecthandlers/BlockParty.java | 4 +- .../effecthandlers/BlockResurrection.java | 4 +- .../handlers/effecthandlers/BlockSkill.java | 4 +- .../handlers/effecthandlers/BlockTarget.java | 4 +- .../handlers/effecthandlers/Bluff.java | 4 +- .../effecthandlers/BonusDropAmount.java | 4 +- .../effecthandlers/BonusDropRate.java | 4 +- .../effecthandlers/BonusSpoilRate.java | 4 +- .../handlers/effecthandlers/Breath.java | 4 +- .../handlers/effecthandlers/BuffBlock.java | 4 +- .../effecthandlers/CallLearnedSkill.java | 4 +- .../handlers/effecthandlers/CallParty.java | 4 +- .../handlers/effecthandlers/CallPc.java | 4 +- .../effecthandlers/CallRandomSkill.java | 4 +- .../handlers/effecthandlers/CallSkill.java | 4 +- .../effecthandlers/CallSkillOnActionTime.java | 4 +- .../effecthandlers/CallTargetParty.java | 4 +- .../effecthandlers/ChameleonRest.java | 4 +- .../handlers/effecthandlers/ChangeBody.java | 6 +- .../handlers/effecthandlers/ChangeFace.java | 4 +- .../effecthandlers/ChangeFishingMastery.java | 4 +- .../effecthandlers/ChangeHairColor.java | 4 +- .../effecthandlers/ChangeHairStyle.java | 4 +- .../handlers/effecthandlers/CheapShot.java | 4 +- .../handlers/effecthandlers/ClassChange.java | 4 +- .../handlers/effecthandlers/Compelling.java | 4 +- .../handlers/effecthandlers/Confuse.java | 4 +- .../handlers/effecthandlers/ConsumeBody.java | 4 +- .../handlers/effecthandlers/ConvertItem.java | 4 +- .../effecthandlers/CounterPhysicalSkill.java | 4 +- .../scripts/handlers/effecthandlers/Cp.java | 4 +- .../handlers/effecthandlers/CpHeal.java | 4 +- .../effecthandlers/CpHealOverTime.java | 4 +- .../effecthandlers/CpHealPercent.java | 4 +- .../handlers/effecthandlers/CpRegen.java | 4 +- .../effecthandlers/CriticalDamage.java | 4 +- .../CriticalDamagePosition.java | 4 +- .../handlers/effecthandlers/CriticalRate.java | 4 +- .../CriticalRatePositionBonus.java | 4 +- .../handlers/effecthandlers/CubicMastery.java | 4 +- .../handlers/effecthandlers/DamOverTime.java | 4 +- .../effecthandlers/DamOverTimePercent.java | 4 +- .../handlers/effecthandlers/DamageBlock.java | 4 +- .../effecthandlers/DamageByAttack.java | 4 +- .../handlers/effecthandlers/DamageShield.java | 4 +- .../effecthandlers/DamageShieldResist.java | 4 +- .../handlers/effecthandlers/DeathLink.java | 4 +- .../handlers/effecthandlers/DebuffBlock.java | 4 +- .../effecthandlers/DefenceAttribute.java | 4 +- .../effecthandlers/DefenceCriticalDamage.java | 4 +- .../effecthandlers/DefenceCriticalRate.java | 4 +- .../DefenceMagicCriticalDamage.java | 4 +- .../DefenceMagicCriticalRate.java | 4 +- .../handlers/effecthandlers/DefenceTrait.java | 4 +- .../handlers/effecthandlers/DeleteHate.java | 4 +- .../effecthandlers/DeleteHateOfMe.java | 4 +- .../effecthandlers/DeleteTopAgro.java | 4 +- .../effecthandlers/DetectHiddenObjects.java | 4 +- .../handlers/effecthandlers/Detection.java | 4 +- .../effecthandlers/DisableTargeting.java | 4 +- .../handlers/effecthandlers/Disarm.java | 4 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 4 +- .../effecthandlers/DispelByCategory.java | 4 +- .../handlers/effecthandlers/DispelBySlot.java | 4 +- .../effecthandlers/DispelBySlotMyself.java | 4 +- .../DispelBySlotProbability.java | 4 +- .../handlers/effecthandlers/DoubleCast.java | 4 +- .../handlers/effecthandlers/DuelistFury.java | 4 +- .../effecthandlers/ElementalSpiritAttack.java | 4 +- .../ElementalSpiritDefense.java | 4 +- .../handlers/effecthandlers/EnableCloak.java | 4 +- .../handlers/effecthandlers/EnergyAttack.java | 4 +- .../effecthandlers/EnlargeAbnormalSlot.java | 4 +- .../handlers/effecthandlers/EnlargeSlot.java | 4 +- .../handlers/effecthandlers/Escape.java | 4 +- .../handlers/effecthandlers/ExpModify.java | 4 +- .../handlers/effecthandlers/Faceoff.java | 4 +- .../handlers/effecthandlers/FakeDeath.java | 4 +- .../handlers/effecthandlers/FatalBlow.java | 4 +- .../effecthandlers/FatalBlowRate.java | 4 +- .../scripts/handlers/effecthandlers/Fear.java | 4 +- .../scripts/handlers/effecthandlers/Feed.java | 4 +- .../effecthandlers/FishingExpSpBonus.java | 4 +- .../scripts/handlers/effecthandlers/Flag.java | 4 +- .../handlers/effecthandlers/FlipBlock.java | 4 +- .../handlers/effecthandlers/FlyAway.java | 4 +- .../handlers/effecthandlers/FocusEnergy.java | 4 +- .../effecthandlers/FocusMaxMomentum.java | 4 +- .../effecthandlers/FocusMomentum.java | 4 +- .../handlers/effecthandlers/FocusSouls.java | 4 +- .../handlers/effecthandlers/GetAgro.java | 4 +- .../effecthandlers/GetDamageLimit.java | 4 +- .../handlers/effecthandlers/GetMomentum.java | 4 +- .../effecthandlers/GiveClanReputation.java | 4 +- .../handlers/effecthandlers/GiveExpAndSp.java | 4 +- .../handlers/effecthandlers/GiveFame.java | 4 +- .../effecthandlers/GiveRecommendation.java | 4 +- .../handlers/effecthandlers/GiveSp.java | 4 +- .../handlers/effecthandlers/GiveXp.java | 4 +- .../scripts/handlers/effecthandlers/Grow.java | 4 +- .../effecthandlers/HairAccessorySet.java | 4 +- .../handlers/effecthandlers/Harvesting.java | 4 +- .../handlers/effecthandlers/HateAttack.java | 4 +- .../effecthandlers/HeadquarterCreate.java | 4 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealEffect.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 4 +- .../handlers/effecthandlers/HealPercent.java | 4 +- .../scripts/handlers/effecthandlers/Hide.java | 4 +- .../handlers/effecthandlers/HitAtNight.java | 4 +- .../handlers/effecthandlers/HitNumber.java | 4 +- .../scripts/handlers/effecthandlers/Hp.java | 4 +- .../handlers/effecthandlers/HpByLevel.java | 4 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../effecthandlers/HpCpHealCritical.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 4 +- .../handlers/effecthandlers/HpRegen.java | 4 +- .../handlers/effecthandlers/HpToOwner.java | 4 +- .../handlers/effecthandlers/IgnoreDeath.java | 4 +- .../effecthandlers/ImmobilePetBuff.java | 4 +- .../effecthandlers/InstantKillResist.java | 4 +- .../handlers/effecthandlers/JewelSlot.java | 4 +- .../handlers/effecthandlers/KarmaCount.java | 4 +- .../handlers/effecthandlers/KnockBack.java | 4 +- .../handlers/effecthandlers/Lethal.java | 4 +- .../handlers/effecthandlers/LimitCp.java | 4 +- .../handlers/effecthandlers/LimitHp.java | 4 +- .../handlers/effecthandlers/LimitMp.java | 4 +- .../handlers/effecthandlers/Lucky.java | 4 +- .../scripts/handlers/effecthandlers/MAtk.java | 4 +- .../handlers/effecthandlers/MAtkByPAtk.java | 4 +- .../effecthandlers/MagicAccuracy.java | 4 +- .../effecthandlers/MagicCriticalDamage.java | 4 +- .../effecthandlers/MagicCriticalRate.java | 4 +- .../MagicCriticalRateByCriticalRate.java | 4 +- .../handlers/effecthandlers/MagicMpCost.java | 4 +- .../MagicalAbnormalDispelAttack.java | 4 +- .../effecthandlers/MagicalAbnormalResist.java | 4 +- .../effecthandlers/MagicalAttack.java | 4 +- .../MagicalAttackByAbnormal.java | 4 +- .../MagicalAttackByAbnormalSlot.java | 4 +- .../effecthandlers/MagicalAttackMp.java | 4 +- .../effecthandlers/MagicalAttackRange.java | 4 +- .../effecthandlers/MagicalAttackSpeed.java | 4 +- .../effecthandlers/MagicalDamOverTime.java | 4 +- .../effecthandlers/MagicalDefence.java | 4 +- .../effecthandlers/MagicalEvasion.java | 4 +- .../effecthandlers/MagicalSkillPower.java | 4 +- .../effecthandlers/MagicalSoulAttack.java | 4 +- .../handlers/effecthandlers/ManaCharge.java | 4 +- .../effecthandlers/ManaDamOverTime.java | 4 +- .../handlers/effecthandlers/ManaHeal.java | 4 +- .../effecthandlers/ManaHealByLevel.java | 4 +- .../effecthandlers/ManaHealOverTime.java | 4 +- .../effecthandlers/ManaHealPercent.java | 4 +- .../handlers/effecthandlers/MaxCp.java | 4 +- .../handlers/effecthandlers/MaxHp.java | 4 +- .../handlers/effecthandlers/MaxMp.java | 4 +- .../handlers/effecthandlers/ModifyVital.java | 4 +- .../scripts/handlers/effecthandlers/Mp.java | 4 +- .../effecthandlers/MpConsumePerLevel.java | 4 +- .../handlers/effecthandlers/MpRegen.java | 4 +- .../handlers/effecthandlers/MpShield.java | 4 +- .../effecthandlers/MpVampiricAttack.java | 4 +- .../scripts/handlers/effecthandlers/Mute.java | 4 +- .../effecthandlers/NoblesseBless.java | 4 +- .../handlers/effecthandlers/OpenChest.java | 4 +- .../effecthandlers/OpenCommonRecipeBook.java | 4 +- .../handlers/effecthandlers/OpenDoor.java | 4 +- .../effecthandlers/OpenDwarfRecipeBook.java | 4 +- .../scripts/handlers/effecthandlers/PAtk.java | 4 +- .../handlers/effecthandlers/Passive.java | 4 +- .../PhysicalAbnormalResist.java | 4 +- .../effecthandlers/PhysicalAttack.java | 4 +- .../effecthandlers/PhysicalAttackHpLink.java | 4 +- .../effecthandlers/PhysicalAttackMute.java | 4 +- .../effecthandlers/PhysicalAttackRange.java | 4 +- .../effecthandlers/PhysicalAttackSaveHp.java | 4 +- .../effecthandlers/PhysicalAttackSpeed.java | 4 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../effecthandlers/PhysicalDefence.java | 4 +- .../effecthandlers/PhysicalEvasion.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 4 +- .../PhysicalShieldAngleAll.java | 4 +- .../effecthandlers/PhysicalSkillPower.java | 4 +- .../effecthandlers/PhysicalSoulAttack.java | 4 +- .../handlers/effecthandlers/PkCount.java | 4 +- .../handlers/effecthandlers/Plunder.java | 4 +- .../effecthandlers/PolearmSingleTarget.java | 4 +- .../effecthandlers/ProtectDeathPenalty.java | 4 +- .../effecthandlers/ProtectionBlessing.java | 4 +- .../handlers/effecthandlers/PullBack.java | 4 +- .../PveMagicalSkillDamageBonus.java | 4 +- .../PveMagicalSkillDefenceBonus.java | 4 +- .../PvePhysicalAttackDamageBonus.java | 4 +- .../PvePhysicalAttackDefenceBonus.java | 4 +- .../PvePhysicalSkillDamageBonus.java | 4 +- .../PvePhysicalSkillDefenceBonus.java | 4 +- .../PveRaidMagicalSkillDefenceBonus.java | 4 +- .../PveRaidPhysicalAttackDefenceBonus.java | 4 +- .../PveRaidPhysicalSkillDefenceBonus.java | 4 +- .../PvpMagicalSkillDamageBonus.java | 4 +- .../PvpMagicalSkillDefenceBonus.java | 4 +- .../PvpPhysicalAttackDamageBonus.java | 4 +- .../PvpPhysicalAttackDefenceBonus.java | 4 +- .../PvpPhysicalSkillDamageBonus.java | 4 +- .../PvpPhysicalSkillDefenceBonus.java | 4 +- .../effecthandlers/RandomizeHate.java | 4 +- .../handlers/effecthandlers/RealDamage.java | 4 +- .../handlers/effecthandlers/RearDamage.java | 4 +- .../handlers/effecthandlers/RebalanceHP.java | 4 +- .../effecthandlers/RebalanceHPSummon.java | 4 +- .../RecoverVitalityInPeaceZone.java | 4 +- .../handlers/effecthandlers/ReduceCancel.java | 4 +- .../handlers/effecthandlers/ReduceDamage.java | 4 +- .../effecthandlers/ReduceDropPenalty.java | 4 +- .../handlers/effecthandlers/ReflectMagic.java | 4 +- .../handlers/effecthandlers/ReflectSkill.java | 4 +- .../effecthandlers/RefuelAirship.java | 4 +- .../handlers/effecthandlers/Relax.java | 4 +- .../effecthandlers/ResetInstanceEntry.java | 4 +- .../ResistAbnormalByCategory.java | 4 +- .../effecthandlers/ResistDDMagic.java | 4 +- .../ResistDispelByCategory.java | 4 +- .../handlers/effecthandlers/ResistSkill.java | 4 +- .../handlers/effecthandlers/Restoration.java | 4 +- .../effecthandlers/RestorationRandom.java | 8 +- .../handlers/effecthandlers/Resurrection.java | 4 +- .../effecthandlers/ResurrectionSpecial.java | 4 +- .../handlers/effecthandlers/Reuse.java | 4 +- .../effecthandlers/ReuseSkillById.java | 4 +- .../scripts/handlers/effecthandlers/Root.java | 4 +- .../effecthandlers/SacrificeSummon.java | 4 +- .../effecthandlers/SafeFallHeight.java | 4 +- .../SendSystemMessageToClan.java | 4 +- .../effecthandlers/ServitorShare.java | 4 +- .../handlers/effecthandlers/SetHp.java | 4 +- .../handlers/effecthandlers/SetSkill.java | 4 +- .../effecthandlers/ShieldDefence.java | 4 +- .../effecthandlers/ShieldDefenceRate.java | 4 +- .../handlers/effecthandlers/SilentMove.java | 4 +- .../effecthandlers/SkillCritical.java | 4 +- .../effecthandlers/SkillCriticalDamage.java | 4 +- .../SkillCriticalProbability.java | 4 +- .../handlers/effecthandlers/SkillEvasion.java | 4 +- .../effecthandlers/SkillPowerAdd.java | 4 +- .../handlers/effecthandlers/SkillTurning.java | 4 +- .../effecthandlers/SkillTurningOverTime.java | 4 +- .../handlers/effecthandlers/SoulBlow.java | 4 +- .../handlers/effecthandlers/SoulEating.java | 4 +- .../scripts/handlers/effecthandlers/Sow.java | 4 +- .../handlers/effecthandlers/SpModify.java | 4 +- .../handlers/effecthandlers/Speed.java | 4 +- .../effecthandlers/SphericBarrier.java | 4 +- .../effecthandlers/SpiritExpModify.java | 4 +- .../handlers/effecthandlers/Spoil.java | 4 +- .../StatBonusSkillCritical.java | 4 +- .../effecthandlers/StatBonusSpeed.java | 4 +- .../effecthandlers/StatByMoveType.java | 4 +- .../handlers/effecthandlers/StatUp.java | 4 +- .../effecthandlers/StealAbnormal.java | 4 +- .../handlers/effecthandlers/Summon.java | 4 +- .../effecthandlers/SummonAgathion.java | 4 +- .../handlers/effecthandlers/SummonCubic.java | 4 +- .../effecthandlers/SummonHallucination.java | 4 +- .../handlers/effecthandlers/SummonMulti.java | 4 +- .../handlers/effecthandlers/SummonNpc.java | 4 +- .../handlers/effecthandlers/SummonPet.java | 4 +- .../handlers/effecthandlers/SummonPoints.java | 4 +- .../handlers/effecthandlers/SummonTrap.java | 4 +- .../handlers/effecthandlers/Sweeper.java | 4 +- .../handlers/effecthandlers/Synergy.java | 4 +- .../handlers/effecthandlers/TakeCastle.java | 4 +- .../effecthandlers/TakeCastleStart.java | 4 +- .../handlers/effecthandlers/TakeFort.java | 4 +- .../effecthandlers/TakeFortStart.java | 4 +- .../handlers/effecthandlers/TalismanSlot.java | 4 +- .../handlers/effecthandlers/TargetCancel.java | 4 +- .../handlers/effecthandlers/TargetMe.java | 4 +- .../effecthandlers/TargetMeProbability.java | 4 +- .../handlers/effecthandlers/Teleport.java | 4 +- .../effecthandlers/TeleportToNpc.java | 4 +- .../effecthandlers/TeleportToPlayer.java | 4 +- .../effecthandlers/TeleportToSummon.java | 4 +- .../effecthandlers/TeleportToTarget.java | 4 +- .../TransferDamageToPlayer.java | 4 +- .../TransferDamageToSummon.java | 4 +- .../handlers/effecthandlers/TransferHate.java | 4 +- .../effecthandlers/Transformation.java | 4 +- .../handlers/effecthandlers/TrapDetect.java | 4 +- .../handlers/effecthandlers/TrapRemove.java | 4 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 4 +- .../effecthandlers/TriggerSkillByDamage.java | 4 +- .../TriggerSkillByDeathBlow.java | 4 +- .../effecthandlers/TriggerSkillByKill.java | 4 +- .../TriggerSkillByMagicType.java | 4 +- .../effecthandlers/TriggerSkillBySkill.java | 4 +- .../TriggerSkillBySkillAttack.java | 4 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 4 +- .../effecthandlers/UnsummonAgathion.java | 4 +- .../effecthandlers/UnsummonServitors.java | 4 +- .../handlers/effecthandlers/Untargetable.java | 4 +- .../effecthandlers/VampiricAttack.java | 4 +- .../effecthandlers/VampiricDefence.java | 4 +- .../effecthandlers/VitalityExpRate.java | 4 +- .../effecthandlers/VitalityPointUp.java | 4 +- .../effecthandlers/VitalityPointsRate.java | 4 +- .../handlers/effecthandlers/WeightLimit.java | 4 +- .../effecthandlers/WeightPenalty.java | 4 +- .../effecthandlers/WorldChatPoints.java | 4 +- .../BuildAdvanceBaseSkillCondition.java | 4 +- .../BuildCampSkillCondition.java | 4 +- ...CanAddMaxEntranceInzoneSkillCondition.java | 4 +- .../CanBookmarkAddSlotSkillCondition.java | 4 +- ...CanChangeVitalItemCountSkillCondition.java | 4 +- .../CanEnchantAttributeSkillCondition.java | 4 +- .../CanMountForEventSkillCondition.java | 4 +- .../CanRefuelAirshipSkillCondition.java | 4 +- .../CanRestoreVitalPointSkillCondition.java | 4 +- .../CanSummonCubicSkillCondition.java | 4 +- .../CanSummonMultiSkillCondition.java | 4 +- .../CanSummonPetSkillCondition.java | 4 +- .../CanSummonSiegeGolemSkillCondition.java | 4 +- .../CanSummonSkillCondition.java | 4 +- .../CanTransformInDominionSkillCondition.java | 4 +- .../CanTransformSkillCondition.java | 4 +- .../CanUntransformSkillCondition.java | 4 +- .../CanUseInBattlefieldSkillCondition.java | 4 +- .../CanUseInDragonLairSkillCondition.java | 4 +- .../CanUseSwoopCannonSkillCondition.java | 4 +- ...nUseVitalityConsumeItemSkillCondition.java | 4 +- .../CannotUseInTransformSkillCondition.java | 4 +- .../CheckLevelSkillCondition.java | 4 +- .../CheckSexSkillCondition.java | 4 +- .../ConsumeBodySkillCondition.java | 4 +- .../EnergySavedSkillCondition.java | 4 +- .../EquipArmorSkillCondition.java | 4 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../NotFearedSkillCondition.java | 4 +- .../NotInUnderwaterSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 4 +- .../OpAffectedBySkillSkillCondition.java | 4 +- .../OpAgathionEnergySkillCondition.java | 4 +- .../OpAlignmentSkillCondition.java | 4 +- .../OpBlinkSkillCondition.java | 4 +- .../OpCallPcSkillCondition.java | 4 +- .../OpCanEscapeSkillCondition.java | 4 +- .../OpCanNotUseAirshipSkillCondition.java | 4 +- ...eTargetWithPrivateStoreSkillCondition.java | 4 +- .../OpChangeWeaponSkillCondition.java | 4 +- .../OpCheckAbnormalSkillCondition.java | 4 +- .../OpCheckAccountTypeSkillCondition.java | 4 +- .../OpCheckCastRangeSkillCondition.java | 4 +- .../OpCheckClassListSkillCondition.java | 4 +- .../OpCheckClassSkillCondition.java | 4 +- .../OpCheckCrtEffectSkillCondition.java | 4 +- .../OpCheckFlagSkillCondition.java | 4 +- ...eckOnGoingEventCampaignSkillCondition.java | 4 +- .../OpCheckPcbangPointSkillCondition.java | 4 +- .../OpCheckResidenceSkillCondition.java | 4 +- .../OpCheckSkillListSkillCondition.java | 4 +- .../OpCheckSkillSkillCondition.java | 4 +- .../OpCompanionSkillCondition.java | 4 +- .../OpEnchantRangeSkillCondition.java | 4 +- .../OpEncumberedSkillCondition.java | 4 +- .../OpEnergyMaxSkillCondition.java | 4 +- .../OpEquipItemSkillCondition.java | 4 +- .../OpExistNpcSkillCondition.java | 4 +- .../OpFishingCastSkillCondition.java | 4 +- .../OpFishingPumpingSkillCondition.java | 4 +- .../OpFishingReelingSkillCondition.java | 4 +- .../OpHaveSummonSkillCondition.java | 4 +- .../OpHaveSummonedNpcSkillCondition.java | 4 +- .../OpHomeSkillCondition.java | 4 +- .../OpInSiegeTimeSkillCondition.java | 4 +- .../OpInstantzoneSkillCondition.java | 4 +- .../OpMainjobSkillCondition.java | 4 +- .../OpNeedAgathionSkillCondition.java | 4 +- .../OpNeedSummonOrPetSkillCondition.java | 4 +- .../OpNotCursedSkillCondition.java | 4 +- .../OpNotInPeacezoneSkillCondition.java | 4 +- .../OpNotInstantzoneSkillCondition.java | 4 +- .../OpNotOlympiadSkillCondition.java | 4 +- .../OpNotTerritorySkillCondition.java | 4 +- .../OpPeacezoneSkillCondition.java | 4 +- .../OpPkcountSkillCondition.java | 4 +- .../OpPledgeSkillCondition.java | 4 +- .../OpRestartPointSkillCondition.java | 4 +- .../OpResurrectionSkillCondition.java | 4 +- .../OpSiegeHammerSkillCondition.java | 4 +- .../OpSkillAcquireSkillCondition.java | 4 +- .../OpSkillSkillCondition.java | 4 +- .../OpSocialClassSkillCondition.java | 4 +- .../OpSoulMaxSkillCondition.java | 4 +- .../OpSubjobSkillCondition.java | 4 +- .../OpSweeperSkillCondition.java | 4 +- .../OpTargetAllItemTypeSkillCondition.java | 4 +- .../OpTargetArmorTypeSkillCondition.java | 4 +- .../OpTargetDoorSkillCondition.java | 4 +- ...OpTargetMyPledgeAcademySkillCondition.java | 4 +- .../OpTargetNpcSkillCondition.java | 4 +- .../OpTargetPcSkillCondition.java | 4 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../OpTerritorySkillCondition.java | 4 +- .../OpUnlockSkillCondition.java | 4 +- .../OpUseFirecrackerSkillCondition.java | 4 +- .../OpUsePraseedSkillCondition.java | 4 +- .../OpWyvernSkillCondition.java | 4 +- .../PossessHolythingSkillCondition.java | 4 +- .../RemainCpPerSkillCondition.java | 4 +- .../RemainHpPerSkillCondition.java | 4 +- .../RemainMpPerSkillCondition.java | 4 +- .../SoulSavedSkillCondition.java | 4 +- .../TargetItemCrystalTypeSkillCondition.java | 4 +- .../TargetMyMenteeSkillCondition.java | 4 +- .../TargetMyPartySkillCondition.java | 4 +- .../TargetMyPledgeSkillCondition.java | 4 +- .../TargetRaceSkillCondition.java | 4 +- .../gameserver/data/xml/impl/ActionData.java | 4 +- .../gameserver/data/xml/impl/AdminData.java | 8 +- .../data/xml/impl/AppearanceItemData.java | 6 +- .../data/xml/impl/AttendanceRewardData.java | 4 +- .../data/xml/impl/BeautyShopData.java | 10 +- .../data/xml/impl/ClanHallData.java | 4 +- .../data/xml/impl/CombinationItemsData.java | 4 +- .../gameserver/data/xml/impl/CubicData.java | 6 +- .../data/xml/impl/DailyMissionData.java | 8 +- .../gameserver/data/xml/impl/DoorData.java | 14 +- .../data/xml/impl/EnchantItemData.java | 8 +- .../data/xml/impl/EnchantSkillGroupsData.java | 6 +- .../data/xml/impl/EquipmentUpgradeData.java | 4 +- .../data/xml/impl/EventEngineData.java | 12 +- .../data/xml/impl/ExtendDropData.java | 26 +- .../data/xml/impl/FakePlayerData.java | 4 +- .../gameserver/data/xml/impl/FenceData.java | 4 +- .../gameserver/data/xml/impl/HennaData.java | 4 +- .../data/xml/impl/InitialEquipmentData.java | 4 +- .../data/xml/impl/LuckyGameData.java | 10 +- .../data/xml/impl/MultisellData.java | 4 +- .../gameserver/data/xml/impl/NpcData.java | 8 +- .../xml/impl/NpcNameLocalisationData.java | 4 +- .../gameserver/data/xml/impl/OptionData.java | 4 +- .../data/xml/impl/PetDataTable.java | 4 +- .../data/xml/impl/PlayerTemplateData.java | 4 +- .../data/xml/impl/PrimeShopData.java | 4 +- .../gameserver/data/xml/impl/RecipeData.java | 4 +- .../data/xml/impl/ResidenceFunctionsData.java | 6 +- .../xml/impl/SendMessageLocalisationData.java | 4 +- .../gameserver/data/xml/impl/ShuttleData.java | 8 +- .../data/xml/impl/SiegeScheduleData.java | 6 +- .../gameserver/data/xml/impl/SkillData.java | 86 +- .../data/xml/impl/SkillTreesData.java | 4 +- .../gameserver/data/xml/impl/SpawnsData.java | 16 +- .../data/xml/impl/StaticObjectData.java | 8 +- .../data/xml/impl/TeleportListData.java | 4 +- .../data/xml/impl/TeleportersData.java | 4 +- .../data/xml/impl/TransformData.java | 6 +- .../gameserver/engines/DocumentBase.java | 8 +- .../engines/DocumentBaseGeneral.java | 4 +- .../engines/items/DocumentItem.java | 8 +- .../engines/items/ItemDataHolder.java | 4 +- .../gameserver/handler/ConditionHandler.java | 8 +- .../gameserver/handler/EffectHandler.java | 8 +- .../handler/SkillConditionHandler.java | 8 +- .../instancemanager/AirShipManager.java | 18 +- .../instancemanager/BoatManager.java | 4 +- .../instancemanager/CastleManorManager.java | 6 +- .../CeremonyOfChaosManager.java | 6 +- .../instancemanager/DBSpawnManager.java | 20 +- .../FakePlayerChatManager.java | 4 +- .../instancemanager/GrandBossManager.java | 16 +- .../instancemanager/InstanceManager.java | 20 +- .../instancemanager/RankManager.java | 34 +- .../gameserver/model/AccessLevel.java | 2 +- .../gameserver/model/ActionDataHolder.java | 2 +- .../model/AdminCommandAccessRight.java | 2 +- .../model/DailyMissionDataHolder.java | 8 +- .../l2jmobius/gameserver/model/Location.java | 2 +- .../gameserver/model/PetLevelData.java | 2 +- .../gameserver/model/RecipeList.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../gameserver/model/SiegeScheduleDate.java | 2 +- .../gameserver/model/SkillLearn.java | 2 +- .../l2jmobius/gameserver/model/StatSet.java | 968 ++++++++++++++++++ .../l2jmobius/gameserver/model/StatsSet.java | 968 ------------------ .../l2jmobius/gameserver/model/actor/Npc.java | 10 +- .../actor/templates/CreatureTemplate.java | 6 +- .../model/actor/templates/CubicTemplate.java | 4 +- .../model/actor/templates/DoorTemplate.java | 4 +- .../model/actor/templates/NpcTemplate.java | 14 +- .../model/actor/templates/PlayerTemplate.java | 4 +- .../model/actor/transform/Transform.java | 4 +- .../actor/transform/TransformLevelData.java | 4 +- .../actor/transform/TransformTemplate.java | 4 +- .../model/alchemy/AlchemyCraftData.java | 4 +- .../model/beautyshop/BeautyItem.java | 6 +- .../ceremonyofchaos/CeremonyOfChaosEvent.java | 8 +- .../gameserver/model/cubic/CubicSkill.java | 4 +- .../gameserver/model/entity/ClanHall.java | 4 +- .../gameserver/model/entity/Hero.java | 72 +- .../eventengine/AbstractEventManager.java | 10 +- .../model/eventengine/EventScheduler.java | 4 +- .../model/events/AbstractScript.java | 6 +- .../model/events/TimerExecutor.java | 8 +- .../model/events/timers/TimerHolder.java | 8 +- .../model/holders/AppearanceHolder.java | 4 +- .../model/holders/AttachSkillHolder.java | 4 +- .../model/holders/EnchantSkillHolder.java | 4 +- .../model/holders/ExtendDropDataHolder.java | 4 +- .../model/holders/FakePlayerHolder.java | 4 +- .../gameserver/model/holders/ItemHolder.java | 4 +- .../model/holders/ItemPointHolder.java | 4 +- .../model/holders/LuckyGameDataHolder.java | 4 +- .../model/holders/MinionHolder.java | 4 +- .../model/holders/MultisellListHolder.java | 4 +- .../model/instancezone/Instance.java | 8 +- .../model/instancezone/InstanceTemplate.java | 10 +- .../instancezone/conditions/Condition.java | 8 +- .../conditions/ConditionCommandChannel.java | 4 +- .../ConditionCommandChannelLeader.java | 4 +- .../conditions/ConditionDistance.java | 4 +- .../conditions/ConditionGroupMax.java | 4 +- .../conditions/ConditionGroupMin.java | 4 +- .../conditions/ConditionHasResidence.java | 6 +- .../conditions/ConditionItem.java | 4 +- .../conditions/ConditionLevel.java | 4 +- .../conditions/ConditionNoParty.java | 4 +- .../conditions/ConditionParty.java | 4 +- .../conditions/ConditionPartyLeader.java | 4 +- .../conditions/ConditionQuest.java | 4 +- .../conditions/ConditionReenter.java | 4 +- .../itemauction/AuctionDateGenerator.java | 4 +- .../model/itemauction/AuctionItem.java | 6 +- .../itemauction/ItemAuctionInstance.java | 6 +- .../gameserver/model/items/Armor.java | 8 +- .../gameserver/model/items/EtcItem.java | 8 +- .../gameserver/model/items/Henna.java | 4 +- .../gameserver/model/items/Item.java | 8 +- .../model/items/PlayerItemTemplate.java | 4 +- .../gameserver/model/items/Weapon.java | 8 +- .../items/appearance/AppearanceStone.java | 4 +- .../items/combination/CombinationItem.java | 4 +- .../items/enchant/AbstractEnchantItem.java | 4 +- .../model/items/enchant/EnchantScroll.java | 4 +- .../items/enchant/EnchantSupportItem.java | 4 +- .../gameserver/model/olympiad/Olympiad.java | 38 +- .../model/olympiad/Participant.java | 6 +- .../model/primeshop/PrimeShopGroup.java | 4 +- .../residences/ResidenceFunctionTemplate.java | 4 +- .../model/shuttle/ShuttleDataHolder.java | 4 +- .../gameserver/model/skills/Skill.java | 6 +- .../model/spawns/NpcSpawnTemplate.java | 16 +- .../gameserver/model/spawns/SpawnGroup.java | 12 +- .../model/spawns/SpawnTemplate.java | 12 +- .../model/teleporter/TeleportHolder.java | 4 +- .../model/teleporter/TeleportLocation.java | 4 +- .../model/variables/AbstractVariables.java | 18 +- .../network/serverpackets/ExHeroList.java | 6 +- .../ranking/ExOlympiadMyRankingInfo.java | 4 +- .../ranking/ExOlympiadRankingInfo.java | 34 +- .../ranking/ExRankingCharInfo.java | 10 +- .../ranking/ExRankingCharRankers.java | 50 +- .../gameserver/util/BypassParser.java | 4 +- .../ai/areas/BeastFarm/ImprovedBabyPets.java | 6 +- .../scripts/ai/bosses/Antharas/Antharas.java | 6 +- .../data/scripts/ai/bosses/Baium/Baium.java | 6 +- .../data/scripts/ai/bosses/Core/Core.java | 8 +- .../scripts/ai/bosses/DrChaos/DrChaos.java | 8 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 8 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 8 +- .../scripts/ai/bosses/Valakas/Valakas.java | 8 +- .../data/scripts/ai/bosses/Zaken/Zaken.java | 8 +- .../CastleTeleporter/CastleTeleporter.java | 6 +- .../ai/others/Servitors/TreeOfLife.java | 4 +- .../admincommandhandlers/AdminGrandBoss.java | 4 +- .../admincommandhandlers/AdminOlympiad.java | 14 +- .../conditions/CategoryTypeCondition.java | 4 +- .../conditions/NpcLevelCondition.java | 4 +- .../conditions/PlayerLevelCondition.java | 4 +- .../effecthandlers/AbnormalShield.java | 4 +- .../effecthandlers/AbnormalTimeChange.java | 4 +- .../handlers/effecthandlers/AbsorbDamage.java | 4 +- .../AbstractConditionalHpEffect.java | 4 +- .../effecthandlers/AbstractStatAddEffect.java | 4 +- .../effecthandlers/AbstractStatEffect.java | 6 +- .../AbstractStatPercentEffect.java | 4 +- .../handlers/effecthandlers/Accuracy.java | 4 +- .../handlers/effecthandlers/AddHate.java | 4 +- .../effecthandlers/AddSkillBySkill.java | 4 +- .../AddTeleportBookmarkSlot.java | 4 +- .../effecthandlers/AdditionalPotionCp.java | 4 +- .../effecthandlers/AdditionalPotionHp.java | 4 +- .../effecthandlers/AdditionalPotionMp.java | 4 +- .../handlers/effecthandlers/AirBind.java | 4 +- .../handlers/effecthandlers/AreaDamage.java | 4 +- .../effecthandlers/AttackAttribute.java | 4 +- .../effecthandlers/AttackAttributeAdd.java | 4 +- .../handlers/effecthandlers/AttackBehind.java | 4 +- .../handlers/effecthandlers/AttackTrait.java | 4 +- .../handlers/effecthandlers/Backstab.java | 4 +- .../handlers/effecthandlers/Betray.java | 4 +- .../handlers/effecthandlers/Blink.java | 4 +- .../handlers/effecthandlers/BlinkSwap.java | 4 +- .../effecthandlers/BlockAbnormalSlot.java | 4 +- .../handlers/effecthandlers/BlockAction.java | 4 +- .../handlers/effecthandlers/BlockActions.java | 4 +- .../handlers/effecthandlers/BlockChat.java | 4 +- .../handlers/effecthandlers/BlockControl.java | 4 +- .../handlers/effecthandlers/BlockEscape.java | 4 +- .../handlers/effecthandlers/BlockMove.java | 4 +- .../handlers/effecthandlers/BlockParty.java | 4 +- .../effecthandlers/BlockResurrection.java | 4 +- .../handlers/effecthandlers/BlockSkill.java | 4 +- .../handlers/effecthandlers/BlockTarget.java | 4 +- .../handlers/effecthandlers/Bluff.java | 4 +- .../effecthandlers/BonusDropAmount.java | 4 +- .../effecthandlers/BonusDropRate.java | 4 +- .../effecthandlers/BonusSpoilRate.java | 4 +- .../handlers/effecthandlers/Breath.java | 4 +- .../handlers/effecthandlers/BuffBlock.java | 4 +- .../effecthandlers/CallLearnedSkill.java | 4 +- .../handlers/effecthandlers/CallParty.java | 4 +- .../handlers/effecthandlers/CallPc.java | 4 +- .../effecthandlers/CallRandomSkill.java | 4 +- .../handlers/effecthandlers/CallSkill.java | 4 +- .../effecthandlers/CallSkillOnActionTime.java | 4 +- .../effecthandlers/CallTargetParty.java | 4 +- .../effecthandlers/ChameleonRest.java | 4 +- .../handlers/effecthandlers/ChangeBody.java | 6 +- .../handlers/effecthandlers/ChangeFace.java | 4 +- .../effecthandlers/ChangeFishingMastery.java | 4 +- .../effecthandlers/ChangeHairColor.java | 4 +- .../effecthandlers/ChangeHairStyle.java | 4 +- .../handlers/effecthandlers/CheapShot.java | 4 +- .../handlers/effecthandlers/ClassChange.java | 4 +- .../handlers/effecthandlers/Compelling.java | 4 +- .../handlers/effecthandlers/Confuse.java | 4 +- .../handlers/effecthandlers/ConsumeBody.java | 4 +- .../handlers/effecthandlers/ConvertItem.java | 4 +- .../effecthandlers/CounterPhysicalSkill.java | 4 +- .../scripts/handlers/effecthandlers/Cp.java | 4 +- .../handlers/effecthandlers/CpHeal.java | 4 +- .../effecthandlers/CpHealOverTime.java | 4 +- .../effecthandlers/CpHealPercent.java | 4 +- .../handlers/effecthandlers/CpRegen.java | 4 +- .../effecthandlers/CriticalDamage.java | 4 +- .../CriticalDamagePosition.java | 4 +- .../handlers/effecthandlers/CriticalRate.java | 4 +- .../CriticalRatePositionBonus.java | 4 +- .../effecthandlers/CrystalGradeModify.java | 4 +- .../handlers/effecthandlers/CubicMastery.java | 4 +- .../handlers/effecthandlers/DamOverTime.java | 4 +- .../effecthandlers/DamOverTimePercent.java | 4 +- .../handlers/effecthandlers/DamageBlock.java | 4 +- .../effecthandlers/DamageByAttack.java | 4 +- .../handlers/effecthandlers/DamageShield.java | 4 +- .../effecthandlers/DamageShieldResist.java | 4 +- .../handlers/effecthandlers/DeathLink.java | 4 +- .../handlers/effecthandlers/DebuffBlock.java | 4 +- .../effecthandlers/DefenceAttribute.java | 4 +- .../effecthandlers/DefenceCriticalDamage.java | 4 +- .../effecthandlers/DefenceCriticalRate.java | 4 +- .../DefenceMagicCriticalDamage.java | 4 +- .../DefenceMagicCriticalRate.java | 4 +- .../handlers/effecthandlers/DefenceTrait.java | 4 +- .../handlers/effecthandlers/DeleteHate.java | 4 +- .../effecthandlers/DeleteHateOfMe.java | 4 +- .../effecthandlers/DeleteTopAgro.java | 4 +- .../effecthandlers/DetectHiddenObjects.java | 4 +- .../handlers/effecthandlers/Detection.java | 4 +- .../handlers/effecthandlers/DisableSkill.java | 4 +- .../effecthandlers/DisableTargeting.java | 4 +- .../handlers/effecthandlers/Disarm.java | 4 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 4 +- .../effecthandlers/DispelByCategory.java | 4 +- .../handlers/effecthandlers/DispelBySlot.java | 4 +- .../effecthandlers/DispelBySlotMyself.java | 4 +- .../DispelBySlotProbability.java | 4 +- .../handlers/effecthandlers/DoubleCast.java | 4 +- .../handlers/effecthandlers/DuelistFury.java | 4 +- .../handlers/effecthandlers/EnableCloak.java | 4 +- .../handlers/effecthandlers/EnergyAttack.java | 4 +- .../effecthandlers/EnlargeAbnormalSlot.java | 4 +- .../handlers/effecthandlers/EnlargeSlot.java | 4 +- .../handlers/effecthandlers/Escape.java | 4 +- .../handlers/effecthandlers/ExpModify.java | 4 +- .../handlers/effecthandlers/Faceoff.java | 4 +- .../handlers/effecthandlers/FakeDeath.java | 4 +- .../handlers/effecthandlers/FatalBlow.java | 4 +- .../effecthandlers/FatalBlowRate.java | 4 +- .../scripts/handlers/effecthandlers/Fear.java | 4 +- .../scripts/handlers/effecthandlers/Feed.java | 4 +- .../effecthandlers/FishingExpSpBonus.java | 4 +- .../scripts/handlers/effecthandlers/Flag.java | 4 +- .../handlers/effecthandlers/FlipBlock.java | 4 +- .../handlers/effecthandlers/FlyAway.java | 4 +- .../handlers/effecthandlers/FocusEnergy.java | 4 +- .../effecthandlers/FocusMaxMomentum.java | 4 +- .../effecthandlers/FocusMomentum.java | 4 +- .../handlers/effecthandlers/FocusSouls.java | 4 +- .../handlers/effecthandlers/GetAgro.java | 4 +- .../effecthandlers/GetDamageLimit.java | 4 +- .../handlers/effecthandlers/GetMomentum.java | 4 +- .../effecthandlers/GiveClanReputation.java | 4 +- .../handlers/effecthandlers/GiveExpAndSp.java | 4 +- .../handlers/effecthandlers/GiveFame.java | 4 +- .../effecthandlers/GiveRecommendation.java | 4 +- .../handlers/effecthandlers/GiveSp.java | 4 +- .../handlers/effecthandlers/GiveXp.java | 4 +- .../scripts/handlers/effecthandlers/Grow.java | 4 +- .../effecthandlers/HairAccessorySet.java | 4 +- .../handlers/effecthandlers/Harvesting.java | 4 +- .../handlers/effecthandlers/HateAttack.java | 4 +- .../effecthandlers/HeadquarterCreate.java | 4 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealEffect.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 4 +- .../handlers/effecthandlers/HealPercent.java | 4 +- .../scripts/handlers/effecthandlers/Hide.java | 4 +- .../handlers/effecthandlers/HitAtNight.java | 4 +- .../handlers/effecthandlers/HitNumber.java | 4 +- .../scripts/handlers/effecthandlers/Hp.java | 4 +- .../handlers/effecthandlers/HpByLevel.java | 4 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../effecthandlers/HpCpHealCritical.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 4 +- .../handlers/effecthandlers/HpRegen.java | 4 +- .../handlers/effecthandlers/HpToOwner.java | 4 +- .../handlers/effecthandlers/IgnoreDeath.java | 4 +- .../effecthandlers/ImmobilePetBuff.java | 4 +- .../effecthandlers/InstantKillResist.java | 4 +- .../handlers/effecthandlers/JewelSlot.java | 4 +- .../handlers/effecthandlers/KarmaCount.java | 4 +- .../handlers/effecthandlers/KnockBack.java | 4 +- .../handlers/effecthandlers/Lethal.java | 4 +- .../handlers/effecthandlers/LimitCp.java | 4 +- .../handlers/effecthandlers/LimitHp.java | 4 +- .../handlers/effecthandlers/LimitMp.java | 4 +- .../handlers/effecthandlers/Lucky.java | 4 +- .../scripts/handlers/effecthandlers/MAtk.java | 4 +- .../effecthandlers/MagicAccuracy.java | 4 +- .../effecthandlers/MagicCriticalDamage.java | 4 +- .../effecthandlers/MagicCriticalRate.java | 4 +- .../handlers/effecthandlers/MagicMpCost.java | 4 +- .../MagicalAbnormalDispelAttack.java | 4 +- .../effecthandlers/MagicalAbnormalResist.java | 4 +- .../effecthandlers/MagicalAttack.java | 4 +- .../MagicalAttackByAbnormal.java | 4 +- .../MagicalAttackByAbnormalSlot.java | 4 +- .../effecthandlers/MagicalAttackMp.java | 4 +- .../effecthandlers/MagicalAttackRange.java | 4 +- .../effecthandlers/MagicalAttackSpeed.java | 4 +- .../effecthandlers/MagicalDamOverTime.java | 4 +- .../effecthandlers/MagicalDefence.java | 4 +- .../effecthandlers/MagicalEvasion.java | 4 +- .../effecthandlers/MagicalSkillPower.java | 4 +- .../effecthandlers/MagicalSoulAttack.java | 4 +- .../handlers/effecthandlers/ManaCharge.java | 4 +- .../effecthandlers/ManaDamOverTime.java | 4 +- .../handlers/effecthandlers/ManaHeal.java | 4 +- .../effecthandlers/ManaHealByLevel.java | 4 +- .../effecthandlers/ManaHealOverTime.java | 4 +- .../effecthandlers/ManaHealPercent.java | 4 +- .../handlers/effecthandlers/MaxCp.java | 4 +- .../handlers/effecthandlers/MaxHp.java | 4 +- .../handlers/effecthandlers/MaxMp.java | 4 +- .../handlers/effecthandlers/ModifyVital.java | 4 +- .../scripts/handlers/effecthandlers/Mp.java | 4 +- .../effecthandlers/MpConsumePerLevel.java | 4 +- .../handlers/effecthandlers/MpRegen.java | 4 +- .../handlers/effecthandlers/MpShield.java | 4 +- .../effecthandlers/MpVampiricAttack.java | 4 +- .../scripts/handlers/effecthandlers/Mute.java | 4 +- .../effecthandlers/NoblesseBless.java | 4 +- .../handlers/effecthandlers/OpenChest.java | 4 +- .../effecthandlers/OpenCommonRecipeBook.java | 4 +- .../handlers/effecthandlers/OpenDoor.java | 4 +- .../effecthandlers/OpenDwarfRecipeBook.java | 4 +- .../scripts/handlers/effecthandlers/PAtk.java | 4 +- .../handlers/effecthandlers/Passive.java | 4 +- .../PhysicalAbnormalResist.java | 4 +- .../effecthandlers/PhysicalAttack.java | 4 +- .../effecthandlers/PhysicalAttackHpLink.java | 4 +- .../effecthandlers/PhysicalAttackMute.java | 4 +- .../effecthandlers/PhysicalAttackRange.java | 4 +- .../effecthandlers/PhysicalAttackSaveHp.java | 4 +- .../effecthandlers/PhysicalAttackSpeed.java | 4 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../effecthandlers/PhysicalDefence.java | 4 +- .../effecthandlers/PhysicalEvasion.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 4 +- .../PhysicalShieldAngleAll.java | 4 +- .../effecthandlers/PhysicalSkillPower.java | 4 +- .../effecthandlers/PhysicalSoulAttack.java | 4 +- .../handlers/effecthandlers/PkCount.java | 4 +- .../handlers/effecthandlers/Plunder.java | 4 +- .../effecthandlers/PolearmSingleTarget.java | 4 +- .../effecthandlers/ProtectDeathPenalty.java | 4 +- .../effecthandlers/ProtectionBlessing.java | 4 +- .../handlers/effecthandlers/PullBack.java | 4 +- .../PveMagicalSkillDamageBonus.java | 4 +- .../PveMagicalSkillDefenceBonus.java | 4 +- .../PvePhysicalAttackDamageBonus.java | 4 +- .../PvePhysicalAttackDefenceBonus.java | 4 +- .../PvePhysicalSkillDamageBonus.java | 4 +- .../PvePhysicalSkillDefenceBonus.java | 4 +- .../PveRaidMagicalSkillDefenceBonus.java | 4 +- .../PveRaidPhysicalAttackDefenceBonus.java | 4 +- .../PveRaidPhysicalSkillDefenceBonus.java | 4 +- .../PvpMagicalSkillDamageBonus.java | 4 +- .../PvpMagicalSkillDefenceBonus.java | 4 +- .../PvpPhysicalAttackDamageBonus.java | 4 +- .../PvpPhysicalAttackDefenceBonus.java | 4 +- .../PvpPhysicalSkillDamageBonus.java | 4 +- .../PvpPhysicalSkillDefenceBonus.java | 4 +- .../effecthandlers/RandomizeHate.java | 4 +- .../handlers/effecthandlers/RealDamage.java | 4 +- .../handlers/effecthandlers/RearDamage.java | 4 +- .../handlers/effecthandlers/RebalanceHP.java | 4 +- .../effecthandlers/RebalanceHPSummon.java | 4 +- .../RecoverVitalityInPeaceZone.java | 4 +- .../handlers/effecthandlers/Recovery.java | 4 +- .../handlers/effecthandlers/ReduceCancel.java | 4 +- .../handlers/effecthandlers/ReduceDamage.java | 4 +- .../effecthandlers/ReduceDropPenalty.java | 4 +- .../handlers/effecthandlers/ReflectMagic.java | 4 +- .../handlers/effecthandlers/ReflectSkill.java | 4 +- .../effecthandlers/RefuelAirship.java | 4 +- .../handlers/effecthandlers/Relax.java | 4 +- .../effecthandlers/ResetInstanceEntry.java | 4 +- .../ResistAbnormalByCategory.java | 4 +- .../effecthandlers/ResistDDMagic.java | 4 +- .../ResistDispelByCategory.java | 4 +- .../handlers/effecthandlers/ResistSkill.java | 4 +- .../handlers/effecthandlers/Restoration.java | 4 +- .../effecthandlers/RestorationRandom.java | 8 +- .../handlers/effecthandlers/Resurrection.java | 4 +- .../effecthandlers/ResurrectionSpecial.java | 4 +- .../handlers/effecthandlers/Reuse.java | 4 +- .../effecthandlers/ReuseSkillById.java | 4 +- .../scripts/handlers/effecthandlers/Root.java | 4 +- .../effecthandlers/SacrificeSummon.java | 4 +- .../effecthandlers/SafeFallHeight.java | 4 +- .../SendSystemMessageToClan.java | 4 +- .../effecthandlers/ServitorShare.java | 4 +- .../handlers/effecthandlers/SetHp.java | 4 +- .../handlers/effecthandlers/SetSkill.java | 4 +- .../effecthandlers/ShieldDefence.java | 4 +- .../effecthandlers/ShieldDefenceRate.java | 4 +- .../handlers/effecthandlers/SilentMove.java | 4 +- .../effecthandlers/SkillCritical.java | 4 +- .../effecthandlers/SkillCriticalDamage.java | 4 +- .../SkillCriticalProbability.java | 4 +- .../handlers/effecthandlers/SkillEvasion.java | 4 +- .../effecthandlers/SkillPowerAdd.java | 4 +- .../handlers/effecthandlers/SkillTurning.java | 4 +- .../effecthandlers/SkillTurningOverTime.java | 4 +- .../handlers/effecthandlers/SoulBlow.java | 4 +- .../handlers/effecthandlers/SoulEating.java | 4 +- .../scripts/handlers/effecthandlers/Sow.java | 4 +- .../handlers/effecthandlers/SpModify.java | 4 +- .../handlers/effecthandlers/Speed.java | 4 +- .../effecthandlers/SphericBarrier.java | 4 +- .../handlers/effecthandlers/Spoil.java | 4 +- .../StatBonusSkillCritical.java | 4 +- .../effecthandlers/StatBonusSpeed.java | 4 +- .../effecthandlers/StatByMoveType.java | 4 +- .../handlers/effecthandlers/StatUp.java | 4 +- .../effecthandlers/StealAbnormal.java | 4 +- .../handlers/effecthandlers/Summon.java | 4 +- .../effecthandlers/SummonAgathion.java | 4 +- .../handlers/effecthandlers/SummonCubic.java | 4 +- .../effecthandlers/SummonHallucination.java | 4 +- .../handlers/effecthandlers/SummonMulti.java | 4 +- .../handlers/effecthandlers/SummonNpc.java | 4 +- .../handlers/effecthandlers/SummonPet.java | 4 +- .../handlers/effecthandlers/SummonPoints.java | 4 +- .../handlers/effecthandlers/SummonTrap.java | 4 +- .../handlers/effecthandlers/Sweeper.java | 4 +- .../handlers/effecthandlers/Synergy.java | 4 +- .../handlers/effecthandlers/TakeCastle.java | 4 +- .../effecthandlers/TakeCastleStart.java | 4 +- .../handlers/effecthandlers/TakeFort.java | 4 +- .../effecthandlers/TakeFortStart.java | 4 +- .../handlers/effecthandlers/TalismanSlot.java | 4 +- .../handlers/effecthandlers/TargetCancel.java | 4 +- .../handlers/effecthandlers/TargetMe.java | 4 +- .../effecthandlers/TargetMeProbability.java | 4 +- .../handlers/effecthandlers/Teleport.java | 4 +- .../effecthandlers/TeleportToNpc.java | 4 +- .../effecthandlers/TeleportToPlayer.java | 4 +- .../effecthandlers/TeleportToSummon.java | 4 +- .../effecthandlers/TeleportToTarget.java | 4 +- .../TransferDamageToPlayer.java | 4 +- .../TransferDamageToSummon.java | 4 +- .../handlers/effecthandlers/TransferHate.java | 4 +- .../effecthandlers/Transformation.java | 4 +- .../handlers/effecthandlers/TrapDetect.java | 4 +- .../handlers/effecthandlers/TrapRemove.java | 4 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 4 +- .../effecthandlers/TriggerSkillByDamage.java | 4 +- .../TriggerSkillByDeathBlow.java | 4 +- .../effecthandlers/TriggerSkillByKill.java | 4 +- .../TriggerSkillByMagicType.java | 4 +- .../effecthandlers/TriggerSkillBySkill.java | 4 +- .../TriggerSkillBySkillAttack.java | 4 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 4 +- .../effecthandlers/UnsummonAgathion.java | 4 +- .../effecthandlers/UnsummonServitors.java | 4 +- .../handlers/effecthandlers/Untargetable.java | 4 +- .../effecthandlers/VampiricAttack.java | 4 +- .../effecthandlers/VampiricDefence.java | 4 +- .../effecthandlers/VitalityExpRate.java | 4 +- .../effecthandlers/VitalityPointUp.java | 4 +- .../effecthandlers/VitalityPointsRate.java | 4 +- .../handlers/effecthandlers/WeightLimit.java | 4 +- .../effecthandlers/WeightPenalty.java | 4 +- .../effecthandlers/WorldChatPoints.java | 4 +- .../BuildAdvanceBaseSkillCondition.java | 4 +- .../BuildCampSkillCondition.java | 4 +- ...CanAddMaxEntranceInzoneSkillCondition.java | 4 +- .../CanBookmarkAddSlotSkillCondition.java | 4 +- ...CanChangeVitalItemCountSkillCondition.java | 4 +- .../CanEnchantAttributeSkillCondition.java | 4 +- .../CanMountForEventSkillCondition.java | 4 +- .../CanRefuelAirshipSkillCondition.java | 4 +- .../CanRestoreVitalPointSkillCondition.java | 4 +- .../CanSummonCubicSkillCondition.java | 4 +- .../CanSummonMultiSkillCondition.java | 4 +- .../CanSummonPetSkillCondition.java | 4 +- .../CanSummonSiegeGolemSkillCondition.java | 4 +- .../CanSummonSkillCondition.java | 4 +- .../CanTransformInDominionSkillCondition.java | 4 +- .../CanTransformSkillCondition.java | 4 +- .../CanUntransformSkillCondition.java | 4 +- .../CanUseInBattlefieldSkillCondition.java | 4 +- .../CanUseInDragonLairSkillCondition.java | 4 +- .../CanUseSwoopCannonSkillCondition.java | 4 +- ...nUseVitalityConsumeItemSkillCondition.java | 4 +- .../CannotUseInTransformSkillCondition.java | 4 +- .../CheckLevelSkillCondition.java | 4 +- .../CheckSexSkillCondition.java | 4 +- .../ConsumeBodySkillCondition.java | 4 +- .../EnergySavedSkillCondition.java | 4 +- .../EquipArmorSkillCondition.java | 4 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../NotFearedSkillCondition.java | 4 +- .../NotInUnderwaterSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 4 +- .../OpAffectedBySkillSkillCondition.java | 4 +- .../OpAgathionEnergySkillCondition.java | 4 +- .../OpAlignmentSkillCondition.java | 4 +- .../OpBlinkSkillCondition.java | 4 +- .../OpCallPcSkillCondition.java | 4 +- .../OpCanEscapeSkillCondition.java | 4 +- .../OpCanNotUseAirshipSkillCondition.java | 4 +- ...eTargetWithPrivateStoreSkillCondition.java | 4 +- .../OpChangeWeaponSkillCondition.java | 4 +- .../OpCheckAbnormalSkillCondition.java | 4 +- .../OpCheckAccountTypeSkillCondition.java | 4 +- .../OpCheckCastRangeSkillCondition.java | 4 +- .../OpCheckClassListSkillCondition.java | 4 +- .../OpCheckClassSkillCondition.java | 4 +- .../OpCheckCrtEffectSkillCondition.java | 4 +- .../OpCheckFlagSkillCondition.java | 4 +- ...eckOnGoingEventCampaignSkillCondition.java | 4 +- .../OpCheckPcbangPointSkillCondition.java | 4 +- .../OpCheckResidenceSkillCondition.java | 4 +- .../OpCheckSkillListSkillCondition.java | 4 +- .../OpCheckSkillSkillCondition.java | 4 +- .../OpCompanionSkillCondition.java | 4 +- .../OpEnchantRangeSkillCondition.java | 4 +- .../OpEncumberedSkillCondition.java | 4 +- .../OpEnergyMaxSkillCondition.java | 4 +- .../OpEquipItemSkillCondition.java | 4 +- .../OpExistNpcSkillCondition.java | 4 +- .../OpFishingCastSkillCondition.java | 4 +- .../OpFishingPumpingSkillCondition.java | 4 +- .../OpFishingReelingSkillCondition.java | 4 +- .../OpHaveSummonSkillCondition.java | 4 +- .../OpHaveSummonedNpcSkillCondition.java | 4 +- .../OpHomeSkillCondition.java | 4 +- .../OpInSiegeTimeSkillCondition.java | 4 +- .../OpInstantzoneSkillCondition.java | 4 +- .../OpMainjobSkillCondition.java | 4 +- .../OpNeedAgathionSkillCondition.java | 4 +- .../OpNeedSummonOrPetSkillCondition.java | 4 +- .../OpNotCursedSkillCondition.java | 4 +- .../OpNotInPeacezoneSkillCondition.java | 4 +- .../OpNotInstantzoneSkillCondition.java | 4 +- .../OpNotOlympiadSkillCondition.java | 4 +- .../OpNotTerritorySkillCondition.java | 4 +- .../OpPeacezoneSkillCondition.java | 4 +- .../OpPkcountSkillCondition.java | 4 +- .../OpPledgeSkillCondition.java | 4 +- .../OpRestartPointSkillCondition.java | 4 +- .../OpResurrectionSkillCondition.java | 4 +- .../OpSiegeHammerSkillCondition.java | 4 +- .../OpSkillAcquireSkillCondition.java | 4 +- .../OpSkillSkillCondition.java | 4 +- .../OpSocialClassSkillCondition.java | 4 +- .../OpSoulMaxSkillCondition.java | 4 +- .../OpSubjobSkillCondition.java | 4 +- .../OpSweeperSkillCondition.java | 4 +- .../OpTargetAllItemTypeSkillCondition.java | 4 +- .../OpTargetArmorTypeSkillCondition.java | 4 +- .../OpTargetDoorSkillCondition.java | 4 +- ...OpTargetMyPledgeAcademySkillCondition.java | 4 +- .../OpTargetNpcSkillCondition.java | 4 +- .../OpTargetPcSkillCondition.java | 4 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../OpTerritorySkillCondition.java | 4 +- .../OpUnlockSkillCondition.java | 4 +- .../OpUseFirecrackerSkillCondition.java | 4 +- .../OpUsePraseedSkillCondition.java | 4 +- .../OpWyvernSkillCondition.java | 4 +- .../PossessHolythingSkillCondition.java | 4 +- .../RemainCpPerSkillCondition.java | 4 +- .../RemainHpPerSkillCondition.java | 4 +- .../RemainMpPerSkillCondition.java | 4 +- .../SoulSavedSkillCondition.java | 4 +- .../TargetItemCrystalTypeSkillCondition.java | 4 +- .../TargetMyMenteeSkillCondition.java | 4 +- .../TargetMyPartySkillCondition.java | 4 +- .../TargetMyPledgeSkillCondition.java | 4 +- .../TargetRaceSkillCondition.java | 4 +- .../gameserver/data/xml/impl/ActionData.java | 4 +- .../gameserver/data/xml/impl/AdminData.java | 8 +- .../data/xml/impl/AppearanceItemData.java | 6 +- .../data/xml/impl/AttendanceRewardData.java | 4 +- .../data/xml/impl/BeautyShopData.java | 10 +- .../data/xml/impl/ClanHallData.java | 4 +- .../data/xml/impl/CombinationItemsData.java | 4 +- .../gameserver/data/xml/impl/CubicData.java | 6 +- .../data/xml/impl/DailyMissionData.java | 8 +- .../gameserver/data/xml/impl/DoorData.java | 14 +- .../data/xml/impl/EnchantItemData.java | 8 +- .../data/xml/impl/EnchantSkillGroupsData.java | 6 +- .../data/xml/impl/EventEngineData.java | 12 +- .../data/xml/impl/ExtendDropData.java | 26 +- .../data/xml/impl/FakePlayerData.java | 4 +- .../gameserver/data/xml/impl/FenceData.java | 4 +- .../gameserver/data/xml/impl/HennaData.java | 4 +- .../data/xml/impl/InitialEquipmentData.java | 4 +- .../data/xml/impl/LuckyGameData.java | 10 +- .../data/xml/impl/MultisellData.java | 4 +- .../gameserver/data/xml/impl/NpcData.java | 8 +- .../xml/impl/NpcNameLocalisationData.java | 4 +- .../gameserver/data/xml/impl/OptionData.java | 4 +- .../data/xml/impl/PetDataTable.java | 4 +- .../data/xml/impl/PlayerTemplateData.java | 4 +- .../data/xml/impl/PrimeShopData.java | 4 +- .../gameserver/data/xml/impl/RecipeData.java | 4 +- .../data/xml/impl/ResidenceFunctionsData.java | 6 +- .../xml/impl/SendMessageLocalisationData.java | 4 +- .../gameserver/data/xml/impl/ShuttleData.java | 8 +- .../data/xml/impl/SiegeScheduleData.java | 6 +- .../gameserver/data/xml/impl/SkillData.java | 86 +- .../data/xml/impl/SkillTreesData.java | 4 +- .../gameserver/data/xml/impl/SpawnsData.java | 16 +- .../data/xml/impl/StaticObjectData.java | 8 +- .../data/xml/impl/TeleportersData.java | 4 +- .../data/xml/impl/TransformData.java | 6 +- .../gameserver/engines/DocumentBase.java | 8 +- .../engines/DocumentBaseGeneral.java | 4 +- .../engines/items/DocumentItem.java | 8 +- .../engines/items/ItemDataHolder.java | 4 +- .../gameserver/handler/ConditionHandler.java | 8 +- .../gameserver/handler/EffectHandler.java | 8 +- .../handler/SkillConditionHandler.java | 8 +- .../instancemanager/AirShipManager.java | 18 +- .../instancemanager/BoatManager.java | 4 +- .../instancemanager/CastleManorManager.java | 6 +- .../CeremonyOfChaosManager.java | 6 +- .../instancemanager/DBSpawnManager.java | 20 +- .../FakePlayerChatManager.java | 4 +- .../instancemanager/GrandBossManager.java | 16 +- .../instancemanager/InstanceManager.java | 20 +- .../gameserver/model/AccessLevel.java | 2 +- .../gameserver/model/ActionDataHolder.java | 2 +- .../model/AdminCommandAccessRight.java | 2 +- .../model/DailyMissionDataHolder.java | 8 +- .../l2jmobius/gameserver/model/Location.java | 2 +- .../gameserver/model/PetLevelData.java | 2 +- .../gameserver/model/RecipeList.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../gameserver/model/SiegeScheduleDate.java | 2 +- .../gameserver/model/SkillLearn.java | 2 +- .../l2jmobius/gameserver/model/StatSet.java | 968 ++++++++++++++++++ .../l2jmobius/gameserver/model/StatsSet.java | 968 ------------------ .../l2jmobius/gameserver/model/actor/Npc.java | 10 +- .../actor/templates/CreatureTemplate.java | 6 +- .../model/actor/templates/CubicTemplate.java | 4 +- .../model/actor/templates/DoorTemplate.java | 4 +- .../model/actor/templates/NpcTemplate.java | 14 +- .../model/actor/templates/PlayerTemplate.java | 4 +- .../model/actor/transform/Transform.java | 4 +- .../actor/transform/TransformLevelData.java | 4 +- .../actor/transform/TransformTemplate.java | 4 +- .../model/alchemy/AlchemyCraftData.java | 4 +- .../model/beautyshop/BeautyItem.java | 6 +- .../ceremonyofchaos/CeremonyOfChaosEvent.java | 8 +- .../gameserver/model/cubic/CubicSkill.java | 4 +- .../gameserver/model/entity/ClanHall.java | 4 +- .../gameserver/model/entity/Hero.java | 70 +- .../eventengine/AbstractEventManager.java | 10 +- .../model/eventengine/EventScheduler.java | 4 +- .../model/events/AbstractScript.java | 6 +- .../model/events/TimerExecutor.java | 8 +- .../model/events/timers/TimerHolder.java | 8 +- .../model/holders/AppearanceHolder.java | 4 +- .../model/holders/AttachSkillHolder.java | 4 +- .../model/holders/EnchantSkillHolder.java | 4 +- .../model/holders/ExtendDropDataHolder.java | 4 +- .../model/holders/FakePlayerHolder.java | 4 +- .../gameserver/model/holders/ItemHolder.java | 4 +- .../model/holders/ItemPointHolder.java | 4 +- .../model/holders/LuckyGameDataHolder.java | 4 +- .../model/holders/MinionHolder.java | 4 +- .../model/holders/MultisellListHolder.java | 4 +- .../model/instancezone/Instance.java | 8 +- .../model/instancezone/InstanceTemplate.java | 10 +- .../instancezone/conditions/Condition.java | 8 +- .../conditions/ConditionCommandChannel.java | 4 +- .../ConditionCommandChannelLeader.java | 4 +- .../conditions/ConditionDistance.java | 4 +- .../conditions/ConditionGroupMax.java | 4 +- .../conditions/ConditionGroupMin.java | 4 +- .../conditions/ConditionHasResidence.java | 6 +- .../conditions/ConditionItem.java | 4 +- .../conditions/ConditionLevel.java | 4 +- .../conditions/ConditionNoParty.java | 4 +- .../conditions/ConditionParty.java | 4 +- .../conditions/ConditionPartyLeader.java | 4 +- .../conditions/ConditionQuest.java | 4 +- .../conditions/ConditionReenter.java | 4 +- .../itemauction/AuctionDateGenerator.java | 4 +- .../model/itemauction/AuctionItem.java | 6 +- .../itemauction/ItemAuctionInstance.java | 6 +- .../gameserver/model/items/Armor.java | 8 +- .../gameserver/model/items/EtcItem.java | 8 +- .../gameserver/model/items/Henna.java | 4 +- .../gameserver/model/items/Item.java | 8 +- .../model/items/PlayerItemTemplate.java | 4 +- .../gameserver/model/items/Weapon.java | 8 +- .../items/appearance/AppearanceStone.java | 4 +- .../items/combination/CombinationItem.java | 4 +- .../items/enchant/AbstractEnchantItem.java | 4 +- .../model/items/enchant/EnchantScroll.java | 4 +- .../items/enchant/EnchantSupportItem.java | 4 +- .../gameserver/model/olympiad/Olympiad.java | 38 +- .../model/olympiad/Participant.java | 6 +- .../model/primeshop/PrimeShopGroup.java | 4 +- .../residences/ResidenceFunctionTemplate.java | 4 +- .../model/shuttle/ShuttleDataHolder.java | 4 +- .../gameserver/model/skills/Skill.java | 6 +- .../model/spawns/NpcSpawnTemplate.java | 16 +- .../gameserver/model/spawns/SpawnGroup.java | 12 +- .../model/spawns/SpawnTemplate.java | 12 +- .../model/teleporter/TeleportHolder.java | 4 +- .../model/teleporter/TeleportLocation.java | 4 +- .../model/variables/AbstractVariables.java | 18 +- .../network/serverpackets/ExHeroList.java | 6 +- .../gameserver/util/BypassParser.java | 4 +- 10201 files changed, 38171 insertions(+), 38171 deletions(-) rename L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/{StatsSet.java => StatSet.java} (95%) rename L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/{StatsSet.java => StatSet.java} (95%) rename L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/{StatsSet.java => StatSet.java} (95%) rename L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/{StatsSet.java => StatSet.java} (95%) create mode 100644 L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/StatSet.java delete mode 100644 L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/StatsSet.java create mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/StatSet.java delete mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/StatsSet.java create mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/StatSet.java delete mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/StatsSet.java create mode 100644 L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/StatSet.java delete mode 100644 L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/StatsSet.java rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/{StatsSet.java => StatSet.java} (94%) create mode 100644 L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/StatSet.java delete mode 100644 L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/StatsSet.java create mode 100644 L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/StatSet.java delete mode 100644 L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/StatsSet.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/StatSet.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/StatsSet.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/StatSet.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/StatsSet.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/StatSet.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/StatsSet.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/StatSet.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/StatsSet.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/StatSet.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/StatsSet.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/StatSet.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/StatsSet.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/StatSet.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/StatsSet.java diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java index 2ceebc156a..a3f07a6ad5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java @@ -18,7 +18,7 @@ package ai.areas.BeastFarm; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -133,7 +133,7 @@ public class ImprovedBabyPets extends AbstractNpcAI private boolean castBuff(Summon summon, int stepNumber, int buffNumber) { final PlayerInstance owner = summon.getOwner(); - final StatsSet parameters = summon.getTemplate().getParameters(); + final StatSet parameters = summon.getTemplate().getParameters(); final SkillHolder skill = parameters.getObject("step" + stepNumber + "_buff0" + buffNumber, SkillHolder.class); if ((skill != null) && (owner != null)) @@ -174,7 +174,7 @@ public class ImprovedBabyPets extends AbstractNpcAI { final boolean previousFollowStatus = summon.getFollowStatus(); final PlayerInstance owner = summon.getOwner(); - final StatsSet parameters = summon.getTemplate().getParameters(); + final StatSet parameters = summon.getTemplate().getParameters(); final SkillHolder skill = parameters.getObject("step" + stepNumber + "_heal0" + healNumber, SkillHolder.class); final int targetType = parameters.getInt("step" + stepNumber + "_heal_target0" + healNumber, 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java index efdbdd4460..9ff1875b62 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java @@ -18,7 +18,7 @@ package ai.areas.FairySettlement; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -50,11 +50,11 @@ public class Wisp extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("DELETE_NPC")) { - params = new StatsSet(); + params = new StatSet(); params.set("LOCATION_OBJECT", npc.getLocation()); getTimers().addTimer("RESPAWN_WISP_" + npc.getObjectId(), params, getRandom(RESPAWN_MIN, RESPAWN_MAX), null, null); npc.deleteMe(); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java index 5cd6622513..b52be69c96 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java @@ -19,7 +19,7 @@ package ai.areas.Parnassus.EntrancePortalToCrystalCaverns; import java.util.Calendar; import org.l2jmobius.gameserver.instancemanager.QuestManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -107,7 +107,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("LOOP_TIMER")) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfHellfire/Zofan.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfHellfire/Zofan.java index b6c122da75..03f451c9fd 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfHellfire/Zofan.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfHellfire/Zofan.java @@ -16,7 +16,7 @@ */ package ai.areas.SeedOfHellfire; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -61,7 +61,7 @@ public class Zofan extends AbstractNpcAI { if ((npc.getInstanceWorld() == null) && (npc.getSpawn() != null)) { - final StatsSet params = npc.getParameters(); + final StatSet params = npc.getParameters(); if (params.getInt("i_childrengarden_guard", 0) == 0) { for (String param : MINION_PARAMS) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Allada.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Allada.java index 5ccca8c99a..4291aeb5ec 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Allada.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Allada.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -45,7 +45,7 @@ public class Allada extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Mei.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Mei.java index 015ee0bc9a..7ad9623ec2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Mei.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Mei.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -40,7 +40,7 @@ public class Mei extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SHOUT")) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Remons.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Remons.java index 41ec3c1bff..a1ea6ba90c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Remons.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Remons.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -43,7 +43,7 @@ public class Remons extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rinne.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rinne.java index 55ab4fc1a7..1d6eafa48a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rinne.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rinne.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -42,7 +42,7 @@ public class Rinne extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rotina.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rotina.java index 24ad1b6041..d0c8f2a81b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rotina.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rotina.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -45,7 +45,7 @@ public class Rotina extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Soros.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Soros.java index d7862030aa..632d1a78a8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Soros.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Soros.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -40,7 +40,7 @@ public class Soros extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java index cbe7cc9ac9..4a2aaf21c4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java @@ -17,7 +17,7 @@ package ai.areas.WallOfArgos.ElmoredenServantsGhost; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -58,7 +58,7 @@ public class ElmoredenServantsGhost extends AbstractNpcAI takeItems(player, USED_GRAVE_PASS, 1); final Location loc; - final StatsSet npcParameters = npc.getParameters(); + final StatSet npcParameters = npc.getParameters(); if (event.equals("teleport1")) { loc = new Location(npcParameters.getInt("TelPos_X1", 0), npcParameters.getInt("TelPos_Y1", 0), npcParameters.getInt("TelPos_Z1", 0)); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java index aca502d2cc..a46695ea27 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -341,7 +341,7 @@ public class Anakim extends AbstractNpcAI addSkillSeeId(ALL_MOBS); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANAKIM); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM); final int status = GrandBossManager.getInstance().getBossStatus(ANAKIM); if (status == DEAD) { @@ -613,9 +613,9 @@ public class Anakim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(ANAKIM, DEAD); final long respawnTime = getRespawnTime(); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANAKIM); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(ANAKIM, info); + GrandBossManager.getInstance().setStatSet(ANAKIM, info); startQuestTimer("unlock_anakim", respawnTime, null, null); startQuestTimer("end_anakim", 900000, null, null); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index b837d839d8..d12c29d422 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -138,7 +138,7 @@ public class Antharas extends AbstractNpcAI addAttackId(ANTHARAS, BOMBER, BEHEMOTH, TERASQUE); addKillId(ANTHARAS, TERASQUE, BEHEMOTH); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANTHARAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANTHARAS); final double curr_hp = info.getDouble("currentHP"); final double curr_mp = info.getDouble("currentMP"); final int loc_x = info.getInt("loc_x"); @@ -761,7 +761,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(PlayerInstance attacker, int damage) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Baium/Baium.java index c0d8221ff5..1d319f5910 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -112,7 +112,7 @@ public class Baium extends AbstractNpcAI addSeeCreatureId(BAIUM); addSpellFinishedId(BAIUM); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(BAIUM); + final StatSet info = GrandBossManager.getInstance().getStatSet(BAIUM); switch (getStatus()) { @@ -666,7 +666,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java index 768ebbc11d..ebf5e78a5a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -122,7 +122,7 @@ public class BalokWarzone extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (isInInstance(world)) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java index 9919e58ce5..e8a2e67509 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java @@ -17,7 +17,7 @@ package ai.bosses.Baylor; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -77,7 +77,7 @@ public class BaylorWarzone extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (isInInstance(world)) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java index 1e80c81840..e8e9fa8756 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; @@ -104,7 +104,7 @@ public class Beleth extends AbstractNpcAI addStartNpc(STONE_COFFIN); addTalkId(STONE_COFFIN); addFirstTalkId(ELF); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(REAL_BELETH); + final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH); if (status == DEAD) { @@ -750,9 +750,9 @@ public class Beleth extends AbstractNpcAI setBelethKiller(killer); GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD); final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(REAL_BELETH); + final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(REAL_BELETH, info); + GrandBossManager.getInstance().setStatSet(REAL_BELETH, info); startQuestTimer("BELETH_UNLOCK", respawnTime, null, null); deleteAll(); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Core/Core.java index bfa7212b8c..c1452bf9de 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; @@ -85,7 +85,7 @@ public class Core extends AbstractNpcAI registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR); _firstAttacked = false; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. @@ -205,9 +205,9 @@ public class Core extends AbstractNpcAI final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000; startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(CORE, info); + GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java index 6ef025304c..764df30625 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -175,7 +175,7 @@ public class IceQueensCastleBattle extends AbstractInstance final Instance world = npc.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); final Npc controller = params.getObject("controller", Npc.class); final Npc freya = params.getObject("freya", Npc.class); switch (event) @@ -734,7 +734,7 @@ public class IceQueensCastleBattle extends AbstractInstance final Instance world = npc.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); switch (npc.getId()) { case FREYA_THRONE: @@ -1069,7 +1069,7 @@ public class IceQueensCastleBattle extends AbstractInstance final Instance world = npc.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); final Npc controller = params.getObject("controller", Npc.class); switch (npc.getId()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java index dc6e826093..b863874cd2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.AggroInfo; import org.l2jmobius.gameserver.model.DamageDoneInfo; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -153,13 +153,13 @@ public class IstinaCavern extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); - final StatsSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); switch (event) { case "DEATH_TIMER": @@ -391,7 +391,7 @@ public class IstinaCavern extends AbstractInstance } else { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); if (skillId == npcParams.getSkillHolder("Istina_Death_Skill01").getSkillId()) { @@ -440,7 +440,7 @@ public class IstinaCavern extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int stage = npcVars.getInt("ISTINA_STAGE", -1); if (npc.getId() == BALLISTA) @@ -657,7 +657,7 @@ public class IstinaCavern extends AbstractInstance private PlayerInstance setPlayerRewardInfo(Npc npc) { final Map rewards = new ConcurrentHashMap<>(); - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); PlayerInstance maxDealer = null; long maxDamage = 0; int totalDamage = 0; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java index 31be0ec32d..f023ad5f8e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java @@ -19,7 +19,7 @@ package ai.bosses.Kimerian; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -83,7 +83,7 @@ public class KimerianCommon extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) @@ -345,8 +345,8 @@ public class KimerianCommon extends AbstractInstance { final Creature creature = event.getSeen(); final Npc npc = (Npc) event.getSeer(); - final StatsSet npcParams = npc.getParameters(); - final StatsSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java index 9fbe2e6026..51ffd45923 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -367,7 +367,7 @@ public class Lilith extends AbstractNpcAI addSkillSeeId(ALL_MOBS); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LILITH); + final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH); final int status = GrandBossManager.getInstance().getBossStatus(LILITH); if (status == DEAD) { @@ -629,9 +629,9 @@ public class Lilith extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LILITH, DEAD); final long respawnTime = getRespawnTime(); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LILITH); + final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(LILITH, info); + GrandBossManager.getInstance().setStatSet(LILITH, info); startQuestTimer("unlock_lilith", respawnTime, null, null); startQuestTimer("end_lilith", 900000, null, null); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index 9ef473069d..cc00a33356 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -244,7 +244,7 @@ public class Lindvior extends AbstractNpcAI addSeeCreatureId(INVISIBLE); _zoneLair = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LINDVIOR_RAID); + final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID); final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID); if (status == DEAD) { @@ -821,9 +821,9 @@ public class Lindvior extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD); final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LINDVIOR_RAID); + final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(LINDVIOR_RAID, info); + GrandBossManager.getInstance().setStatSet(LINDVIOR_RAID, info); startQuestTimer("unlock_lindvior", respawnTime, null, null); } else if (npc.getId() == NPC_GENERATOR) @@ -867,7 +867,7 @@ public class Lindvior extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SHOUT") && (npc != null) && !npc.isDead()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/LionelHunter.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/LionelHunter.java index e02f478232..0677792823 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/LionelHunter.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/LionelHunter.java @@ -18,7 +18,7 @@ package ai.bosses.Lindvior; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.WalkingManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -43,7 +43,7 @@ public class LionelHunter extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SHOUT") && (npc != null)) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java index b9c19644c4..c5c62c8f2f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -152,13 +152,13 @@ public class OctavisWarzone extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (isInInstance(world)) { - final StatsSet npcVars = npc.getVariables(); - final StatsSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); switch (event) { @@ -378,7 +378,7 @@ public class OctavisWarzone extends AbstractInstance } else if (CommonUtil.contains(OCTAVIS_STAGE_2, npc.getId())) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); if (npcVars.getBoolean("START_TIMERS", true)) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index 38eebefc7b..5e525a6caa 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -92,7 +92,7 @@ public class Orfen extends AbstractNpcAI registerMobs(mobs); _IsTeleported = false; ZONE = ZoneManager.getInstance().getZoneById(12013); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); final int status = GrandBossManager.getInstance().getBossStatus(ORFEN); if (status == DEAD) { @@ -327,9 +327,9 @@ public class Orfen extends AbstractNpcAI respawnTime *= 3600000; startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(ORFEN, info); + GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); startQuestTimer("despawn_minions", 20000, null, null); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index c2564917c7..b9fdddaaf7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; @@ -91,7 +91,7 @@ public class QueenAnt extends AbstractNpcAI addFactionCallId(NURSE); _zone = ZoneManager.getInstance().getZoneById(12012); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); final int status = GrandBossManager.getInstance().getBossStatus(QUEEN); if (status == DEAD) { @@ -367,9 +367,9 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("action", npc, null); cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(QUEEN, info); + GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); _larva.deleteMe(); _larva = null; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java index 6cad246a41..e154809d9c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java @@ -19,7 +19,7 @@ package ai.bosses.Spezion.Cannon; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -171,7 +171,7 @@ public class Cannon extends AbstractNpcAI { if (skill.getId() == PRESENT_SKILL.getSkillId()) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); npc.broadcastPacket(new Earthquake(npc, 10, 5)); npc.broadcastPacket(new OnEventTrigger(npcParams.getInt("TRIGGER_ID"), true)); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java index 086615be42..4af559d521 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -105,13 +105,13 @@ public class TeredorWarzone extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); - final StatsSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); switch (event) { @@ -236,7 +236,7 @@ public class TeredorWarzone extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); switch (npc.getId()) { @@ -292,7 +292,7 @@ public class TeredorWarzone extends AbstractInstance if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); switch (npc.getId()) { @@ -472,7 +472,7 @@ public class TeredorWarzone extends AbstractInstance { case TEREDOR: { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int hpPer = npc.getCurrentHpPercent(); int teredorStatus = npcVars.getInt("TEREDOR_STATUS", 1); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java index 9d9a79d53a..1610356a26 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -322,7 +322,7 @@ public class Trasken extends AbstractNpcAI DoorData.getInstance().getDoor(DOOR).openMe(); } // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(TRASKEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN); final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN); if (status == DEAD) { @@ -603,9 +603,9 @@ public class Trasken extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD); final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(TRASKEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(TRASKEN, info); + GrandBossManager.getInstance().setStatSet(TRASKEN, info); startQuestTimer("unlock_trasken", respawnTime, null, null); break; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java index 9414859da4..7233381898 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; @@ -123,7 +123,7 @@ public class Valakas extends AbstractNpcAI registerMobs(VALAKAS); ZONE = ZoneManager.getInstance().getZoneById(12010); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(VALAKAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); final int status = GrandBossManager.getInstance().getBossStatus(VALAKAS); if (status == DEAD) @@ -446,9 +446,9 @@ public class Valakas extends AbstractNpcAI final long respawnTime = (Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM)) * 3600000; startQuestTimer("valakas_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(VALAKAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(VALAKAS, info); + GrandBossManager.getInstance().setStatSet(VALAKAS, info); return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java index c73ef9d83c..703e55428a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -189,8 +189,8 @@ public class CavernOfThePirateCaptain extends AbstractInstance final Instance world = npc.getInstanceWorld(); if (world != null) { - final StatsSet templParams = world.getTemplateParameters(); - final StatsSet params = world.getParameters(); + final StatSet templParams = world.getTemplateParameters(); + final StatSet params = world.getParameters(); switch (event) { case "BURN_BLUE": diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/AreaSkillNpc.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/AreaSkillNpc.java index 183d58cb8b..1bd02d5e61 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/AreaSkillNpc.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/AreaSkillNpc.java @@ -17,7 +17,7 @@ package ai.others; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -109,7 +109,7 @@ public class AreaSkillNpc extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java index 01b37387a8..ef9e26a221 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -101,7 +101,7 @@ public class CastleTeleporter extends AbstractNpcAI if (st.hasMoreTokens()) { final int unknowInt = Integer.parseInt(st.nextToken()); - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); Location teleLoc = null; switch (unknowInt) { @@ -191,7 +191,7 @@ public class CastleTeleporter extends AbstractNpcAI return htmltext; } - private Location getTeleportLocation(StatsSet npcParams, String paramName1, String paramName2, String paramName3) + private Location getTeleportLocation(StatSet npcParams, String paramName1, String paramName2, String paramName3) { final Location loc; if (getRandom(100) < 33) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java index b1355fa9c5..c05c1b184b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java @@ -16,7 +16,7 @@ */ package ai.others.NpcBuffers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ class NpcBufferSkillData private final int _scaleToLevel; private final int _initialDelay; - NpcBufferSkillData(StatsSet set) + NpcBufferSkillData(StatSet set) { _skill = new SkillHolder(set.getInt("id"), set.getInt("level")); _scaleToLevel = set.getInt("scaleToLevel", -1); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java index dd7f4187be..ecae9d2861 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -54,7 +54,7 @@ class NpcBuffersData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node attr; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -75,7 +75,7 @@ class NpcBuffersData implements IXmlReader case "skill": { attrs = c.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { attr = attrs.item(i); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Servitors/ClanFlag.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Servitors/ClanFlag.java index 558d57b407..b09a5f38e9 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Servitors/ClanFlag.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Servitors/ClanFlag.java @@ -17,7 +17,7 @@ package ai.others.Servitors; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -51,7 +51,7 @@ public class ClanFlag extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java index af4da1ab5a..d8fb991180 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -63,7 +63,7 @@ public class GateOfUnlimitedSummoning extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java index f19f5dea69..c817501830 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java @@ -17,7 +17,7 @@ package ai.others.Servitors; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -52,7 +52,7 @@ public class TreeOfLife extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (player != null) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java index 3ee8063427..ee96be41d8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -91,7 +91,7 @@ public class TersisHerald extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("DESPAWN_NPCS")) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index 2e5331f903..55dc363405 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.zone.type.NoRestartZone; @@ -309,7 +309,7 @@ public class AdminGrandBoss implements IAdminCommandHandler } } - final StatsSet info = GrandBossManager.getInstance().getStatsSet(grandBossId); + final StatSet info = GrandBossManager.getInstance().getStatSet(grandBossId); final String bossRespawn = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(info.getLong("respawn_time")); final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java index 91dddce811..be48a48ec6 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java @@ -19,7 +19,7 @@ package handlers.admincommandhandlers; import java.util.StringTokenizer; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -114,7 +114,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.isNoble()) { - final StatsSet statDat = getPlayerSet(player); + final StatSet statDat = getPlayerSet(player); final int oldpoints = Olympiad.getInstance().getNoblePoints(player); final int points = Math.max(oldpoints + val, 0); if (points > 1000) @@ -155,7 +155,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.isNoble()) { - final StatsSet playerStat = Olympiad.getNobleStats(player.getObjectId()); + final StatSet playerStat = Olympiad.getNobleStats(player.getObjectId()); if (playerStat == null) { BuilderUtil.sendSysMessage(activeChar, "This player hasn't played on Olympiad yet!"); @@ -197,7 +197,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.isNoble()) { - final StatsSet statDat = getPlayerSet(player); + final StatSet statDat = getPlayerSet(player); final int oldpoints = Olympiad.getInstance().getNoblePoints(player); final int points = oldpoints - val; if ((points < 1) && (points > 1000)) @@ -237,12 +237,12 @@ public class AdminOlympiad implements IAdminCommandHandler return Integer.decode(token); } - private StatsSet getPlayerSet(PlayerInstance player) + private StatSet getPlayerSet(PlayerInstance player) { - StatsSet statDat = Olympiad.getNobleStats(player.getObjectId()); + StatSet statDat = Olympiad.getNobleStats(player.getObjectId()); if (statDat == null) { - statDat = new StatsSet(); + statDat = new StatSet(); statDat.set(Olympiad.CLASS_ID, player.getBaseClass()); statDat.set(Olympiad.CHAR_NAME, player.getName()); statDat.set(Olympiad.POINTS, Olympiad.DEFAULT_POINTS); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java index d8a3d6e5ce..6382651e6c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java @@ -19,7 +19,7 @@ package handlers.conditions; import java.util.List; import org.l2jmobius.gameserver.enums.CategoryType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -31,7 +31,7 @@ public class CategoryTypeCondition implements ICondition { private final List _categoryTypes; - public CategoryTypeCondition(StatsSet params) + public CategoryTypeCondition(StatSet params) { _categoryTypes = params.getEnumList("category", CategoryType.class); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java index b24cfa0f14..9a14cb6fa2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java @@ -16,7 +16,7 @@ */ package handlers.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -29,7 +29,7 @@ public class NpcLevelCondition implements ICondition private final int _minLevel; private final int _maxLevel; - public NpcLevelCondition(StatsSet params) + public NpcLevelCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java index afffe7a0c5..9e3deaa8ce 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java @@ -16,7 +16,7 @@ */ package handlers.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -29,7 +29,7 @@ public class PlayerLevelCondition implements ICondition private final int _minLevel; private final int _maxLevel; - public PlayerLevelCondition(StatsSet params) + public PlayerLevelCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 09f609dc37..0e81066579 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -32,7 +32,7 @@ public class AbnormalShield extends AbstractEffect { private final int _times; - public AbnormalShield(StatsSet params) + public AbnormalShield(StatSet params) { _times = params.getInt("times", -1); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 0496c9068d..9c508c8c52 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Objects; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class AbnormalTimeChange extends AbstractEffect private final int _time; private final int _mode; - public AbnormalTimeChange(StatsSet params) + public AbnormalTimeChange(StatSet params) { final String abnormals = params.getString("slot", null); if ((abnormals != null) && !abnormals.isEmpty()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 98f85c7b21..3f9132b8e3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -37,7 +37,7 @@ public class AbsorbDamage extends AbstractEffect private final double _damage; private static final Map _damageHolder = new ConcurrentHashMap<>(); - public AbsorbDamage(StatsSet params) + public AbsorbDamage(StatSet params) { _damage = params.getDouble("damage", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 26f51d5351..86fef7cf6d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; @@ -38,7 +38,7 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect private final int _hpPercent; private final Map _updates = new ConcurrentHashMap<>(); - protected AbstractConditionalHpEffect(StatsSet params, Stat stat) + protected AbstractConditionalHpEffect(StatSet params, Stat stat) { super(params, stat); _hpPercent = params.getInt("hpPercent", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java index 2e40124e39..f010f84271 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AbstractStatAddEffect extends AbstractEffect private final Stat _stat; protected final double _amount; - public AbstractStatAddEffect(StatsSet params, Stat stat) + public AbstractStatAddEffect(StatSet params, Stat stat) { _stat = stat; _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index da6a575c44..29e439684b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; @@ -42,12 +42,12 @@ public abstract class AbstractStatEffect extends AbstractEffect protected final StatModifierType _mode; protected final List _conditions = new ArrayList<>(); - public AbstractStatEffect(StatsSet params, Stat stat) + public AbstractStatEffect(StatSet params, Stat stat) { this(params, stat, stat); } - public AbstractStatEffect(StatsSet params, Stat mulStat, Stat addStat) + public AbstractStatEffect(StatSet params, Stat mulStat, Stat addStat) { _addStat = addStat; _mulStat = mulStat; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java index 9811f395aa..33d08bff36 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AbstractStatPercentEffect extends AbstractEffect private final Stat _stat; protected final double _amount; - public AbstractStatPercentEffect(StatsSet params, Stat stat) + public AbstractStatPercentEffect(StatSet params, Stat stat) { _stat = stat; _amount = params.getDouble("amount", 1); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java index 539814ef2a..79c022a23c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class Accuracy extends AbstractStatEffect { - public Accuracy(StatsSet params) + public Accuracy(StatSet params) { super(params, Stat.ACCURACY_COMBAT); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index 0c1fcbd92b..48d69968c5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddHate extends AbstractEffect private final double _power; private final boolean _affectSummoner; - public AddHate(StatsSet params) + public AddHate(StatSet params) { _power = params.getDouble("power", 0); _affectSummoner = params.getBoolean("affectSummoner", false); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java index e90d5cc7f3..324927947a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddSkillBySkill extends AbstractEffect private final int _existingSkillLevel; private final SkillHolder _addedSkill; - public AddSkillBySkill(StatsSet params) + public AddSkillBySkill(StatSet params) { _existingSkillId = params.getInt("existingSkillId"); _existingSkillLevel = params.getInt("existingSkillLevel"); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index bdd8314dd7..205bc82200 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddTeleportBookmarkSlot extends AbstractEffect { private final int _amount; - public AddTeleportBookmarkSlot(StatsSet params) + public AddTeleportBookmarkSlot(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java index c26ec5442f..658931ecb2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionCp extends AbstractStatAddEffect { - public AdditionalPotionCp(StatsSet params) + public AdditionalPotionCp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_CP); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java index 6b68e40f32..57d54c7d3b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionHp extends AbstractStatAddEffect { - public AdditionalPotionHp(StatsSet params) + public AdditionalPotionHp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_HP); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java index c9e1cc237e..007547ebe7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionMp extends AbstractStatAddEffect { - public AdditionalPotionMp(StatsSet params) + public AdditionalPotionMp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_MP); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index cbbd845e23..c01bdec653 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -22,7 +22,7 @@ import java.util.Map; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -78,7 +78,7 @@ public class AirBind extends AbstractEffect _chainedAirSkills.put(ClassId.AEORE_SHILLIEN_SAINT, 11999); // Heavy Hit } - public AirBind(StatsSet params) + public AirBind(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java index f5cbb63465..9255ba1877 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AreaDamage extends AbstractStatAddEffect { - public AreaDamage(StatsSet params) + public AreaDamage(StatSet params) { super(params, Stat.DAMAGE_ZONE_VULN); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java index 2ded14e7ae..a5d56477f5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AttackAttribute extends AbstractEffect private final AttributeType _attribute; private final double _amount; - public AttackAttribute(StatsSet params) + public AttackAttribute(StatSet params) { _amount = params.getDouble("amount", 0); _attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java index ff58d09cc7..795366850d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class AttackAttributeAdd extends AbstractEffect { private final double _amount; - public AttackAttributeAdd(StatsSet params) + public AttackAttributeAdd(StatSet params) { _amount = params.getDouble("amount", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java index 37bfbf341a..fcd2b48c99 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class AttackBehind extends AbstractEffect { - public AttackBehind(StatsSet params) + public AttackBehind(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index 062c325a55..4136f5d530 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class AttackTrait extends AbstractEffect { private final Map _attackTraits = new EnumMap<>(TraitType.class); - public AttackTrait(StatsSet params) + public AttackTrait(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 02d6a8d78c..8ac42d45c3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -37,7 +37,7 @@ public class Backstab extends AbstractEffect private final double _criticalChance; private final boolean _overHit; - public Backstab(StatsSet params) + public Backstab(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Betray.java index 32e3c65c55..79e8bd3360 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Betray extends AbstractEffect { - public Betray(StatsSet params) + public Betray(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Blink.java index ba1caed6ac..56d3f628fd 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -52,7 +52,7 @@ public class Blink extends AbstractEffect private final int _flyDelay; private final int _animationSpeed; - public Blink(StatsSet params) + public Blink(StatSet params) { _flyCourse = params.getInt("angle", 0); _flyRadius = params.getInt("range", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 8677f72407..596d4b752f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; */ public class BlinkSwap extends AbstractEffect { - public BlinkSwap(StatsSet params) + public BlinkSwap(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 7bec602aef..cea12039d2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -20,7 +20,7 @@ import java.util.Arrays; import java.util.Set; import java.util.stream.Collectors; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class BlockAbnormalSlot extends AbstractEffect { private final Set _blockAbnormalSlots; - public BlockAbnormalSlot(StatsSet params) + public BlockAbnormalSlot(StatSet params) { _blockAbnormalSlots = Arrays.stream(params.getString("slot").split(";")).map(slot -> Enum.valueOf(AbnormalType.class, slot)).collect(Collectors.toSet()); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index b4839ab322..348881f970 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -21,7 +21,7 @@ import java.util.Set; import org.l2jmobius.gameserver.datatables.BotReportTable; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class BlockAction extends AbstractEffect { private final Set _blockedActions = new HashSet<>(); - public BlockAction(StatsSet params) + public BlockAction(StatSet params) { final String[] actions = params.getString("blockedActions").split(","); for (String action : actions) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index 68f6586e3e..635d2735f9 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -22,7 +22,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class BlockActions extends AbstractEffect { private final Set _allowedSkills; - public BlockActions(StatsSet params) + public BlockActions(StatSet params) { final String[] allowedSkills = params.getString("allowedSkills", "").split(";"); _allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet()); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 99af987208..3502d140d0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockChat extends AbstractEffect { - public BlockChat(StatsSet params) + public BlockChat(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java index 6160114414..a2b084c918 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; */ public class BlockControl extends AbstractEffect { - public BlockControl(StatsSet params) + public BlockControl(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java index 3d96329b6d..69b390ae8f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BlockEscape extends AbstractEffect { - public BlockEscape(StatsSet params) + public BlockEscape(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index 8bbd7ac018..85d89180e7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockMove extends AbstractEffect { - public BlockMove(StatsSet params) + public BlockMove(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index 316f82f855..9e28fc403a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockParty extends AbstractEffect { - public BlockParty(StatsSet params) + public BlockParty(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java index ae2ac8b035..d3235fc34f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BlockResurrection extends AbstractEffect { - public BlockResurrection(StatsSet params) + public BlockResurrection(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index f7f119691f..f2cc65b782 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -35,7 +35,7 @@ public class BlockSkill extends AbstractEffect { private final int[] _magicTypes; - public BlockSkill(StatsSet params) + public BlockSkill(StatSet params) { _magicTypes = params.getIntArray("magicTypes", ";"); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index d9b3d3a34d..9f0b7143d2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockTarget extends AbstractEffect { - public BlockTarget(StatsSet params) + public BlockTarget(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index bc4cbd6320..bef60ad003 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class Bluff extends AbstractEffect { private final int _chance; - public Bluff(StatsSet params) + public Bluff(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java index 2ace40a596..69583d613b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusDropAmount extends AbstractStatPercentEffect { - public BonusDropAmount(StatsSet params) + public BonusDropAmount(StatSet params) { super(params, Stat.BONUS_DROP_AMOUNT); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java index b81560b040..e63c8f79f4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusDropRate extends AbstractStatPercentEffect { - public BonusDropRate(StatsSet params) + public BonusDropRate(StatSet params) { super(params, Stat.BONUS_DROP_RATE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java index b984404cb2..e0fb54b162 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusSpoilRate extends AbstractStatPercentEffect { - public BonusSpoilRate(StatsSet params) + public BonusSpoilRate(StatSet params) { super(params, Stat.BONUS_SPOIL_RATE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Breath.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Breath.java index 859f341f3c..4235319f22 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Breath.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Breath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class Breath extends AbstractStatEffect { - public Breath(StatsSet params) + public Breath(StatSet params) { super(params, Stat.BREATH); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java index a6d25f3c36..4102506e6c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BuffBlock extends AbstractEffect { - public BuffBlock(StatsSet params) + public BuffBlock(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index de7497f8bf..4f470b06c7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class CallLearnedSkill extends AbstractEffect { private final int _skillId; - public CallLearnedSkill(StatsSet params) + public CallLearnedSkill(StatSet params) { _skillId = params.getInt("skillId"); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index e6096be4be..b41daf073c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CallParty extends AbstractEffect { - public CallParty(StatsSet params) + public CallParty(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index 0760fb675e..eb4bdf2349 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class CallPc extends AbstractEffect private final int _itemId; private final int _itemCount; - public CallPc(StatsSet params) + public CallPc(StatSet params) { _itemId = params.getInt("itemId", 0); _itemCount = params.getInt("itemCount", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index d6d5cb721d..0da3802665 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -35,7 +35,7 @@ public class CallRandomSkill extends AbstractEffect { private final List _skills = new ArrayList<>(); - public CallRandomSkill(StatsSet params) + public CallRandomSkill(StatSet params) { final String skills = params.getString("skills", null); if (skills != null) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index 99c1494223..f8e4b226c4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -35,7 +35,7 @@ public class CallSkill extends AbstractEffect private final SkillHolder _skill; private final int _skillLevelScaleTo; - public CallSkill(StatsSet params) + public CallSkill(StatSet params) { _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0)); _skillLevelScaleTo = params.getInt("skillLevelScaleTo", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index b340de4ae1..ff98639c37 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.Collections; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ public class CallSkillOnActionTime extends AbstractEffect { private final SkillHolder _skill; - public CallSkillOnActionTime(StatsSet params) + public CallSkillOnActionTime(StatSet params) { _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0)); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index d48eb90fb3..32753a71a0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CallTargetParty extends AbstractEffect { - public CallTargetParty(StatsSet params) + public CallTargetParty(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index ef01f4a8ed..d4331bf5b7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ public class ChameleonRest extends AbstractEffect { private final double _power; - public ChameleonRest(StatsSet params) + public ChameleonRest(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index e3b846674d..37054f2fd0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; @@ -35,9 +35,9 @@ public class ChangeBody extends AbstractEffect { private final Set _transformations = new HashSet<>(); - public ChangeBody(StatsSet params) + public ChangeBody(StatSet params) { - for (StatsSet item : params.getList("templates", StatsSet.class)) + for (StatSet item : params.getList("templates", StatSet.class)) { _transformations.add(new TemplateChanceHolder(item.getInt(".templateId"), item.getInt(".minChance"), item.getInt(".maxChance"))); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 76c6e03aa6..6b6386909e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeFace extends AbstractEffect { private final int _value; - public ChangeFace(StatsSet params) + public ChangeFace(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java index cee3ac1a6f..304afa821c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; /** @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; */ public class ChangeFishingMastery extends AbstractEffect { - public ChangeFishingMastery(StatsSet params) + public ChangeFishingMastery(StatSet params) { } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index 0c583cbc13..64ac49f5d5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeHairColor extends AbstractEffect { private final int _value; - public ChangeHairColor(StatsSet params) + public ChangeHairColor(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index ad2efbe6a0..ae7d6c6da1 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeHairStyle extends AbstractEffect { private final int _value; - public ChangeHairStyle(StatsSet params) + public ChangeHairStyle(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java index 2d536029fd..4d7c380c75 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class CheapShot extends AbstractEffect { - public CheapShot(StatsSet params) + public CheapShot(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index 207b7f0a3e..1a6a44fb31 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.SubclassInfoType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class ClassChange extends AbstractEffect private final int _index; private static final int IDENTITY_CRISIS_SKILL_ID = 1570; - public ClassChange(StatsSet params) + public ClassChange(StatSet params) { _index = params.getInt("index", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index ccf7598eff..e184022afc 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.stats.Formulas; */ public class Compelling extends AbstractEffect { - public Compelling(StatsSet params) + public Compelling(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index b6aa30f604..f164ac6f3f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class Confuse extends AbstractEffect { private final int _chance; - public Confuse(StatsSet params) + public Confuse(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 25e29532eb..78293c1b0f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ConsumeBody extends AbstractEffect { - public ConsumeBody(StatsSet params) + public ConsumeBody(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index e915eb0391..6ddd0d72eb 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class ConvertItem extends AbstractEffect { - public ConvertItem(StatsSet params) + public ConvertItem(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java index 9402fdb06d..857df659c0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CounterPhysicalSkill extends AbstractStatAddEffect { - public CounterPhysicalSkill(StatsSet params) + public CounterPhysicalSkill(StatSet params) { super(params, Stat.VENGEANCE_SKILL_PHYSICAL_DAMAGE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 67bca7fd1b..598682037b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Cp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Cp(StatsSet params) + public Cp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index e0cd52808e..37303b0e7a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class CpHeal extends AbstractEffect { private final double _power; - public CpHeal(StatsSet params) + public CpHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index e2e8ee3479..54de5adfc6 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class CpHealOverTime extends AbstractEffect { private final double _power; - public CpHealOverTime(StatsSet params) + public CpHealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index 5665e937dc..b4a994d6df 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CpHealPercent extends AbstractEffect { private final double _power; - public CpHealPercent(StatsSet params) + public CpHealPercent(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java index 1cc851b2af..efb020bbd5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CpRegen extends AbstractStatEffect { - public CpRegen(StatsSet params) + public CpRegen(StatSet params) { super(params, Stat.REGENERATE_CP_RATE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java index 8983497026..0b93eef45e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CriticalDamage extends AbstractStatEffect { - public CriticalDamage(StatsSet params) + public CriticalDamage(StatSet params) { super(params, Stat.CRITICAL_DAMAGE, Stat.CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 7ef4f0ecb4..0630f087b7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.Position; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CriticalDamagePosition extends AbstractEffect private final double _amount; private final Position _position; - public CriticalDamagePosition(StatsSet params) + public CriticalDamagePosition(StatSet params) { _amount = params.getDouble("amount", 0); _position = params.getEnum("position", Position.class, Position.FRONT); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java index 01f49380eb..0d4bded60e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; public class CriticalRate extends AbstractConditionalHpEffect { - public CriticalRate(StatsSet params) + public CriticalRate(StatSet params) { super(params, Stat.CRITICAL_RATE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 863b385ca3..4d65fa84eb 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.Position; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CriticalRatePositionBonus extends AbstractEffect private final double _amount; private final Position _position; - public CriticalRatePositionBonus(StatsSet params) + public CriticalRatePositionBonus(StatSet params) { _amount = params.getDouble("amount", 0); _position = params.getEnum("position", Position.class, Position.FRONT); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index 2e8ec38347..9d04575ae2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class CrystalGradeModify extends AbstractEffect { private final int _grade; - public CrystalGradeModify(StatsSet params) + public CrystalGradeModify(StatSet params) { _grade = params.getInt("grade", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java index 94ff8e64e2..79ee5b994e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CubicMastery extends AbstractStatAddEffect { - public CubicMastery(StatsSet params) + public CubicMastery(StatSet params) { super(params, Stat.MAX_CUBIC); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index 36abf0accf..e6bb53fdea 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class DamOverTime extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTime(StatsSet params) + public DamOverTime(StatSet params) { _canKill = params.getBoolean("canKill", false); _power = params.getDouble("power"); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 13e57099e0..b5f25db4d8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class DamOverTimePercent extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTimePercent(StatsSet params) + public DamOverTimePercent(StatSet params) { _canKill = params.getBoolean("canKill", false); _power = params.getDouble("power"); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java index dc7a45198f..c9567ea034 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ public class DamageBlock extends AbstractEffect private final boolean _blockHp; private final boolean _blockMp; - public DamageBlock(StatsSet params) + public DamageBlock(StatSet params) { final String type = params.getString("type", null); _blockHp = type.equalsIgnoreCase("BLOCK_HP"); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java index bfa716eacc..9eb0b4e233 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DamageByAttackType; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -38,7 +38,7 @@ public class DamageByAttack extends AbstractEffect private final double _value; private final DamageByAttackType _type; - public DamageByAttack(StatsSet params) + public DamageByAttack(StatSet params) { _value = params.getDouble("amount"); _type = params.getEnum("type", DamageByAttackType.class, DamageByAttackType.NONE); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java index 5a7629482a..e823a9824a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DamageShield extends AbstractStatAddEffect { - public DamageShield(StatsSet params) + public DamageShield(StatSet params) { super(params, Stat.REFLECT_DAMAGE_PERCENT); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java index db1abe264d..3029a3f0aa 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DamageShieldResist extends AbstractStatAddEffect { - public DamageShieldResist(StatsSet params) + public DamageShieldResist(StatSet params) { super(params, Stat.REFLECT_DAMAGE_PERCENT_DEFENSE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index 8561ff46b0..369bd5483d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class DeathLink extends AbstractEffect { private final double _power; - public DeathLink(StatsSet params) + public DeathLink(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java index b948fad1fc..54261c6229 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class DebuffBlock extends AbstractEffect { - public DebuffBlock(StatsSet params) + public DebuffBlock(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java index 217ef3dfaa..4bc08271fa 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class DefenceAttribute extends AbstractEffect private final AttributeType _attribute; private final double _amount; - public DefenceAttribute(StatsSet params) + public DefenceAttribute(StatSet params) { _amount = params.getDouble("amount", 0); _attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java index 0c0c2e8d6a..daff53d9e1 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceCriticalDamage extends AbstractStatEffect { - public DefenceCriticalDamage(StatsSet params) + public DefenceCriticalDamage(StatSet params) { super(params, Stat.DEFENCE_CRITICAL_DAMAGE, Stat.DEFENCE_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java index 131eb500ea..74a729e38c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceCriticalRate extends AbstractStatEffect { - public DefenceCriticalRate(StatsSet params) + public DefenceCriticalRate(StatSet params) { super(params, Stat.DEFENCE_CRITICAL_RATE, Stat.DEFENCE_CRITICAL_RATE_ADD); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java index 1abee78e08..c664939977 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceMagicCriticalDamage extends AbstractStatEffect { - public DefenceMagicCriticalDamage(StatsSet params) + public DefenceMagicCriticalDamage(StatSet params) { super(params, Stat.DEFENCE_MAGIC_CRITICAL_DAMAGE, Stat.DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java index 2146b89551..6594dda2b3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceMagicCriticalRate extends AbstractStatEffect { - public DefenceMagicCriticalRate(StatsSet params) + public DefenceMagicCriticalRate(StatSet params) { super(params, Stat.DEFENCE_MAGIC_CRITICAL_RATE, Stat.DEFENCE_MAGIC_CRITICAL_RATE_ADD); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index bd80f690cd..134ed56979 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class DefenceTrait extends AbstractEffect { private final Map _defenceTraits = new EnumMap<>(TraitType.class); - public DefenceTrait(StatsSet params) + public DefenceTrait(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index bab5e1a762..7cee616006 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class DeleteHate extends AbstractEffect { private final int _chance; - public DeleteHate(StatsSet params) + public DeleteHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index 85985653b8..f10f189e68 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class DeleteHateOfMe extends AbstractEffect { private final int _chance; - public DeleteHateOfMe(StatsSet params) + public DeleteHateOfMe(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index d3664ad00f..82833ac79d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class DeleteTopAgro extends AbstractEffect { private final int _chance; - public DeleteTopAgro(StatsSet params) + public DeleteTopAgro(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index ae1f2a5942..ba6dad4698 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DoorOpenType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DetectHiddenObjects extends AbstractEffect { - public DetectHiddenObjects(StatsSet params) + public DetectHiddenObjects(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Detection.java index 078360ff35..a20cbcb348 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Detection extends AbstractEffect { - public Detection(StatsSet params) + public Detection(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java index d679c71919..5227885bb5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class DisableSkill extends AbstractEffect private final Set disableSkills; private Skill knownSKill; - public DisableSkill(StatsSet params) + public DisableSkill(StatSet params) { final String disable = params.getString("disable"); if ((disable != null) && !disable.isEmpty()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 8567a94d12..32ee715df7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DisableTargeting extends AbstractEffect { - public DisableTargeting(StatsSet params) + public DisableTargeting(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index fa06ec7221..5a80971f51 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Disarm extends AbstractEffect { - public Disarm(StatsSet params) + public Disarm(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index 0133906661..8b06598d83 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class Disarmor extends AbstractEffect private final Map _unequippedItems; // PlayerObjId, ItemObjId private final int _slot; - public Disarmor(StatsSet params) + public Disarmor(StatSet params) { _unequippedItems = new ConcurrentHashMap<>(); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 95de0300bb..a652a023f5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DispelAll extends AbstractEffect { - public DispelAll(StatsSet params) + public DispelAll(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 88d979a0d9..040271d2a7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.List; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -38,7 +38,7 @@ public class DispelByCategory extends AbstractEffect private final int _rate; private final int _max; - public DispelByCategory(StatsSet params) + public DispelByCategory(StatSet params) { _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); _rate = params.getInt("rate", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index a6e4c7cd19..ab79e046b2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.EnumMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -37,7 +37,7 @@ public class DispelBySlot extends AbstractEffect private final String _dispel; private final Map _dispelAbnormals; - public DispelBySlot(StatsSet params) + public DispelBySlot(StatSet params) { _dispel = params.getString("dispel"); if ((_dispel != null) && !_dispel.isEmpty()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 1ba6612e23..d1341d10b9 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class DispelBySlotMyself extends AbstractEffect { private final Set _dispelAbnormals; - public DispelBySlotMyself(StatsSet params) + public DispelBySlotMyself(StatSet params) { final String dispel = params.getString("dispel"); if ((dispel != null) && !dispel.isEmpty()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 845980e59d..b58723058e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -37,7 +37,7 @@ public class DispelBySlotProbability extends AbstractEffect private final Set _dispelAbnormals; private final int _rate; - public DispelBySlotProbability(StatsSet params) + public DispelBySlotProbability(StatSet params) { final String[] dispelEffects = params.getString("dispel").split(";"); _rate = params.getInt("rate", 100); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index 7acd9c4a6c..688d77a703 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -45,7 +45,7 @@ public class DoubleCast extends AbstractEffect private final Map> _addedToggles; - public DoubleCast(StatsSet params) + public DoubleCast(StatSet params) { _addedToggles = new HashMap<>(); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java index d7f067a2a0..d1e21edeb0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DuelistFury extends AbstractEffect { - public DuelistFury(StatsSet params) + public DuelistFury(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index 409fed6a23..de397bb5ff 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class EnableCloak extends AbstractEffect { - public EnableCloak(StatsSet params) + public EnableCloak(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index e855c4ba1a..2fe2bef99f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -43,7 +43,7 @@ public class EnergyAttack extends AbstractEffect private final boolean _overHit; private final double _pDefMod; - public EnergyAttack(StatsSet params) + public EnergyAttack(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getInt("criticalChance", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index a8f108573f..ae463ef2a4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class EnlargeAbnormalSlot extends AbstractEffect { private final int _slots; - public EnlargeAbnormalSlot(StatsSet params) + public EnlargeAbnormalSlot(StatSet params) { _slots = params.getInt("slots", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java index c43ea04413..c4073b1a47 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StorageType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class EnlargeSlot extends AbstractEffect private final StorageType _type; private final double _amount; - public EnlargeSlot(StatsSet params) + public EnlargeSlot(StatSet params) { _amount = params.getDouble("amount", 0); _type = params.getEnum("type", StorageType.class, StorageType.INVENTORY_NORMAL); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Escape.java index 936f82d8ce..f3a07c9d15 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class Escape extends AbstractEffect { private final TeleportWhereType _escapeType; - public Escape(StatsSet params) + public Escape(StatSet params) { _escapeType = params.getEnum("escapeType", TeleportWhereType.class, null); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java index 76dbc8171c..eb68d24af8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ExpModify extends AbstractStatAddEffect { - public ExpModify(StatsSet params) + public ExpModify(StatSet params) { super(params, Stat.BONUS_EXP); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java index bf11db6e4b..1100ca25be 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Faceoff extends AbstractEffect { - public Faceoff(StatsSet params) + public Faceoff(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index e256209e39..79f7b43503 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -34,7 +34,7 @@ public class FakeDeath extends AbstractEffect { private final double _power; - public FakeDeath(StatsSet params) + public FakeDeath(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index a94c75d310..780d5cefba 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -44,7 +44,7 @@ public class FatalBlow extends AbstractEffect private final double _abnormalPower; private final boolean _overHit; - public FatalBlow(StatsSet params) + public FatalBlow(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java index c8ff8f7acb..6e7597e63d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class FatalBlowRate extends AbstractEffect private final double _amount; private final StatModifierType _mode; - public FatalBlowRate(StatsSet params) + public FatalBlowRate(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 9731e75e5d..ec2659ea2c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DefenderInstance; import org.l2jmobius.gameserver.model.actor.instance.FortCommanderInstance; @@ -40,7 +40,7 @@ public class Fear extends AbstractEffect { private static final int FEAR_RANGE = 500; - public Fear(StatsSet params) + public Fear(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 5e04e46d60..94d9912bdf 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.MountType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ public class Feed extends AbstractEffect private final int _ride; private final int _wyvern; - public Feed(StatsSet params) + public Feed(StatSet params) { _normal = params.getInt("normal", 0); _ride = params.getInt("ride", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java index 0b22a4d4c9..146e3b73e6 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class FishingExpSpBonus extends AbstractStatPercentEffect { - public FishingExpSpBonus(StatsSet params) + public FishingExpSpBonus(StatSet params) { super(params, Stat.FISHING_EXP_SP_BONUS); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Flag.java index c1469eab19..2442cbdb35 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Flag extends AbstractEffect { - public Flag(StatsSet params) + public Flag(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index 0243f0f543..74a9754a95 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.BlockInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class FlipBlock extends AbstractEffect { - public FlipBlock(StatsSet params) + public FlipBlock(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 7fc7da5fe6..3412e4d36d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class FlyAway extends AbstractEffect { private final int _radius; - public FlyAway(StatsSet params) + public FlyAway(StatSet params) { _radius = params.getInt("radius"); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java index fd3216286d..590fbbcd44 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class FocusEnergy extends AbstractStatAddEffect { - public FocusEnergy(StatsSet params) + public FocusEnergy(StatSet params) { super(params, Stat.MAX_MOMENTUM); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index efbd93f304..19f0163e42 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class FocusMaxMomentum extends AbstractEffect { - public FocusMaxMomentum(StatsSet params) + public FocusMaxMomentum(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index 284d19ee5f..e8c18e9682 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -36,7 +36,7 @@ public class FocusMomentum extends AbstractEffect private final int _amount; private final int _maxCharges; - public FocusMomentum(StatsSet params) + public FocusMomentum(StatSet params) { _amount = params.getInt("amount", 1); _maxCharges = params.getInt("maxCharges", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 18a9864bbc..debd491cfe 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class FocusSouls extends AbstractEffect { private final int _charge; - public FocusSouls(StatsSet params) + public FocusSouls(StatSet params) { _charge = params.getInt("charge", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 8540ccd49c..23328db910 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Set; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class GetAgro extends AbstractEffect { - public GetAgro(StatsSet params) + public GetAgro(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java index 1ca8722709..e91002d04b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class GetDamageLimit extends AbstractStatAddEffect { - public GetDamageLimit(StatsSet params) + public GetDamageLimit(StatSet params) { super(params, Stat.DAMAGE_LIMIT); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 2dfd3bf8c4..439f3e8e3a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class GetMomentum extends AbstractEffect { private static int _ticks; - public GetMomentum(StatsSet params) + public GetMomentum(StatSet params) { _ticks = params.getInt("ticks", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index 7c1c0f3fa2..2c842101ed 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class GiveClanReputation extends AbstractEffect { private final int _reputation; - public GiveClanReputation(StatsSet params) + public GiveClanReputation(StatSet params) { _reputation = params.getInt("reputation", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index fd4d61fa73..9052c63154 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class GiveExpAndSp extends AbstractEffect private final int _xp; private final int _sp; - public GiveExpAndSp(StatsSet params) + public GiveExpAndSp(StatSet params) { _xp = params.getInt("xp", 0); _sp = params.getInt("sp", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index 3448e09797..9d41a4395b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ public class GiveFame extends AbstractEffect { private final int _fame; - public GiveFame(StatsSet params) + public GiveFame(StatSet params) { _fame = params.getInt("fame", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index c948fa0948..617a8ef88a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class GiveRecommendation extends AbstractEffect { private final int _amount; - public GiveRecommendation(StatsSet params) + public GiveRecommendation(StatSet params) { _amount = params.getInt("amount", 0); if (_amount == 0) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index 5fe06566c7..75a16fe828 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class GiveSp extends AbstractEffect { private final int _sp; - public GiveSp(StatsSet params) + public GiveSp(StatSet params) { _sp = params.getInt("sp", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index 5b1a04c165..ae7248c500 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class GiveXp extends AbstractEffect { private final int _xp; - public GiveXp(StatsSet params) + public GiveXp(StatSet params) { _xp = params.getInt("xp", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 17095c209a..5cf4994f32 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Grow extends AbstractEffect { - public Grow(StatsSet params) + public Grow(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index a2200e1a2f..350c8e659f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.UserInfoType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class HairAccessorySet extends AbstractEffect { - public HairAccessorySet(StatsSet params) + public HairAccessorySet(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index 04b0b8ac6f..8211e03c01 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Harvesting extends AbstractEffect { - public Harvesting(StatsSet params) + public Harvesting(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java index ac1c9f49d8..097db6604a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HateAttack extends AbstractStatPercentEffect { - public HateAttack(StatsSet params) + public HateAttack(StatSet params) { super(params, Stat.HATE_ATTACK); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index 00f569eb17..9963ff1336 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlagInstance; @@ -34,7 +34,7 @@ public class HeadquarterCreate extends AbstractEffect private static final int HQ_NPC_ID = 35062; private final boolean _isAdvanced; - public HeadquarterCreate(StatsSet params) + public HeadquarterCreate(StatSet params) { _isAdvanced = params.getBoolean("isAdvanced", false); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 6e611144f1..139972a272 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -40,7 +40,7 @@ public class Heal extends AbstractEffect { private final double _power; - public Heal(StatsSet params) + public Heal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java index 5a7457d3df..a9f75ab036 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HealEffect extends AbstractStatEffect { - public HealEffect(StatsSet params) + public HealEffect(StatSet params) { super(params, Stat.HEAL_EFFECT, Stat.HEAL_EFFECT_ADD); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 86e28dc8b4..da76f33058 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class HealOverTime extends AbstractEffect { private final double _power; - public HealOverTime(StatsSet params) + public HealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index 6c9c8986bb..8b1c821a0a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class HealPercent extends AbstractEffect { private final int _power; - public HealPercent(StatsSet params) + public HealPercent(StatSet params) { _power = params.getInt("power", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Hide.java index e431277964..d02898bac5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Hide extends AbstractEffect { - public Hide(StatsSet params) + public Hide(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index e7e5f3f91b..78fa1c9392 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.GameTimeController; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HitAtNight extends AbstractStatEffect { - public HitAtNight(StatsSet params) + public HitAtNight(StatSet params) { super(params, Stat.HIT_AT_NIGHT); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java index 1fd98e7aa9..f14b922308 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HitNumber extends AbstractStatEffect { - public HitNumber(StatsSet params) + public HitNumber(StatSet params) { super(params, Stat.ATTACK_COUNT_MAX); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 3611fd7d74..c2426f8d11 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Hp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Hp(StatsSet params) + public Hp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index 3d125565fe..6244c76428 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class HpByLevel extends AbstractEffect { private final double _power; - public HpByLevel(StatsSet params) + public HpByLevel(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 3cdb210bba..80b4af9b46 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -40,7 +40,7 @@ public class HpCpHeal extends AbstractEffect { private final double _power; - public HpCpHeal(StatsSet params) + public HpCpHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java index 0394dab996..6f96c2dcb3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class HpCpHealCritical extends AbstractEffect { - public HpCpHealCritical(StatsSet params) + public HpCpHealCritical(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 554b1cec79..7cf47c3a65 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class HpDrain extends AbstractEffect private final double _power; private final double _percentage; - public HpDrain(StatsSet params) + public HpDrain(StatSet params) { _power = params.getDouble("power", 0); _percentage = params.getDouble("percentage", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java index cb1d2bc3a7..b170bc62ba 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HpRegen extends AbstractStatEffect { - public HpRegen(StatsSet params) + public HpRegen(StatSet params) { super(params, Stat.REGENERATE_HP_RATE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 235e89a79b..f346fbaad8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class HpToOwner extends AbstractEffect private final double _power; private final int _stealAmount; - public HpToOwner(StatsSet params) + public HpToOwner(StatSet params) { _power = params.getDouble("power"); _stealAmount = params.getInt("stealAmount"); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java index 9829519da9..c659684ae8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class IgnoreDeath extends AbstractEffect { - public IgnoreDeath(StatsSet params) + public IgnoreDeath(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index f7c9baa155..44dceba10e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ImmobilePetBuff extends AbstractEffect { - public ImmobilePetBuff(StatsSet params) + public ImmobilePetBuff(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java index a60fc45d15..a03eff933a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ public class InstantKillResist extends AbstractEffect { private final int _amount; - public InstantKillResist(StatsSet params) + public InstantKillResist(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java index 7e1fc8abe4..265a9aab97 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class JewelSlot extends AbstractStatAddEffect { - public JewelSlot(StatsSet params) + public JewelSlot(StatSet params) { super(params, Stat.BROOCH_JEWELS); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 3d5ff2dda3..a34d7cc5b3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class KarmaCount extends AbstractEffect private final int _amount; private final int _mode; - public KarmaCount(StatsSet params) + public KarmaCount(StatSet params) { _amount = params.getInt("amount", 0); switch (params.getString("mode", "DIFF")) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index b6f5b03994..cffa4427c6 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -94,7 +94,7 @@ public class KnockBack extends AbstractEffect _chainKnockSkills.put(ClassId.AEORE_SHILLIEN_SAINT, 12000); // Heavy Hit } - public KnockBack(StatsSet params) + public KnockBack(StatSet params) { _distance = params.getInt("distance", 50); _speed = params.getInt("speed", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index 7bfac989cf..1affb1b141 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -38,7 +38,7 @@ public class Lethal extends AbstractEffect private final double _fullLethal; private final double _halfLethal; - public Lethal(StatsSet params) + public Lethal(StatSet params) { _fullLethal = params.getDouble("fullLethal", 0); _halfLethal = params.getDouble("halfLethal", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java index aeb42458a6..43b17877ad 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitCp extends AbstractStatEffect { - public LimitCp(StatsSet params) + public LimitCp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_CP); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java index cf76ec482a..45d8f37355 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitHp extends AbstractStatEffect { - public LimitHp(StatsSet params) + public LimitHp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_HP); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java index f5eda36ba6..8d31633d0a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitMp extends AbstractStatEffect { - public LimitMp(StatsSet params) + public LimitMp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_MP); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Lucky.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Lucky.java index 3775d2361d..4ff5ea9a01 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Lucky.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Lucky.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Lucky extends AbstractEffect { - public Lucky(StatsSet params) + public Lucky(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MAtk.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MAtk.java index 5f9ad5f32b..38c2fc9067 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MAtk.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MAtk.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MAtk extends AbstractStatEffect { - public MAtk(StatsSet params) + public MAtk(StatSet params) { super(params, Stat.MAGIC_ATTACK); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java index 2b9ae2e9e6..393d0d2d30 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicAccuracy extends AbstractStatEffect { - public MagicAccuracy(StatsSet params) + public MagicAccuracy(StatSet params) { super(params, Stat.ACCURACY_MAGIC); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java index 123706eb55..b9a58b09f3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicCriticalDamage extends AbstractStatEffect { - public MagicCriticalDamage(StatsSet params) + public MagicCriticalDamage(StatSet params) { super(params, Stat.MAGIC_CRITICAL_DAMAGE, Stat.MAGIC_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java index 0c10014e50..c9fa9a4240 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicCriticalRate extends AbstractStatEffect { - public MagicCriticalRate(StatsSet params) + public MagicCriticalRate(StatSet params) { super(params, Stat.MAGIC_CRITICAL_RATE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index e8b6f5e8bf..5281bf8445 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class MagicMpCost extends AbstractEffect private final int _magicType; private final double _amount; - public MagicMpCost(StatsSet params) + public MagicMpCost(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index ed4a3fca8b..283a99176c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class MagicalAbnormalDispelAttack extends AbstractEffect private final double _power; private final AbnormalType _abnormalType; - public MagicalAbnormalDispelAttack(StatsSet params) + public MagicalAbnormalDispelAttack(StatSet params) { _power = params.getDouble("power", 0); _abnormalType = AbnormalType.getAbnormalType(params.getString("abnormalType", null)); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java index 8234db1c43..be6403077c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAbnormalResist extends AbstractStatAddEffect { - public MagicalAbnormalResist(StatsSet params) + public MagicalAbnormalResist(StatSet params) { super(params, Stat.ABNORMAL_RESIST_MAGICAL); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index 4e938809f1..25c7d25954 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -37,7 +37,7 @@ public class MagicalAttack extends AbstractEffect private final boolean _overHit; private final double _debuffModifier; - public MagicalAttack(StatsSet params) + public MagicalAttack(StatSet params) { _power = params.getDouble("power", 0); _overHit = params.getBoolean("overHit", false); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 424480b76c..11c387780e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class MagicalAttackByAbnormal extends AbstractEffect { private final double _power; - public MagicalAttackByAbnormal(StatsSet params) + public MagicalAttackByAbnormal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9c3e263a05..348e904025 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -40,7 +40,7 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect private final double _power; private final Set _abnormals; - public MagicalAttackByAbnormalSlot(StatsSet params) + public MagicalAttackByAbnormalSlot(StatSet params) { _power = params.getDouble("power", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 49dd351046..de55dd0fcd 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -38,7 +38,7 @@ public class MagicalAttackMp extends AbstractEffect private final boolean _critical; private final double _criticalLimit; - public MagicalAttackMp(StatsSet params) + public MagicalAttackMp(StatSet params) { _power = params.getDouble("power"); _critical = params.getBoolean("critical"); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 4414b36fa7..93ac560169 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class MagicalAttackRange extends AbstractEffect private final double _power; private final double _shieldDefPercent; - public MagicalAttackRange(StatsSet params) + public MagicalAttackRange(StatSet params) { _power = params.getDouble("power"); _shieldDefPercent = params.getDouble("shieldDefPercent", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java index 2e304e5f8b..1cf39ed501 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAttackSpeed extends AbstractStatEffect { - public MagicalAttackSpeed(StatsSet params) + public MagicalAttackSpeed(StatSet params) { super(params, Stat.MAGIC_ATTACK_SPEED); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 9a3a776e32..880d71f0c5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class MagicalDamOverTime extends AbstractEffect private final double _power; private final boolean _canKill; - public MagicalDamOverTime(StatsSet params) + public MagicalDamOverTime(StatSet params) { _power = params.getDouble("power", 0); _canKill = params.getBoolean("canKill", false); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java index 80fdf87050..9b4e6061aa 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalDefence extends AbstractStatEffect { - public MagicalDefence(StatsSet params) + public MagicalDefence(StatSet params) { super(params, Stat.MAGICAL_DEFENCE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java index c3c7c404f3..4e83b80e8b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalEvasion extends AbstractStatEffect { - public MagicalEvasion(StatsSet params) + public MagicalEvasion(StatSet params) { super(params, Stat.MAGIC_EVASION_RATE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java index 6253af7373..bf419a19f7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalSkillPower extends AbstractStatEffect { - public MagicalSkillPower(StatsSet params) + public MagicalSkillPower(StatSet params) { super(params, Stat.MAGICAL_SKILL_POWER, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index d0047fedef..f4388dc16f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class MagicalSoulAttack extends AbstractEffect { private final double _power; - public MagicalSoulAttack(StatsSet params) + public MagicalSoulAttack(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java index fcc143cd4b..688243d9e1 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ManaCharge extends AbstractStatAddEffect { - public ManaCharge(StatsSet params) + public ManaCharge(StatSet params) { super(params, Stat.MANA_CHARGE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index 0c84b4ab61..b889e6e824 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class ManaDamOverTime extends AbstractEffect { private final double _power; - public ManaDamOverTime(StatsSet params) + public ManaDamOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index f48011c9a2..94286df1c8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -34,7 +34,7 @@ public class ManaHeal extends AbstractEffect { private final double _power; - public ManaHeal(StatsSet params) + public ManaHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index bfdfa54380..61f15449a0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -35,7 +35,7 @@ public class ManaHealByLevel extends AbstractEffect { private final double _power; - public ManaHealByLevel(StatsSet params) + public ManaHealByLevel(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 46937a8dd0..e505c9e7a2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class ManaHealOverTime extends AbstractEffect { private final double _power; - public ManaHealOverTime(StatsSet params) + public ManaHealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 101961d1c4..71085da549 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class ManaHealPercent extends AbstractEffect { private final double _power; - public ManaHealPercent(StatsSet params) + public ManaHealPercent(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 7c9c63e3ad..07d15d826c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxCp extends AbstractStatEffect { private final boolean _heal; - public MaxCp(StatsSet params) + public MaxCp(StatSet params) { super(params, Stat.MAX_CP); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 6d2c3449bd..85867bca96 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxHp extends AbstractStatEffect { private final boolean _heal; - public MaxHp(StatsSet params) + public MaxHp(StatSet params) { super(params, Stat.MAX_HP); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index e554c63055..9ca46fda8d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxMp extends AbstractStatEffect { private final boolean _heal; - public MaxMp(StatsSet params) + public MaxMp(StatSet params) { super(params, Stat.MAX_MP); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 39cf62a95b..c27284e5f6 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -43,7 +43,7 @@ public class ModifyVital extends AbstractEffect private final int _mp; private final int _cp; - public ModifyVital(StatsSet params) + public ModifyVital(StatSet params) { _type = params.getEnum("type", ModifyType.class); if (_type != ModifyType.SET) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 29ee88f805..095d130f7f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Mp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Mp(StatsSet params) + public Mp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index 76d858ad8e..b13d7824d0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class MpConsumePerLevel extends AbstractEffect { private final double _power; - public MpConsumePerLevel(StatsSet params) + public MpConsumePerLevel(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java index 2051009805..ae7bf0c48c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpRegen extends AbstractStatEffect { - public MpRegen(StatsSet params) + public MpRegen(StatSet params) { super(params, Stat.REGENERATE_MP_RATE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MpShield.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MpShield.java index 82e307a562..a4eb3e663f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MpShield.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MpShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpShield extends AbstractStatAddEffect { - public MpShield(StatsSet params) + public MpShield(StatSet params) { super(params, Stat.MANA_SHIELD_PERCENT); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java index af2ce119cc..366e96b18f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpVampiricAttack extends AbstractStatAddEffect { - public MpVampiricAttack(StatsSet params) + public MpVampiricAttack(StatSet params) { super(params, Stat.ABSORB_MANA_DAMAGE_PERCENT); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mute.java index a7f2f76e23..7e5b5a528f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Mute extends AbstractEffect { - public Mute(StatsSet params) + public Mute(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java index 3cc4cae96f..513dc46ec7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class NoblesseBless extends AbstractEffect { - public NoblesseBless(StatsSet params) + public NoblesseBless(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index bb0f02af5c..05f8c6a99b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpenChest extends AbstractEffect { - public OpenChest(StatsSet params) + public OpenChest(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 15cd9c2a64..de0414fd23 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.RecipeController; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpenCommonRecipeBook extends AbstractEffect { - public OpenCommonRecipeBook(StatsSet params) + public OpenCommonRecipeBook(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 21dd337982..7b5effc6b4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class OpenDoor extends AbstractEffect private final int _chance; private final boolean _isItem; - public OpenDoor(StatsSet params) + public OpenDoor(StatSet params) { _chance = params.getInt("chance", 0); _isItem = params.getBoolean("isItem", false); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index b99a8f9757..3526fa5fdc 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.RecipeController; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpenDwarfRecipeBook extends AbstractEffect { - public OpenDwarfRecipeBook(StatsSet params) + public OpenDwarfRecipeBook(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PAtk.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PAtk.java index c353d03a00..7f10b9dcc7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PAtk.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PAtk.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PAtk extends AbstractConditionalHpEffect { - public PAtk(StatsSet params) + public PAtk(StatSet params) { super(params, Stat.PHYSICAL_ATTACK); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Passive.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Passive.java index cef680ca21..27ce15bb60 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Passive.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Passive.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Passive extends AbstractEffect { - public Passive(StatsSet params) + public Passive(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java index 05f55c7dac..1a9f29424f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAbnormalResist extends AbstractStatAddEffect { - public PhysicalAbnormalResist(StatsSet params) + public PhysicalAbnormalResist(StatSet params) { super(params, Stat.ABNORMAL_RESIST_PHYSICAL); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 098770705b..7e5fb14465 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -52,7 +52,7 @@ public class PhysicalAttack extends AbstractEffect private final Set _abnormals; private final double _abnormalPowerMod; - public PhysicalAttack(StatsSet params) + public PhysicalAttack(StatSet params) { _power = params.getDouble("power", 0); _pAtkMod = params.getDouble("pAtkMod", 1.0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index d325c3d5ed..f191867614 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -38,7 +38,7 @@ public class PhysicalAttackHpLink extends AbstractEffect private final double _criticalChance; private final boolean _overHit; - public PhysicalAttackHpLink(StatsSet params) + public PhysicalAttackHpLink(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index dc575c2c75..fe087a1bcc 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class PhysicalAttackMute extends AbstractEffect { - public PhysicalAttackMute(StatsSet params) + public PhysicalAttackMute(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java index 112b41eb36..2093d45264 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAttackRange extends AbstractStatEffect { - public PhysicalAttackRange(StatsSet params) + public PhysicalAttackRange(StatSet params) { super(params, Stat.PHYSICAL_ATTACK_RANGE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index d3c2dcfaf2..5d66bd4c87 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ public class PhysicalAttackSaveHp extends AbstractEffect private final boolean _overHit; private final double _saveHp; - public PhysicalAttackSaveHp(StatsSet params) + public PhysicalAttackSaveHp(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java index 167b859572..cdf34eb6f6 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAttackSpeed extends AbstractStatEffect { - public PhysicalAttackSpeed(StatsSet params) + public PhysicalAttackSpeed(StatSet params) { super(params, Stat.PHYSICAL_ATTACK_SPEED); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 61bed5561b..a1a6818a00 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class PhysicalAttackWeaponBonus extends AbstractEffect private final Map _weaponBonus = new EnumMap<>(WeaponType.class); - public PhysicalAttackWeaponBonus(StatsSet params) + public PhysicalAttackWeaponBonus(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java index fa3925e725..078c3673b9 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalDefence extends AbstractConditionalHpEffect { - public PhysicalDefence(StatsSet params) + public PhysicalDefence(StatSet params) { super(params, Stat.PHYSICAL_DEFENCE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java index 812c641ac8..9714220e1b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalEvasion extends AbstractConditionalHpEffect { - public PhysicalEvasion(StatsSet params) + public PhysicalEvasion(StatSet params) { super(params, Stat.EVASION_RATE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index b337fed6cb..fe7cf853c8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class PhysicalMute extends AbstractEffect { - public PhysicalMute(StatsSet params) + public PhysicalMute(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java index 0fd835f4e3..1b843dda3d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class PhysicalShieldAngleAll extends AbstractEffect { - public PhysicalShieldAngleAll(StatsSet params) + public PhysicalShieldAngleAll(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java index 9d3f051659..507eb57326 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalSkillPower extends AbstractStatEffect { - public PhysicalSkillPower(StatsSet params) + public PhysicalSkillPower(StatSet params) { super(params, Stat.PHYSICAL_SKILL_POWER, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index a958116ff7..9ceccea4cc 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -42,7 +42,7 @@ public class PhysicalSoulAttack extends AbstractEffect private final boolean _ignoreShieldDefence; private final boolean _overHit; - public PhysicalSoulAttack(StatsSet params) + public PhysicalSoulAttack(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index e95e09ab90..fd2b23a2ae 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class PkCount extends AbstractEffect { private final int _amount; - public PkCount(StatsSet params) + public PkCount(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index 2a356bdbc9..18cecfb90e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class Plunder extends AbstractEffect { - public Plunder(StatsSet params) + public Plunder(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index fd61584af1..3e885274b3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PolearmSingleTarget extends AbstractEffect { - public PolearmSingleTarget(StatsSet params) + public PolearmSingleTarget(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java index 86f2e2cee8..b2fb920379 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class ProtectDeathPenalty extends AbstractEffect { - public ProtectDeathPenalty(StatsSet params) + public ProtectDeathPenalty(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java index 890b8980bd..6664b36bae 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ProtectionBlessing extends AbstractEffect { - public ProtectionBlessing(StatsSet params) + public ProtectionBlessing(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index 6de78c2c82..62c480716d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class PullBack extends AbstractEffect private final int _animationSpeed; private final FlyType _type; - public PullBack(StatsSet params) + public PullBack(StatSet params) { _speed = params.getInt("speed", 0); _delay = params.getInt("delay", _speed); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java index 1019c56778..84a72299f3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveMagicalSkillDamageBonus extends AbstractStatPercentEffect { - public PveMagicalSkillDamageBonus(StatsSet params) + public PveMagicalSkillDamageBonus(StatSet params) { super(params, Stat.PVE_MAGICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java index 8da698c746..70870aa45c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveMagicalSkillDefenceBonus(StatsSet params) + public PveMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java index c7a82d4ded..8f60ea025c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalAttackDamageBonus extends AbstractStatPercentEffect { - public PvePhysicalAttackDamageBonus(StatsSet params) + public PvePhysicalAttackDamageBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_ATTACK_DAMAGE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java index 0717fe525b..ea01a4e1d8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PvePhysicalAttackDefenceBonus(StatsSet params) + public PvePhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java index 878f942877..1e8b9e76c4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvePhysicalSkillDamageBonus(StatsSet params) + public PvePhysicalSkillDamageBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java index bdfa0dcc67..b1dbb0b217 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvePhysicalSkillDefenceBonus(StatsSet params) + public PvePhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java index 94fdc26015..fbe3119ba8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveRaidMagicalSkillDefenceBonus(StatsSet params) + public PveRaidMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java index f54d849752..83352e1b2f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidPhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PveRaidPhysicalAttackDefenceBonus(StatsSet params) + public PveRaidPhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java index 0a344f96de..be05bec159 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidPhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveRaidPhysicalSkillDefenceBonus(StatsSet params) + public PveRaidPhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java index 542c019420..2f0153189a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpMagicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvpMagicalSkillDamageBonus(StatsSet params) + public PvpMagicalSkillDamageBonus(StatSet params) { super(params, Stat.PVP_MAGICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java index bb006280fc..41ad3b7749 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvpMagicalSkillDefenceBonus(StatsSet params) + public PvpMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVP_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java index 483d7b02e4..23488ea000 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalAttackDamageBonus extends AbstractStatPercentEffect { - public PvpPhysicalAttackDamageBonus(StatsSet params) + public PvpPhysicalAttackDamageBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_ATTACK_DAMAGE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java index 40c3a22ea2..ff942b3d4d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PvpPhysicalAttackDefenceBonus(StatsSet params) + public PvpPhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java index 225c7c1e39..19a7c96003 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvpPhysicalSkillDamageBonus(StatsSet params) + public PvpPhysicalSkillDamageBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java index ea2d1fa126..211d14c5e3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvpPhysicalSkillDefenceBonus(StatsSet params) + public PvpPhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 8a01583374..e500b487af 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -36,7 +36,7 @@ public class RandomizeHate extends AbstractEffect { private final int _chance; - public RandomizeHate(StatsSet params) + public RandomizeHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index 8b2801ee6c..18b07bd2d7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class RealDamage extends AbstractEffect { private final double _power; - public RealDamage(StatsSet params) + public RealDamage(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java index 4372c15bcf..86738fae0f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class RearDamage extends AbstractStatPercentEffect { - public RearDamage(StatsSet params) + public RearDamage(StatSet params) { super(params, Stat.REAR_DAMAGE_RATE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 31c7a4e4b3..82ed18faa1 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RebalanceHP extends AbstractEffect { - public RebalanceHP(StatsSet params) + public RebalanceHP(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index 09d307be02..979809b533 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RebalanceHPSummon extends AbstractEffect { - public RebalanceHPSummon(StatsSet params) + public RebalanceHPSummon(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 7599b691ac..e76328929a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class RecoverVitalityInPeaceZone extends AbstractEffect private final double _amount; private final int _ticks; - public RecoverVitalityInPeaceZone(StatsSet params) + public RecoverVitalityInPeaceZone(StatSet params) { _amount = params.getDouble("amount", 0); _ticks = params.getInt("ticks", 10); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Recovery.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Recovery.java index 35c5cf3af1..30296eec4d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Recovery.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Recovery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Recovery extends AbstractEffect { - public Recovery(StatsSet params) + public Recovery(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java index 824044ae21..e52b5abafb 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ReduceCancel extends AbstractStatEffect { - public ReduceCancel(StatsSet params) + public ReduceCancel(StatSet params) { super(params, Stat.ATTACK_CANCEL); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index ecc7a10d31..be9188f3b0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -33,7 +33,7 @@ public class ReduceDamage extends AbstractEffect { private final double _amount; - public ReduceDamage(StatsSet params) + public ReduceDamage(StatSet params) { _amount = params.getDouble("amount"); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java index 8534a94fc6..7b8862f608 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ReduceDropType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -32,7 +32,7 @@ public class ReduceDropPenalty extends AbstractEffect private final double _deathPenalty; private final ReduceDropType _type; - public ReduceDropPenalty(StatsSet params) + public ReduceDropPenalty(StatSet params) { _exp = params.getDouble("exp", 0); _deathPenalty = params.getDouble("deathPenalty", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java index c15f7301b9..6436b488e0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ReflectMagic extends AbstractStatAddEffect { - public ReflectMagic(StatsSet params) + public ReflectMagic(StatSet params) { super(params, Stat.VENGEANCE_SKILL_MAGIC_DAMAGE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java index bf1d555351..583191fd4c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.BasicProperty; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ReflectSkill extends AbstractEffect private final Stat _stat; private final double _amount; - public ReflectSkill(StatsSet params) + public ReflectSkill(StatSet params) { _stat = params.getEnum("type", BasicProperty.class, BasicProperty.PHYSICAL) == BasicProperty.PHYSICAL ? Stat.REFLECT_SKILL_PHYSIC : Stat.REFLECT_SKILL_MAGIC; _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index e850ea6be9..77b96e4205 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class RefuelAirship extends AbstractEffect { private final int _value; - public RefuelAirship(StatsSet params) + public RefuelAirship(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Relax.java index c8c61fe47e..e2ba4420db 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ public class Relax extends AbstractEffect { private final double _power; - public Relax(StatsSet params) + public Relax(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 9678dc1174..0613c17234 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class ResetInstanceEntry extends AbstractEffect { private final Set _instanceId; - public ResetInstanceEntry(StatsSet params) + public ResetInstanceEntry(StatSet params) { final String instanceIds = params.getString("instanceId", null); if ((instanceIds != null) && !instanceIds.isEmpty()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java index 940c731208..f15ff56189 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ResistAbnormalByCategory extends AbstractEffect private final DispelSlotType _slot; private final double _amount; - public ResistAbnormalByCategory(StatsSet params) + public ResistAbnormalByCategory(StatSet params) { _amount = params.getDouble("amount", 0); _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.DEBUFF); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java index dae38e5246..2e29b5cc8e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ResistDDMagic extends AbstractStatPercentEffect { - public ResistDDMagic(StatsSet params) + public ResistDDMagic(StatSet params) { super(params, Stat.MAGIC_SUCCESS_RES); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java index af2b203aad..d08fcb262a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ResistDispelByCategory extends AbstractEffect private final DispelSlotType _slot; private final double _amount; - public ResistDispelByCategory(StatsSet params) + public ResistDispelByCategory(StatSet params) { _amount = params.getDouble("amount", 0); _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index af1e40bea8..cd03f1a74a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -34,7 +34,7 @@ public class ResistSkill extends AbstractEffect { private final List _skills = new ArrayList<>(); - public ResistSkill(StatsSet params) + public ResistSkill(StatSet params) { for (int i = 1;; i++) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index feb5885fb0..6f887a07cf 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class Restoration extends AbstractEffect private final int _itemCount; private final int _itemEnchantmentLevel; - public Restoration(StatsSet params) + public Restoration(StatSet params) { _itemId = params.getInt("itemId", 0); _itemCount = params.getInt("itemCount", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 37cd974643..0baf0aaae6 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -25,7 +25,7 @@ import java.util.Map.Entry; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.ExtractableProductItem; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,12 +47,12 @@ public class RestorationRandom extends AbstractEffect { private final List _products = new ArrayList<>(); - public RestorationRandom(StatsSet params) + public RestorationRandom(StatSet params) { - for (StatsSet group : params.getList("items", StatsSet.class)) + for (StatSet group : params.getList("items", StatSet.class)) { final List items = new ArrayList<>(); - for (StatsSet item : group.getList(".", StatsSet.class)) + for (StatSet item : group.getList(".", StatSet.class)) { items.add(new RestorationItemHolder(item.getInt(".id"), item.getInt(".count"), item.getInt(".minEnchant", 0), item.getInt(".maxEnchant", 0))); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index f9c10b7ff2..9b287dd419 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class Resurrection extends AbstractEffect { private final int _power; - public Resurrection(StatsSet params) + public Resurrection(StatSet params) { _power = params.getInt("power", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 18d8bdb0bd..6ef063ce91 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -39,7 +39,7 @@ public class ResurrectionSpecial extends AbstractEffect private final int _power; private final Set _instanceId; - public ResurrectionSpecial(StatsSet params) + public ResurrectionSpecial(StatSet params) { _power = params.getInt("power", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index e4d66b43d3..0e7391681b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class Reuse extends AbstractEffect private final int _magicType; private final double _amount; - public Reuse(StatsSet params) + public Reuse(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index 3716fc1922..e17cd7cc25 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ReuseSkillById extends AbstractEffect { private final int _skillId; - public ReuseSkillById(StatsSet params) + public ReuseSkillById(StatSet params) { _skillId = params.getInt("skillId", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Root.java index 1ca3492949..b6876e8e13 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Root extends AbstractEffect { - public Root(StatsSet params) + public Root(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index 66fc8d82c8..4c7ee53239 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class SacrificeSummon extends AbstractEffect { - public SacrificeSummon(StatsSet params) + public SacrificeSummon(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java index d00856c9bd..683f45bb55 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SafeFallHeight extends AbstractStatEffect { - public SafeFallHeight(StatsSet params) + public SafeFallHeight(StatSet params) { super(params, Stat.FALL); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 7f6bf69ee3..797aa95263 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -33,7 +33,7 @@ public class SendSystemMessageToClan extends AbstractEffect { private final SystemMessage _message; - public SendSystemMessageToClan(StatsSet params) + public SendSystemMessageToClan(StatSet params) { final int id = params.getInt("id", 0); _message = new SystemMessage(id); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java index 7acbf846df..a0508d73b1 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class ServitorShare extends AbstractEffect { private final Map _sharedStats = new EnumMap<>(Stat.class); - public ServitorShare(StatsSet params) + public ServitorShare(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 01dfd87c71..6e8187feae 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SetHp extends AbstractEffect private final double _amount; private final StatModifierType _mode; - public SetHp(StatsSet params) + public SetHp(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index 805d18160b..fae21baa51 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SetSkill extends AbstractEffect private final int _skillId; private final int _skillLvl; - public SetSkill(StatsSet params) + public SetSkill(StatSet params) { _skillId = params.getInt("skillId", 0); _skillLvl = params.getInt("skillLvl", 1); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java index a93bb5f253..354cb42b55 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ShieldDefence extends AbstractStatEffect { - public ShieldDefence(StatsSet params) + public ShieldDefence(StatSet params) { super(params, Stat.SHIELD_DEFENCE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java index f28d0e4ad2..1fdee75f69 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ShieldDefenceRate extends AbstractStatEffect { - public ShieldDefenceRate(StatsSet params) + public ShieldDefenceRate(StatSet params) { super(params, Stat.SHIELD_DEFENCE_RATE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java index 1d649082dc..533b631f10 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class SilentMove extends AbstractEffect { - public SilentMove(StatsSet params) + public SilentMove(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java index 89dad85514..7c929a7fe8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class SkillCritical extends AbstractEffect { private final BaseStat _stat; - public SkillCritical(StatsSet params) + public SkillCritical(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java index 369bef11f5..8f054f973b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillCriticalDamage extends AbstractStatEffect { - public SkillCriticalDamage(StatsSet params) + public SkillCriticalDamage(StatSet params) { super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java index c91f2d6b49..88ecf69e77 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillCriticalProbability extends AbstractStatPercentEffect { - public SkillCriticalProbability(StatsSet params) + public SkillCriticalProbability(StatSet params) { super(params, Stat.SKILL_CRITICAL_PROBABILITY); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 7b98a9e180..1664ea1827 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class SkillEvasion extends AbstractEffect private final int _magicType; private final double _amount; - public SkillEvasion(StatsSet params) + public SkillEvasion(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java index 9cc62532b4..2880d0ccef 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillPowerAdd extends AbstractStatAddEffect { - public SkillPowerAdd(StatsSet params) + public SkillPowerAdd(StatSet params) { super(params, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 9578c88f91..7156fff2df 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SkillTurning extends AbstractEffect private final int _chance; private final boolean _staticChance; - public SkillTurning(StatsSet params) + public SkillTurning(StatSet params) { _chance = params.getInt("chance", 100); _staticChance = params.getBoolean("staticChance", false); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 45b02206a4..04691304ed 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SkillTurningOverTime extends AbstractEffect private final int _chance; private final boolean _staticChance; - public SkillTurningOverTime(StatsSet params) + public SkillTurningOverTime(StatSet params) { _chance = params.getInt("chance", 100); _staticChance = params.getBoolean("staticChance", false); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index c1dd92cedb..b919c7acac 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -36,7 +36,7 @@ public class SoulBlow extends AbstractEffect private final double _chanceBoost; private final boolean _overHit; - public SoulBlow(StatsSet params) + public SoulBlow(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 8471aa236c..4f63a84081 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; @@ -40,7 +40,7 @@ public class SoulEating extends AbstractEffect private final int _expNeeded; private final int _maxSouls; - public SoulEating(StatsSet params) + public SoulEating(StatSet params) { _expNeeded = params.getInt("expNeeded"); _maxSouls = params.getInt("maxSouls"); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a7d5c2628a..ad261845eb 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Seed; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Sow extends AbstractEffect { - public Sow(StatsSet params) + public Sow(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SpModify.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SpModify.java index 24d124ecce..c3bc6193e9 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SpModify.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SpModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SpModify extends AbstractStatAddEffect { - public SpModify(StatsSet params) + public SpModify(StatSet params) { super(params, Stat.BONUS_SP); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 0718408ca2..890438d65f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.enums.SpeedType; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -36,7 +36,7 @@ public class Speed extends AbstractEffect private final StatModifierType _mode; private List _speedType; - public Speed(StatsSet params) + public Speed(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index 91b91ad05e..db247775f3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SphericBarrier extends AbstractStatAddEffect { - public SphericBarrier(StatsSet params) + public SphericBarrier(StatSet params) { super(params, Stat.SPHERIC_BARRIER_RANGE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index d13eaf1c2e..385240377f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class Spoil extends AbstractEffect { - public Spoil(StatsSet params) + public Spoil(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index b63c24dc20..22c4132b63 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -36,7 +36,7 @@ public class StatBonusSkillCritical extends AbstractEffect private final BaseStat _stat; private final Condition _armorTypeCondition; - public StatBonusSkillCritical(StatsSet params) + public StatBonusSkillCritical(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.DEX); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index 41a20bfafe..49280eb774 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -36,7 +36,7 @@ public class StatBonusSpeed extends AbstractEffect private final BaseStat _stat; private final Condition _armorTypeCondition; - public StatBonusSpeed(StatsSet params) + public StatBonusSpeed(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.DEX); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index a007b118b2..bcf691e360 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class StatByMoveType extends AbstractEffect private final MoveType _type; private final double _value; - public StatByMoveType(StatsSet params) + public StatByMoveType(StatSet params) { _stat = params.getEnum("stat", Stat.class); _type = params.getEnum("type", MoveType.class); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatUp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatUp.java index a22710ca7a..29d72bb4de 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatUp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatUp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class StatUp extends AbstractEffect private final BaseStat _stat; private final double _amount; - public StatUp(StatsSet params) + public StatUp(StatSet params) { _amount = params.getDouble("amount", 0); _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index 0720057c19..23239887a7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.List; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -39,7 +39,7 @@ public class StealAbnormal extends AbstractEffect private final int _rate; private final int _max; - public StealAbnormal(StatsSet params) + public StealAbnormal(StatSet params) { _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); _rate = params.getInt("rate", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Summon.java index 0f95637961..7ef79d4c39 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.ServitorInstance; @@ -43,7 +43,7 @@ public class Summon extends AbstractEffect private final int _lifeTime; private final int _consumeItemInterval; - public Summon(StatsSet params) + public Summon(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index 8929e1f2b0..50c025e572 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class SummonAgathion extends AbstractEffect { private final int _npcId; - public SummonAgathion(StatsSet params) + public SummonAgathion(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index 7716d58f16..49b816f272 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.CubicData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; @@ -42,7 +42,7 @@ public class SummonCubic extends AbstractEffect private final int _cubicId; private final int _cubicLvl; - public SummonCubic(StatsSet params) + public SummonCubic(StatSet params) { _cubicId = params.getInt("cubicId", -1); _cubicLvl = params.getInt("cubicLvl", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index d0a2a82738..13d5a2eac7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoppelgangerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ public class SummonHallucination extends AbstractEffect private final int _npcId; private final int _npcCount; - public SummonHallucination(StatsSet params) + public SummonHallucination(StatSet params) { _despawnDelay = params.getInt("despawnDelay", 20000); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index bcd050e084..d61a6e5c02 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.ServitorInstance; @@ -43,7 +43,7 @@ public class SummonMulti extends AbstractEffect private final int _consumeItemInterval; private final int _summonPoints; - public SummonMulti(StatsSet params) + public SummonMulti(StatSet params) { _npcId = params.getInt("npcId"); _expMultiplier = params.getFloat("expMultiplier", 1); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index 6f4090eef0..eaff214b7c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DecoyInstance; @@ -48,7 +48,7 @@ public class SummonNpc extends AbstractEffect private final boolean _isSummonSpawn; private final boolean _singleInstance; // Only one instance of this NPC is allowed. - public SummonNpc(StatsSet params) + public SummonNpc(StatSet params) { _despawnDelay = params.getInt("despawnDelay", 20000); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 5ef621819e..534a41ee16 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.data.xml.impl.PetDataTable; import org.l2jmobius.gameserver.model.PetData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PetItemList; */ public class SummonPet extends AbstractEffect { - public SummonPet(StatsSet params) + public SummonPet(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java index 7dd690587c..b1d5ec38cb 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SummonPoints extends AbstractStatAddEffect { - public SummonPoints(StatsSet params) + public SummonPoints(StatSet params) { super(params, Stat.MAX_SUMMON_POINTS); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index d8a47b670f..ac1ddaa16a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; @@ -35,7 +35,7 @@ public class SummonTrap extends AbstractEffect private final int _despawnTime; private final int _npcId; - public SummonTrap(StatsSet params) + public SummonTrap(StatSet params) { _despawnTime = params.getInt("despawnTime", 0); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 84f6d070a8..3196bb949d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Collection; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Sweeper extends AbstractEffect { - public Sweeper(StatsSet params) + public Sweeper(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 1594a8a23b..77dc9b4af7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ public class Synergy extends AbstractEffect private final int _skillLevelScaleTo; private final int _minSlot; - public Synergy(StatsSet params) + public Synergy(StatSet params) { final String requiredSlots = params.getString("requiredSlots", null); if ((requiredSlots != null) && !requiredSlots.isEmpty()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index e35516fef5..39ed981bbf 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Castle; @@ -33,7 +33,7 @@ public class TakeCastle extends AbstractEffect { private final CastleSide _side; - public TakeCastle(StatsSet params) + public TakeCastle(StatSet params) { _side = params.getEnum("side", CastleSide.class); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 77fd9ec103..3be2bf5593 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Castle; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TakeCastleStart extends AbstractEffect { - public TakeCastleStart(StatsSet params) + public TakeCastleStart(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 70842191a7..18749c1aef 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Fort; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TakeFort extends AbstractEffect { - public TakeFort(StatsSet params) + public TakeFort(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 0eb23f6733..77355f9683 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TakeFortStart extends AbstractEffect { - public TakeFortStart(StatsSet params) + public TakeFortStart(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index cec32755ed..dd8e09278f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class TalismanSlot extends AbstractEffect { private final int _slots; - public TalismanSlot(StatsSet params) + public TalismanSlot(StatSet params) { _slots = params.getInt("slots", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 281b5322fd..32a126f499 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class TargetCancel extends AbstractEffect { private final int _chance; - public TargetCancel(StatsSet params) + public TargetCancel(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index b4463de391..86ff70c9ca 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMe extends AbstractEffect { - public TargetMe(StatsSet params) + public TargetMe(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index 11e581113e..e68a1e1faf 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class TargetMeProbability extends AbstractEffect { private final int _chance; - public TargetMeProbability(StatsSet params) + public TargetMeProbability(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 6c30519678..9ca01faf50 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -32,7 +32,7 @@ public class Teleport extends AbstractEffect { private final Location _loc; - public Teleport(StatsSet params) + public Teleport(StatSet params) { _loc = new Location(params.getInt("x", 0), params.getInt("y", 0), params.getInt("z", 0)); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index e0e715818c..bdc53208d5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -38,7 +38,7 @@ public class TeleportToNpc extends AbstractEffect private final int _npcId; private final boolean _party; - public TeleportToNpc(StatsSet params) + public TeleportToNpc(StatSet params) { _npcId = params.getInt("npcId"); _party = params.getBoolean("party", false); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index c84c559322..4f4275fd41 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TeleportToPlayer extends AbstractEffect { - public TeleportToPlayer(StatsSet params) + public TeleportToPlayer(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index 1c9af0f535..b2d6b663de 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class TeleportToSummon extends AbstractEffect { private final double _maxDistance; - public TeleportToSummon(StatsSet params) + public TeleportToSummon(StatSet params) { _maxDistance = params.getDouble("distance", -1); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index e550302b02..c4bf787a10 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class TeleportToTarget extends AbstractEffect { - public TeleportToTarget(StatsSet params) + public TeleportToTarget(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index ba1c55c615..ff63eea817 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class TransferDamageToPlayer extends AbstractStatAddEffect { - public TransferDamageToPlayer(StatsSet params) + public TransferDamageToPlayer(StatSet params) { super(params, Stat.TRANSFER_DAMAGE_TO_PLAYER); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java index b084bfc1cb..c87d5f0554 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class TransferDamageToSummon extends AbstractStatAddEffect { - public TransferDamageToSummon(StatsSet params) + public TransferDamageToSummon(StatSet params) { super(params, Stat.TRANSFER_DAMAGE_SUMMON_PERCENT); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index e9f0292113..48bc5e3a1c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -34,7 +34,7 @@ public class TransferHate extends AbstractEffect { private final int _chance; - public TransferHate(StatsSet params) + public TransferHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 2ddf95a4db..bf593eaed8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Transformation extends AbstractEffect { private final List _id; - public Transformation(StatsSet params) + public Transformation(StatSet params) { final String ids = params.getString("transformationId", null); if ((ids != null) && !ids.isEmpty()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 103ccdf8ce..2b4af0a1d3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class TrapDetect extends AbstractEffect { private final int _power; - public TrapDetect(StatsSet params) + public TrapDetect(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index eb7b073b36..c4a6c6aed9 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.TrapAction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class TrapRemove extends AbstractEffect { private final int _power; - public TrapRemove(StatsSet params) + public TrapRemove(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 6df3874ab1..8fb87050b1 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -59,7 +59,7 @@ public class TriggerSkillByAttack extends AbstractEffect * @param params */ - public TriggerSkillByAttack(StatsSet params) + public TriggerSkillByAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index ae6a3bc89f..78366b8047 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillByAvoid extends AbstractEffect /** * @param params */ - public TriggerSkillByAvoid(StatsSet params) + public TriggerSkillByAvoid(StatSet params) { _chance = params.getInt("chance", 100); _skill = new SkillHolder(params.getInt("skillId", 0), params.getInt("skillLevel", 0)); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index c24fb95246..9fe53c0622 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -48,7 +48,7 @@ public class TriggerSkillByDamage extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillByDamage(StatsSet params) + public TriggerSkillByDamage(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c086507336..8b84350293 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillByDeathBlow extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillByDeathBlow(StatsSet params) + public TriggerSkillByDeathBlow(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index a9bfcc320c..11802645f2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -37,7 +37,7 @@ public class TriggerSkillByKill extends AbstractEffect private final int _chance; private final SkillHolder _skill; - public TriggerSkillByKill(StatsSet params) + public TriggerSkillByKill(StatSet params) { _chance = params.getInt("chance", 100); _skill = new SkillHolder(params.getInt("skillId", 0), params.getInt("skillLevel", 0)); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 2893d46f33..7f2d3f9fa7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -52,7 +52,7 @@ public class TriggerSkillByMagicType extends AbstractEffect * @param params */ - public TriggerSkillByMagicType(StatsSet params) + public TriggerSkillByMagicType(StatSet params) { _chance = params.getInt("chance", 100); _magicTypes = params.getIntArray("magicTypes", ";"); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 1524e3d4f4..b77da803f5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillBySkill extends AbstractEffect private final int _skillLevelScaleTo; private final TargetType _targetType; - public TriggerSkillBySkill(StatsSet params) + public TriggerSkillBySkill(StatSet params) { _castSkillId = params.getInt("castSkillId"); _chance = params.getInt("chance", 100); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index ec2124c44e..7bb68baec9 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -53,7 +53,7 @@ public class TriggerSkillBySkillAttack extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillBySkillAttack(StatsSet params) + public TriggerSkillBySkillAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 3f58619f0a..c209decfb3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -69,7 +69,7 @@ public class TwoHandedBluntBonus extends AbstractEffect private final double _speedAmount; private final StatModifierType _speedMode; - public TwoHandedBluntBonus(StatsSet params) + public TwoHandedBluntBonus(StatSet params) { _pAtkAmount = params.getDouble("pAtkAmount", 0); _pAtkMode = params.getEnum("pAtkMode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index b2c50c4b88..344456a925 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -69,7 +69,7 @@ public class TwoHandedSwordBonus extends AbstractEffect private final double _speedAmount; private final StatModifierType _speedMode; - public TwoHandedSwordBonus(StatsSet params) + public TwoHandedSwordBonus(StatSet params) { _pAtkAmount = params.getDouble("pAtkAmount", 0); _pAtkMode = params.getEnum("pAtkMode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 01ae8122ec..20b418c29b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ public class Unsummon extends AbstractEffect { private final int _chance; - public Unsummon(StatsSet params) + public Unsummon(StatSet params) { _chance = params.getInt("chance", -1); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 57eb89196d..f73f0f57f0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; */ public class UnsummonAgathion extends AbstractEffect { - public UnsummonAgathion(StatsSet params) + public UnsummonAgathion(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index a4fdc2c0aa..0779d018cc 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class UnsummonServitors extends AbstractEffect { - public UnsummonServitors(StatsSet params) + public UnsummonServitors(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index dbb0c700b5..ac33fcba0d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Untargetable extends AbstractEffect { - public Untargetable(StatsSet params) + public Untargetable(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java index ac6cae3d05..1c85196fe0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class VampiricAttack extends AbstractEffect private final double _amount; private final double _sum; - public VampiricAttack(StatsSet params) + public VampiricAttack(StatSet params) { _amount = params.getDouble("amount"); _sum = _amount * params.getDouble("chance"); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java index ab724714e1..571ca55bbe 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ public class VampiricDefence extends AbstractEffect { private final int _amount; - public VampiricDefence(StatsSet params) + public VampiricDefence(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java index f8b9d76f3a..caaa8d02b4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class VitalityExpRate extends AbstractStatPercentEffect { - public VitalityExpRate(StatsSet params) + public VitalityExpRate(StatSet params) { super(params, Stat.VITALITY_EXP_RATE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index cba2b14c35..385595e03d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class VitalityPointUp extends AbstractEffect { private final int _value; - public VitalityPointUp(StatsSet params) + public VitalityPointUp(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java index 86612955dd..72f78ec177 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class VitalityPointsRate extends AbstractStatPercentEffect { - public VitalityPointsRate(StatsSet params) + public VitalityPointsRate(StatSet params) { super(params, Stat.VITALITY_CONSUME_RATE); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java index 09500b3823..bf20bd5018 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WeightLimit extends AbstractStatEffect { - public WeightLimit(StatsSet params) + public WeightLimit(StatSet params) { super(params, Stat.WEIGHT_LIMIT); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java index f9be68f493..6020399f85 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WeightPenalty extends AbstractStatAddEffect { - public WeightPenalty(StatsSet params) + public WeightPenalty(StatSet params) { super(params, Stat.WEIGHT_PENALTY); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java index bdf9aca48d..81eb9a9688 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WorldChatPoints extends AbstractStatEffect { - public WorldChatPoints(StatsSet params) + public WorldChatPoints(StatSet params) { super(params, Stat.WORLD_CHAT_POINTS); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java index 5a3842921d..127dadf9d2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class BuildAdvanceBaseSkillCondition implements ISkillCondition { - public BuildAdvanceBaseSkillCondition(StatsSet params) + public BuildAdvanceBaseSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java index a9dd2b9eba..ffb7d13539 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class BuildCampSkillCondition implements ISkillCondition { - public BuildCampSkillCondition(StatsSet params) + public BuildCampSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java index c1220c828a..aca51bafbf 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanAddMaxEntranceInzoneSkillCondition implements ISkillCondition { - public CanAddMaxEntranceInzoneSkillCondition(StatsSet params) + public CanAddMaxEntranceInzoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java index eddd45771c..6ac3c2e199 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ public class CanBookmarkAddSlotSkillCondition implements ISkillCondition { private final int _teleportBookmarkSlots; - public CanBookmarkAddSlotSkillCondition(StatsSet params) + public CanBookmarkAddSlotSkillCondition(StatSet params) { _teleportBookmarkSlots = params.getInt("teleportBookmarkSlots"); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java index 30fdb7f36f..ee1bf96e69 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanChangeVitalItemCountSkillCondition implements ISkillCondition { - public CanChangeVitalItemCountSkillCondition(StatsSet params) + public CanChangeVitalItemCountSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java index da553a6d9f..48e28e7af7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanEnchantAttributeSkillCondition implements ISkillCondition { - public CanEnchantAttributeSkillCondition(StatsSet params) + public CanEnchantAttributeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java index c14f1ffe64..2908994776 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanMountForEventSkillCondition implements ISkillCondition { - public CanMountForEventSkillCondition(StatsSet params) + public CanMountForEventSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java index d07aa9a622..9dc5f99592 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShipInstance; @@ -31,7 +31,7 @@ public class CanRefuelAirshipSkillCondition implements ISkillCondition { private final int _amount; - public CanRefuelAirshipSkillCondition(StatsSet params) + public CanRefuelAirshipSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java index d451f3c997..67206b47bd 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanRestoreVitalPointSkillCondition implements ISkillCondition { - public CanRestoreVitalPointSkillCondition(StatsSet params) + public CanRestoreVitalPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java index 7e519025b0..49232af88f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CanSummonCubicSkillCondition implements ISkillCondition { - public CanSummonCubicSkillCondition(StatsSet params) + public CanSummonCubicSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java index 23cca508c1..6610f322f1 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class CanSummonMultiSkillCondition implements ISkillCondition { private final int _summonPoints; - public CanSummonMultiSkillCondition(StatsSet params) + public CanSummonMultiSkillCondition(StatSet params) { _summonPoints = params.getInt("summonPoints"); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java index 85419e1e5e..c38566dbdd 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.CharSummonTable; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; */ public class CanSummonPetSkillCondition implements ISkillCondition { - public CanSummonPetSkillCondition(StatsSet params) + public CanSummonPetSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java index ea41a2e22e..3655e158cb 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanSummonSiegeGolemSkillCondition implements ISkillCondition { - public CanSummonSiegeGolemSkillCondition(StatsSet params) + public CanSummonSiegeGolemSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java index 6248c5131f..4d59811c7b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanSummonSkillCondition implements ISkillCondition { - public CanSummonSkillCondition(StatsSet params) + public CanSummonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java index 309da529c9..bd8838d02f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanTransformInDominionSkillCondition implements ISkillCondition { - public CanTransformInDominionSkillCondition(StatsSet params) + public CanTransformInDominionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java index 81297944f1..2f4d780cab 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class CanTransformSkillCondition implements ISkillCondition // TODO: What to do with this? // private final int _transformId; - public CanTransformSkillCondition(StatsSet params) + public CanTransformSkillCondition(StatSet params) { // _transformId = params.getInt("transformId"); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java index 800d0375be..771873a553 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanUntransformSkillCondition implements ISkillCondition { - public CanUntransformSkillCondition(StatsSet params) + public CanUntransformSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java index e651b3b1d5..ffe2e4a026 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class CanUseInBattlefieldSkillCondition implements ISkillCondition { - public CanUseInBattlefieldSkillCondition(StatsSet params) + public CanUseInBattlefieldSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java index 5ff751abce..ba030b97a4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanUseInDragonLairSkillCondition implements ISkillCondition { - public CanUseInDragonLairSkillCondition(StatsSet params) + public CanUseInDragonLairSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java index 4d914c28fe..8a0cb18ac7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class CanUseSwoopCannonSkillCondition implements ISkillCondition { - public CanUseSwoopCannonSkillCondition(StatsSet params) + public CanUseSwoopCannonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java index 6a2d832a4c..e9996580fc 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanUseVitalityConsumeItemSkillCondition implements ISkillCondition { - public CanUseVitalityConsumeItemSkillCondition(StatsSet params) + public CanUseVitalityConsumeItemSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java index f694956e7e..48dafb46c3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class CannotUseInTransformSkillCondition implements ISkillCondition { private final int _transformId; - public CannotUseInTransformSkillCondition(StatsSet params) + public CannotUseInTransformSkillCondition(StatSet params) { _transformId = params.getInt("transformId", -1); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java index 141c69322f..6591233504 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -32,7 +32,7 @@ public class CheckLevelSkillCondition implements ISkillCondition private final int _maxLevel; private final SkillConditionAffectType _affectType; - public CheckLevelSkillCondition(StatsSet params) + public CheckLevelSkillCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java index 15163a3373..d72f463c4e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class CheckSexSkillCondition implements ISkillCondition { private final boolean _isFemale; - public CheckSexSkillCondition(StatsSet params) + public CheckSexSkillCondition(StatSet params) { _isFemale = params.getBoolean("isFemale"); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java index 8dee11ef9c..12e49c23a7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConsumeBodySkillCondition implements ISkillCondition { - public ConsumeBodySkillCondition(StatsSet params) + public ConsumeBodySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java index c24da9ebcd..ba1b1cdd5f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class EnergySavedSkillCondition implements ISkillCondition { private final int _amount; - public EnergySavedSkillCondition(StatsSet params) + public EnergySavedSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 192f3487e2..cbaf72bb00 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -35,7 +35,7 @@ public class EquipArmorSkillCondition implements ISkillCondition { private int _armorTypesMask = 0; - public EquipArmorSkillCondition(StatsSet params) + public EquipArmorSkillCondition(StatSet params) { final List armorTypes = params.getEnumList("armorType", ArmorType.class); if (armorTypes != null) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index e5f22008fa..708b4dd1d4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class EquipShieldSkillCondition implements ISkillCondition { - public EquipShieldSkillCondition(StatsSet params) + public EquipShieldSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 4561945254..f733f81f62 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -33,7 +33,7 @@ public class EquipWeaponSkillCondition implements ISkillCondition { private int _weaponTypesMask = 0; - public EquipWeaponSkillCondition(StatsSet params) + public EquipWeaponSkillCondition(StatSet params) { final List weaponTypes = params.getEnumList("weaponType", WeaponType.class); if (weaponTypes != null) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java index 5f77215218..e36c06fa11 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class NotFearedSkillCondition implements ISkillCondition { - public NotFearedSkillCondition(StatsSet params) + public NotFearedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java index b9096cc1a9..b6e7bcd826 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class NotInUnderwaterSkillCondition implements ISkillCondition { - public NotInUnderwaterSkillCondition(StatsSet params) + public NotInUnderwaterSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index eee6ec73e9..18d8dc8a11 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -35,7 +35,7 @@ public class Op2hWeaponSkillCondition implements ISkillCondition { private final List _weaponTypes = new ArrayList<>(); - public Op2hWeaponSkillCondition(StatsSet params) + public Op2hWeaponSkillCondition(StatSet params) { final List weaponTypes = params.getList("weaponType", String.class); if (weaponTypes != null) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 3b91f36fe4..6223172dbc 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; - public OpAffectedBySkillSkillCondition(StatsSet params) + public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java index 2eb561291e..3818df4736 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAgathionEnergySkillCondition implements ISkillCondition { - public OpAgathionEnergySkillCondition(StatsSet params) + public OpAgathionEnergySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java index 76a7ebc5a8..ee2b415021 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.enums.SkillConditionAlignment; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -32,7 +32,7 @@ public class OpAlignmentSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final SkillConditionAlignment _alignment; - public OpAlignmentSkillCondition(StatsSet params) + public OpAlignmentSkillCondition(StatSet params) { _affectType = params.getEnum("affectType", SkillConditionAffectType.class); _alignment = params.getEnum("alignment", SkillConditionAlignment.class); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index 1c83d18f4e..bcc6715bb2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -33,7 +33,7 @@ public class OpBlinkSkillCondition implements ISkillCondition private final int _angle; private final int _range; - public OpBlinkSkillCondition(StatsSet params) + public OpBlinkSkillCondition(StatSet params) { switch (params.getEnum("direction", Position.class)) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java index 5215f86ae6..fde0c7f0f8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpCallPcSkillCondition implements ISkillCondition { - public OpCallPcSkillCondition(StatsSet params) + public OpCallPcSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java index dddafec6f0..1de2a32550 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCanEscapeSkillCondition implements ISkillCondition { - public OpCanEscapeSkillCondition(StatsSet params) + public OpCanEscapeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java index 3f1685a1e0..a87fd8adb6 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCanNotUseAirshipSkillCondition implements ISkillCondition { - public OpCanNotUseAirshipSkillCondition(StatsSet params) + public OpCanNotUseAirshipSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java index 8eec19a568..ac7a81c015 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCannotUseTargetWithPrivateStoreSkillCondition implements ISkillCondition { - public OpCannotUseTargetWithPrivateStoreSkillCondition(StatsSet params) + public OpCannotUseTargetWithPrivateStoreSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 91de0adc8c..4030b79d00 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Weapon; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpChangeWeaponSkillCondition implements ISkillCondition { - public OpChangeWeaponSkillCondition(StatsSet params) + public OpChangeWeaponSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java index c2de03de1e..3e304e7d9d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.AbnormalType; @@ -34,7 +34,7 @@ public class OpCheckAbnormalSkillCondition implements ISkillCondition private final boolean _hasAbnormal; private final SkillConditionAffectType _affectType; - public OpCheckAbnormalSkillCondition(StatsSet params) + public OpCheckAbnormalSkillCondition(StatSet params) { _type = params.getEnum("type", AbnormalType.class); _level = params.getInt("level"); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java index 65084182b1..c70b58dc50 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCheckAccountTypeSkillCondition implements ISkillCondition { - public OpCheckAccountTypeSkillCondition(StatsSet params) + public OpCheckAccountTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java index 3d4f0a58a0..11eb804274 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpCheckCastRangeSkillCondition implements ISkillCondition { private final int _distance; - public OpCheckCastRangeSkillCondition(StatsSet params) + public OpCheckCastRangeSkillCondition(StatSet params) { _distance = params.getInt("distance"); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java index 7e2e391595..03af1ac63d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.ClassId; @@ -35,7 +35,7 @@ public class OpCheckClassListSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final boolean _isWithin; - public OpCheckClassListSkillCondition(StatsSet params) + public OpCheckClassListSkillCondition(StatSet params) { _classIds = params.getEnumList("classIds", ClassId.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java index 9f779f937a..9702804304 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.ClassId; @@ -33,7 +33,7 @@ public class OpCheckClassSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final boolean _isWithin; - public OpCheckClassSkillCondition(StatsSet params) + public OpCheckClassSkillCondition(StatSet params) { _classId = params.getEnum("classId", ClassId.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java index 3bf6b65dc8..ad997dced7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckCrtEffectSkillCondition implements ISkillCondition { - public OpCheckCrtEffectSkillCondition(StatsSet params) + public OpCheckCrtEffectSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java index 61c3aa66a4..c0bb54afe0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class OpCheckFlagSkillCondition implements ISkillCondition { - public OpCheckFlagSkillCondition(StatsSet params) + public OpCheckFlagSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java index 75af2ab89a..2e0c07d040 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckOnGoingEventCampaignSkillCondition implements ISkillCondition { - public OpCheckOnGoingEventCampaignSkillCondition(StatsSet params) + public OpCheckOnGoingEventCampaignSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java index c64f7c6722..f11569f43c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckPcbangPointSkillCondition implements ISkillCondition { - public OpCheckPcbangPointSkillCondition(StatsSet params) + public OpCheckPcbangPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java index 252519f7ff..997a4d0fec 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.data.xml.impl.ClanHallData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -35,7 +35,7 @@ public class OpCheckResidenceSkillCondition implements ISkillCondition private final List _residencesId; private final boolean _isWithin; - public OpCheckResidenceSkillCondition(StatsSet params) + public OpCheckResidenceSkillCondition(StatSet params) { _residencesId = params.getList("residencesId", Integer.class); _isWithin = params.getBoolean("isWithin"); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java index 6abeed7d35..3a1bcf424c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -34,7 +34,7 @@ public class OpCheckSkillListSkillCondition implements ISkillCondition private final List _skillIds; private final SkillConditionAffectType _affectType; - public OpCheckSkillListSkillCondition(StatsSet params) + public OpCheckSkillListSkillCondition(StatSet params) { _skillIds = params.getList("skillIds", Integer.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java index 984338b2c0..af563d983f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpCheckSkillSkillCondition implements ISkillCondition private final int _skillId; private final SkillConditionAffectType _affectType; - public OpCheckSkillSkillCondition(StatsSet params) + public OpCheckSkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java index ea882c3635..5d85a2dbdb 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionCompanionType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpCompanionSkillCondition implements ISkillCondition { private final SkillConditionCompanionType _type; - public OpCompanionSkillCondition(StatsSet params) + public OpCompanionSkillCondition(StatSet params) { _type = params.getEnum("type", SkillConditionCompanionType.class); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java index 069b9d1759..464853c00c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpEnchantRangeSkillCondition implements ISkillCondition { - public OpEnchantRangeSkillCondition(StatsSet params) + public OpEnchantRangeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java index 99f22bb16a..e12f3ae007 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class OpEncumberedSkillCondition implements ISkillCondition private final int _slotsPercent; private final int _weightPercent; - public OpEncumberedSkillCondition(StatsSet params) + public OpEncumberedSkillCondition(StatSet params) { _slotsPercent = params.getInt("slotsPercent"); _weightPercent = params.getInt("weightPercent"); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java index 187dfba744..49cf8e2cb8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpEnergyMaxSkillCondition implements ISkillCondition { private final int _amount; - public OpEnergyMaxSkillCondition(StatsSet params) + public OpEnergyMaxSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 75bdf465e0..82eb70b770 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class OpEquipItemSkillCondition implements ISkillCondition private final int _itemId; private final SkillConditionAffectType _affectType; - public OpEquipItemSkillCondition(StatsSet params) + public OpEquipItemSkillCondition(StatSet params) { _itemId = params.getInt("itemId"); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java index 2c4576c2fa..fa6e82082b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ public class OpExistNpcSkillCondition implements ISkillCondition private final int _range; private final boolean _isAround; - public OpExistNpcSkillCondition(StatsSet params) + public OpExistNpcSkillCondition(StatSet params) { _npcIds = params.getList("npcIds", Integer.class); _range = params.getInt("range"); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java index 27cc3e90a9..8299b40047 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingCastSkillCondition implements ISkillCondition { - public OpFishingCastSkillCondition(StatsSet params) + public OpFishingCastSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java index 84cc031a24..4b43eb834e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingPumpingSkillCondition implements ISkillCondition { - public OpFishingPumpingSkillCondition(StatsSet params) + public OpFishingPumpingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java index 86aa667bee..a6a400f96f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingReelingSkillCondition implements ISkillCondition { - public OpFishingReelingSkillCondition(StatsSet params) + public OpFishingReelingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java index d22733df7e..50e6dafb82 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpHaveSummonSkillCondition implements ISkillCondition { - public OpHaveSummonSkillCondition(StatsSet params) + public OpHaveSummonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 2e854ca2b8..cceb4e937b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { private final int _npcId; - public OpHaveSummonedNpcSkillCondition(StatsSet params) + public OpHaveSummonedNpcSkillCondition(StatSet params) { _npcId = params.getInt("npcId"); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java index 16932ce531..374a75bfab 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.impl.ClanHallData; import org.l2jmobius.gameserver.enums.ResidenceType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -34,7 +34,7 @@ public class OpHomeSkillCondition implements ISkillCondition { private final ResidenceType _type; - public OpHomeSkillCondition(StatsSet params) + public OpHomeSkillCondition(StatSet params) { _type = params.getEnum("type", ResidenceType.class); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java index 9482a0bf55..62ad48bdcc 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpInSiegeTimeSkillCondition implements ISkillCondition { - public OpInSiegeTimeSkillCondition(StatsSet params) + public OpInSiegeTimeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java index 1bffdacd6c..f2fb298398 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -30,7 +30,7 @@ public class OpInstantzoneSkillCondition implements ISkillCondition { private final int _instanceId; - public OpInstantzoneSkillCondition(StatsSet params) + public OpInstantzoneSkillCondition(StatSet params) { _instanceId = params.getInt("instanceId"); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java index 76703cc53b..7418ef9b64 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpMainjobSkillCondition implements ISkillCondition { - public OpMainjobSkillCondition(StatsSet params) + public OpMainjobSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java index d4c9f1f331..3c81369bbb 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNeedAgathionSkillCondition implements ISkillCondition { - public OpNeedAgathionSkillCondition(StatsSet params) + public OpNeedAgathionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java index 96f6774f25..e7a477b0ee 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; @@ -34,7 +34,7 @@ public class OpNeedSummonOrPetSkillCondition implements ISkillCondition { private final List _npcIds = new ArrayList<>(); - public OpNeedSummonOrPetSkillCondition(StatsSet params) + public OpNeedSummonOrPetSkillCondition(StatSet params) { final List npcIds = params.getList("npcIds", String.class); if (npcIds != null) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java index 9701002065..ae1edfd719 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotCursedSkillCondition implements ISkillCondition { - public OpNotCursedSkillCondition(StatsSet params) + public OpNotCursedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInCeremonyOfChaosSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInCeremonyOfChaosSkillCondition.java index 9549fdc2ac..b5cefc61cc 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInCeremonyOfChaosSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInCeremonyOfChaosSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotInCeremonyOfChaosSkillCondition implements ISkillCondition { - public OpNotInCeremonyOfChaosSkillCondition(StatsSet params) + public OpNotInCeremonyOfChaosSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java index bf909425d8..1de79f388a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpNotInPeacezoneSkillCondition implements ISkillCondition { - public OpNotInPeacezoneSkillCondition(StatsSet params) + public OpNotInPeacezoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java index 0752ba4a6a..0d3e4cb4dd 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotInstantzoneSkillCondition implements ISkillCondition { - public OpNotInstantzoneSkillCondition(StatsSet params) + public OpNotInstantzoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java index 45891cd0ac..7ea02159ba 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotOlympiadSkillCondition implements ISkillCondition { - public OpNotOlympiadSkillCondition(StatsSet params) + public OpNotOlympiadSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java index 5c5d293ae8..2397a68e99 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpNotTerritorySkillCondition implements ISkillCondition { - public OpNotTerritorySkillCondition(StatsSet params) + public OpNotTerritorySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java index 874872bb2e..d9f8c1fa3b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpPeacezoneSkillCondition implements ISkillCondition { - public OpPeacezoneSkillCondition(StatsSet params) + public OpPeacezoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java index c20c4665bb..08d6bb095a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpPkcountSkillCondition implements ISkillCondition { private final SkillConditionAffectType _affectType; - public OpPkcountSkillCondition(StatsSet params) + public OpPkcountSkillCondition(StatSet params) { _affectType = params.getEnum("affectType", SkillConditionAffectType.class); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java index 879fc88c4c..d393c5ddc3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -30,7 +30,7 @@ public class OpPledgeSkillCondition implements ISkillCondition { private final int _level; - public OpPledgeSkillCondition(StatsSet params) + public OpPledgeSkillCondition(StatSet params) { _level = params.getInt("level"); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java index 9adc89b98d..adf16f8feb 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpRestartPointSkillCondition implements ISkillCondition { - public OpRestartPointSkillCondition(StatsSet params) + public OpRestartPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java index bbd1d9d7d1..6874091ba2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class OpResurrectionSkillCondition implements ISkillCondition { - public OpResurrectionSkillCondition(StatsSet params) + public OpResurrectionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java index 8bbf796ad2..566f935a50 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpSiegeHammerSkillCondition implements ISkillCondition { - public OpSiegeHammerSkillCondition(StatsSet params) + public OpSiegeHammerSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java index be3ad18e05..cbfc1a25b2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition private final int _skillId; private final boolean _hasLearned; - public OpSkillAcquireSkillCondition(StatsSet params) + public OpSkillAcquireSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _hasLearned = params.getBoolean("hasLearned"); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java index c8789d28e4..a8382b83b3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpSkillSkillCondition implements ISkillCondition private final int _skillLevel; private final boolean _hasLearned; - public OpSkillSkillCondition(StatsSet params) + public OpSkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _skillLevel = params.getInt("skillLevel"); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java index 5127071683..a3d188f3eb 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpSocialClassSkillCondition implements ISkillCondition { private final int _socialClass; - public OpSocialClassSkillCondition(StatsSet params) + public OpSocialClassSkillCondition(StatSet params) { _socialClass = params.getInt("socialClass"); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java index b9d37d18c0..c86984a218 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class OpSoulMaxSkillCondition implements ISkillCondition { - public OpSoulMaxSkillCondition(StatsSet params) + public OpSoulMaxSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java index 4780c13a58..0faa676bbe 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpSubjobSkillCondition implements ISkillCondition { - public OpSubjobSkillCondition(StatsSet params) + public OpSubjobSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java index 17a9a1a9e3..a14192847a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.concurrent.atomic.AtomicBoolean; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpSweeperSkillCondition implements ISkillCondition { - public OpSweeperSkillCondition(StatsSet params) + public OpSweeperSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java index b36585bf00..c4b3923e92 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTargetAllItemTypeSkillCondition implements ISkillCondition { - public OpTargetAllItemTypeSkillCondition(StatsSet params) + public OpTargetAllItemTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 6b85389d62..5492e96e1a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTargetArmorTypeSkillCondition implements ISkillCondition { - public OpTargetArmorTypeSkillCondition(StatsSet params) + public OpTargetArmorTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java index 80c63112a6..c4881a974e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpTargetDoorSkillCondition implements ISkillCondition { private final List _doorIds; - public OpTargetDoorSkillCondition(StatsSet params) + public OpTargetDoorSkillCondition(StatSet params) { _doorIds = params.getList("doorIds", Integer.class); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java index 6fbc3cda10..eaabf4a73d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpTargetMyPledgeAcademySkillCondition implements ISkillCondition { - public OpTargetMyPledgeAcademySkillCondition(StatsSet params) + public OpTargetMyPledgeAcademySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java index d5820600dd..14a744613d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpTargetNpcSkillCondition implements ISkillCondition { private final List _npcId; - public OpTargetNpcSkillCondition(StatsSet params) + public OpTargetNpcSkillCondition(StatSet params) { _npcId = params.getList("npcIds", Integer.class); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java index 854225a75a..b0c5e50ae3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpTargetPcSkillCondition implements ISkillCondition { - public OpTargetPcSkillCondition(StatsSet params) + public OpTargetPcSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index 7faecb2ffd..62fd4b365f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Weapon; @@ -34,7 +34,7 @@ public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition { private final List _weaponTypes = new ArrayList<>(); - public OpTargetWeaponAttackTypeSkillCondition(StatsSet params) + public OpTargetWeaponAttackTypeSkillCondition(StatSet params) { final List weaponTypes = params.getList("weaponType", String.class); if (weaponTypes != null) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java index 8451365885..e114c03412 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTerritorySkillCondition implements ISkillCondition { - public OpTerritorySkillCondition(StatsSet params) + public OpTerritorySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java index 13f287687e..fde1293086 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpUnlockSkillCondition implements ISkillCondition { - public OpUnlockSkillCondition(StatsSet params) + public OpUnlockSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java index 8cc76a34bb..46dea5bbcb 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpUseFirecrackerSkillCondition implements ISkillCondition { - public OpUseFirecrackerSkillCondition(StatsSet params) + public OpUseFirecrackerSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java index f3b54bbad7..651dade274 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpUsePraseedSkillCondition implements ISkillCondition { - public OpUsePraseedSkillCondition(StatsSet params) + public OpUsePraseedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java index 890b0fcd5f..dd57df0e13 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.MountType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpWyvernSkillCondition implements ISkillCondition { - public OpWyvernSkillCondition(StatsSet params) + public OpWyvernSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java index 8a4c974840..5ac80d3e62 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class PossessHolythingSkillCondition implements ISkillCondition { - public PossessHolythingSkillCondition(StatsSet params) + public PossessHolythingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java index 8b0fb55554..38b5644fb1 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class RemainCpPerSkillCondition implements ISkillCondition private final int _amount; private final SkillConditionPercentType _percentType; - public RemainCpPerSkillCondition(StatsSet params) + public RemainCpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java index 612367a233..1ad96100ad 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -33,7 +33,7 @@ public class RemainHpPerSkillCondition implements ISkillCondition private final SkillConditionPercentType _percentType; private final SkillConditionAffectType _affectType; - public RemainHpPerSkillCondition(StatsSet params) + public RemainHpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java index 5455c1587a..39085349d9 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class RemainMpPerSkillCondition implements ISkillCondition private final int _amount; private final SkillConditionPercentType _percentType; - public RemainMpPerSkillCondition(StatsSet params) + public RemainMpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java index 7de47f103f..6e9e5ad821 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class SoulSavedSkillCondition implements ISkillCondition { private final int _amount; - public SoulSavedSkillCondition(StatsSet params) + public SoulSavedSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java index 0b75a5a623..f4bdbaaecb 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class TargetItemCrystalTypeSkillCondition implements ISkillCondition { - public TargetItemCrystalTypeSkillCondition(StatsSet params) + public TargetItemCrystalTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java index 51502ff209..604a41f904 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.MentorManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMyMenteeSkillCondition implements ISkillCondition { - public TargetMyMenteeSkillCondition(StatsSet params) + public TargetMyMenteeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java index fc621365a9..4bfb496634 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class TargetMyPartySkillCondition implements ISkillCondition { private final boolean _includeMe; - public TargetMyPartySkillCondition(StatsSet params) + public TargetMyPartySkillCondition(StatSet params) { _includeMe = params.getBoolean("includeMe"); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java index 9ebec0e691..d44a1bc8a9 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMyPledgeSkillCondition implements ISkillCondition { - public TargetMyPledgeSkillCondition(StatsSet params) + public TargetMyPledgeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java index f4da8d6079..5045aa3848 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class TargetRaceSkillCondition implements ISkillCondition { private final Race _race; - public TargetRaceSkillCondition(StatsSet params) + public TargetRaceSkillCondition(StatSet params) { _race = params.getEnum("race", Race.class); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java index 55734b03bb..d1aac35879 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -350,7 +350,7 @@ public class ChamberOfDelusion extends AbstractInstance protected void changeRoom(Instance world) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); final List locations = world.getEnterLocations(); int newRoom = params.getInt("currentRoom", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java index 95a96bb16e..bef23aa88c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java @@ -19,7 +19,7 @@ package instances.CrystalCaverns; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -64,12 +64,12 @@ public class CrystalCavernsCoralGarden extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (event) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java index d977f82481..5d6a8dda61 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java @@ -17,7 +17,7 @@ package instances.CrystalCaverns; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -90,13 +90,13 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); - final StatsSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); final int baseId = npcParams.getInt("base_id", -1); switch (event) @@ -156,7 +156,7 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (npc.getId()) { @@ -205,7 +205,7 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); final int baseId = npcParams.getInt("base_id", -1); switch (npc.getId()) @@ -365,7 +365,7 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance { case WATER_CANNON: { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); final int baseId = npcParams.getInt("base_id", -1); if (baseId != 1) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java index b9662a5d06..7624504082 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java @@ -19,7 +19,7 @@ package instances.CrystalCaverns; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -83,12 +83,12 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (event) { @@ -180,7 +180,7 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); switch (npc.getId()) { @@ -224,7 +224,7 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance final Instance instance = receiver.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = receiver.getParameters(); + final StatSet npcParams = receiver.getParameters(); if (eventName.equals(String.valueOf(24220005 + npcParams.getInt("Terri_ID", 0)))) { @@ -265,7 +265,7 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); final int killTarget = instance.getParameters().getInt("KILL_TARGET", 5); int currentKillCount = instance.getParameters().getInt("KILL_COUNT", 0); @@ -377,7 +377,7 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance if (isInInstance(instance) && creature.isPlayer()) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); switch (npc.getId()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java index 0d9724e766..1245a89ed0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -404,7 +404,7 @@ public class DarkCloudMansion extends AbstractInstance { if (CommonUtil.contains(BELETH_SAMPLE, npc.getId())) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); if (!params.getBoolean("blocked", false)) { if (npc.isScriptValue(1)) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java index 85c7a898db..3e913de57d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java @@ -18,7 +18,7 @@ package instances.FaeronTrainingGrounds1; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -273,7 +273,7 @@ public class FaeronTrainingGrounds1 extends AbstractInstance final Instance world = player.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); for (int i = 0; i < MOB_SPAWNS.length; i++) { if (params.getObject("Mob" + i, Npc.class) == null) @@ -295,7 +295,7 @@ public class FaeronTrainingGrounds1 extends AbstractInstance final Instance world = player.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); for (int i = 0; i < MOB_SPAWNS.length; i++) { final Npc mob = params.getObject("Mob" + i, Npc.class); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java index 9a8123b6cf..b038186d7f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java @@ -18,7 +18,7 @@ package instances.FaeronTrainingGrounds2; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -270,7 +270,7 @@ public class FaeronTrainingGrounds2 extends AbstractInstance final Instance world = player.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); for (int i = 0; i < MOB_SPAWNS.length; i++) { if (params.getObject("Mob" + i, Npc.class) == null) @@ -292,7 +292,7 @@ public class FaeronTrainingGrounds2 extends AbstractInstance final Instance world = player.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); for (int i = 0; i < MOB_SPAWNS.length; i++) { final Npc mob = params.getObject("Mob" + i, Npc.class); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java index 20046a664b..54b93c8ccb 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -566,7 +566,7 @@ public class HarnakUndergroundRuins extends AbstractInstance } case 2: { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); final int waveNpc = params.getInt("waveNpcId"); if (world.getAliveNpcs(waveNpc).isEmpty()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaBoss.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaBoss.java index 181f892fbe..3ef76e5f72 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaBoss.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaBoss.java @@ -17,7 +17,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureAttacked; @@ -70,7 +70,7 @@ public class KartiaBoss extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SAY") && npc.isTargetable()) { @@ -107,7 +107,7 @@ public class KartiaBoss extends AbstractNpcAI public void spawnMinions(Npc npc) { - final StatsSet param = npc.getParameters(); + final StatSet param = npc.getParameters(); final int kartiaLevel = param.getInt("cartia_level", 0); final boolean isParty = param.getInt("party_type", 0) == 1; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java index bd312c7fe6..721a32deb0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -97,12 +97,12 @@ public class KartiaHelperAdolph extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if ((instance != null) && event.equals("CHECK_ACTION")) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final PlayerInstance plr = npcVars.getObject("PLAYER_OBJECT", PlayerInstance.class); if (plr != null) { @@ -159,7 +159,7 @@ public class KartiaHelperAdolph extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder skill_01 = instParams.getSkillHolder("adolphHate"); final SkillHolder skill_02 = instParams.getSkillHolder("adolphPunish"); final SkillHolder skill_03 = instParams.getSkillHolder("adolphShield"); @@ -256,7 +256,7 @@ public class KartiaHelperAdolph extends AbstractNpcAI { npc.setTarget(event.getAttacker()); addAttackDesire(npc, (Creature) npc.getTarget()); - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder hateSkill = instParams.getSkillHolder("adolphHate"); if ((hateSkill != null) && SkillCaster.checkUseConditions(npc, hateSkill.getSkill())) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java index e9aada8d07..c87c49ae5b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java @@ -19,7 +19,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -92,7 +92,7 @@ public class KartiaHelperBarton extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if ((instance != null) && event.equals("CHECK_ACTION")) @@ -170,7 +170,7 @@ public class KartiaHelperBarton extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder skill01 = instParams.getSkillHolder("bartonInfinity"); final SkillHolder skill02 = instParams.getSkillHolder("bartonBerserker"); final SkillHolder skill03 = instParams.getSkillHolder("bartonHurricane"); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java index e383a62d49..01edde0bd4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java @@ -26,7 +26,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -115,12 +115,12 @@ public class KartiaHelperElise extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if ((instance != null) && event.equals("CHECK_ACTION")) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final FriendlyNpcInstance adolph = npcVars.getObject("ADOLPH_OBJECT", FriendlyNpcInstance.class); if (!npc.isCastingNow()) { @@ -153,8 +153,8 @@ public class KartiaHelperElise extends AbstractNpcAI final Instance instance = npc.getInstanceWorld(); if (instance != null) { - final StatsSet npcVars = npc.getVariables(); - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet npcVars = npc.getVariables(); + final StatSet instParams = instance.getTemplateParameters(); if (!npc.isCastingNow()) { final PlayerInstance plr = npcVars.getObject("PLAYER_OBJECT", PlayerInstance.class); @@ -248,7 +248,7 @@ public class KartiaHelperElise extends AbstractNpcAI { if (creature.isPlayer() || (creature instanceof FriendlyNpcInstance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); if (creature.isPlayer()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperEliyah.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperEliyah.java index 244110429c..cb3013c46c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperEliyah.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperEliyah.java @@ -18,7 +18,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance; @@ -87,7 +87,7 @@ public class KartiaHelperEliyah extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if ((instance != null) && event.equals("CHECK_ACTION")) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java index 07fe730289..123414862a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java @@ -18,7 +18,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -96,7 +96,7 @@ public class KartiaHelperGuardian extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (instance == null) @@ -183,7 +183,7 @@ public class KartiaHelperGuardian extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder skill01 = instParams.getSkillHolder("guardianSpiritsBlow"); final SkillHolder skill02 = instParams.getSkillHolder("guardianSpiritsWrath"); final int numberOfActiveSkills = 2; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java index 1541261bac..45fdfece27 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java @@ -19,7 +19,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -93,7 +93,7 @@ public class KartiaHelperHayuk extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (instance == null) @@ -176,7 +176,7 @@ public class KartiaHelperHayuk extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder skill01 = instParams.getSkillHolder("hayukPinpointShot"); final SkillHolder skill02 = instParams.getSkillHolder("hayukRecoilShot"); final SkillHolder skill03 = instParams.getSkillHolder("hayukMultipleArrow"); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaSupportTroop.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaSupportTroop.java index bfdc9b4cd3..d17653b8e3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaSupportTroop.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaSupportTroop.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -49,7 +49,7 @@ public class KartiaSupportTroop extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SAY") && !npc.isDead()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java index 0bf65e9c9b..01d0a1ab7a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -273,7 +273,7 @@ public class KartiasLabyrinth extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = (npc != null) ? npc.getInstanceWorld() : player.getInstanceWorld(); if (instance != null) @@ -363,7 +363,7 @@ public class KartiasLabyrinth extends AbstractInstance if (instance != null) { - final StatsSet param = instance.getParameters(); + final StatSet param = instance.getParameters(); if (param.getBoolean("BOSS_KILL_OPEN_DOOR", false) && CommonUtil.contains(MINI_BOSSES, npc.getId())) { instance.setParameter("BOSS_KILL_OPEN_DOOR", true); @@ -562,7 +562,7 @@ public class KartiasLabyrinth extends AbstractInstance private void manageProgressInInstance(Instance instance) { - final StatsSet param = instance.getParameters(); + final StatSet param = instance.getParameters(); final int room = param.getInt("ROOM", 1); final int stage = param.getInt("STAGE", 1); final int wave = param.getInt("WAVE", 1); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java index f15af5684c..8b67da1f73 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -452,7 +452,7 @@ public class LabyrinthOfBelis extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (world != null) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java index f9c6c2b1af..7cd9254745 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -445,7 +445,7 @@ public class MemoryOfDisaster extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Nursery/Nursery.java index 4e85e49c12..ff1ff2587e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Nursery/Nursery.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Nursery/Nursery.java @@ -19,7 +19,7 @@ package instances.Nursery; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -80,12 +80,12 @@ public class Nursery extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int gameStage = npcVars.getInt("GAME_STAGE", 0); switch (event) @@ -142,7 +142,7 @@ public class Nursery extends AbstractInstance if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int gameStage = npcVars.getInt("GAME_STAGE", 0); switch (gameStage) @@ -200,7 +200,7 @@ public class Nursery extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int gameStage = npcVars.getInt("GAME_STAGE", 0); switch (event) @@ -281,7 +281,7 @@ public class Nursery extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int maguenStatus = npcVars.getInt("MAGUEN_STATUS", 0); switch (maguenStatus) @@ -407,8 +407,8 @@ public class Nursery extends AbstractInstance final Npc gameManager = instance.getNpc(TIE); if (gameManager != null) { - final StatsSet managerVars = gameManager.getVariables(); - final StatsSet npcVars = npc.getVariables(); + final StatSet managerVars = gameManager.getVariables(); + final StatSet npcVars = npc.getVariables(); final int gamePoints = managerVars.getInt("GAME_POINTS", 0); if (gamePoints > 0) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java index 501ea07ad2..1d546871e9 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java @@ -19,7 +19,7 @@ package instances.PailakaInjuredDragon; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -172,7 +172,7 @@ public class PailakaInjuredDragon extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (isInInstance(world)) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java index 8de90bca71..cd31666b75 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java @@ -19,7 +19,7 @@ package instances.PrisonOfDarkness; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -122,12 +122,12 @@ public class PrisonOfDarkness extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (event) { @@ -187,7 +187,7 @@ public class PrisonOfDarkness extends AbstractInstance if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (event) { @@ -327,7 +327,7 @@ public class PrisonOfDarkness extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (npc.getId()) { @@ -360,7 +360,7 @@ public class PrisonOfDarkness extends AbstractInstance if (isInInstance(instance) && (npc.getId() == EXIT_PORTAL)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (npcVars.getInt("PORTAL_STATE", 0)) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java index 415395c724..7d06cdeb54 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java @@ -18,7 +18,7 @@ package instances.TaintedDimension; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -97,7 +97,7 @@ public class TaintedDimension extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java index ea2c993d9d..a5e71ce2ae 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java @@ -18,7 +18,7 @@ package quests.Q10771_VolatilePower; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.quest.Quest; @@ -179,7 +179,7 @@ public class Q10771_VolatilePower extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java index 98953e5ec5..b9ff741914 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java @@ -19,7 +19,7 @@ package quests.Q10772_ReportsFromCrumaTowerPart1; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -160,7 +160,7 @@ public class Q10772_ReportsFromCrumaTowerPart1 extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("DESPAWN_OWL") && (npc != null) && (npc.getId() == MAGIC_OWL)) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java index c5a67dbc68..1e7ffec6b6 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java @@ -19,7 +19,7 @@ package quests.Q10776_TheWrathOfTheGiants; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.quest.Quest; @@ -238,7 +238,7 @@ public class Q10776_TheWrathOfTheGiants extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java index cf9ddf1f88..badb40ec0c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java @@ -19,7 +19,7 @@ package quests.Q10777_ReportsFromCrumaTowerPart2; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -162,7 +162,7 @@ public class Q10777_ReportsFromCrumaTowerPart2 extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if ((npc != null) && (npc.getId() == MAGIC_OWL) && event.equals("DESPAWN_OWL")) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java index 59796b30a1..539b6fbd1b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java @@ -17,7 +17,7 @@ package quests.Q10787_ASpyMission; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -156,7 +156,7 @@ public class Q10787_ASpyMission extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if ((npc != null) && (npc.getId() == SUSPICIOUS_BOX) && event.equals("DESPAWN")) { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java index b1d0ec8553..7e9236b634 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.ActionDataHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -57,7 +57,7 @@ public class ActionData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "action", actionNode -> { - final ActionDataHolder holder = new ActionDataHolder(new StatsSet(parseAttributes(actionNode))); + final ActionDataHolder holder = new ActionDataHolder(new StatSet(parseAttributes(actionNode))); _actionData.put(holder.getId(), holder); })); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java index 36002572b0..f7762ab07b 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java @@ -32,7 +32,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.AdminCommandAccessRight; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -72,7 +72,7 @@ public class AdminData implements IXmlReader { NamedNodeMap attrs; Node attr; - StatsSet set; + StatSet set; AccessLevel level; AdminCommandAccessRight command; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -83,7 +83,7 @@ public class AdminData implements IXmlReader { if ("access".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -99,7 +99,7 @@ public class AdminData implements IXmlReader } else if ("admin".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java index b425296a19..6a14a867fc 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java @@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.alchemy.AlchemyCraftData; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -55,7 +55,7 @@ public class AlchemyData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node att; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -67,7 +67,7 @@ public class AlchemyData implements IXmlReader if ("skill".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index 6d25769eab..817f0cabde 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; @@ -83,7 +83,7 @@ public class AppearanceItemData implements IXmlReader { if ("appearance_stone".equalsIgnoreCase(d.getNodeName())) { - final AppearanceStone stone = new AppearanceStone(new StatsSet(parseAttributes(d))); + final AppearanceStone stone = new AppearanceStone(new StatSet(parseAttributes(d))); for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) { switch (c.getNodeName()) @@ -120,7 +120,7 @@ public class AppearanceItemData implements IXmlReader } case "visual": { - stone.addVisualId(new AppearanceHolder(new StatsSet(parseAttributes(c)))); + stone.addVisualId(new AppearanceHolder(new StatSet(parseAttributes(c)))); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java index 891d19fcf2..3054b0e7ef 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.beautyshop.BeautyData; import org.l2jmobius.gameserver.model.beautyshop.BeautyItem; @@ -56,7 +56,7 @@ public class BeautyShopData implements IXmlReader public void parseDocument(Document doc, File f) { NamedNodeMap attrs; - StatsSet set; + StatSet set; Node att; Race race = null; Sex sex = null; @@ -92,7 +92,7 @@ public class BeautyShopData implements IXmlReader if ("hair".equalsIgnoreCase(a.getNodeName())) { attrs = a.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -105,7 +105,7 @@ public class BeautyShopData implements IXmlReader if ("color".equalsIgnoreCase(g.getNodeName())) { attrs = g.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -119,7 +119,7 @@ public class BeautyShopData implements IXmlReader else if ("face".equalsIgnoreCase(a.getNodeName())) { attrs = a.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java index 37e977c51e..530a5d975a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java @@ -34,7 +34,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.entity.ClanHall; @@ -66,7 +66,7 @@ public class ClanHallData implements IXmlReader final List doors = new ArrayList<>(); final List npcs = new ArrayList<>(); final List teleports = new ArrayList<>(); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); for (Node listNode = doc.getFirstChild(); listNode != null; listNode = listNode.getNextSibling()) { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java index ae608cefb6..f1a23734e0 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.combination.CombinationItem; import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; @@ -57,7 +57,7 @@ public class CombinationItemsData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "item", itemNode -> { - final CombinationItem item = new CombinationItem(new StatsSet(parseAttributes(itemNode))); + final CombinationItem item = new CombinationItem(new StatSet(parseAttributes(itemNode))); forEach(itemNode, "reward", rewardNode -> { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java index 038738b138..4af039b48d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.CubicSkill; import org.l2jmobius.gameserver.model.cubic.ICubicConditionHolder; @@ -61,7 +61,7 @@ public class CubicData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - forEach(doc, "list", listNode -> forEach(listNode, "cubic", cubicNode -> parseTemplate(cubicNode, new CubicTemplate(new StatsSet(parseAttributes(cubicNode)))))); + forEach(doc, "list", listNode -> forEach(listNode, "cubic", cubicNode -> parseTemplate(cubicNode, new CubicTemplate(new StatSet(parseAttributes(cubicNode)))))); } /** @@ -137,7 +137,7 @@ public class CubicData implements IXmlReader { forEach(cubicNode, "skill", skillNode -> { - final CubicSkill skill = new CubicSkill(new StatsSet(parseAttributes(skillNode))); + final CubicSkill skill = new CubicSkill(new StatSet(parseAttributes(skillNode))); forEach(cubicNode, "conditions", conditionNode -> parseConditions(cubicNode, template, skill)); template.getSkills().add(skill); }); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java index 835eab4fe9..53248de524 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java @@ -35,7 +35,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -51,7 +51,7 @@ public class DoorData implements IXmlReader // Info holders private final Map> _groups = new HashMap<>(); private final Map _doors = new HashMap<>(); - private final Map _templates = new HashMap<>(); + private final Map _templates = new HashMap<>(); private final Map> _regions = new HashMap<>(); protected DoorData() @@ -75,9 +75,9 @@ public class DoorData implements IXmlReader LOGGER.info(getClass().getSimpleName() + ": Loaded " + _doors.size() + " Door Templates for " + _regions.size() + " regions."); } - public StatsSet parseDoor(Node doorNode) + public StatSet parseDoor(Node doorNode) { - final StatsSet params = new StatsSet(parseAttributes(doorNode)); + final StatSet params = new StatSet(parseAttributes(doorNode)); params.set("baseHpMax", 1); // Avoid doors without HP value created dead due to default value 0 in CreatureTemplate forEach(doorNode, IXmlReader::isNode, innerDoorNode -> @@ -115,7 +115,7 @@ public class DoorData implements IXmlReader /** * @param set */ - private void applyCollisions(StatsSet set) + private void applyCollisions(StatSet set) { // Insert Collision data if (set.contains("nodeX_0") && set.contains("nodeY_0") && set.contains("nodeX_1") && set.contains("nodeY_1")) @@ -142,7 +142,7 @@ public class DoorData implements IXmlReader * @param set * @return */ - public DoorInstance spawnDoor(StatsSet set) + public DoorInstance spawnDoor(StatSet set) { // Create door template + door instance final DoorTemplate template = new DoorTemplate(set); @@ -183,7 +183,7 @@ public class DoorData implements IXmlReader return door; } - public StatsSet getDoorTemplate(int doorId) + public StatSet getDoorTemplate(int doorId) { return _templates.get(doorId); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java index eca42a9a34..637ef1e953 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -64,7 +64,7 @@ public class EnchantItemData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node att; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -76,7 +76,7 @@ public class EnchantItemData implements IXmlReader if ("enchant".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -107,7 +107,7 @@ public class EnchantItemData implements IXmlReader else if ("support".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java index 46701fd777..bb1e8026b7 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.SkillEnchantType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.EnchantSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -69,10 +69,10 @@ public class EnchantSkillGroupsData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "enchant", enchantNode -> { - final EnchantSkillHolder enchantSkillHolder = new EnchantSkillHolder(new StatsSet(parseAttributes(enchantNode))); + final EnchantSkillHolder enchantSkillHolder = new EnchantSkillHolder(new StatSet(parseAttributes(enchantNode))); forEach(enchantNode, "sps", spsNode -> forEach(spsNode, "sp", spNode -> enchantSkillHolder.addSp(parseEnum(spNode.getAttributes(), SkillEnchantType.class, "type"), parseInteger(spNode.getAttributes(), "amount")))); forEach(enchantNode, "chances", chancesNode -> forEach(chancesNode, "chance", chanceNode -> enchantSkillHolder.addChance(parseEnum(chanceNode.getAttributes(), SkillEnchantType.class, "type"), parseInteger(chanceNode.getAttributes(), "value")))); - forEach(enchantNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> enchantSkillHolder.addRequiredItem(parseEnum(itemNode.getAttributes(), SkillEnchantType.class, "type"), new ItemHolder(new StatsSet(parseAttributes(itemNode)))))); + forEach(enchantNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> enchantSkillHolder.addRequiredItem(parseEnum(itemNode.getAttributes(), SkillEnchantType.class, "type"), new ItemHolder(new StatSet(parseAttributes(itemNode)))))); _enchantSkillHolders.put(parseInteger(enchantNode.getAttributes(), "level"), enchantSkillHolder); })); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java index a8bb0397ac..037af7e1ae 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java @@ -34,7 +34,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.eventengine.AbstractEventManager; import org.l2jmobius.gameserver.model.eventengine.EventMethodNotification; import org.l2jmobius.gameserver.model.eventengine.EventScheduler; @@ -156,7 +156,7 @@ public class EventEngineData implements IXmlReader */ private void parseVariables(AbstractEventManager eventManager, Node innerNode) { - final StatsSet variables = new StatsSet(LinkedHashMap::new); + final StatSet variables = new StatSet(LinkedHashMap::new); for (Node variableNode = innerNode.getFirstChild(); variableNode != null; variableNode = variableNode.getNextSibling()) { if ("variable".equals(variableNode.getNodeName())) @@ -188,7 +188,7 @@ public class EventEngineData implements IXmlReader { if ("schedule".equals(scheduleNode.getNodeName())) { - final StatsSet params = new StatsSet(LinkedHashMap::new); + final StatSet params = new StatSet(LinkedHashMap::new); final NamedNodeMap attrs = scheduleNode.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -235,7 +235,7 @@ public class EventEngineData implements IXmlReader } else if ("conditionalSchedule".equals(scheduleNode.getNodeName())) { - final StatsSet params = new StatsSet(LinkedHashMap::new); + final StatSet params = new StatSet(LinkedHashMap::new); final NamedNodeMap attrs = scheduleNode.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -346,7 +346,7 @@ public class EventEngineData implements IXmlReader * @param variableNode */ @SuppressWarnings("unchecked") - private void parseListVariables(AbstractEventManager eventManager, StatsSet variables, Node variableNode) + private void parseListVariables(AbstractEventManager eventManager, StatSet variables, Node variableNode) { final String name = parseString(variableNode.getAttributes(), "name"); final String type = parseString(variableNode.getAttributes(), "type"); @@ -419,7 +419,7 @@ public class EventEngineData implements IXmlReader * @param variableNode */ @SuppressWarnings("unchecked") - private void parseMapVariables(AbstractEventManager eventManager, StatsSet variables, Node variableNode) + private void parseMapVariables(AbstractEventManager eventManager, StatSet variables, Node variableNode) { final String name = parseString(variableNode.getAttributes(), "name"); final String keyType = parseString(variableNode.getAttributes(), "keyType"); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java index db19c5fdff..0724877d9d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.ConditionHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.ICondition; import org.l2jmobius.gameserver.model.holders.ExtendDropDataHolder; import org.l2jmobius.gameserver.model.holders.ExtendDropItemHolder; @@ -62,7 +62,7 @@ public class ExtendDropData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "drop", dropNode -> { - final StatsSet set = new StatsSet(parseAttributes(dropNode)); + final StatSet set = new StatSet(parseAttributes(dropNode)); final List items = new ArrayList<>(1); forEach(dropNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> @@ -80,8 +80,8 @@ public class ExtendDropData implements IXmlReader forEach(dropNode, "conditions", conditionsNode -> forEach(conditionsNode, "condition", conditionNode -> { final String conditionName = parseString(conditionNode.getAttributes(), "name"); - final StatsSet params = (StatsSet) parseValue(conditionNode); - final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); + final StatSet params = (StatSet) parseValue(conditionNode); + final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); if (conditionFunction != null) { conditions.add(conditionFunction.apply(params)); @@ -109,7 +109,7 @@ public class ExtendDropData implements IXmlReader private Object parseValue(Node node) { - StatsSet statsSet = null; + StatSet statSet = null; List list = null; Object text = null; for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) @@ -145,12 +145,12 @@ public class ExtendDropData implements IXmlReader final Object value = parseValue(node); if (value != null) { - if (statsSet == null) + if (statSet == null) { - statsSet = new StatsSet(); + statSet = new StatSet(); } - statsSet.set(nodeName, value); + statSet.set(nodeName, value); } } } @@ -161,9 +161,9 @@ public class ExtendDropData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", list); + statSet.set(".", list); } else { @@ -176,16 +176,16 @@ public class ExtendDropData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", text); + statSet.set(".", text); } else { return text; } } - return statsSet; + return statSet; } public ExtendDropDataHolder getExtendDropById(int id) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java index 57a16d6390..608f4702b8 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.FakePlayerHolder; @@ -72,7 +72,7 @@ public class FakePlayerData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayer", fakePlayerNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerNode)); final int npcId = set.getInt("npcId"); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); final String name = template.getName(); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java index 18cc499b71..a5ade27c03 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.FenceState; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldRegion; import org.l2jmobius.gameserver.model.actor.instance.FenceInstance; @@ -79,7 +79,7 @@ public class FenceData implements IXmlReader private void spawnFence(Node fenceNode) { - final StatsSet set = new StatsSet(parseAttributes(fenceNode)); + final StatSet set = new StatSet(parseAttributes(fenceNode)); spawnFence(set.getInt("x"), set.getInt("y"), set.getInt("z"), set.getString("name"), set.getInt("width"), set.getInt("length"), set.getInt("height"), 0, set.getEnum("state", FenceState.class, FenceState.CLOSED)); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java index 67dd4e396b..02efb756f2 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.Henna; import org.l2jmobius.gameserver.model.skills.Skill; @@ -86,7 +86,7 @@ public class HennaData implements IXmlReader */ private void parseHenna(Node d) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final List wearClassIds = new ArrayList<>(); final List skills = new ArrayList<>(); NamedNodeMap attrs = d.getAttributes(); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java index 03ad8ab79e..d81e85948d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; @@ -93,7 +93,7 @@ public class InitialEquipmentData implements IXmlReader { if ("item".equalsIgnoreCase(c.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java index 72080aa4ac..54b1909d60 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemPointHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; @@ -55,17 +55,17 @@ public class LuckyGameData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "luckygame", rewardNode -> { - final LuckyGameDataHolder holder = new LuckyGameDataHolder(new StatsSet(parseAttributes(rewardNode))); + final LuckyGameDataHolder holder = new LuckyGameDataHolder(new StatSet(parseAttributes(rewardNode))); forEach(rewardNode, "common_reward", commonRewardNode -> forEach(commonRewardNode, "item", itemNode -> { - final StatsSet stats = new StatsSet(parseAttributes(itemNode)); + final StatSet stats = new StatSet(parseAttributes(itemNode)); holder.addCommonReward(new ItemChanceHolder(stats.getInt("id"), stats.getDouble("chance"), stats.getLong("count"))); })); forEach(rewardNode, "unique_reward", uniqueRewardNode -> forEach(uniqueRewardNode, "item", itemNode -> { - holder.addUniqueReward(new ItemPointHolder(new StatsSet(parseAttributes(itemNode)))); + holder.addUniqueReward(new ItemPointHolder(new StatSet(parseAttributes(itemNode)))); })); forEach(rewardNode, "modify_reward", uniqueRewardNode -> @@ -74,7 +74,7 @@ public class LuckyGameData implements IXmlReader holder.setMaxModifyRewardGame(parseInteger(uniqueRewardNode.getAttributes(), "max_game")); forEach(uniqueRewardNode, "item", itemNode -> { - final StatsSet stats = new StatsSet(parseAttributes(itemNode)); + final StatSet stats = new StatSet(parseAttributes(itemNode)); holder.addModifyReward(new ItemChanceHolder(stats.getInt("id"), stats.getDouble("chance"), stats.getLong("count"))); }); }); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java index 75bb48ed37..190653cdec 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java @@ -35,7 +35,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.SpecialItemType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; @@ -90,7 +90,7 @@ public class MultisellData implements IXmlReader { forEach(doc, "list", listNode -> { - final StatsSet set = new StatsSet(parseAttributes(listNode)); + final StatSet set = new StatSet(parseAttributes(listNode)); final int listId = Integer.parseInt(f.getName().substring(0, f.getName().length() - 4)); final List entries = new ArrayList<>(listNode.getChildNodes().getLength()); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java index 12ad0f9f0e..de0567af09 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.enums.AISkillScope; import org.l2jmobius.gameserver.enums.DropType; import org.l2jmobius.gameserver.enums.MpRewardAffectType; import org.l2jmobius.gameserver.enums.MpRewardType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.DropHolder; @@ -95,7 +95,7 @@ public class NpcData implements IXmlReader if ("npc".equalsIgnoreCase(listNode.getNodeName())) { NamedNodeMap attrs = listNode.getAttributes(); - final StatsSet set = new StatsSet(new HashMap<>()); + final StatSet set = new StatSet(new HashMap<>()); final int npcId = parseInteger(attrs, "id"); Map parameters = null; Map skills = null; @@ -511,11 +511,11 @@ public class NpcData implements IXmlReader if (parameters != null) { // Using unmodifiable map parameters of template are not meant to be changed at runtime. - template.setParameters(new StatsSet(Collections.unmodifiableMap(parameters))); + template.setParameters(new StatSet(Collections.unmodifiableMap(parameters))); } else { - template.setParameters(StatsSet.EMPTY_STATSET); + template.setParameters(StatSet.EMPTY_STATSET); } if (skills != null) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java index 3712cca6af..373f87ecfc 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -79,7 +79,7 @@ public class NpcNameLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); NPC_NAME_LOCALISATIONS.get(_lang).put(set.getInt("id"), new String[] { set.getString("name"), diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 55dcd539aa..36c5897ecd 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.EffectHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; @@ -71,7 +71,7 @@ public class OptionData implements IXmlReader forEach(innerNode, "effect", effectNode -> { final String name = parseString(effectNode.getAttributes(), "name"); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); forEach(effectNode, IXmlReader::isNode, paramNode -> params.set(paramNode.getNodeName(), SkillData.getInstance().parseValue(paramNode, true, false, Collections.emptyMap()))); option.addEffect(EffectHandler.getInstance().getHandlerFactory(name).apply(params)); }); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java index b1bb74baf6..c893725bc3 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.PetLevelData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * This class parse and hold all pet parameters.
@@ -116,7 +116,7 @@ public class PetDataTable implements IXmlReader if (s.getNodeName().equals("stat")) { final int level = Integer.parseInt(s.getAttributes().getNamedItem("level").getNodeValue()); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (Node bean = s.getFirstChild(); bean != null; bean = bean.getNextSibling()) { if (bean.getNodeName().equals("set")) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java index ab1cb3b257..b646782547 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.base.ClassId; @@ -83,7 +83,7 @@ public class PlayerTemplateData implements IXmlReader } else if ("staticData".equalsIgnoreCase(d.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.set("classId", classId); final List creationPoints = new ArrayList<>(); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java index 34a04edd9b..35b879e73f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; @@ -83,7 +83,7 @@ public class PrimeShopData implements IXmlReader { NamedNodeMap attrs = d.getAttributes(); Node att; - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java index b7ed4c8fba..43e5d84784 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.RecipeInstance; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.RecipeStatInstance; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; /** @@ -82,7 +82,7 @@ public class RecipeData implements IXmlReader Node att; int id = -1; boolean haveRare = false; - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); att = attrs.getNamedItem("id"); if (att == null) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java index 796f5ae085..9a8397e085 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java @@ -29,7 +29,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate; /** @@ -60,7 +60,7 @@ public class ResidenceFunctionsData implements IXmlReader forEach(doc, "list", list -> forEach(list, "function", func -> { final NamedNodeMap attrs = func.getAttributes(); - final StatsSet set = new StatsSet(HashMap::new); + final StatSet set = new StatSet(HashMap::new); for (int i = 0; i < attrs.getLength(); i++) { final Node node = attrs.item(i); @@ -69,7 +69,7 @@ public class ResidenceFunctionsData implements IXmlReader forEach(func, "function", levelNode -> { final NamedNodeMap levelAttrs = levelNode.getAttributes(); - final StatsSet levelSet = new StatsSet(HashMap::new); + final StatSet levelSet = new StatSet(HashMap::new); levelSet.merge(set); for (int i = 0; i < levelAttrs.getLength(); i++) { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java index 053d9089ce..d6b28a5962 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; /** @@ -82,7 +82,7 @@ public class SendMessageLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); SEND_MESSAGE_LOCALISATIONS.get(_lang).put(set.getString("message").split(SPLIT_STRING), set.getString("translation").split(SPLIT_STRING)); })); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java index e473030c56..c3eda1f3b8 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.actor.instance.ShuttleInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; @@ -72,7 +72,7 @@ public class ShuttleData implements IXmlReader public void parseDocument(Document doc, File f) { NamedNodeMap attrs; - StatsSet set; + StatSet set; Node att; ShuttleDataHolder data; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -84,7 +84,7 @@ public class ShuttleData implements IXmlReader if ("shuttle".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -164,7 +164,7 @@ public class ShuttleData implements IXmlReader { for (ShuttleDataHolder data : _shuttles.values()) { - final ShuttleInstance shuttle = new ShuttleInstance(new CreatureTemplate(new StatsSet())); + final ShuttleInstance shuttle = new ShuttleInstance(new CreatureTemplate(new StatSet())); shuttle.setData(data); shuttle.setHeading(data.getLocation().getHeading()); shuttle.setLocationInvisible(data.getLocation()); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java index 9db0b5f64b..ba000649f2 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.SiegeScheduleDate; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.util.Util; /** @@ -54,7 +54,7 @@ public class SiegeScheduleData implements IXmlReader LOGGER.info(getClass().getSimpleName() + ": Loaded " + _scheduleData.size() + " siege schedulers."); if (_scheduleData.isEmpty()) { - _scheduleData.add(new SiegeScheduleDate(new StatsSet())); + _scheduleData.add(new SiegeScheduleDate(new StatSet())); LOGGER.info(getClass().getSimpleName() + ": Emergency loaded " + _scheduleData.size() + " default siege schedulers."); } } @@ -72,7 +72,7 @@ public class SiegeScheduleData implements IXmlReader { case "schedule": { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final NamedNodeMap attrs = cd.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java index cc019c4dbb..2592b3ed97 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java @@ -40,7 +40,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.EffectHandler; import org.l2jmobius.gameserver.handler.SkillConditionHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.EffectScope; @@ -67,9 +67,9 @@ public class SkillData implements IXmlReader private final Integer _toLevel; private final Integer _fromSubLevel; private final Integer _toSubLevel; - private final Map> _info; + private final Map> _info; - public NamedParamInfo(String name, Integer fromLevel, Integer toLevel, Integer fromSubLevel, Integer toSubLevel, Map> info) + public NamedParamInfo(String name, Integer fromLevel, Integer toLevel, Integer fromSubLevel, Integer toSubLevel, Map> info) { _name = name; _fromLevel = fromLevel; @@ -104,7 +104,7 @@ public class SkillData implements IXmlReader return _toSubLevel; } - public Map> getInfo() + public Map> getInfo() { return _info; } @@ -241,8 +241,8 @@ public class SkillData implements IXmlReader { NamedNodeMap attributes = listNode.getAttributes(); final Map> levels = new HashMap<>(); - final Map> skillInfo = new HashMap<>(); - final StatsSet generalSkillInfo = skillInfo.computeIfAbsent(-1, k -> new HashMap<>()).computeIfAbsent(-1, k -> new StatsSet()); + final Map> skillInfo = new HashMap<>(); + final StatSet generalSkillInfo = skillInfo.computeIfAbsent(-1, k -> new HashMap<>()).computeIfAbsent(-1, k -> new StatSet()); parseAttributes(attributes, "", generalSkillInfo); @@ -321,7 +321,7 @@ public class SkillData implements IXmlReader { return; } - subLevelMap.forEach((subLevel, statsSet) -> + subLevelMap.forEach((subLevel, statSet) -> { if (subLevel == -1) { @@ -339,7 +339,7 @@ public class SkillData implements IXmlReader { return; } - subLevelMap.forEach((subLevel, statsSet) -> + subLevelMap.forEach((subLevel, statSet) -> { if (subLevel == -1) { @@ -371,31 +371,31 @@ public class SkillData implements IXmlReader levels.forEach((level, subLevels) -> subLevels.forEach(subLevel -> { - final StatsSet statsSet = Optional.ofNullable(skillInfo.getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatsSet::new); - skillInfo.getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(statsSet.getSet()::putIfAbsent); - skillInfo.getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(statsSet.getSet()::putIfAbsent); - statsSet.set(".level", level); - statsSet.set(".subLevel", subLevel); - final Skill skill = new Skill(statsSet); + final StatSet statSet = Optional.ofNullable(skillInfo.getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatSet::new); + skillInfo.getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(statSet.getSet()::putIfAbsent); + skillInfo.getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(statSet.getSet()::putIfAbsent); + statSet.set(".level", level); + statSet.set(".subLevel", subLevel); + final Skill skill = new Skill(statSet); forEachNamedParamInfoParam(effectParamInfo, level, subLevel, ((effectScope, params) -> { final String effectName = params.getString(".name"); params.remove(".name"); try { - final Function effectFunction = EffectHandler.getInstance().getHandlerFactory(effectName); + final Function effectFunction = EffectHandler.getInstance().getHandlerFactory(effectName); if (effectFunction != null) { skill.addEffect(effectScope, effectFunction.apply(params)); } else { - LOGGER.warning(getClass().getSimpleName() + ": Missing effect for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]"); + LOGGER.warning(getClass().getSimpleName() + ": Missing effect for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]"); } } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading effect for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading effect for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]", e); } })); @@ -405,19 +405,19 @@ public class SkillData implements IXmlReader params.remove(".name"); try { - final Function conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName); + final Function conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName); if (conditionFunction != null) { skill.addCondition(skillConditionScope, conditionFunction.apply(params)); } else { - LOGGER.warning(getClass().getSimpleName() + ": Missing condition for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + skillConditionScope + "] Effect Name[" + conditionName + "]"); + LOGGER.warning(getClass().getSimpleName() + ": Missing condition for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + skillConditionScope + "] Effect Name[" + conditionName + "]"); } } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading condition for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Condition Scope[" + skillConditionScope + "] Condition Name[" + conditionName + "]", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading condition for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Condition Scope[" + skillConditionScope + "] Condition Name[" + conditionName + "]", e); } })); @@ -434,16 +434,16 @@ public class SkillData implements IXmlReader } } - private void forEachNamedParamInfoParam(Map> paramInfo, int level, int subLevel, BiConsumer consumer) + private void forEachNamedParamInfoParam(Map> paramInfo, int level, int subLevel, BiConsumer consumer) { paramInfo.forEach((scope, namedParamInfos) -> namedParamInfos.forEach(namedParamInfo -> { if ((((namedParamInfo.getFromLevel() == null) && (namedParamInfo.getToLevel() == null)) || ((namedParamInfo.getFromLevel() <= level) && (namedParamInfo.getToLevel() >= level))) // && (((namedParamInfo.getFromSubLevel() == null) && (namedParamInfo.getToSubLevel() == null)) || ((namedParamInfo.getFromSubLevel() <= subLevel) && (namedParamInfo.getToSubLevel() >= subLevel)))) { - final StatsSet params = Optional.ofNullable(namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatsSet::new); - namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); - namedParamInfo.getInfo().getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); + final StatSet params = Optional.ofNullable(namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatSet::new); + namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); + namedParamInfo.getInfo().getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); params.set(".name", namedParamInfo.getName()); consumer.accept(scope, params); } @@ -460,7 +460,7 @@ public class SkillData implements IXmlReader final Integer subLevel = parseInteger(attributes, "subLevel"); final Integer fromSubLevel = parseInteger(attributes, "fromSubLevel", subLevel); final Integer toSubLevel = parseInteger(attributes, "toSubLevel", subLevel); - final Map> info = new HashMap<>(); + final Map> info = new HashMap<>(); for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) { if (!node.getNodeName().equals("#text")) @@ -471,7 +471,7 @@ public class SkillData implements IXmlReader return new NamedParamInfo(name, fromLevel, toLevel, fromSubLevel, toSubLevel, info); } - private void parseInfo(Node node, Map>> variableValues, Map> info) + private void parseInfo(Node node, Map>> variableValues, Map> info) { Map> values = parseValues(node); final Object generalValue = values.getOrDefault(-1, Collections.emptyMap()).get(-1); @@ -492,7 +492,7 @@ public class SkillData implements IXmlReader } } - values.forEach((level, subLevelMap) -> subLevelMap.forEach((subLevel, value) -> info.computeIfAbsent(level, k -> new HashMap<>()).computeIfAbsent(subLevel, k -> new StatsSet()).set(node.getNodeName(), value))); + values.forEach((level, subLevelMap) -> subLevelMap.forEach((subLevel, value) -> info.computeIfAbsent(level, k -> new HashMap<>()).computeIfAbsent(subLevel, k -> new StatSet()).set(node.getNodeName(), value))); } private Map> parseValues(Node node) @@ -535,7 +535,7 @@ public class SkillData implements IXmlReader variables.put("index", (i - fromLevel) + 1d); variables.put("subIndex", (j - fromSubLevel) + 1d); final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1); - if ((base != null) && !(base instanceof StatsSet)) + if ((base != null) && !(base instanceof StatSet)) { variables.put("base", Double.parseDouble(String.valueOf(base))); } @@ -555,13 +555,13 @@ public class SkillData implements IXmlReader Object parseValue(Node node, boolean blockValue, boolean parseAttributes, Map variables) { - StatsSet statsSet = null; + StatSet statSet = null; List list = null; Object text = null; if (parseAttributes && (!node.getNodeName().equals("value") || !blockValue) && (node.getAttributes().getLength() > 0)) { - statsSet = new StatsSet(); - parseAttributes(node.getAttributes(), "", statsSet, variables); + statSet = new StatSet(); + parseAttributes(node.getAttributes(), "", statSet, variables); } for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) { @@ -604,12 +604,12 @@ public class SkillData implements IXmlReader final Object value = parseValue(node, false, true, variables); if (value != null) { - if (statsSet == null) + if (statSet == null) { - statsSet = new StatsSet(); + statSet = new StatSet(); } - statsSet.set(nodeName, value); + statSet.set(nodeName, value); } } } @@ -620,9 +620,9 @@ public class SkillData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", list); + statSet.set(".", list); } else { @@ -635,30 +635,30 @@ public class SkillData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", text); + statSet.set(".", text); } else { return text; } } - return statsSet; + return statSet; } - private void parseAttributes(NamedNodeMap attributes, String prefix, StatsSet statsSet, Map variables) + private void parseAttributes(NamedNodeMap attributes, String prefix, StatSet statSet, Map variables) { for (int i = 0; i < attributes.getLength(); i++) { final Node attributeNode = attributes.item(i); - statsSet.set(prefix + "." + attributeNode.getNodeName(), parseNodeValue(attributeNode.getNodeValue(), variables)); + statSet.set(prefix + "." + attributeNode.getNodeName(), parseNodeValue(attributeNode.getNodeValue(), variables)); } } - private void parseAttributes(NamedNodeMap attributes, String prefix, StatsSet statsSet) + private void parseAttributes(NamedNodeMap attributes, String prefix, StatSet statSet) { - parseAttributes(attributes, prefix, statsSet, Collections.emptyMap()); + parseAttributes(attributes, prefix, statSet, Collections.emptyMap()); } private Object parseNodeValue(String value, Map variables) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java index f1fc07cea5..b85011b133 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.SubclassType; import org.l2jmobius.gameserver.model.SkillLearn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.base.ClassId; @@ -229,7 +229,7 @@ public class SkillTreesData implements IXmlReader { if ("skill".equalsIgnoreCase(c.getNodeName())) { - final StatsSet learnSkillSet = new StatsSet(); + final StatSet learnSkillSet = new StatSet(); attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java index 87915d89eb..78c22d1e7d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java @@ -36,7 +36,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.ChanceLocation; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.MinionHolder; import org.l2jmobius.gameserver.model.interfaces.IParameterized; @@ -169,7 +169,7 @@ public class SpawnsData implements IXmlReader public void parseSpawn(Node spawnsNode, File file, Collection spawns) { - final SpawnTemplate spawnTemplate = new SpawnTemplate(new StatsSet(parseAttributes(spawnsNode)), file); + final SpawnTemplate spawnTemplate = new SpawnTemplate(new StatSet(parseAttributes(spawnsNode)), file); SpawnGroup defaultGroup = null; for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling()) { @@ -185,7 +185,7 @@ public class SpawnsData implements IXmlReader { if (defaultGroup == null) { - defaultGroup = new SpawnGroup(StatsSet.EMPTY_STATSET); + defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET); } parseNpc(innerNode, spawnTemplate, defaultGroup); } @@ -244,7 +244,7 @@ public class SpawnsData implements IXmlReader private void parseGroup(Node n, SpawnTemplate spawnTemplate) { - final SpawnGroup group = new SpawnGroup(new StatsSet(parseAttributes(n))); + final SpawnGroup group = new SpawnGroup(new StatSet(parseAttributes(n))); forEach(n, IXmlReader::isNode, npcNode -> { switch (npcNode.getNodeName()) @@ -271,7 +271,7 @@ public class SpawnsData implements IXmlReader */ private void parseNpc(Node n, SpawnTemplate spawnTemplate, SpawnGroup group) { - final NpcSpawnTemplate npcTemplate = new NpcSpawnTemplate(spawnTemplate, group, new StatsSet(parseAttributes(n))); + final NpcSpawnTemplate npcTemplate = new NpcSpawnTemplate(spawnTemplate, group, new StatSet(parseAttributes(n))); final NpcTemplate template = NpcData.getInstance().getTemplate(npcTemplate.getId()); if (template == null) { @@ -332,10 +332,10 @@ public class SpawnsData implements IXmlReader * @param n * @param npcTemplate */ - private void parseParameters(Node n, IParameterized npcTemplate) + private void parseParameters(Node n, IParameterized npcTemplate) { final Map params = parseParameters(n); - npcTemplate.setParameters(!params.isEmpty() ? new StatsSet(Collections.unmodifiableMap(params)) : StatsSet.EMPTY_STATSET); + npcTemplate.setParameters(!params.isEmpty() ? new StatSet(Collections.unmodifiableMap(params)) : StatSet.EMPTY_STATSET); } /** @@ -344,7 +344,7 @@ public class SpawnsData implements IXmlReader */ private void parseMinions(Node n, NpcSpawnTemplate npcTemplate) { - forEach(n, "minion", minionNode -> npcTemplate.addMinion(new MinionHolder(new StatsSet(parseAttributes(minionNode))))); + forEach(n, "minion", minionNode -> npcTemplate.addMinion(new MinionHolder(new StatSet(parseAttributes(minionNode))))); } /** diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java index 98d333446c..ef93935404 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; @@ -69,7 +69,7 @@ public class StaticObjectData implements IXmlReader if ("object".equalsIgnoreCase(d.getNodeName())) { final NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -86,9 +86,9 @@ public class StaticObjectData implements IXmlReader * Initialize an static object based on the stats set and add it to the map. * @param set the stats set to add. */ - private void addObject(StatsSet set) + private void addObject(StatSet set) { - final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatsSet()), set.getInt("id")); + final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatSet()), set.getInt("id")); obj.setType(set.getInt("type", 0)); obj.setName(set.getString("name")); obj.setMap(set.getString("texture", "none"), set.getInt("map_x", 0), set.getInt("map_y", 0)); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java index 7c8c9a538d..487bae9dea 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.TeleportType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.teleporter.TeleportHolder; /** @@ -74,7 +74,7 @@ public class TeleportersData implements IXmlReader final String name = parseString(nodeAttrs, "name", type.name()); // Parse locations final TeleportHolder holder = new TeleportHolder(name, type); - forEach(node, "location", location -> holder.registerLocation(new StatsSet(parseAttributes(location)))); + forEach(node, "location", location -> holder.registerLocation(new StatSet(parseAttributes(location)))); // Register holder if (teleList.putIfAbsent(name, holder) != null) { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java index b6b3bf2e90..c2f5f94adb 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java @@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.transform.Transform; import org.l2jmobius.gameserver.model.actor.transform.TransformLevelData; import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate; @@ -70,7 +70,7 @@ public class TransformData implements IXmlReader if ("transform".equalsIgnoreCase(d.getNodeName())) { NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -192,7 +192,7 @@ public class TransformData implements IXmlReader transform.setTemplate(isMale, templateData); } - final StatsSet levelsSet = new StatsSet(); + final StatSet levelsSet = new StatSet(); for (Node s = z.getFirstChild(); s != null; s = s.getNextSibling()) { if ("level".equals(s.getNodeName())) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/engines/DocumentBase.java index ba3fc7f6b4..d178b10006 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/engines/DocumentBase.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/engines/DocumentBase.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.PlayerState; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionCategoryType; @@ -178,7 +178,7 @@ public abstract class DocumentBase protected abstract void parseDocument(Document doc); - protected abstract StatsSet getStatsSet(); + protected abstract StatSet getStatSet(); protected abstract String getTableValue(String name); @@ -1245,7 +1245,7 @@ public abstract class DocumentBase setTable(name, array.toArray(new String[array.size()])); } - protected void parseBeanSet(Node n, StatsSet set, Integer level) + protected void parseBeanSet(Node n, StatSet set, Integer level) { final String name = n.getAttributes().getNamedItem("name").getNodeValue().trim(); final String value = n.getAttributes().getNamedItem("val").getNodeValue().trim(); @@ -1260,7 +1260,7 @@ public abstract class DocumentBase } } - protected void setExtractableSkillData(StatsSet set, String value) + protected void setExtractableSkillData(StatSet set, String value) { set.set("capsuled_items_skill", value); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java index e8c77b206e..46f8f9be1f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java @@ -21,7 +21,7 @@ import java.io.File; import org.w3c.dom.Document; import org.w3c.dom.Node; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; /** @@ -41,7 +41,7 @@ public class DocumentBaseGeneral extends DocumentBase } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return null; } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java index 3ea7f41bb6..419552cf68 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.engines.DocumentBase; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -57,7 +57,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return _currentItem.set; } @@ -111,7 +111,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader _currentItem.id = itemId; _currentItem.name = itemName; _currentItem.type = className; - _currentItem.set = new StatsSet(); + _currentItem.set = new StatSet(); _currentItem.set.set("item_id", itemId); _currentItem.set.set("name", itemName); _currentItem.set.set("additionalName", additionalName); @@ -218,7 +218,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatsSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (Item) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java index 56e5b21a9f..967c1fc34d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.engines.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; public class ItemDataHolder @@ -24,7 +24,7 @@ public class ItemDataHolder int id; String type; String name; - StatsSet set; + StatSet set; int currentLevel; Item item; } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/handler/ConditionHandler.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/handler/ConditionHandler.java index 47f24d690d..b53f170fb3 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/handler/ConditionHandler.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/handler/ConditionHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.ICondition; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class ConditionHandler { - private final Map> _conditionHandlerFactories = new HashMap<>(); + private final Map> _conditionHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _conditionHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _conditionHandlerFactories.get(name); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/handler/EffectHandler.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/handler/EffectHandler.java index a58de8efb4..328265d9db 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/handler/EffectHandler.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/handler/EffectHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class EffectHandler { - private final Map> _effectHandlerFactories = new HashMap<>(); + private final Map> _effectHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _effectHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _effectHandlerFactories.get(name); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java index a6e2275d04..32438040e0 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class SkillConditionHandler { - private final Map> _skillConditionHandlerFactories = new HashMap<>(); + private final Map> _skillConditionHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _skillConditionHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _skillConditionHandlerFactories.get(name); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java index 6992dd5366..65a8c52d7e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.model.AirShipTeleportList; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShipInstance; @@ -45,13 +45,13 @@ public class AirShipManager private static final String UPDATE_DB = "UPDATE airships SET fuel=? WHERE owner_id=?"; private CreatureTemplate _airShipTemplate = null; - private final Map _airShipsInfo = new HashMap<>(); + private final Map _airShipsInfo = new HashMap<>(); private final Map _airShips = new HashMap<>(); private final Map _teleports = new HashMap<>(); protected AirShipManager() { - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", 9); npcDat.set("level", 0); npcDat.set("jClass", "boat"); @@ -113,7 +113,7 @@ public class AirShipManager public AirShipInstance getNewAirShip(int x, int y, int z, int heading, int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return null; @@ -147,7 +147,7 @@ public class AirShipManager if (ship.getOwnerId() != 0) { storeInDb(ship.getOwnerId()); - final StatsSet info = _airShipsInfo.get(ship.getOwnerId()); + final StatSet info = _airShipsInfo.get(ship.getOwnerId()); if (info != null) { info.set("fuel", ship.getFuel()); @@ -164,7 +164,7 @@ public class AirShipManager { if (!_airShipsInfo.containsKey(ownerId)) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("fuel", 600); _airShipsInfo.put(ownerId, info); @@ -264,10 +264,10 @@ public class AirShipManager Statement s = con.createStatement(); ResultSet rs = s.executeQuery(LOAD_DB)) { - StatsSet info; + StatSet info; while (rs.next()) { - info = new StatsSet(); + info = new StatSet(); info.set("fuel", rs.getInt("fuel")); _airShipsInfo.put(rs.getInt("owner_id"), info); } @@ -285,7 +285,7 @@ public class AirShipManager private void storeInDb(int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java index 2db10dd045..e5c610b3f2 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.BoatInstance; @@ -57,7 +57,7 @@ public class BoatManager return null; } - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", boatId); npcDat.set("level", 0); npcDat.set("jClass", "boat"); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 99a9678ece..56f08422cd 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.enums.ManorMode; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; import org.l2jmobius.gameserver.model.SeedProduction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.entity.Castle; @@ -126,7 +126,7 @@ public class CastleManorManager implements IXmlReader, IStorable @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; NamedNodeMap attrs; Node att; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -142,7 +142,7 @@ public class CastleManorManager implements IXmlReader, IStorable { if ("crop".equalsIgnoreCase(c.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); set.set("castleId", castleId); attrs = c.getAttributes(); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java index d92a9c313a..a1a8472823 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java @@ -27,7 +27,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosState; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -181,7 +181,7 @@ public class CeremonyOfChaosManager extends AbstractEventManager _npcs = new ConcurrentHashMap<>(); protected final Map _spawns = new ConcurrentHashMap<>(); - protected final Map _storedInfo = new ConcurrentHashMap<>(); + protected final Map _storedInfo = new ConcurrentHashMap<>(); protected final Map> _schedules = new ConcurrentHashMap<>(); /** @@ -161,7 +161,7 @@ public class DBSpawnManager { npc.setDBStatus(RaidBossStatus.ALIVE); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getCurrentHp()); info.set("currentMP", npc.getCurrentMp()); info.set("respawnTime", 0); @@ -181,7 +181,7 @@ public class DBSpawnManager */ public void updateStatus(Npc npc, boolean isNpcDead) { - final StatsSet info = _storedInfo.get(npc.getId()); + final StatSet info = _storedInfo.get(npc.getId()); if (info == null) { return; @@ -254,7 +254,7 @@ public class DBSpawnManager _npcs.put(npcId, npc); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", currentHP); info.set("currentMP", currentMP); info.set("respawnTime", 0); @@ -316,7 +316,7 @@ public class DBSpawnManager } npc.setDBStatus(RaidBossStatus.ALIVE); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", 0); @@ -401,7 +401,7 @@ public class DBSpawnManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("UPDATE npc_respawns SET respawnTime = ?, currentHP = ?, currentMP = ? WHERE id = ?")) { - for (Entry entry : _storedInfo.entrySet()) + for (Entry entry : _storedInfo.entrySet()) { final Integer npcId = entry.getKey(); if (npcId == null) @@ -420,7 +420,7 @@ public class DBSpawnManager updateStatus(npc, false); } - final StatsSet info = entry.getValue(); + final StatSet info = entry.getValue(); if (info == null) { continue; @@ -529,7 +529,7 @@ public class DBSpawnManager */ public void notifySpawnNightNpc(Npc npc) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getCurrentHp()); info.set("currentMP", npc.getCurrentMp()); info.set("respawnTime", 0); @@ -572,7 +572,7 @@ public class DBSpawnManager * Gets the stored info. * @return the stored info */ - public Map getStoredInfo() + public Map getStoredInfo() { return _storedInfo; } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index 3dd4e3f652..767bed6954 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.datatables.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.FakePlayerChatHolder; @@ -73,7 +73,7 @@ public class FakePlayerChatManager implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayerChat", fakePlayerChatNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerChatNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerChatNode)); MESSAGES.add(new FakePlayerChatHolder(set.getString("fpcName"), set.getString("searchMethod"), set.getString("searchText"), set.getString("answers"))); })); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java index 3bc57b3856..f91a16f65a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java @@ -33,7 +33,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.tasks.GrandBossManagerStoreTask; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; import org.l2jmobius.gameserver.model.interfaces.IStorable; @@ -51,7 +51,7 @@ public class GrandBossManager implements IStorable protected static Map _bosses = new ConcurrentHashMap<>(); - protected static Map _storedInfo = new HashMap<>(); + protected static Map _storedInfo = new HashMap<>(); private final Map _bossStatus = new HashMap<>(); @@ -72,7 +72,7 @@ public class GrandBossManager implements IStorable final int bossId = rs.getInt("boss_id"); if (NpcData.getInstance().getTemplate(bossId) != null) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("loc_x", rs.getInt("loc_x")); info.set("loc_y", rs.getInt("loc_y")); info.set("loc_z", rs.getInt("loc_z")); @@ -136,12 +136,12 @@ public class GrandBossManager implements IStorable return _bosses.get(bossId); } - public StatsSet getStatsSet(int bossId) + public StatSet getStatSet(int bossId) { return _storedInfo.get(bossId); } - public void setStatsSet(int bossId, StatsSet info) + public void setStatSet(int bossId, StatSet info) { _storedInfo.put(bossId, info); updateDb(bossId, false); @@ -152,10 +152,10 @@ public class GrandBossManager implements IStorable { try (Connection con = DatabaseFactory.getConnection()) { - for (Entry e : _storedInfo.entrySet()) + for (Entry e : _storedInfo.entrySet()) { final GrandBossInstance boss = _bosses.get(e.getKey()); - final StatsSet info = e.getValue(); + final StatSet info = e.getValue(); if ((boss == null) || (info == null)) { try (PreparedStatement update = con.prepareStatement(UPDATE_GRAND_BOSS_DATA2)) @@ -205,7 +205,7 @@ public class GrandBossManager implements IStorable try (Connection con = DatabaseFactory.getConnection()) { final GrandBossInstance boss = _bosses.get(bossId); - final StatsSet info = _storedInfo.get(bossId); + final StatSet info = _storedInfo.get(bossId); if (statusOnly || (boss == null) || (info == null)) { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index d77642378f..29e517b0cd 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.enums.InstanceReenterType; import org.l2jmobius.gameserver.enums.InstanceRemoveBuffType; import org.l2jmobius.gameserver.enums.InstanceTeleportType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.holders.InstanceReenterTimeHolder; @@ -151,7 +151,7 @@ public class InstanceManager implements IXmlReader return; } - final InstanceTemplate template = new InstanceTemplate(new StatsSet(parseAttributes(instanceNode))); + final InstanceTemplate template = new InstanceTemplate(new StatSet(parseAttributes(instanceNode))); // Update name if wasn't provided if (template.getName() == null) @@ -241,10 +241,10 @@ public class InstanceManager implements IXmlReader { if (doorNode.getNodeName().equals("door")) { - final StatsSet parsedSet = DoorData.getInstance().parseDoor(doorNode); - final StatsSet mergedSet = new StatsSet(); + final StatSet parsedSet = DoorData.getInstance().parseDoor(doorNode); + final StatSet mergedSet = new StatSet(); final int doorId = parsedSet.getInt("id"); - final StatsSet templateSet = DoorData.getInstance().getDoorTemplate(doorId); + final StatSet templateSet = DoorData.getInstance().getDoorTemplate(doorId); if (templateSet != null) { mergedSet.merge(templateSet); @@ -324,14 +324,14 @@ public class InstanceManager implements IXmlReader final boolean onlyLeader = parseBoolean(attrs, "onlyLeader", false); final boolean showMessageAndHtml = parseBoolean(attrs, "showMessageAndHtml", false); // Load parameters - StatsSet params = null; + StatSet params = null; for (Node f = conditionNode.getFirstChild(); f != null; f = f.getNextSibling()) { if (f.getNodeName().equals("param")) { if (params == null) { - params = new StatsSet(); + params = new StatSet(); } params.set(parseString(f.getAttributes(), "name"), parseString(f.getAttributes(), "value")); @@ -341,14 +341,14 @@ public class InstanceManager implements IXmlReader // If none parameters found then set empty StatSet if (params == null) { - params = StatsSet.EMPTY_STATSET; + params = StatSet.EMPTY_STATSET; } // Now when everything is loaded register condition to template try { final Class clazz = Class.forName("org.l2jmobius.gameserver.model.instancezone.conditions.Condition" + type); - final Constructor constructor = clazz.getConstructor(InstanceTemplate.class, StatsSet.class, boolean.class, boolean.class); + final Constructor constructor = clazz.getConstructor(InstanceTemplate.class, StatSet.class, boolean.class, boolean.class); conditions.add((Condition) constructor.newInstance(template, params, onlyLeader, showMessageAndHtml)); } catch (Exception ex) @@ -378,7 +378,7 @@ public class InstanceManager implements IXmlReader */ public Instance createInstance() { - return new Instance(getNewInstanceId(), new InstanceTemplate(StatsSet.EMPTY_STATSET), null); + return new Instance(getNewInstanceId(), new InstanceTemplate(StatSet.EMPTY_STATSET), null); } /** diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/AccessLevel.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/AccessLevel.java index 772c1fe77e..72b77905e1 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/AccessLevel.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/AccessLevel.java @@ -52,7 +52,7 @@ public class AccessLevel /** Flag to gain exp in party */ private boolean _gainExp = false; - public AccessLevel(StatsSet set) + public AccessLevel(StatSet set) { _accessLevel = set.getInt("level"); _name = set.getString("name"); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/ActionDataHolder.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/ActionDataHolder.java index 4887bedba8..ca6d9ee685 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/ActionDataHolder.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/ActionDataHolder.java @@ -25,7 +25,7 @@ public class ActionDataHolder private final String _handler; private final int _optionId; - public ActionDataHolder(StatsSet set) + public ActionDataHolder(StatSet set) { _id = set.getInt("id"); _handler = set.getString("handler"); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java index 656119098e..3f88e455d7 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java @@ -27,7 +27,7 @@ public class AdminCommandAccessRight private final int _accessLevel; private final boolean _requireConfirm; - public AdminCommandAccessRight(StatsSet set) + public AdminCommandAccessRight(StatSet set) { _adminCommand = set.getString("command"); _requireConfirm = set.getBoolean("confirmDlg", false); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Location.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Location.java index 1c61740e4d..024c71075f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Location.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Location.java @@ -49,7 +49,7 @@ public class Location implements IPositionable this(obj.getX(), obj.getY(), obj.getZ(), obj.getHeading()); } - public Location(StatsSet set) + public Location(StatSet set) { _x = set.getInt("x"); _y = set.getInt("y"); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/PetLevelData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/PetLevelData.java index e46b215b5f..7cad1a225a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/PetLevelData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/PetLevelData.java @@ -46,7 +46,7 @@ public class PetLevelData private final double _slowFlySpeedOnRide; private final double _fastFlySpeedOnRide; - public PetLevelData(StatsSet set) + public PetLevelData(StatSet set) { _ownerExpTaken = set.getInt("get_exp_type"); _petMaxExp = set.getLong("exp"); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/RecipeList.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/RecipeList.java index 9e4a3b2387..a81bbb1802 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/RecipeList.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/RecipeList.java @@ -68,7 +68,7 @@ public class RecipeList * @param set * @param haveRare */ - public RecipeList(StatsSet set, boolean haveRare) + public RecipeList(StatSet set, boolean haveRare) { _recipes = new RecipeInstance[0]; _statUse = new RecipeStatInstance[0]; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Seed.java index 6d31ffc60f..54ef8acd9f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Seed.java @@ -35,7 +35,7 @@ public class Seed private final int _seedReferencePrice; private final int _cropReferencePrice; - public Seed(StatsSet set) + public Seed(StatSet set) { _cropId = set.getInt("id"); _seedId = set.getInt("seedId"); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java index 78897cf4f1..4de77df228 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java @@ -27,7 +27,7 @@ public class SiegeScheduleDate private final int _hour; private final int _maxConcurrent; - public SiegeScheduleDate(StatsSet set) + public SiegeScheduleDate(StatSet set) { _day = set.getInt("day", Calendar.SUNDAY); _hour = set.getInt("hour", 16); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/SkillLearn.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/SkillLearn.java index e2ccdd6331..00f53c0cb9 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/SkillLearn.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/SkillLearn.java @@ -58,7 +58,7 @@ public class SkillLearn * Constructor for SkillLearn. * @param set the set with the SkillLearn data. */ - public SkillLearn(StatsSet set) + public SkillLearn(StatSet set) { _skillName = set.getString("skillName"); _skillId = set.getInt("skillId"); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/StatsSet.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/StatSet.java similarity index 95% rename from L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/StatsSet.java rename to L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/StatSet.java index 5ce013ebd2..3c824d9fa4 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/StatsSet.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/StatSet.java @@ -39,25 +39,25 @@ import org.l2jmobius.gameserver.util.Util; * They are stored as object but can be retrieved in any type wanted. As long as cast is available.
* @author mkizub */ -public class StatsSet implements IParserAdvUtils +public class StatSet implements IParserAdvUtils { - private static final Logger LOGGER = Logger.getLogger(StatsSet.class.getName()); + private static final Logger LOGGER = Logger.getLogger(StatSet.class.getName()); /** Static empty immutable map, used to avoid multiple null checks over the source. */ - public static final StatsSet EMPTY_STATSET = new StatsSet(Collections.emptyMap()); + public static final StatSet EMPTY_STATSET = new StatSet(Collections.emptyMap()); private final Map _set; - public StatsSet() + public StatSet() { this(ConcurrentHashMap::new); } - public StatsSet(Supplier> mapFactory) + public StatSet(Supplier> mapFactory) { this(mapFactory.get()); } - public StatsSet(Map map) + public StatSet(Map map) { _set = map; } @@ -73,9 +73,9 @@ public class StatsSet implements IParserAdvUtils /** * Add a set of couple values in the current set - * @param newSet : StatsSet pointing out the list of couples to add in the current set + * @param newSet : StatSet pointing out the list of couples to add in the current set */ - public void merge(StatsSet newSet) + public void merge(StatSet newSet) { _set.putAll(newSet.getSet()); } @@ -871,7 +871,7 @@ public class StatsSet implements IParserAdvUtils return (Map) obj; } - public StatsSet set(String name, Object value) + public StatSet set(String name, Object value) { if (value == null) { @@ -881,49 +881,49 @@ public class StatsSet implements IParserAdvUtils return this; } - public StatsSet set(String key, boolean value) + public StatSet set(String key, boolean value) { _set.put(key, value); return this; } - public StatsSet set(String key, byte value) + public StatSet set(String key, byte value) { _set.put(key, value); return this; } - public StatsSet set(String key, short value) + public StatSet set(String key, short value) { _set.put(key, value); return this; } - public StatsSet set(String key, int value) + public StatSet set(String key, int value) { _set.put(key, value); return this; } - public StatsSet set(String key, long value) + public StatSet set(String key, long value) { _set.put(key, value); return this; } - public StatsSet set(String key, float value) + public StatSet set(String key, float value) { _set.put(key, value); return this; } - public StatsSet set(String key, double value) + public StatSet set(String key, double value) { _set.put(key, value); return this; } - public StatsSet set(String key, String value) + public StatSet set(String key, String value) { if (value == null) { @@ -933,7 +933,7 @@ public class StatsSet implements IParserAdvUtils return this; } - public StatsSet set(String key, Enum value) + public StatSet set(String key, Enum value) { if (value == null) { @@ -943,9 +943,9 @@ public class StatsSet implements IParserAdvUtils return this; } - public static StatsSet valueOf(String key, Object value) + public static StatSet valueOf(String key, Object value) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.set(key, value); return set; } @@ -963,6 +963,6 @@ public class StatsSet implements IParserAdvUtils @Override public String toString() { - return "StatsSet{_set=" + _set + '}'; + return "StatSet{_set=" + _set + '}'; } } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java index d4cb439bbf..2213caf3ec 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.MpRewardTask; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.FishermanInstance; @@ -148,7 +148,7 @@ public class Npc extends Creature private NpcStringId _titleString; private NpcStringId _nameString; - private StatsSet _params; + private StatSet _params; private RaidBossStatus _raidStatus; /** Contains information about local tax payments. */ @@ -1756,7 +1756,7 @@ public class Npc extends Creature /** * @return the parameters of the npc merged with the spawn parameters (if there are any) */ - public StatsSet getParameters() + public StatSet getParameters() { if (_params != null) { @@ -1768,10 +1768,10 @@ public class Npc extends Creature final NpcSpawnTemplate npcSpawnTemplate = _spawn.getNpcSpawnTemplate(); if ((npcSpawnTemplate != null) && (npcSpawnTemplate.getParameters() != null) && !npcSpawnTemplate.getParameters().isEmpty()) { - final StatsSet params = getTemplate().getParameters(); + final StatSet params = getTemplate().getParameters(); if ((params != null) && !params.getSet().isEmpty()) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.merge(params); set.merge(npcSpawnTemplate.getParameters()); _params = set; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 82f429bc18..4cb0835220 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -21,7 +21,7 @@ import java.util.EnumMap; import java.util.Map; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; @@ -49,12 +49,12 @@ public class CreatureTemplate extends ListenersContainer /** The creature's race. */ private Race _race; - public CreatureTemplate(StatsSet set) + public CreatureTemplate(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { // Base stats _baseValues.put(Stat.STAT_STR, set.getDouble("baseSTR", 0)); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java index 86441c678c..14f0e9cae8 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.CubicInstance; @@ -46,7 +46,7 @@ public class CubicTemplate implements ICubicConditionHolder private final List _conditions = new ArrayList<>(); public List _skills = new ArrayList<>(); - public CubicTemplate(StatsSet set) + public CubicTemplate(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java index c40883ac75..410040bc86 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.templates; import org.l2jmobius.gameserver.enums.DoorOpenType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -57,7 +57,7 @@ public class DoorTemplate extends CreatureTemplate implements IIdentifiable private final boolean _stealth; private final boolean _isInverted; - public DoorTemplate(StatsSet set) + public DoorTemplate(StatSet set) { super(set); _doorId = set.getInt("id"); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 767743de2e..8ab41c70e3 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.enums.MpRewardAffectType; import org.l2jmobius.gameserver.enums.MpRewardType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -63,7 +63,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private boolean _usingServerSideName; private String _title; private boolean _usingServerSideTitle; - private StatsSet _parameters; + private StatSet _parameters; private Sex _sex; private int _chestId; private int _rhandId; @@ -123,15 +123,15 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable /** * Constructor of Creature. - * @param set The StatsSet object to transfer data to the method + * @param set The StatSet object to transfer data to the method */ - public NpcTemplate(StatsSet set) + public NpcTemplate(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _id = set.getInt("id"); @@ -320,12 +320,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _usingServerSideTitle; } - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } - public void setParameters(StatsSet set) + public void setParameters(StatSet set) { _parameters = set; } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 50292b8bc8..28458aa09e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -50,7 +50,7 @@ public class PlayerTemplate extends CreatureTemplate private final List _creationPoints; private final Map _baseSlotDef; - public PlayerTemplate(StatsSet set, List creationPoints) + public PlayerTemplate(StatSet set, List creationPoints) { super(set); _classId = ClassId.getClassId(set.getInt("classId")); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index aa28a0f648..260da48365 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -23,7 +23,7 @@ import java.util.Objects; import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import org.l2jmobius.gameserver.enums.InventoryBlockType; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -57,7 +57,7 @@ public class Transform implements IIdentifiable private TransformTemplate _maleTemplate; private TransformTemplate _femaleTemplate; - public Transform(StatsSet set) + public Transform(StatSet set) { _id = set.getInt("id"); _displayId = set.getInt("displayId", _id); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java index 5660852a01..729998503f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.actor.transform; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -31,7 +31,7 @@ public class TransformLevelData private final double _levelMod; private Map _stats; - public TransformLevelData(StatsSet set) + public TransformLevelData(StatSet set) { _level = set.getInt("val"); _levelMod = set.getDouble("levelMod"); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 4de84b8bdc..7aca059f91 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -23,7 +23,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -49,7 +49,7 @@ public class TransformTemplate private ExBasicActionList _list; private final Map _data = new LinkedHashMap<>(100); - public TransformTemplate(StatsSet set) + public TransformTemplate(StatSet set) { _collisionRadius = set.contains("radius") ? set.getDouble("radius") : null; _collisionHeight = set.contains("height") ? set.getDouble("height") : null; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java index d808a6b8bf..02550d2818 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -36,7 +36,7 @@ public class AlchemyCraftData private ItemHolder _productionSuccess; private ItemHolder _productionFailure; - public AlchemyCraftData(StatsSet set) + public AlchemyCraftData(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java index 0bd061d3c4..79dd6c0207 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.beautyshop; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -32,7 +32,7 @@ public class BeautyItem private final int _beautyShopTicket; private final Map _colors = new HashMap<>(); - public BeautyItem(StatsSet set) + public BeautyItem(StatSet set) { _id = set.getInt("id"); _adena = set.getInt("adena", 0); @@ -60,7 +60,7 @@ public class BeautyItem return _beautyShopTicket; } - public void addColor(StatsSet set) + public void addColor(StatSet set) { final BeautyItem color = new BeautyItem(set); _colors.put(set.getInt("id"), color); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index 689a61464d..8b32364c1a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party.MessageType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.appearance.PlayerAppearance; @@ -244,7 +244,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent player.teleToLocation(_instance.getEnterLocations().get(index++), 0, _instance); } - getTimers().addTimer("match_start_countdown", StatsSet.valueOf("time", 60), 100, null, null); + getTimers().addTimer("match_start_countdown", StatSet.valueOf("time", 60), 100, null, null); getTimers().addTimer("teleport_message1", 10000, null, null); getTimers().addTimer("teleport_message2", 14000, null, null); @@ -400,7 +400,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent } } getTimers().cancelTimer("update", null, null); - getTimers().addTimer("match_end_countdown", StatsSet.valueOf("time", 30), 30 * 1000, null, null); + getTimers().addTimer("match_end_countdown", StatSet.valueOf("time", 30), 30 * 1000, null, null); EventDispatcher.getInstance().notifyEvent(new OnCeremonyOfChaosMatchResult(winners, members)); } @@ -493,7 +493,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java index 39f9196d93..371f8dc459 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.conditions.ICubicCondition; @@ -38,7 +38,7 @@ public class CubicSkill extends SkillHolder implements ICubicConditionHolder private final List _conditions = new ArrayList<>(); private final boolean _targetDebuff; - public CubicSkill(StatsSet set) + public CubicSkill(StatSet set) { super(set.getInt("id"), set.getInt("level")); _triggerRate = set.getInt("triggerRate", 100); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/ClanHall.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/ClanHall.java index 8da77477fd..22af370709 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/ClanHall.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/ClanHall.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -75,7 +75,7 @@ public class ClanHall extends AbstractResidence private static final String LOAD_CLANHALL = "SELECT * FROM clanhall WHERE id=?"; private static final String UPDATE_CLANHALL = "UPDATE clanhall SET ownerId=?,paidUntil=? WHERE id=?"; - public ClanHall(StatsSet params) + public ClanHall(StatSet params) { super(params.getInt("id")); // Set static parameters diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Hero.java index ef005ff325..aee8b019ee 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Hero.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Hero.java @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.data.xml.impl.ClassListData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -74,13 +74,13 @@ public class Hero // delete hero items private static final String DELETE_ITEMS = "DELETE FROM items WHERE item_id IN (30392, 30393, 30394, 30395, 30396, 30397, 30398, 30399, 30400, 30401, 30402, 30403, 30404, 30405, 30372, 30373, 6842, 6611, 6612, 6613, 6614, 6615, 6616, 6617, 6618, 6619, 6620, 6621, 9388, 9389, 9390) AND owner_id NOT IN (SELECT charId FROM characters WHERE accesslevel > 0)"; - private static final Map HEROES = new ConcurrentHashMap<>(); - private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); + private static final Map HEROES = new ConcurrentHashMap<>(); + private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); - private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); - private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); + private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); + private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); - private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); + private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); private static final Map HERO_MESSAGE = new ConcurrentHashMap<>(); public static final String COUNT = "count"; @@ -118,7 +118,7 @@ public class Hero { while (rset.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset.getInt(Olympiad.CLASS_ID)); @@ -137,7 +137,7 @@ public class Hero while (rset2.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset2.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset2.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset2.getInt(Olympiad.CLASS_ID)); @@ -159,7 +159,7 @@ public class Hero LOGGER.info("Hero System: Loaded " + COMPLETE_HEROS.size() + " all time Heroes."); } - private void processHeros(PreparedStatement ps, int charId, StatsSet hero) throws SQLException + private void processHeros(PreparedStatement ps, int charId, StatSet hero) throws SQLException { ps.setInt(1, charId); try (ResultSet rs = ps.executeQuery()) @@ -224,7 +224,7 @@ public class Hero public void loadDiary(int charId) { - final List diary = new ArrayList<>(); + final List diary = new ArrayList<>(); int diaryentries = 0; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement("SELECT * FROM heroes_diary WHERE charId=? ORDER BY time ASC")) @@ -234,7 +234,7 @@ public class Hero { while (rset.next()) { - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final long time = rset.getLong("time"); final int action = rset.getInt("action"); @@ -279,8 +279,8 @@ public class Hero public void loadFights(int charId) { - final List fights = new ArrayList<>(); - final StatsSet heroCountData = new StatsSet(); + final List fights = new ArrayList<>(); + final StatSet heroCountData = new StatSet(); final Calendar data = Calendar.getInstance(); data.set(Calendar.DAY_OF_MONTH, 1); data.set(Calendar.HOUR_OF_DAY, 0); @@ -326,7 +326,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charTwoClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -362,7 +362,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charOneClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -410,14 +410,14 @@ public class Hero } } - public Map getHeroes() + public Map getHeroes() { return HEROES; } public int getHeroByClass(int classid) { - for (Entry e : HEROES.entrySet()) + for (Entry e : HEROES.entrySet()) { if (e.getValue().getInt(Olympiad.CLASS_ID) == classid) { @@ -438,7 +438,7 @@ public class Hero public void showHeroDiary(PlayerInstance player, int heroclass, int charid, int page) { final int perpage = 10; - final List mainList = HERO_DIARY.get(charid); + final List mainList = HERO_DIARY.get(charid); if (mainList != null) { final NpcHtmlMessage diaryReply = new NpcHtmlMessage(); @@ -453,7 +453,7 @@ public class Hero if (!mainList.isEmpty()) { - final List list = new ArrayList<>(mainList); + final List list = new ArrayList<>(mainList); Collections.reverse(list); boolean color = true; @@ -463,7 +463,7 @@ public class Hero for (int i = (page - 1) * perpage; i < list.size(); i++) { breakat = i; - final StatsSet diaryEntry = list.get(i); + final StatSet diaryEntry = list.get(i); fList.append(""); if (color) { @@ -524,7 +524,7 @@ public class Hero int loss = 0; int draw = 0; - final List heroFights = HERO_FIGHTS.get(charid); + final List heroFights = HERO_FIGHTS.get(charid); if (heroFights != null) { final NpcHtmlMessage fightReply = new NpcHtmlMessage(); @@ -536,7 +536,7 @@ public class Hero if (!heroFights.isEmpty()) { - final StatsSet heroCount = HERO_COUNTS.get(charid); + final StatSet heroCount = HERO_COUNTS.get(charid); if (heroCount != null) { win = heroCount.getInt("victory"); @@ -551,7 +551,7 @@ public class Hero for (int i = (page - 1) * perpage; i < heroFights.size(); i++) { breakat = i; - final StatsSet fight = heroFights.get(i); + final StatSet fight = heroFights.get(i); fList.append(""); if (color) { @@ -609,7 +609,7 @@ public class Hero } } - public synchronized void computeNewHeroes(List newHeroes) + public synchronized void computeNewHeroes(List newHeroes) { updateHeroes(true); @@ -659,13 +659,13 @@ public class Hero return; } - for (StatsSet hero : newHeroes) + for (StatSet hero : newHeroes) { final int charId = hero.getInt(Olympiad.CHAR_ID); if (COMPLETE_HEROS.containsKey(charId)) { - final StatsSet oldHero = COMPLETE_HEROS.get(charId); + final StatSet oldHero = COMPLETE_HEROS.get(charId); final int count = oldHero.getInt(COUNT); oldHero.set(COUNT, count + 1); oldHero.set(PLAYED, 1); @@ -674,7 +674,7 @@ public class Hero } else { - final StatsSet newHero = new StatsSet(); + final StatSet newHero = new StatSet(); newHero.set(Olympiad.CHAR_NAME, hero.getString(Olympiad.CHAR_NAME)); newHero.set(Olympiad.CLASS_ID, hero.getInt(Olympiad.CLASS_ID)); newHero.set(COUNT, 1); @@ -700,9 +700,9 @@ public class Hero } else { - StatsSet hero; + StatSet hero; int heroId; - for (Entry entry : HEROES.entrySet()) + for (Entry entry : HEROES.entrySet()) { hero = entry.getValue(); heroId = entry.getKey(); @@ -787,13 +787,13 @@ public class Hero setDiaryData(charId, ACTION_RAID_KILLED, npcId); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (template == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -806,13 +806,13 @@ public class Hero setDiaryData(charId, ACTION_CASTLE_TAKEN, castleId); final Castle castle = CastleManager.getInstance().getCastleById(castleId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (castle == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -922,10 +922,10 @@ public class Hero */ public void claimHero(PlayerInstance player) { - StatsSet hero = HEROES.get(player.getObjectId()); + StatSet hero = HEROES.get(player.getObjectId()); if (hero == null) { - hero = new StatsSet(); + hero = new StatSet(); HEROES.put(player.getObjectId(), hero); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java index f1263e8d44..c52f487402 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java @@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.atomic.AtomicReference; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.eventengine.drop.IEventDrop; import org.l2jmobius.gameserver.model.events.AbstractScript; @@ -42,7 +42,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout public abstract class AbstractEventManager>extends AbstractScript { private String _name; - private StatsSet _variables = StatsSet.EMPTY_STATSET; + private StatSet _variables = StatSet.EMPTY_STATSET; private Set _schedulers = Collections.emptySet(); private Set _conditionalSchedulers = Collections.emptySet(); private Map _rewards = Collections.emptyMap(); @@ -67,14 +67,14 @@ public abstract class AbstractEventManager>extends Ab /* ********************** */ - public StatsSet getVariables() + public StatSet getVariables() { return _variables; } - public void setVariables(StatsSet variables) + public void setVariables(StatSet variables) { - _variables = new StatsSet(Collections.unmodifiableMap(variables.getSet())); + _variables = new StatSet(Collections.unmodifiableMap(variables.getSet())); } /* ********************** */ diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java index 59c64b812c..e41af41d1a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.util.cron4j.PastPredictor; import org.l2jmobius.gameserver.util.cron4j.Predictor; @@ -45,7 +45,7 @@ public class EventScheduler private List _notifications; private ScheduledFuture _task; - public EventScheduler(AbstractEventManager manager, StatsSet set) + public EventScheduler(AbstractEventManager manager, StatSet set) { _eventManager = manager; _name = set.getString("name", ""); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 153b768796..59143ed335 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -50,7 +50,7 @@ import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -182,12 +182,12 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime onTimerCancel(holder.getEvent(), holder.getParams(), holder.getNpc(), holder.getPlayer()); } - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { LOGGER.warning("[" + getClass().getSimpleName() + "]: Timer event arrived at non overriden onTimerEvent method event: " + event + " npc: " + npc + " player: " + player); } - public void onTimerCancel(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerCancel(String event, StatSet params, Npc npc, PlayerInstance player) { } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java index 400fb64b6e..861c4a9b31 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java @@ -24,7 +24,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.timers.IEventTimerCancel; @@ -69,7 +69,7 @@ public class TimerExecutor * @param eventTimer * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - public boolean addTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) + public boolean addTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) { return addTimer(new TimerHolder<>(event, params, time, npc, player, false, eventTimer, _cancelListener, this)); } @@ -95,7 +95,7 @@ public class TimerExecutor * @param player * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - public boolean addTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player) + public boolean addTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player) { return addTimer(event, params, time, npc, player, _eventListener); } @@ -123,7 +123,7 @@ public class TimerExecutor * @param eventTimer * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - private boolean addRepeatingTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) + private boolean addRepeatingTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) { return addTimer(new TimerHolder<>(event, params, time, npc, player, true, eventTimer, _cancelListener, this)); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java index ab8fa150ca..0fcafba759 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java @@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.gameserver.instancemanager.TimersManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.TimerExecutor; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.events.TimerExecutor; public class TimerHolder implements Runnable { private final T _event; - private final StatsSet _params; + private final StatSet _params; private final long _time; private final Npc _npc; private final PlayerInstance _player; @@ -44,7 +44,7 @@ public class TimerHolder implements Runnable private final TimerExecutor _postExecutor; private final ScheduledFuture _task; - public TimerHolder(T event, StatsSet params, long time, Npc npc, PlayerInstance player, boolean isRepeating, IEventTimerEvent eventScript, IEventTimerCancel cancelScript, TimerExecutor postExecutor) + public TimerHolder(T event, StatSet params, long time, Npc npc, PlayerInstance player, boolean isRepeating, IEventTimerEvent eventScript, IEventTimerCancel cancelScript, TimerExecutor postExecutor) { Objects.requireNonNull(event, getClass().getSimpleName() + ": \"event\" cannot be null!"); Objects.requireNonNull(eventScript, getClass().getSimpleName() + ": \"script\" cannot be null!"); @@ -73,7 +73,7 @@ public class TimerHolder implements Runnable /** * @return the parameters of this timer */ - public StatsSet getParams() + public StatSet getParams() { return _params; } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index 4a017eaaa2..78b7d0eaa3 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; @@ -37,7 +37,7 @@ public class AppearanceHolder private final AppearanceTargetType _targetType; private final Integer _bodyPart; - public AppearanceHolder(StatsSet set) + public AppearanceHolder(StatSet set) { _visualId = set.getInt("id", 0); _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java index 29740873cd..0f9488448d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Nik @@ -43,7 +43,7 @@ public class AttachSkillHolder extends SkillHolder return _requiredSkillLevel; } - public static AttachSkillHolder fromStatsSet(StatsSet set) + public static AttachSkillHolder fromStatSet(StatSet set) { return new AttachSkillHolder(set.getInt("skillId"), set.getInt("skillLevel", 1), set.getInt("requiredSkillId"), set.getInt("requiredSkillLevel", 1)); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java index 885f202288..df26644763 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Set; import org.l2jmobius.gameserver.enums.SkillEnchantType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; /** @@ -37,7 +37,7 @@ public class EnchantSkillHolder private final Map _chance = new EnumMap<>(SkillEnchantType.class); private final Map> _requiredItems = new EnumMap<>(SkillEnchantType.class); - public EnchantSkillHolder(StatsSet set) + public EnchantSkillHolder(StatSet set) { _level = set.getInt("level"); _enchantFailLevel = set.getInt("enchantFailLevel"); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java index e6706c8467..33d14e4345 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Map; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -36,7 +36,7 @@ public class ExtendDropDataHolder private final List _conditions; private final Map _systemMessages; - public ExtendDropDataHolder(StatsSet set) + public ExtendDropDataHolder(StatSet set) { _id = set.getInt("id"); _items = set.getList("items", ExtendDropItemHolder.class); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java index 16454d764a..d63d4eb775 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -52,7 +52,7 @@ public class FakePlayerHolder private final int _clanId; private final int _pledgeStatus; - public FakePlayerHolder(StatsSet set) + public FakePlayerHolder(StatSet set) { _classId = set.getInt("classId", 182); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java index a9c72776cd..86af0c1405 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -29,7 +29,7 @@ public class ItemHolder implements IIdentifiable private final int _id; private final long _count; - public ItemHolder(StatsSet set) + public ItemHolder(StatSet set) { _id = set.getInt("id"); _count = set.getLong("count"); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java index 5b581c4cfe..a54dfa8300 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -25,7 +25,7 @@ public class ItemPointHolder extends ItemHolder { private final int _points; - public ItemPointHolder(StatsSet params) + public ItemPointHolder(StatSet params) { this(params.getInt("id"), params.getLong("count"), params.getInt("points")); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java index 22c6c327eb..0ba78224d3 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.holders; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -34,7 +34,7 @@ public class LuckyGameDataHolder private int _minModifyRewardGame; private int _maxModifyRewardGame; - public LuckyGameDataHolder(StatsSet params) + public LuckyGameDataHolder(StatSet params) { _index = params.getInt("index"); _turningPoints = params.getInt("turning_point"); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java index f77e380e8d..9fa8c99654 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.holders; import java.time.Duration; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -32,7 +32,7 @@ public class MinionHolder implements IIdentifiable private final long _respawnTime; private final int _weightPoint; - public MinionHolder(StatsSet set) + public MinionHolder(StatSet set) { _id = set.getInt("id"); _count = set.getInt("count", 1); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java index f4173594d1..36ac70176d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -52,7 +52,7 @@ public class MultisellListHolder implements IIdentifiable } @SuppressWarnings("unchecked") - public MultisellListHolder(StatsSet set) + public MultisellListHolder(StatSet set) { _listId = set.getInt("listId"); _isChanceMultisell = set.getBoolean("isChanceMultisell", false); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index f1b98ee9ac..ecd1069283 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -45,7 +45,7 @@ import org.l2jmobius.gameserver.enums.InstanceReenterType; import org.l2jmobius.gameserver.enums.InstanceTeleportType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -87,7 +87,7 @@ public class Instance implements IIdentifiable, INamable private final Set _players = ConcurrentHashMap.newKeySet(); // Players inside instance private final Set _npcs = ConcurrentHashMap.newKeySet(); // Spawned NPCs inside instance private final Map _doors = new HashMap<>(); // Spawned doors inside instance - private final StatsSet _parameters = new StatsSet(); + private final StatSet _parameters = new StatSet(); // Timers private final Map> _ejectDeadTasks = new ConcurrentHashMap<>(); private ScheduledFuture _cleanUpTask = null; @@ -171,7 +171,7 @@ public class Instance implements IIdentifiable, INamable * Get instance world parameters. * @return instance parameters */ - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } @@ -1020,7 +1020,7 @@ public class Instance implements IIdentifiable, INamable * Get parameters from instance template.
* @return template parameters */ - public StatsSet getTemplateParameters() + public StatSet getTemplateParameters() { return _template.getParameters(); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 2a196f73ef..b53b0a819d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.AbstractPlayerGroup; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -71,7 +71,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl private float _spRate = Config.RATE_INSTANCE_SP; private float _expPartyRate = Config.RATE_INSTANCE_PARTY_XP; private float _spPartyRate = Config.RATE_INSTANCE_PARTY_SP; - private StatsSet _parameters = StatsSet.EMPTY_STATSET; + private StatSet _parameters = StatSet.EMPTY_STATSET; private final Map _doors = new HashMap<>(); private final List _spawns = new ArrayList<>(); // Locations @@ -92,7 +92,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl /** * @param set */ - public InstanceTemplate(StatsSet set) + public InstanceTemplate(StatSet set) { _templateId = set.getInt("id", 0); _name = set.getString("name", null); @@ -178,7 +178,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (!set.isEmpty()) { - _parameters = new StatsSet(Collections.unmodifiableMap(set)); + _parameters = new StatSet(Collections.unmodifiableMap(set)); } } @@ -469,7 +469,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl * Get instance template parameters. * @return parameters of template */ - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java index 3b67ff72f4..3627959662 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; import java.util.function.BiConsumer; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public abstract class Condition { private final InstanceTemplate _template; - private final StatsSet _parameters; + private final StatSet _parameters; private final boolean _leaderOnly; private final boolean _showMessageAndHtml; private SystemMessageId _systemMsg = null; @@ -46,7 +46,7 @@ public abstract class Condition * @param onlyLeader flag which means if only leader should be affected (leader means player who wants to enter not group leader!) * @param showMessageAndHtml if {@code true} and HTML message is defined then both are send, otherwise only HTML or message is send */ - public Condition(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public Condition(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { _template = template; _parameters = parameters; @@ -58,7 +58,7 @@ public abstract class Condition * Gets parameters of condition. * @return set of parameters */ - protected final StatsSet getParameters() + protected final StatSet getParameters() { return _parameters; } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java index e379741b59..c27d92d662 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionCommandChannel extends Condition { - public ConditionCommandChannel(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionCommandChannel(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_CANNOT_ENTER_BECAUSE_YOU_ARE_NOT_ASSOCIATED_WITH_THE_CURRENT_COMMAND_CHANNEL); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java index ed434e3524..a828dcceae 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.model.AbstractPlayerGroup; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionCommandChannelLeader extends Condition { - public ConditionCommandChannelLeader(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionCommandChannelLeader(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java index d2a60816d0..423a37a94e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionDistance extends Condition { - public ConditionDistance(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionDistance(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); setSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED, (message, player) -> message.addString(player.getName())); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java index 3dc78a98c7..8aa68b7e08 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionGroupMax extends Condition { - public ConditionGroupMax(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionGroupMax(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_CANNOT_ENTER_DUE_TO_THE_PARTY_HAVING_EXCEEDED_THE_LIMIT); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java index f7930b1d8c..fde9d13439 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionGroupMin extends Condition { - public ConditionGroupMin(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionGroupMin(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_MUST_HAVE_A_MINIMUM_OF_S1_PEOPLE_TO_ENTER_THIS_INSTANCED_ZONE, (msg, player) -> msg.addInt(getLimit())); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 3088d8ae64..53fee609aa 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.enums.ResidenceType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; */ public class ConditionHasResidence extends Condition { - public ConditionHasResidence(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionHasResidence(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); } @@ -43,7 +43,7 @@ public class ConditionHasResidence extends Condition return false; } - final StatsSet params = getParameters(); + final StatSet params = getParameters(); final int id = params.getInt("id"); boolean test = false; switch (params.getEnum("type", ResidenceType.class)) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java index 4e1c407325..eed350db38 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -32,7 +32,7 @@ public class ConditionItem extends Condition private final long _count; private final boolean _take; - public ConditionItem(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionItem(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Load params diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java index 7d509a20c7..b38f8c0e2c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -32,7 +32,7 @@ public class ConditionLevel extends Condition private final int _min; private final int _max; - public ConditionLevel(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionLevel(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Load params diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java index b91deeffdb..d71e6d0a39 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; */ public class ConditionNoParty extends Condition { - public ConditionNoParty(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionNoParty(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java index dd31bf3ca5..5bf768a03e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionParty extends Condition { - public ConditionParty(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionParty(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java index 524a59675a..0363715536 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionPartyLeader extends Condition { - public ConditionPartyLeader(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionPartyLeader(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java index 481cb251ce..48d7fc7981 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.instancemanager.QuestManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionQuest extends Condition { - public ConditionQuest(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionQuest(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Set message diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 899b17aff9..a073129734 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionReenter extends Condition { - public ConditionReenter(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionReenter(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); setSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET, (message, player) -> message.addString(player.getName())); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java index ec255025c3..fafafe5604 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.itemauction; import java.util.Calendar; import java.util.concurrent.TimeUnit; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Forsaiken @@ -40,7 +40,7 @@ public class AuctionDateGenerator private int _hour_of_day; private int _minute_of_hour; - public AuctionDateGenerator(StatsSet config) + public AuctionDateGenerator(StatSet config) { _calendar = Calendar.getInstance(); _interval = config.getInt(FIELD_INTERVAL, -1); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 64bf0a6ff1..cb554e4dce 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.itemauction; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.idfactory.IdFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,9 +34,9 @@ public class AuctionItem private final int _itemId; private final long _itemCount; @SuppressWarnings("unused") - private final StatsSet _itemExtra; + private final StatSet _itemExtra; - public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatsSet itemExtra) + public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatSet itemExtra) { _auctionItemId = auctionItemId; _auctionLength = auctionLength; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 6dff6e3a4d..dc3a7f6f6b 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -44,7 +44,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -84,7 +84,7 @@ public class ItemAuctionInstance _items = new ArrayList<>(); final NamedNodeMap nanode = node.getAttributes(); - final StatsSet generatorConfig = new StatsSet(); + final StatSet generatorConfig = new StatSet(); for (int i = nanode.getLength(); i-- > 0;) { final Node n = nanode.item(i); @@ -115,7 +115,7 @@ public class ItemAuctionInstance throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } - final StatsSet itemExtra = new StatsSet(); + final StatSet itemExtra = new StatSet(); final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Armor.java index ac707b015b..c87f7ed45e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Armor.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.type.ArmorType; /** @@ -28,15 +28,15 @@ public class Armor extends Item /** * Constructor for Armor. - * @param set the StatsSet designating the set of couples (key,value) characterizing the armor. + * @param set the StatSet designating the set of couples (key,value) characterizing the armor. */ - public Armor(StatsSet set) + public Armor(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/EtcItem.java index 86d7291595..a902860c0d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/EtcItem.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -38,15 +38,15 @@ public class EtcItem extends Item /** * Constructor for EtcItem. - * @param set StatsSet designating the set of couples (key,value) for description of the Etc + * @param set StatSet designating the set of couples (key,value) for description of the Etc */ - public EtcItem(StatsSet set) + public EtcItem(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Henna.java index c669b86eec..c4c32e7cda 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -21,7 +21,7 @@ import java.util.EnumMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; @@ -45,7 +45,7 @@ public class Henna private final List _skills; private final List _wear_class; - public Henna(StatsSet set) + public Henna(StatSet set) { _dyeId = set.getInt("dyeId"); _dyeItemId = set.getInt("dyeItemId"); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Item.java index 4a5c714d97..7ed78ba385 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Item.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.enums.ItemGrade; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; @@ -175,14 +175,14 @@ public abstract class Item extends ListenersContainer implements IIdentifiable /** * Constructor of the Item that fill class variables.
*
- * @param set : StatsSet corresponding to a set of couples (key,value) for description of the item + * @param set : StatSet corresponding to a set of couples (key,value) for description of the item */ - protected Item(StatsSet set) + protected Item(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { _itemId = set.getInt("item_id"); _displayId = set.getInt("displayId", _itemId); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java index ab196007a8..3ca228cbe5 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -29,7 +29,7 @@ public class PlayerItemTemplate extends ItemHolder /** * @param set the set containing the values for this object */ - public PlayerItemTemplate(StatsSet set) + public PlayerItemTemplate(StatSet set) { super(set.getInt("id"), set.getInt("count")); _equipped = set.getBoolean("equipped", false); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Weapon.java index 16f0c47287..5f9f8507bd 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Weapon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.items; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ItemSkillType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -58,15 +58,15 @@ public class Weapon extends Item /** * Constructor for Weapon. - * @param set the StatsSet designating the set of couples (key,value) characterizing the weapon. + * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. */ - public Weapon(StatsSet set) + public Weapon(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java index 422054b245..aa1f33acce 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java @@ -23,7 +23,7 @@ import java.util.List; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -54,7 +54,7 @@ public class AppearanceStone private List _racesNot; private List _allVisualIds; - public AppearanceStone(StatsSet set) + public AppearanceStone(StatSet set) { _id = set.getInt("id"); _visualId = set.getInt("visualId", 0); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java index f3b53f1a67..a2897ba911 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.items.combination; import java.util.EnumMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -31,7 +31,7 @@ public class CombinationItem private final int _chance; private final Map _rewards = new EnumMap<>(CombinationItemType.class); - public CombinationItem(StatsSet set) + public CombinationItem(StatSet set) { _itemOne = set.getInt("one"); _itemTwo = set.getInt("two"); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java index 1cde38a6d6..a7f1326bd8 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.CrystalType; @@ -59,7 +59,7 @@ public abstract class AbstractEnchantItem private final int _maxEnchantLevel; private final double _bonusRate; - public AbstractEnchantItem(StatsSet set) + public AbstractEnchantItem(StatSet set) { _id = set.getInt("id"); if (getItem() == null) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java index 36ccf3a5a4..310a7643ec 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -40,7 +40,7 @@ public class EnchantScroll extends AbstractEnchantItem private final int _scrollGroupId; private Set _items; - public EnchantScroll(StatsSet set) + public EnchantScroll(StatSet set) { super(set); _scrollGroupId = set.getInt("scrollGroupId", 0); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java index c02095428b..978e38d533 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items.enchant; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.items.type.ItemType; @@ -30,7 +30,7 @@ public class EnchantSupportItem extends AbstractEnchantItem private final boolean _isGiant; private final ItemType type; - public EnchantSupportItem(StatsSet set) + public EnchantSupportItem(StatSet set) { super(set); type = getItem().getItemType(); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 714e3b3ac1..375bd2d16a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.data.xml.impl.CategoryData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.entity.Hero; @@ -61,7 +61,7 @@ public class Olympiad extends ListenersContainer protected static final Logger LOGGER = Logger.getLogger(Olympiad.class.getName()); protected static final Logger LOGGER_OLYMPIAD = Logger.getLogger("olympiad"); - private static final Map NOBLES = new ConcurrentHashMap<>(); + private static final Map NOBLES = new ConcurrentHashMap<>(); private static final Map NOBLES_RANK = new HashMap<>(); public static final String OLYMPIAD_HTML_PATH = "data/html/olympiad/"; @@ -229,10 +229,10 @@ public class Olympiad extends ListenersContainer PreparedStatement statement = con.prepareStatement(OLYMPIAD_LOAD_NOBLES); ResultSet rset = statement.executeQuery()) { - StatsSet statData; + StatSet statData; while (rset.next()) { - statData = new StatsSet(); + statData = new StatSet(); statData.set(CLASS_ID, rset.getInt(CLASS_ID)); statData.set(CHAR_NAME, rset.getString(CHAR_NAME)); statData.set(POINTS, rset.getInt(POINTS)); @@ -461,7 +461,7 @@ public class Olympiad extends ListenersContainer saveNobleData(); _period = 1; - final List heroesToBe = sortHerosToBe(); + final List heroesToBe = sortHerosToBe(); Hero.getInstance().resetData(); Hero.getInstance().computeNewHeroes(heroesToBe); @@ -495,7 +495,7 @@ public class Olympiad extends ListenersContainer return NOBLES.size(); } - public static StatsSet getNobleStats(int playerId) + public static StatSet getNobleStats(int playerId) { return NOBLES.get(playerId); } @@ -814,7 +814,7 @@ public class Olympiad extends ListenersContainer } int currentPoints; - for (StatsSet nobleInfo : NOBLES.values()) + for (StatSet nobleInfo : NOBLES.values()) { currentPoints = nobleInfo.getInt(POINTS); currentPoints += WEEKLY_POINTS; @@ -832,7 +832,7 @@ public class Olympiad extends ListenersContainer return; } - for (StatsSet nobleInfo : NOBLES.values()) + for (StatSet nobleInfo : NOBLES.values()) { nobleInfo.set(COMP_DONE_WEEK, 0); nobleInfo.set(COMP_DONE_WEEK_CLASSED, 0); @@ -868,9 +868,9 @@ public class Olympiad extends ListenersContainer try (Connection con = DatabaseFactory.getConnection()) { - for (Entry entry : NOBLES.entrySet()) + for (Entry entry : NOBLES.entrySet()) { - final StatsSet nobleInfo = entry.getValue(); + final StatSet nobleInfo = entry.getValue(); if (nobleInfo == null) { @@ -992,7 +992,7 @@ public class Olympiad extends ListenersContainer } } - protected List sortHerosToBe() + protected List sortHerosToBe() { if (_period != 1) { @@ -1000,8 +1000,8 @@ public class Olympiad extends ListenersContainer } LOGGER_OLYMPIAD.info("Noble,charid,classid,compDone,points"); - StatsSet nobleInfo; - for (Entry entry : NOBLES.entrySet()) + StatSet nobleInfo; + for (Entry entry : NOBLES.entrySet()) { nobleInfo = entry.getValue(); if (nobleInfo == null) @@ -1018,12 +1018,12 @@ public class Olympiad extends ListenersContainer LOGGER_OLYMPIAD.info(charName + "," + charId + "," + classId + "," + compDone + "," + points); } - final List heroesToBe = new LinkedList<>(); + final List heroesToBe = new LinkedList<>(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(OLYMPIAD_GET_HEROS)) { - StatsSet hero; + StatSet hero; for (int element : HERO_IDS) { statement.setInt(1, element); @@ -1032,7 +1032,7 @@ public class Olympiad extends ListenersContainer { if (rset.next()) { - hero = new StatsSet(); + hero = new StatSet(); hero.set(CLASS_ID, element); hero.set(CHAR_ID, rset.getInt(CHAR_ID)); hero.set(CHAR_NAME, rset.getString(CHAR_NAME)); @@ -1086,7 +1086,7 @@ public class Olympiad extends ListenersContainer return 0; } - final StatsSet noble = NOBLES.get(objectId); + final StatSet noble = NOBLES.get(objectId); if ((noble == null) || (noble.getInt(POINTS) == 0)) { return 0; @@ -1136,7 +1136,7 @@ public class Olympiad extends ListenersContainer { if (!NOBLES.containsKey(player.getObjectId())) { - final StatsSet statDat = new StatsSet(); + final StatSet statDat = new StatSet(); statDat.set(CLASS_ID, player.getBaseClass()); statDat.set(CHAR_NAME, player.getName()); statDat.set(POINTS, DEFAULT_POINTS); @@ -1318,7 +1318,7 @@ public class Olympiad extends ListenersContainer * @param data the stats set data to add. * @return the old stats set if the noble is already present, null otherwise. */ - public static StatsSet addNobleStats(int charId, StatsSet data) + public static StatSet addNobleStats(int charId, StatSet data) { return NOBLES.put(charId, data); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Participant.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Participant.java index 670066ac32..b6d879b902 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Participant.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Participant.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.olympiad; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class Participant private final int baseClass; private boolean disconnected = false; private boolean defaulted = false; - private final StatsSet stats; + private final StatSet stats; public String clanName; public int clanId; @@ -125,7 +125,7 @@ public class Participant /** * @return the stats */ - public StatsSet getStats() + public StatSet getStats() { return stats; } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java index 4d5231ca5d..c1fb0f88f6 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.primeshop; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -49,7 +49,7 @@ public class PrimeShopGroup private final int _availableCount; private final List _items; - public PrimeShopGroup(StatsSet set, List items) + public PrimeShopGroup(StatSet set, List items) { _brId = set.getInt("id"); _category = set.getInt("cat", 0); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java index d150ec98cd..88795e0721 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.residences; import java.time.Duration; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -33,7 +33,7 @@ public class ResidenceFunctionTemplate private final Duration _duration; private final double _value; - public ResidenceFunctionTemplate(StatsSet set) + public ResidenceFunctionTemplate(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java index 4f15efda0b..b19f8e59d5 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; /** @@ -34,7 +34,7 @@ public class ShuttleDataHolder private final List _stops = new ArrayList<>(2); private final List _routes = new ArrayList<>(2); - public ShuttleDataHolder(StatsSet set) + public ShuttleDataHolder(StatSet set) { _id = set.getInt("id"); _loc = new Location(set); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/Skill.java index c44b45a781..0e97466a3a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.handler.IAffectScopeHandler; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.CubicInstance; @@ -210,7 +210,7 @@ public class Skill implements IIdentifiable private final SkillBuffType _buffType; private final boolean _displayInList; - public Skill(StatsSet set) + public Skill(StatSet set) { _id = set.getInt(".id"); _level = set.getInt(".level"); @@ -391,7 +391,7 @@ public class Skill implements IIdentifiable _toggleGroupId = set.getInt("toggleGroupId", -1); _attachToggleGroupId = set.getInt("attachToggleGroupId", -1); - _attachSkills = set.getList("attachSkillList", StatsSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatsSet).collect(Collectors.toList()); + _attachSkills = set.getList("attachSkillList", StatSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatSet).collect(Collectors.toList()); final String abnormalResist = set.getString("abnormalResists", null); if (abnormalResist != null) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java index bfc25bddde..39b738dbca 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.ChanceLocation; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory; /** * @author UnAfraid */ -public class NpcSpawnTemplate implements Cloneable, IParameterized +public class NpcSpawnTemplate implements Cloneable, IParameterized { private static final Logger LOGGER = Logger.getLogger(NpcSpawnTemplate.class.getName()); @@ -56,7 +56,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized private final Duration _respawnTimeRandom; private List _locations; private SpawnTerritory _zone; - private StatsSet _parameters; + private StatSet _parameters; private final boolean _spawnAnimation; private final boolean _saveInDB; private final String _dbName; @@ -82,7 +82,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized _minions = template._minions; } - public NpcSpawnTemplate(SpawnTemplate spawnTemplate, SpawnGroup group, StatsSet set) + public NpcSpawnTemplate(SpawnTemplate spawnTemplate, SpawnGroup group, StatSet set) { _spawnTemplate = spawnTemplate; _group = group; @@ -128,14 +128,14 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized mergeParameters(spawnTemplate, group); } - private StatsSet mergeParameters(SpawnTemplate spawnTemplate, SpawnGroup group) + private StatSet mergeParameters(SpawnTemplate spawnTemplate, SpawnGroup group) { if ((_parameters == null) && (spawnTemplate.getParameters() == null) && (group.getParameters() == null)) { return null; } - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); if (spawnTemplate.getParameters() != null) { set.merge(spawnTemplate.getParameters()); @@ -206,13 +206,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized } @Override - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } @Override - public void setParameters(StatsSet parameters) + public void setParameters(StatSet parameters) { if (_parameters == null) { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java index 6723863c93..7ceb2d46af 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IParameterized; import org.l2jmobius.gameserver.model.interfaces.ITerritorized; @@ -31,16 +31,16 @@ import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory; /** * @author UnAfraid */ -public class SpawnGroup implements Cloneable, ITerritorized, IParameterized +public class SpawnGroup implements Cloneable, ITerritorized, IParameterized { private final String _name; private final boolean _spawnByDefault; private List _territories; private List _bannedTerritories; private final List _spawns = new ArrayList<>(); - private StatsSet _parameters; + private StatSet _parameters; - public SpawnGroup(StatsSet set) + public SpawnGroup(StatSet set) { this(set.getString("name", null), set.getBoolean("spawnByDefault", true)); } @@ -104,13 +104,13 @@ public class SpawnGroup implements Cloneable, ITerritorized, IParameterized +public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized { private final String _name; private final String _ai; @@ -45,9 +45,9 @@ public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized _territories; private List _bannedTerritories; private final List _groups = new ArrayList<>(); - private StatsSet _parameters; + private StatSet _parameters; - public SpawnTemplate(StatsSet set, File file) + public SpawnTemplate(StatSet set, File file) { this(set.getString("name", null), set.getString("ai", null), set.getBoolean("spawnByDefault", true), file); } @@ -128,13 +128,13 @@ public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized _castleId; - public TeleportLocation(int id, StatsSet set) + public TeleportLocation(int id, StatSet set) { super(set); _id = id; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java index 916ae0790c..33cf6ac3bc 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.variables; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.IRestorable; import org.l2jmobius.gameserver.model.interfaces.IStorable; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.interfaces.IStorable; /** * @author UnAfraid */ -public abstract class AbstractVariables extends StatsSet implements IRestorable, IStorable, IDeletable +public abstract class AbstractVariables extends StatSet implements IRestorable, IStorable, IDeletable { private final AtomicBoolean _hasChanges = new AtomicBoolean(false); @@ -41,42 +41,42 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, */ @Override - public StatsSet set(String name, boolean value) + public StatSet set(String name, boolean value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, double value) + public StatSet set(String name, double value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, Enum value) + public StatSet set(String name, Enum value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, int value) + public StatSet set(String name, int value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, long value) + public StatSet set(String name, long value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, String value) + public StatSet set(String name, String value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); @@ -89,7 +89,7 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, * @param markAsChanged * @return */ - public StatsSet set(String name, String value, boolean markAsChanged) + public StatSet set(String name, String value, boolean markAsChanged) { if (markAsChanged) { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index a057b3e170..e54c80dbfd 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExHeroList implements IClientOutgoingPacket { - private final Map _heroList; + private final Map _heroList; public ExHeroList() { @@ -42,7 +42,7 @@ public class ExHeroList implements IClientOutgoingPacket OutgoingPackets.EX_HERO_LIST.writeId(packet); packet.writeD(_heroList.size()); - for (StatsSet hero : _heroList.values()) + for (StatSet hero : _heroList.values()) { packet.writeS(hero.getString(Olympiad.CHAR_NAME)); packet.writeD(hero.getInt(Olympiad.CLASS_ID)); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/BypassParser.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/BypassParser.java index 414125bdeb..a80323ba1f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/BypassParser.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/BypassParser.java @@ -20,12 +20,12 @@ import java.util.LinkedHashMap; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid */ -public class BypassParser extends StatsSet +public class BypassParser extends StatSet { private static final String ALLOWED_CHARS = "a-zA-Z0-9-_`!@#%^&*()\\[\\]|\\\\/"; private static final Pattern PATTERN = Pattern.compile(String.format("([%s]*)=('([%s ]*)'|[%s]*)", ALLOWED_CHARS, ALLOWED_CHARS, ALLOWED_CHARS)); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java index 2ceebc156a..a3f07a6ad5 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java @@ -18,7 +18,7 @@ package ai.areas.BeastFarm; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -133,7 +133,7 @@ public class ImprovedBabyPets extends AbstractNpcAI private boolean castBuff(Summon summon, int stepNumber, int buffNumber) { final PlayerInstance owner = summon.getOwner(); - final StatsSet parameters = summon.getTemplate().getParameters(); + final StatSet parameters = summon.getTemplate().getParameters(); final SkillHolder skill = parameters.getObject("step" + stepNumber + "_buff0" + buffNumber, SkillHolder.class); if ((skill != null) && (owner != null)) @@ -174,7 +174,7 @@ public class ImprovedBabyPets extends AbstractNpcAI { final boolean previousFollowStatus = summon.getFollowStatus(); final PlayerInstance owner = summon.getOwner(); - final StatsSet parameters = summon.getTemplate().getParameters(); + final StatSet parameters = summon.getTemplate().getParameters(); final SkillHolder skill = parameters.getObject("step" + stepNumber + "_heal0" + healNumber, SkillHolder.class); final int targetType = parameters.getInt("step" + stepNumber + "_heal_target0" + healNumber, 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java index efdbdd4460..9ff1875b62 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java @@ -18,7 +18,7 @@ package ai.areas.FairySettlement; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -50,11 +50,11 @@ public class Wisp extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("DELETE_NPC")) { - params = new StatsSet(); + params = new StatSet(); params.set("LOCATION_OBJECT", npc.getLocation()); getTimers().addTimer("RESPAWN_WISP_" + npc.getObjectId(), params, getRandom(RESPAWN_MIN, RESPAWN_MAX), null, null); npc.deleteMe(); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java index 5cd6622513..b52be69c96 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java @@ -19,7 +19,7 @@ package ai.areas.Parnassus.EntrancePortalToCrystalCaverns; import java.util.Calendar; import org.l2jmobius.gameserver.instancemanager.QuestManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -107,7 +107,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("LOOP_TIMER")) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/SeedOfHellfire/Zofan.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/SeedOfHellfire/Zofan.java index b6c122da75..03f451c9fd 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/SeedOfHellfire/Zofan.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/SeedOfHellfire/Zofan.java @@ -16,7 +16,7 @@ */ package ai.areas.SeedOfHellfire; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -61,7 +61,7 @@ public class Zofan extends AbstractNpcAI { if ((npc.getInstanceWorld() == null) && (npc.getSpawn() != null)) { - final StatsSet params = npc.getParameters(); + final StatSet params = npc.getParameters(); if (params.getInt("i_childrengarden_guard", 0) == 0) { for (String param : MINION_PARAMS) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Allada.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Allada.java index 5ccca8c99a..4291aeb5ec 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Allada.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Allada.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -45,7 +45,7 @@ public class Allada extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Mei.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Mei.java index 015ee0bc9a..7ad9623ec2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Mei.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Mei.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -40,7 +40,7 @@ public class Mei extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SHOUT")) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Remons.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Remons.java index 41ec3c1bff..a1ea6ba90c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Remons.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Remons.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -43,7 +43,7 @@ public class Remons extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rinne.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rinne.java index 55ab4fc1a7..1d6eafa48a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rinne.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rinne.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -42,7 +42,7 @@ public class Rinne extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rotina.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rotina.java index 24ad1b6041..d0c8f2a81b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rotina.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rotina.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -45,7 +45,7 @@ public class Rotina extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Soros.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Soros.java index d7862030aa..632d1a78a8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Soros.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Soros.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -40,7 +40,7 @@ public class Soros extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java index cbe7cc9ac9..4a2aaf21c4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java @@ -17,7 +17,7 @@ package ai.areas.WallOfArgos.ElmoredenServantsGhost; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -58,7 +58,7 @@ public class ElmoredenServantsGhost extends AbstractNpcAI takeItems(player, USED_GRAVE_PASS, 1); final Location loc; - final StatsSet npcParameters = npc.getParameters(); + final StatSet npcParameters = npc.getParameters(); if (event.equals("teleport1")) { loc = new Location(npcParameters.getInt("TelPos_X1", 0), npcParameters.getInt("TelPos_Y1", 0), npcParameters.getInt("TelPos_Z1", 0)); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java index aca502d2cc..a46695ea27 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -341,7 +341,7 @@ public class Anakim extends AbstractNpcAI addSkillSeeId(ALL_MOBS); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANAKIM); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM); final int status = GrandBossManager.getInstance().getBossStatus(ANAKIM); if (status == DEAD) { @@ -613,9 +613,9 @@ public class Anakim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(ANAKIM, DEAD); final long respawnTime = getRespawnTime(); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANAKIM); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(ANAKIM, info); + GrandBossManager.getInstance().setStatSet(ANAKIM, info); startQuestTimer("unlock_anakim", respawnTime, null, null); startQuestTimer("end_anakim", 900000, null, null); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index b837d839d8..d12c29d422 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -138,7 +138,7 @@ public class Antharas extends AbstractNpcAI addAttackId(ANTHARAS, BOMBER, BEHEMOTH, TERASQUE); addKillId(ANTHARAS, TERASQUE, BEHEMOTH); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANTHARAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANTHARAS); final double curr_hp = info.getDouble("currentHP"); final double curr_mp = info.getDouble("currentMP"); final int loc_x = info.getInt("loc_x"); @@ -761,7 +761,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(PlayerInstance attacker, int damage) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Baium/Baium.java index c0d8221ff5..1d319f5910 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -112,7 +112,7 @@ public class Baium extends AbstractNpcAI addSeeCreatureId(BAIUM); addSpellFinishedId(BAIUM); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(BAIUM); + final StatSet info = GrandBossManager.getInstance().getStatSet(BAIUM); switch (getStatus()) { @@ -666,7 +666,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java index 768ebbc11d..ebf5e78a5a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -122,7 +122,7 @@ public class BalokWarzone extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (isInInstance(world)) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java index 9919e58ce5..e8a2e67509 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java @@ -17,7 +17,7 @@ package ai.bosses.Baylor; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -77,7 +77,7 @@ public class BaylorWarzone extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (isInInstance(world)) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java index 1e80c81840..e8e9fa8756 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; @@ -104,7 +104,7 @@ public class Beleth extends AbstractNpcAI addStartNpc(STONE_COFFIN); addTalkId(STONE_COFFIN); addFirstTalkId(ELF); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(REAL_BELETH); + final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH); if (status == DEAD) { @@ -750,9 +750,9 @@ public class Beleth extends AbstractNpcAI setBelethKiller(killer); GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD); final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(REAL_BELETH); + final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(REAL_BELETH, info); + GrandBossManager.getInstance().setStatSet(REAL_BELETH, info); startQuestTimer("BELETH_UNLOCK", respawnTime, null, null); deleteAll(); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Core/Core.java index bfa7212b8c..c1452bf9de 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; @@ -85,7 +85,7 @@ public class Core extends AbstractNpcAI registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR); _firstAttacked = false; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. @@ -205,9 +205,9 @@ public class Core extends AbstractNpcAI final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000; startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(CORE, info); + GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java index 6ef025304c..764df30625 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -175,7 +175,7 @@ public class IceQueensCastleBattle extends AbstractInstance final Instance world = npc.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); final Npc controller = params.getObject("controller", Npc.class); final Npc freya = params.getObject("freya", Npc.class); switch (event) @@ -734,7 +734,7 @@ public class IceQueensCastleBattle extends AbstractInstance final Instance world = npc.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); switch (npc.getId()) { case FREYA_THRONE: @@ -1069,7 +1069,7 @@ public class IceQueensCastleBattle extends AbstractInstance final Instance world = npc.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); final Npc controller = params.getObject("controller", Npc.class); switch (npc.getId()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java index dc6e826093..b863874cd2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.AggroInfo; import org.l2jmobius.gameserver.model.DamageDoneInfo; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -153,13 +153,13 @@ public class IstinaCavern extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); - final StatsSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); switch (event) { case "DEATH_TIMER": @@ -391,7 +391,7 @@ public class IstinaCavern extends AbstractInstance } else { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); if (skillId == npcParams.getSkillHolder("Istina_Death_Skill01").getSkillId()) { @@ -440,7 +440,7 @@ public class IstinaCavern extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int stage = npcVars.getInt("ISTINA_STAGE", -1); if (npc.getId() == BALLISTA) @@ -657,7 +657,7 @@ public class IstinaCavern extends AbstractInstance private PlayerInstance setPlayerRewardInfo(Npc npc) { final Map rewards = new ConcurrentHashMap<>(); - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); PlayerInstance maxDealer = null; long maxDamage = 0; int totalDamage = 0; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index 61b663a0f3..7aebfa337d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -116,7 +116,7 @@ public class Kelbim extends AbstractNpcAI addKillId(KELBIM); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(KELBIM); + final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM); final int status = GrandBossManager.getInstance().getBossStatus(KELBIM); if (status == DEAD) { @@ -429,9 +429,9 @@ public class Kelbim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(KELBIM, DEAD); final long respawnTime = (Config.KELBIM_SPAWN_INTERVAL + getRandom(-Config.KELBIM_SPAWN_RANDOM, Config.KELBIM_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(KELBIM); + final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(KELBIM, info); + GrandBossManager.getInstance().setStatSet(KELBIM, info); startQuestTimer("unlock_kelbim", respawnTime, null, null); startQuestTimer("end_kelbim", 1800000, null, null); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java index 31be0ec32d..f023ad5f8e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java @@ -19,7 +19,7 @@ package ai.bosses.Kimerian; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -83,7 +83,7 @@ public class KimerianCommon extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) @@ -345,8 +345,8 @@ public class KimerianCommon extends AbstractInstance { final Creature creature = event.getSeen(); final Npc npc = (Npc) event.getSeer(); - final StatsSet npcParams = npc.getParameters(); - final StatsSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java index 9fbe2e6026..51ffd45923 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -367,7 +367,7 @@ public class Lilith extends AbstractNpcAI addSkillSeeId(ALL_MOBS); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LILITH); + final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH); final int status = GrandBossManager.getInstance().getBossStatus(LILITH); if (status == DEAD) { @@ -629,9 +629,9 @@ public class Lilith extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LILITH, DEAD); final long respawnTime = getRespawnTime(); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LILITH); + final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(LILITH, info); + GrandBossManager.getInstance().setStatSet(LILITH, info); startQuestTimer("unlock_lilith", respawnTime, null, null); startQuestTimer("end_lilith", 900000, null, null); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index 9ef473069d..cc00a33356 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -244,7 +244,7 @@ public class Lindvior extends AbstractNpcAI addSeeCreatureId(INVISIBLE); _zoneLair = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LINDVIOR_RAID); + final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID); final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID); if (status == DEAD) { @@ -821,9 +821,9 @@ public class Lindvior extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD); final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LINDVIOR_RAID); + final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(LINDVIOR_RAID, info); + GrandBossManager.getInstance().setStatSet(LINDVIOR_RAID, info); startQuestTimer("unlock_lindvior", respawnTime, null, null); } else if (npc.getId() == NPC_GENERATOR) @@ -867,7 +867,7 @@ public class Lindvior extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SHOUT") && (npc != null) && !npc.isDead()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/LionelHunter.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/LionelHunter.java index e02f478232..0677792823 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/LionelHunter.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/LionelHunter.java @@ -18,7 +18,7 @@ package ai.bosses.Lindvior; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.WalkingManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -43,7 +43,7 @@ public class LionelHunter extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SHOUT") && (npc != null)) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java index b9c19644c4..c5c62c8f2f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -152,13 +152,13 @@ public class OctavisWarzone extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (isInInstance(world)) { - final StatsSet npcVars = npc.getVariables(); - final StatsSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); switch (event) { @@ -378,7 +378,7 @@ public class OctavisWarzone extends AbstractInstance } else if (CommonUtil.contains(OCTAVIS_STAGE_2, npc.getId())) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); if (npcVars.getBoolean("START_TIMERS", true)) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index 38eebefc7b..5e525a6caa 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -92,7 +92,7 @@ public class Orfen extends AbstractNpcAI registerMobs(mobs); _IsTeleported = false; ZONE = ZoneManager.getInstance().getZoneById(12013); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); final int status = GrandBossManager.getInstance().getBossStatus(ORFEN); if (status == DEAD) { @@ -327,9 +327,9 @@ public class Orfen extends AbstractNpcAI respawnTime *= 3600000; startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(ORFEN, info); + GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); startQuestTimer("despawn_minions", 20000, null, null); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index c2564917c7..b9fdddaaf7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; @@ -91,7 +91,7 @@ public class QueenAnt extends AbstractNpcAI addFactionCallId(NURSE); _zone = ZoneManager.getInstance().getZoneById(12012); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); final int status = GrandBossManager.getInstance().getBossStatus(QUEEN); if (status == DEAD) { @@ -367,9 +367,9 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("action", npc, null); cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(QUEEN, info); + GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); _larva.deleteMe(); _larva = null; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java index 6cad246a41..e154809d9c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java @@ -19,7 +19,7 @@ package ai.bosses.Spezion.Cannon; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -171,7 +171,7 @@ public class Cannon extends AbstractNpcAI { if (skill.getId() == PRESENT_SKILL.getSkillId()) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); npc.broadcastPacket(new Earthquake(npc, 10, 5)); npc.broadcastPacket(new OnEventTrigger(npcParams.getInt("TRIGGER_ID"), true)); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java index 086615be42..4af559d521 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -105,13 +105,13 @@ public class TeredorWarzone extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); - final StatsSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); switch (event) { @@ -236,7 +236,7 @@ public class TeredorWarzone extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); switch (npc.getId()) { @@ -292,7 +292,7 @@ public class TeredorWarzone extends AbstractInstance if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); switch (npc.getId()) { @@ -472,7 +472,7 @@ public class TeredorWarzone extends AbstractInstance { case TEREDOR: { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int hpPer = npc.getCurrentHpPercent(); int teredorStatus = npcVars.getInt("TEREDOR_STATUS", 1); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java index 9d9a79d53a..1610356a26 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -322,7 +322,7 @@ public class Trasken extends AbstractNpcAI DoorData.getInstance().getDoor(DOOR).openMe(); } // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(TRASKEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN); final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN); if (status == DEAD) { @@ -603,9 +603,9 @@ public class Trasken extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD); final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(TRASKEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(TRASKEN, info); + GrandBossManager.getInstance().setStatSet(TRASKEN, info); startQuestTimer("unlock_trasken", respawnTime, null, null); break; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java index 9414859da4..7233381898 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; @@ -123,7 +123,7 @@ public class Valakas extends AbstractNpcAI registerMobs(VALAKAS); ZONE = ZoneManager.getInstance().getZoneById(12010); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(VALAKAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); final int status = GrandBossManager.getInstance().getBossStatus(VALAKAS); if (status == DEAD) @@ -446,9 +446,9 @@ public class Valakas extends AbstractNpcAI final long respawnTime = (Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM)) * 3600000; startQuestTimer("valakas_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(VALAKAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(VALAKAS, info); + GrandBossManager.getInstance().setStatSet(VALAKAS, info); return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java index c73ef9d83c..703e55428a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -189,8 +189,8 @@ public class CavernOfThePirateCaptain extends AbstractInstance final Instance world = npc.getInstanceWorld(); if (world != null) { - final StatsSet templParams = world.getTemplateParameters(); - final StatsSet params = world.getParameters(); + final StatSet templParams = world.getTemplateParameters(); + final StatSet params = world.getParameters(); switch (event) { case "BURN_BLUE": diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/AreaSkillNpc.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/AreaSkillNpc.java index 155cfb90b1..bf17680d0b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/AreaSkillNpc.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/AreaSkillNpc.java @@ -17,7 +17,7 @@ package ai.others; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -115,7 +115,7 @@ public class AreaSkillNpc extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java index 01b37387a8..ef9e26a221 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -101,7 +101,7 @@ public class CastleTeleporter extends AbstractNpcAI if (st.hasMoreTokens()) { final int unknowInt = Integer.parseInt(st.nextToken()); - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); Location teleLoc = null; switch (unknowInt) { @@ -191,7 +191,7 @@ public class CastleTeleporter extends AbstractNpcAI return htmltext; } - private Location getTeleportLocation(StatsSet npcParams, String paramName1, String paramName2, String paramName3) + private Location getTeleportLocation(StatSet npcParams, String paramName1, String paramName2, String paramName3) { final Location loc; if (getRandom(100) < 33) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java index b1355fa9c5..c05c1b184b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java @@ -16,7 +16,7 @@ */ package ai.others.NpcBuffers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ class NpcBufferSkillData private final int _scaleToLevel; private final int _initialDelay; - NpcBufferSkillData(StatsSet set) + NpcBufferSkillData(StatSet set) { _skill = new SkillHolder(set.getInt("id"), set.getInt("level")); _scaleToLevel = set.getInt("scaleToLevel", -1); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java index dd7f4187be..ecae9d2861 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -54,7 +54,7 @@ class NpcBuffersData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node attr; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -75,7 +75,7 @@ class NpcBuffersData implements IXmlReader case "skill": { attrs = c.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { attr = attrs.item(i); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Servitors/ClanFlag.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Servitors/ClanFlag.java index 558d57b407..b09a5f38e9 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Servitors/ClanFlag.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Servitors/ClanFlag.java @@ -17,7 +17,7 @@ package ai.others.Servitors; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -51,7 +51,7 @@ public class ClanFlag extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java index 55c9613eab..a50c042b7f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -68,7 +68,7 @@ public class GateOfUnlimitedSummoning extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java index f19f5dea69..c817501830 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java @@ -17,7 +17,7 @@ package ai.others.Servitors; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -52,7 +52,7 @@ public class TreeOfLife extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (player != null) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java index 3ee8063427..ee96be41d8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -91,7 +91,7 @@ public class TersisHerald extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("DESPAWN_NPCS")) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index 2e5331f903..55dc363405 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.zone.type.NoRestartZone; @@ -309,7 +309,7 @@ public class AdminGrandBoss implements IAdminCommandHandler } } - final StatsSet info = GrandBossManager.getInstance().getStatsSet(grandBossId); + final StatSet info = GrandBossManager.getInstance().getStatSet(grandBossId); final String bossRespawn = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(info.getLong("respawn_time")); final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java index 1fe6c7c424..807c4c6ab4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java @@ -19,7 +19,7 @@ package handlers.admincommandhandlers; import java.util.StringTokenizer; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -114,7 +114,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.getNobleLevel() > 0) { - final StatsSet statDat = getPlayerSet(player); + final StatSet statDat = getPlayerSet(player); final int oldpoints = Olympiad.getInstance().getNoblePoints(player); final int points = Math.max(oldpoints + val, 0); if (points > 1000) @@ -155,7 +155,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.getNobleLevel() > 0) { - final StatsSet playerStat = Olympiad.getNobleStats(player.getObjectId()); + final StatSet playerStat = Olympiad.getNobleStats(player.getObjectId()); if (playerStat == null) { BuilderUtil.sendSysMessage(activeChar, "This player hasn't played on Olympiad yet!"); @@ -197,7 +197,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.getNobleLevel() > 0) { - final StatsSet statDat = getPlayerSet(player); + final StatSet statDat = getPlayerSet(player); final int oldpoints = Olympiad.getInstance().getNoblePoints(player); final int points = oldpoints - val; if ((points < 1) && (points > 1000)) @@ -237,12 +237,12 @@ public class AdminOlympiad implements IAdminCommandHandler return Integer.decode(token); } - private StatsSet getPlayerSet(PlayerInstance player) + private StatSet getPlayerSet(PlayerInstance player) { - StatsSet statDat = Olympiad.getNobleStats(player.getObjectId()); + StatSet statDat = Olympiad.getNobleStats(player.getObjectId()); if (statDat == null) { - statDat = new StatsSet(); + statDat = new StatSet(); statDat.set(Olympiad.CLASS_ID, player.getBaseClass()); statDat.set(Olympiad.CHAR_NAME, player.getName()); statDat.set(Olympiad.POINTS, Olympiad.DEFAULT_POINTS); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java index d8a3d6e5ce..6382651e6c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java @@ -19,7 +19,7 @@ package handlers.conditions; import java.util.List; import org.l2jmobius.gameserver.enums.CategoryType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -31,7 +31,7 @@ public class CategoryTypeCondition implements ICondition { private final List _categoryTypes; - public CategoryTypeCondition(StatsSet params) + public CategoryTypeCondition(StatSet params) { _categoryTypes = params.getEnumList("category", CategoryType.class); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java index b24cfa0f14..9a14cb6fa2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java @@ -16,7 +16,7 @@ */ package handlers.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -29,7 +29,7 @@ public class NpcLevelCondition implements ICondition private final int _minLevel; private final int _maxLevel; - public NpcLevelCondition(StatsSet params) + public NpcLevelCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java index afffe7a0c5..9e3deaa8ce 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java @@ -16,7 +16,7 @@ */ package handlers.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -29,7 +29,7 @@ public class PlayerLevelCondition implements ICondition private final int _minLevel; private final int _maxLevel; - public PlayerLevelCondition(StatsSet params) + public PlayerLevelCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 09f609dc37..0e81066579 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -32,7 +32,7 @@ public class AbnormalShield extends AbstractEffect { private final int _times; - public AbnormalShield(StatsSet params) + public AbnormalShield(StatSet params) { _times = params.getInt("times", -1); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 0496c9068d..9c508c8c52 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Objects; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class AbnormalTimeChange extends AbstractEffect private final int _time; private final int _mode; - public AbnormalTimeChange(StatsSet params) + public AbnormalTimeChange(StatSet params) { final String abnormals = params.getString("slot", null); if ((abnormals != null) && !abnormals.isEmpty()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 98f85c7b21..3f9132b8e3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -37,7 +37,7 @@ public class AbsorbDamage extends AbstractEffect private final double _damage; private static final Map _damageHolder = new ConcurrentHashMap<>(); - public AbsorbDamage(StatsSet params) + public AbsorbDamage(StatSet params) { _damage = params.getDouble("damage", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 26f51d5351..86fef7cf6d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; @@ -38,7 +38,7 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect private final int _hpPercent; private final Map _updates = new ConcurrentHashMap<>(); - protected AbstractConditionalHpEffect(StatsSet params, Stat stat) + protected AbstractConditionalHpEffect(StatSet params, Stat stat) { super(params, stat); _hpPercent = params.getInt("hpPercent", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java index 2e40124e39..f010f84271 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AbstractStatAddEffect extends AbstractEffect private final Stat _stat; protected final double _amount; - public AbstractStatAddEffect(StatsSet params, Stat stat) + public AbstractStatAddEffect(StatSet params, Stat stat) { _stat = stat; _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index da6a575c44..29e439684b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; @@ -42,12 +42,12 @@ public abstract class AbstractStatEffect extends AbstractEffect protected final StatModifierType _mode; protected final List _conditions = new ArrayList<>(); - public AbstractStatEffect(StatsSet params, Stat stat) + public AbstractStatEffect(StatSet params, Stat stat) { this(params, stat, stat); } - public AbstractStatEffect(StatsSet params, Stat mulStat, Stat addStat) + public AbstractStatEffect(StatSet params, Stat mulStat, Stat addStat) { _addStat = addStat; _mulStat = mulStat; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java index 9811f395aa..33d08bff36 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AbstractStatPercentEffect extends AbstractEffect private final Stat _stat; protected final double _amount; - public AbstractStatPercentEffect(StatsSet params, Stat stat) + public AbstractStatPercentEffect(StatSet params, Stat stat) { _stat = stat; _amount = params.getDouble("amount", 1); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java index 539814ef2a..79c022a23c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class Accuracy extends AbstractStatEffect { - public Accuracy(StatsSet params) + public Accuracy(StatSet params) { super(params, Stat.ACCURACY_COMBAT); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index 0c1fcbd92b..48d69968c5 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddHate extends AbstractEffect private final double _power; private final boolean _affectSummoner; - public AddHate(StatsSet params) + public AddHate(StatSet params) { _power = params.getDouble("power", 0); _affectSummoner = params.getBoolean("affectSummoner", false); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java index e90d5cc7f3..324927947a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddSkillBySkill extends AbstractEffect private final int _existingSkillLevel; private final SkillHolder _addedSkill; - public AddSkillBySkill(StatsSet params) + public AddSkillBySkill(StatSet params) { _existingSkillId = params.getInt("existingSkillId"); _existingSkillLevel = params.getInt("existingSkillLevel"); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index bdd8314dd7..205bc82200 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddTeleportBookmarkSlot extends AbstractEffect { private final int _amount; - public AddTeleportBookmarkSlot(StatsSet params) + public AddTeleportBookmarkSlot(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java index c26ec5442f..658931ecb2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionCp extends AbstractStatAddEffect { - public AdditionalPotionCp(StatsSet params) + public AdditionalPotionCp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_CP); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java index 6b68e40f32..57d54c7d3b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionHp extends AbstractStatAddEffect { - public AdditionalPotionHp(StatsSet params) + public AdditionalPotionHp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_HP); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java index c9e1cc237e..007547ebe7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionMp extends AbstractStatAddEffect { - public AdditionalPotionMp(StatsSet params) + public AdditionalPotionMp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_MP); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index cbbd845e23..c01bdec653 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -22,7 +22,7 @@ import java.util.Map; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -78,7 +78,7 @@ public class AirBind extends AbstractEffect _chainedAirSkills.put(ClassId.AEORE_SHILLIEN_SAINT, 11999); // Heavy Hit } - public AirBind(StatsSet params) + public AirBind(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java index f5cbb63465..9255ba1877 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AreaDamage extends AbstractStatAddEffect { - public AreaDamage(StatsSet params) + public AreaDamage(StatSet params) { super(params, Stat.DAMAGE_ZONE_VULN); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java index 2ded14e7ae..a5d56477f5 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AttackAttribute extends AbstractEffect private final AttributeType _attribute; private final double _amount; - public AttackAttribute(StatsSet params) + public AttackAttribute(StatSet params) { _amount = params.getDouble("amount", 0); _attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java index ff58d09cc7..795366850d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class AttackAttributeAdd extends AbstractEffect { private final double _amount; - public AttackAttributeAdd(StatsSet params) + public AttackAttributeAdd(StatSet params) { _amount = params.getDouble("amount", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java index 37bfbf341a..fcd2b48c99 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class AttackBehind extends AbstractEffect { - public AttackBehind(StatsSet params) + public AttackBehind(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index 062c325a55..4136f5d530 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class AttackTrait extends AbstractEffect { private final Map _attackTraits = new EnumMap<>(TraitType.class); - public AttackTrait(StatsSet params) + public AttackTrait(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 02d6a8d78c..8ac42d45c3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -37,7 +37,7 @@ public class Backstab extends AbstractEffect private final double _criticalChance; private final boolean _overHit; - public Backstab(StatsSet params) + public Backstab(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Betray.java index 32e3c65c55..79e8bd3360 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Betray extends AbstractEffect { - public Betray(StatsSet params) + public Betray(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Blink.java index ba1caed6ac..56d3f628fd 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -52,7 +52,7 @@ public class Blink extends AbstractEffect private final int _flyDelay; private final int _animationSpeed; - public Blink(StatsSet params) + public Blink(StatSet params) { _flyCourse = params.getInt("angle", 0); _flyRadius = params.getInt("range", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 8677f72407..596d4b752f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; */ public class BlinkSwap extends AbstractEffect { - public BlinkSwap(StatsSet params) + public BlinkSwap(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 7bec602aef..cea12039d2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -20,7 +20,7 @@ import java.util.Arrays; import java.util.Set; import java.util.stream.Collectors; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class BlockAbnormalSlot extends AbstractEffect { private final Set _blockAbnormalSlots; - public BlockAbnormalSlot(StatsSet params) + public BlockAbnormalSlot(StatSet params) { _blockAbnormalSlots = Arrays.stream(params.getString("slot").split(";")).map(slot -> Enum.valueOf(AbnormalType.class, slot)).collect(Collectors.toSet()); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index b4839ab322..348881f970 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -21,7 +21,7 @@ import java.util.Set; import org.l2jmobius.gameserver.datatables.BotReportTable; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class BlockAction extends AbstractEffect { private final Set _blockedActions = new HashSet<>(); - public BlockAction(StatsSet params) + public BlockAction(StatSet params) { final String[] actions = params.getString("blockedActions").split(","); for (String action : actions) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index 68f6586e3e..635d2735f9 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -22,7 +22,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class BlockActions extends AbstractEffect { private final Set _allowedSkills; - public BlockActions(StatsSet params) + public BlockActions(StatSet params) { final String[] allowedSkills = params.getString("allowedSkills", "").split(";"); _allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet()); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 99af987208..3502d140d0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockChat extends AbstractEffect { - public BlockChat(StatsSet params) + public BlockChat(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java index 6160114414..a2b084c918 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; */ public class BlockControl extends AbstractEffect { - public BlockControl(StatsSet params) + public BlockControl(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java index 3d96329b6d..69b390ae8f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BlockEscape extends AbstractEffect { - public BlockEscape(StatsSet params) + public BlockEscape(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index 8bbd7ac018..85d89180e7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockMove extends AbstractEffect { - public BlockMove(StatsSet params) + public BlockMove(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index 316f82f855..9e28fc403a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockParty extends AbstractEffect { - public BlockParty(StatsSet params) + public BlockParty(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java index ae2ac8b035..d3235fc34f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BlockResurrection extends AbstractEffect { - public BlockResurrection(StatsSet params) + public BlockResurrection(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index f7f119691f..f2cc65b782 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -35,7 +35,7 @@ public class BlockSkill extends AbstractEffect { private final int[] _magicTypes; - public BlockSkill(StatsSet params) + public BlockSkill(StatSet params) { _magicTypes = params.getIntArray("magicTypes", ";"); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index d9b3d3a34d..9f0b7143d2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockTarget extends AbstractEffect { - public BlockTarget(StatsSet params) + public BlockTarget(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index bc4cbd6320..bef60ad003 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class Bluff extends AbstractEffect { private final int _chance; - public Bluff(StatsSet params) + public Bluff(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java index 2ace40a596..69583d613b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusDropAmount extends AbstractStatPercentEffect { - public BonusDropAmount(StatsSet params) + public BonusDropAmount(StatSet params) { super(params, Stat.BONUS_DROP_AMOUNT); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java index b81560b040..e63c8f79f4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusDropRate extends AbstractStatPercentEffect { - public BonusDropRate(StatsSet params) + public BonusDropRate(StatSet params) { super(params, Stat.BONUS_DROP_RATE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java index b984404cb2..e0fb54b162 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusSpoilRate extends AbstractStatPercentEffect { - public BonusSpoilRate(StatsSet params) + public BonusSpoilRate(StatSet params) { super(params, Stat.BONUS_SPOIL_RATE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Breath.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Breath.java index 859f341f3c..4235319f22 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Breath.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Breath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class Breath extends AbstractStatEffect { - public Breath(StatsSet params) + public Breath(StatSet params) { super(params, Stat.BREATH); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java index a6d25f3c36..4102506e6c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BuffBlock extends AbstractEffect { - public BuffBlock(StatsSet params) + public BuffBlock(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index de7497f8bf..4f470b06c7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class CallLearnedSkill extends AbstractEffect { private final int _skillId; - public CallLearnedSkill(StatsSet params) + public CallLearnedSkill(StatSet params) { _skillId = params.getInt("skillId"); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index e6096be4be..b41daf073c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CallParty extends AbstractEffect { - public CallParty(StatsSet params) + public CallParty(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index 0760fb675e..eb4bdf2349 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class CallPc extends AbstractEffect private final int _itemId; private final int _itemCount; - public CallPc(StatsSet params) + public CallPc(StatSet params) { _itemId = params.getInt("itemId", 0); _itemCount = params.getInt("itemCount", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index d6d5cb721d..0da3802665 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -35,7 +35,7 @@ public class CallRandomSkill extends AbstractEffect { private final List _skills = new ArrayList<>(); - public CallRandomSkill(StatsSet params) + public CallRandomSkill(StatSet params) { final String skills = params.getString("skills", null); if (skills != null) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index 99c1494223..f8e4b226c4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -35,7 +35,7 @@ public class CallSkill extends AbstractEffect private final SkillHolder _skill; private final int _skillLevelScaleTo; - public CallSkill(StatsSet params) + public CallSkill(StatSet params) { _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0)); _skillLevelScaleTo = params.getInt("skillLevelScaleTo", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index b340de4ae1..ff98639c37 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.Collections; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ public class CallSkillOnActionTime extends AbstractEffect { private final SkillHolder _skill; - public CallSkillOnActionTime(StatsSet params) + public CallSkillOnActionTime(StatSet params) { _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0)); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index d48eb90fb3..32753a71a0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CallTargetParty extends AbstractEffect { - public CallTargetParty(StatsSet params) + public CallTargetParty(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index ef01f4a8ed..d4331bf5b7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ public class ChameleonRest extends AbstractEffect { private final double _power; - public ChameleonRest(StatsSet params) + public ChameleonRest(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index e3b846674d..37054f2fd0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; @@ -35,9 +35,9 @@ public class ChangeBody extends AbstractEffect { private final Set _transformations = new HashSet<>(); - public ChangeBody(StatsSet params) + public ChangeBody(StatSet params) { - for (StatsSet item : params.getList("templates", StatsSet.class)) + for (StatSet item : params.getList("templates", StatSet.class)) { _transformations.add(new TemplateChanceHolder(item.getInt(".templateId"), item.getInt(".minChance"), item.getInt(".maxChance"))); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 76c6e03aa6..6b6386909e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeFace extends AbstractEffect { private final int _value; - public ChangeFace(StatsSet params) + public ChangeFace(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java index cee3ac1a6f..304afa821c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; /** @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; */ public class ChangeFishingMastery extends AbstractEffect { - public ChangeFishingMastery(StatsSet params) + public ChangeFishingMastery(StatSet params) { } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index 0c583cbc13..64ac49f5d5 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeHairColor extends AbstractEffect { private final int _value; - public ChangeHairColor(StatsSet params) + public ChangeHairColor(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index ad2efbe6a0..ae7d6c6da1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeHairStyle extends AbstractEffect { private final int _value; - public ChangeHairStyle(StatsSet params) + public ChangeHairStyle(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java index 2d536029fd..4d7c380c75 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class CheapShot extends AbstractEffect { - public CheapShot(StatsSet params) + public CheapShot(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index 207b7f0a3e..1a6a44fb31 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.SubclassInfoType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class ClassChange extends AbstractEffect private final int _index; private static final int IDENTITY_CRISIS_SKILL_ID = 1570; - public ClassChange(StatsSet params) + public ClassChange(StatSet params) { _index = params.getInt("index", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index b585afcda8..183b134c53 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.stats.Formulas; */ public class Compelling extends AbstractEffect { - public Compelling(StatsSet params) + public Compelling(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index b6aa30f604..f164ac6f3f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class Confuse extends AbstractEffect { private final int _chance; - public Confuse(StatsSet params) + public Confuse(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 25e29532eb..78293c1b0f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ConsumeBody extends AbstractEffect { - public ConsumeBody(StatsSet params) + public ConsumeBody(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index e915eb0391..6ddd0d72eb 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class ConvertItem extends AbstractEffect { - public ConvertItem(StatsSet params) + public ConvertItem(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java index 9402fdb06d..857df659c0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CounterPhysicalSkill extends AbstractStatAddEffect { - public CounterPhysicalSkill(StatsSet params) + public CounterPhysicalSkill(StatSet params) { super(params, Stat.VENGEANCE_SKILL_PHYSICAL_DAMAGE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 67bca7fd1b..598682037b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Cp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Cp(StatsSet params) + public Cp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index e0cd52808e..37303b0e7a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class CpHeal extends AbstractEffect { private final double _power; - public CpHeal(StatsSet params) + public CpHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index e2e8ee3479..54de5adfc6 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class CpHealOverTime extends AbstractEffect { private final double _power; - public CpHealOverTime(StatsSet params) + public CpHealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index 5665e937dc..b4a994d6df 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CpHealPercent extends AbstractEffect { private final double _power; - public CpHealPercent(StatsSet params) + public CpHealPercent(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java index 1cc851b2af..efb020bbd5 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CpRegen extends AbstractStatEffect { - public CpRegen(StatsSet params) + public CpRegen(StatSet params) { super(params, Stat.REGENERATE_CP_RATE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java index 8983497026..0b93eef45e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CriticalDamage extends AbstractStatEffect { - public CriticalDamage(StatsSet params) + public CriticalDamage(StatSet params) { super(params, Stat.CRITICAL_DAMAGE, Stat.CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 7ef4f0ecb4..0630f087b7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.Position; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CriticalDamagePosition extends AbstractEffect private final double _amount; private final Position _position; - public CriticalDamagePosition(StatsSet params) + public CriticalDamagePosition(StatSet params) { _amount = params.getDouble("amount", 0); _position = params.getEnum("position", Position.class, Position.FRONT); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java index 01f49380eb..0d4bded60e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; public class CriticalRate extends AbstractConditionalHpEffect { - public CriticalRate(StatsSet params) + public CriticalRate(StatSet params) { super(params, Stat.CRITICAL_RATE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 863b385ca3..4d65fa84eb 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.Position; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CriticalRatePositionBonus extends AbstractEffect private final double _amount; private final Position _position; - public CriticalRatePositionBonus(StatsSet params) + public CriticalRatePositionBonus(StatSet params) { _amount = params.getDouble("amount", 0); _position = params.getEnum("position", Position.class, Position.FRONT); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index 2e8ec38347..9d04575ae2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class CrystalGradeModify extends AbstractEffect { private final int _grade; - public CrystalGradeModify(StatsSet params) + public CrystalGradeModify(StatSet params) { _grade = params.getInt("grade", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java index 94ff8e64e2..79ee5b994e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CubicMastery extends AbstractStatAddEffect { - public CubicMastery(StatsSet params) + public CubicMastery(StatSet params) { super(params, Stat.MAX_CUBIC); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index 36abf0accf..e6bb53fdea 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class DamOverTime extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTime(StatsSet params) + public DamOverTime(StatSet params) { _canKill = params.getBoolean("canKill", false); _power = params.getDouble("power"); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 13e57099e0..b5f25db4d8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class DamOverTimePercent extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTimePercent(StatsSet params) + public DamOverTimePercent(StatSet params) { _canKill = params.getBoolean("canKill", false); _power = params.getDouble("power"); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java index dc7a45198f..c9567ea034 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ public class DamageBlock extends AbstractEffect private final boolean _blockHp; private final boolean _blockMp; - public DamageBlock(StatsSet params) + public DamageBlock(StatSet params) { final String type = params.getString("type", null); _blockHp = type.equalsIgnoreCase("BLOCK_HP"); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java index bfa716eacc..9eb0b4e233 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DamageByAttackType; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -38,7 +38,7 @@ public class DamageByAttack extends AbstractEffect private final double _value; private final DamageByAttackType _type; - public DamageByAttack(StatsSet params) + public DamageByAttack(StatSet params) { _value = params.getDouble("amount"); _type = params.getEnum("type", DamageByAttackType.class, DamageByAttackType.NONE); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java index 5a7629482a..e823a9824a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DamageShield extends AbstractStatAddEffect { - public DamageShield(StatsSet params) + public DamageShield(StatSet params) { super(params, Stat.REFLECT_DAMAGE_PERCENT); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java index db1abe264d..3029a3f0aa 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DamageShieldResist extends AbstractStatAddEffect { - public DamageShieldResist(StatsSet params) + public DamageShieldResist(StatSet params) { super(params, Stat.REFLECT_DAMAGE_PERCENT_DEFENSE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index 8561ff46b0..369bd5483d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class DeathLink extends AbstractEffect { private final double _power; - public DeathLink(StatsSet params) + public DeathLink(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java index b948fad1fc..54261c6229 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class DebuffBlock extends AbstractEffect { - public DebuffBlock(StatsSet params) + public DebuffBlock(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java index 217ef3dfaa..4bc08271fa 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class DefenceAttribute extends AbstractEffect private final AttributeType _attribute; private final double _amount; - public DefenceAttribute(StatsSet params) + public DefenceAttribute(StatSet params) { _amount = params.getDouble("amount", 0); _attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java index 0c0c2e8d6a..daff53d9e1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceCriticalDamage extends AbstractStatEffect { - public DefenceCriticalDamage(StatsSet params) + public DefenceCriticalDamage(StatSet params) { super(params, Stat.DEFENCE_CRITICAL_DAMAGE, Stat.DEFENCE_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java index 131eb500ea..74a729e38c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceCriticalRate extends AbstractStatEffect { - public DefenceCriticalRate(StatsSet params) + public DefenceCriticalRate(StatSet params) { super(params, Stat.DEFENCE_CRITICAL_RATE, Stat.DEFENCE_CRITICAL_RATE_ADD); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java index 1abee78e08..c664939977 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceMagicCriticalDamage extends AbstractStatEffect { - public DefenceMagicCriticalDamage(StatsSet params) + public DefenceMagicCriticalDamage(StatSet params) { super(params, Stat.DEFENCE_MAGIC_CRITICAL_DAMAGE, Stat.DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java index 2146b89551..6594dda2b3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceMagicCriticalRate extends AbstractStatEffect { - public DefenceMagicCriticalRate(StatsSet params) + public DefenceMagicCriticalRate(StatSet params) { super(params, Stat.DEFENCE_MAGIC_CRITICAL_RATE, Stat.DEFENCE_MAGIC_CRITICAL_RATE_ADD); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index bd80f690cd..134ed56979 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class DefenceTrait extends AbstractEffect { private final Map _defenceTraits = new EnumMap<>(TraitType.class); - public DefenceTrait(StatsSet params) + public DefenceTrait(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index bab5e1a762..7cee616006 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class DeleteHate extends AbstractEffect { private final int _chance; - public DeleteHate(StatsSet params) + public DeleteHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index 85985653b8..f10f189e68 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class DeleteHateOfMe extends AbstractEffect { private final int _chance; - public DeleteHateOfMe(StatsSet params) + public DeleteHateOfMe(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index d3664ad00f..82833ac79d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class DeleteTopAgro extends AbstractEffect { private final int _chance; - public DeleteTopAgro(StatsSet params) + public DeleteTopAgro(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index ae1f2a5942..ba6dad4698 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DoorOpenType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DetectHiddenObjects extends AbstractEffect { - public DetectHiddenObjects(StatsSet params) + public DetectHiddenObjects(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Detection.java index 078360ff35..a20cbcb348 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Detection extends AbstractEffect { - public Detection(StatsSet params) + public Detection(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java index d679c71919..5227885bb5 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class DisableSkill extends AbstractEffect private final Set disableSkills; private Skill knownSKill; - public DisableSkill(StatsSet params) + public DisableSkill(StatSet params) { final String disable = params.getString("disable"); if ((disable != null) && !disable.isEmpty()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 8567a94d12..32ee715df7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DisableTargeting extends AbstractEffect { - public DisableTargeting(StatsSet params) + public DisableTargeting(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index fa06ec7221..5a80971f51 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Disarm extends AbstractEffect { - public Disarm(StatsSet params) + public Disarm(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index 0133906661..8b06598d83 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class Disarmor extends AbstractEffect private final Map _unequippedItems; // PlayerObjId, ItemObjId private final int _slot; - public Disarmor(StatsSet params) + public Disarmor(StatSet params) { _unequippedItems = new ConcurrentHashMap<>(); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 95de0300bb..a652a023f5 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DispelAll extends AbstractEffect { - public DispelAll(StatsSet params) + public DispelAll(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 88d979a0d9..040271d2a7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.List; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -38,7 +38,7 @@ public class DispelByCategory extends AbstractEffect private final int _rate; private final int _max; - public DispelByCategory(StatsSet params) + public DispelByCategory(StatSet params) { _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); _rate = params.getInt("rate", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index a6e4c7cd19..ab79e046b2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.EnumMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -37,7 +37,7 @@ public class DispelBySlot extends AbstractEffect private final String _dispel; private final Map _dispelAbnormals; - public DispelBySlot(StatsSet params) + public DispelBySlot(StatSet params) { _dispel = params.getString("dispel"); if ((_dispel != null) && !_dispel.isEmpty()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 1ba6612e23..d1341d10b9 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class DispelBySlotMyself extends AbstractEffect { private final Set _dispelAbnormals; - public DispelBySlotMyself(StatsSet params) + public DispelBySlotMyself(StatSet params) { final String dispel = params.getString("dispel"); if ((dispel != null) && !dispel.isEmpty()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 845980e59d..b58723058e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -37,7 +37,7 @@ public class DispelBySlotProbability extends AbstractEffect private final Set _dispelAbnormals; private final int _rate; - public DispelBySlotProbability(StatsSet params) + public DispelBySlotProbability(StatSet params) { final String[] dispelEffects = params.getString("dispel").split(";"); _rate = params.getInt("rate", 100); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index 7acd9c4a6c..688d77a703 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -45,7 +45,7 @@ public class DoubleCast extends AbstractEffect private final Map> _addedToggles; - public DoubleCast(StatsSet params) + public DoubleCast(StatSet params) { _addedToggles = new HashMap<>(); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java index d7f067a2a0..d1e21edeb0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DuelistFury extends AbstractEffect { - public DuelistFury(StatsSet params) + public DuelistFury(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index 409fed6a23..de397bb5ff 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class EnableCloak extends AbstractEffect { - public EnableCloak(StatsSet params) + public EnableCloak(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index e855c4ba1a..2fe2bef99f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -43,7 +43,7 @@ public class EnergyAttack extends AbstractEffect private final boolean _overHit; private final double _pDefMod; - public EnergyAttack(StatsSet params) + public EnergyAttack(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getInt("criticalChance", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index a8f108573f..ae463ef2a4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class EnlargeAbnormalSlot extends AbstractEffect { private final int _slots; - public EnlargeAbnormalSlot(StatsSet params) + public EnlargeAbnormalSlot(StatSet params) { _slots = params.getInt("slots", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java index c43ea04413..c4073b1a47 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StorageType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class EnlargeSlot extends AbstractEffect private final StorageType _type; private final double _amount; - public EnlargeSlot(StatsSet params) + public EnlargeSlot(StatSet params) { _amount = params.getDouble("amount", 0); _type = params.getEnum("type", StorageType.class, StorageType.INVENTORY_NORMAL); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Escape.java index 936f82d8ce..f3a07c9d15 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class Escape extends AbstractEffect { private final TeleportWhereType _escapeType; - public Escape(StatsSet params) + public Escape(StatSet params) { _escapeType = params.getEnum("escapeType", TeleportWhereType.class, null); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java index 76dbc8171c..eb68d24af8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ExpModify extends AbstractStatAddEffect { - public ExpModify(StatsSet params) + public ExpModify(StatSet params) { super(params, Stat.BONUS_EXP); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java index bf11db6e4b..1100ca25be 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Faceoff extends AbstractEffect { - public Faceoff(StatsSet params) + public Faceoff(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index e256209e39..79f7b43503 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -34,7 +34,7 @@ public class FakeDeath extends AbstractEffect { private final double _power; - public FakeDeath(StatsSet params) + public FakeDeath(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index a94c75d310..780d5cefba 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -44,7 +44,7 @@ public class FatalBlow extends AbstractEffect private final double _abnormalPower; private final boolean _overHit; - public FatalBlow(StatsSet params) + public FatalBlow(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java index c8ff8f7acb..6e7597e63d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class FatalBlowRate extends AbstractEffect private final double _amount; private final StatModifierType _mode; - public FatalBlowRate(StatsSet params) + public FatalBlowRate(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 9731e75e5d..ec2659ea2c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DefenderInstance; import org.l2jmobius.gameserver.model.actor.instance.FortCommanderInstance; @@ -40,7 +40,7 @@ public class Fear extends AbstractEffect { private static final int FEAR_RANGE = 500; - public Fear(StatsSet params) + public Fear(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 5e04e46d60..94d9912bdf 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.MountType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ public class Feed extends AbstractEffect private final int _ride; private final int _wyvern; - public Feed(StatsSet params) + public Feed(StatSet params) { _normal = params.getInt("normal", 0); _ride = params.getInt("ride", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java index 0b22a4d4c9..146e3b73e6 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class FishingExpSpBonus extends AbstractStatPercentEffect { - public FishingExpSpBonus(StatsSet params) + public FishingExpSpBonus(StatSet params) { super(params, Stat.FISHING_EXP_SP_BONUS); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Flag.java index c1469eab19..2442cbdb35 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Flag extends AbstractEffect { - public Flag(StatsSet params) + public Flag(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index 0243f0f543..74a9754a95 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.BlockInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class FlipBlock extends AbstractEffect { - public FlipBlock(StatsSet params) + public FlipBlock(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 7fc7da5fe6..3412e4d36d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class FlyAway extends AbstractEffect { private final int _radius; - public FlyAway(StatsSet params) + public FlyAway(StatSet params) { _radius = params.getInt("radius"); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java index fd3216286d..590fbbcd44 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class FocusEnergy extends AbstractStatAddEffect { - public FocusEnergy(StatsSet params) + public FocusEnergy(StatSet params) { super(params, Stat.MAX_MOMENTUM); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index efbd93f304..19f0163e42 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class FocusMaxMomentum extends AbstractEffect { - public FocusMaxMomentum(StatsSet params) + public FocusMaxMomentum(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index 284d19ee5f..e8c18e9682 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -36,7 +36,7 @@ public class FocusMomentum extends AbstractEffect private final int _amount; private final int _maxCharges; - public FocusMomentum(StatsSet params) + public FocusMomentum(StatSet params) { _amount = params.getInt("amount", 1); _maxCharges = params.getInt("maxCharges", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 18a9864bbc..debd491cfe 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class FocusSouls extends AbstractEffect { private final int _charge; - public FocusSouls(StatsSet params) + public FocusSouls(StatSet params) { _charge = params.getInt("charge", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 8540ccd49c..23328db910 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Set; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class GetAgro extends AbstractEffect { - public GetAgro(StatsSet params) + public GetAgro(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java index 1ca8722709..e91002d04b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class GetDamageLimit extends AbstractStatAddEffect { - public GetDamageLimit(StatsSet params) + public GetDamageLimit(StatSet params) { super(params, Stat.DAMAGE_LIMIT); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 2dfd3bf8c4..439f3e8e3a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class GetMomentum extends AbstractEffect { private static int _ticks; - public GetMomentum(StatsSet params) + public GetMomentum(StatSet params) { _ticks = params.getInt("ticks", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index 7c1c0f3fa2..2c842101ed 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class GiveClanReputation extends AbstractEffect { private final int _reputation; - public GiveClanReputation(StatsSet params) + public GiveClanReputation(StatSet params) { _reputation = params.getInt("reputation", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index fd4d61fa73..9052c63154 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class GiveExpAndSp extends AbstractEffect private final int _xp; private final int _sp; - public GiveExpAndSp(StatsSet params) + public GiveExpAndSp(StatSet params) { _xp = params.getInt("xp", 0); _sp = params.getInt("sp", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index 3448e09797..9d41a4395b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ public class GiveFame extends AbstractEffect { private final int _fame; - public GiveFame(StatsSet params) + public GiveFame(StatSet params) { _fame = params.getInt("fame", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index c948fa0948..617a8ef88a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class GiveRecommendation extends AbstractEffect { private final int _amount; - public GiveRecommendation(StatsSet params) + public GiveRecommendation(StatSet params) { _amount = params.getInt("amount", 0); if (_amount == 0) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index 5fe06566c7..75a16fe828 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class GiveSp extends AbstractEffect { private final int _sp; - public GiveSp(StatsSet params) + public GiveSp(StatSet params) { _sp = params.getInt("sp", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index 5b1a04c165..ae7248c500 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class GiveXp extends AbstractEffect { private final int _xp; - public GiveXp(StatsSet params) + public GiveXp(StatSet params) { _xp = params.getInt("xp", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 17095c209a..5cf4994f32 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Grow extends AbstractEffect { - public Grow(StatsSet params) + public Grow(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index a2200e1a2f..350c8e659f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.UserInfoType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class HairAccessorySet extends AbstractEffect { - public HairAccessorySet(StatsSet params) + public HairAccessorySet(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index 04b0b8ac6f..8211e03c01 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Harvesting extends AbstractEffect { - public Harvesting(StatsSet params) + public Harvesting(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java index ac1c9f49d8..097db6604a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HateAttack extends AbstractStatPercentEffect { - public HateAttack(StatsSet params) + public HateAttack(StatSet params) { super(params, Stat.HATE_ATTACK); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index 00f569eb17..9963ff1336 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlagInstance; @@ -34,7 +34,7 @@ public class HeadquarterCreate extends AbstractEffect private static final int HQ_NPC_ID = 35062; private final boolean _isAdvanced; - public HeadquarterCreate(StatsSet params) + public HeadquarterCreate(StatSet params) { _isAdvanced = params.getBoolean("isAdvanced", false); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 6e611144f1..139972a272 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -40,7 +40,7 @@ public class Heal extends AbstractEffect { private final double _power; - public Heal(StatsSet params) + public Heal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java index 5a7457d3df..a9f75ab036 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HealEffect extends AbstractStatEffect { - public HealEffect(StatsSet params) + public HealEffect(StatSet params) { super(params, Stat.HEAL_EFFECT, Stat.HEAL_EFFECT_ADD); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 86e28dc8b4..da76f33058 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class HealOverTime extends AbstractEffect { private final double _power; - public HealOverTime(StatsSet params) + public HealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index 6c9c8986bb..8b1c821a0a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class HealPercent extends AbstractEffect { private final int _power; - public HealPercent(StatsSet params) + public HealPercent(StatSet params) { _power = params.getInt("power", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Hide.java index e431277964..d02898bac5 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Hide extends AbstractEffect { - public Hide(StatsSet params) + public Hide(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index e7e5f3f91b..78fa1c9392 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.GameTimeController; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HitAtNight extends AbstractStatEffect { - public HitAtNight(StatsSet params) + public HitAtNight(StatSet params) { super(params, Stat.HIT_AT_NIGHT); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java index 1fd98e7aa9..f14b922308 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HitNumber extends AbstractStatEffect { - public HitNumber(StatsSet params) + public HitNumber(StatSet params) { super(params, Stat.ATTACK_COUNT_MAX); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 3611fd7d74..c2426f8d11 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Hp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Hp(StatsSet params) + public Hp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index 3d125565fe..6244c76428 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class HpByLevel extends AbstractEffect { private final double _power; - public HpByLevel(StatsSet params) + public HpByLevel(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 3cdb210bba..80b4af9b46 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -40,7 +40,7 @@ public class HpCpHeal extends AbstractEffect { private final double _power; - public HpCpHeal(StatsSet params) + public HpCpHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java index 0394dab996..6f96c2dcb3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class HpCpHealCritical extends AbstractEffect { - public HpCpHealCritical(StatsSet params) + public HpCpHealCritical(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 554b1cec79..7cf47c3a65 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class HpDrain extends AbstractEffect private final double _power; private final double _percentage; - public HpDrain(StatsSet params) + public HpDrain(StatSet params) { _power = params.getDouble("power", 0); _percentage = params.getDouble("percentage", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java index cb1d2bc3a7..b170bc62ba 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HpRegen extends AbstractStatEffect { - public HpRegen(StatsSet params) + public HpRegen(StatSet params) { super(params, Stat.REGENERATE_HP_RATE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 235e89a79b..f346fbaad8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class HpToOwner extends AbstractEffect private final double _power; private final int _stealAmount; - public HpToOwner(StatsSet params) + public HpToOwner(StatSet params) { _power = params.getDouble("power"); _stealAmount = params.getInt("stealAmount"); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java index 9829519da9..c659684ae8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class IgnoreDeath extends AbstractEffect { - public IgnoreDeath(StatsSet params) + public IgnoreDeath(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index f7c9baa155..44dceba10e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ImmobilePetBuff extends AbstractEffect { - public ImmobilePetBuff(StatsSet params) + public ImmobilePetBuff(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java index a60fc45d15..a03eff933a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ public class InstantKillResist extends AbstractEffect { private final int _amount; - public InstantKillResist(StatsSet params) + public InstantKillResist(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java index 7e1fc8abe4..265a9aab97 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class JewelSlot extends AbstractStatAddEffect { - public JewelSlot(StatsSet params) + public JewelSlot(StatSet params) { super(params, Stat.BROOCH_JEWELS); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 3d5ff2dda3..a34d7cc5b3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class KarmaCount extends AbstractEffect private final int _amount; private final int _mode; - public KarmaCount(StatsSet params) + public KarmaCount(StatSet params) { _amount = params.getInt("amount", 0); switch (params.getString("mode", "DIFF")) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index b6f5b03994..cffa4427c6 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -94,7 +94,7 @@ public class KnockBack extends AbstractEffect _chainKnockSkills.put(ClassId.AEORE_SHILLIEN_SAINT, 12000); // Heavy Hit } - public KnockBack(StatsSet params) + public KnockBack(StatSet params) { _distance = params.getInt("distance", 50); _speed = params.getInt("speed", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index 7bfac989cf..1affb1b141 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -38,7 +38,7 @@ public class Lethal extends AbstractEffect private final double _fullLethal; private final double _halfLethal; - public Lethal(StatsSet params) + public Lethal(StatSet params) { _fullLethal = params.getDouble("fullLethal", 0); _halfLethal = params.getDouble("halfLethal", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java index aeb42458a6..43b17877ad 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitCp extends AbstractStatEffect { - public LimitCp(StatsSet params) + public LimitCp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_CP); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java index cf76ec482a..45d8f37355 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitHp extends AbstractStatEffect { - public LimitHp(StatsSet params) + public LimitHp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_HP); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java index f5eda36ba6..8d31633d0a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitMp extends AbstractStatEffect { - public LimitMp(StatsSet params) + public LimitMp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_MP); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Lucky.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Lucky.java index 3775d2361d..4ff5ea9a01 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Lucky.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Lucky.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Lucky extends AbstractEffect { - public Lucky(StatsSet params) + public Lucky(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MAtk.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MAtk.java index 5f9ad5f32b..38c2fc9067 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MAtk.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MAtk.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MAtk extends AbstractStatEffect { - public MAtk(StatsSet params) + public MAtk(StatSet params) { super(params, Stat.MAGIC_ATTACK); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java index 2b9ae2e9e6..393d0d2d30 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicAccuracy extends AbstractStatEffect { - public MagicAccuracy(StatsSet params) + public MagicAccuracy(StatSet params) { super(params, Stat.ACCURACY_MAGIC); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java index 123706eb55..b9a58b09f3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicCriticalDamage extends AbstractStatEffect { - public MagicCriticalDamage(StatsSet params) + public MagicCriticalDamage(StatSet params) { super(params, Stat.MAGIC_CRITICAL_DAMAGE, Stat.MAGIC_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java index 0c10014e50..c9fa9a4240 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicCriticalRate extends AbstractStatEffect { - public MagicCriticalRate(StatsSet params) + public MagicCriticalRate(StatSet params) { super(params, Stat.MAGIC_CRITICAL_RATE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index e8b6f5e8bf..5281bf8445 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class MagicMpCost extends AbstractEffect private final int _magicType; private final double _amount; - public MagicMpCost(StatsSet params) + public MagicMpCost(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index ed4a3fca8b..283a99176c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class MagicalAbnormalDispelAttack extends AbstractEffect private final double _power; private final AbnormalType _abnormalType; - public MagicalAbnormalDispelAttack(StatsSet params) + public MagicalAbnormalDispelAttack(StatSet params) { _power = params.getDouble("power", 0); _abnormalType = AbnormalType.getAbnormalType(params.getString("abnormalType", null)); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java index 8234db1c43..be6403077c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAbnormalResist extends AbstractStatAddEffect { - public MagicalAbnormalResist(StatsSet params) + public MagicalAbnormalResist(StatSet params) { super(params, Stat.ABNORMAL_RESIST_MAGICAL); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index 4e938809f1..25c7d25954 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -37,7 +37,7 @@ public class MagicalAttack extends AbstractEffect private final boolean _overHit; private final double _debuffModifier; - public MagicalAttack(StatsSet params) + public MagicalAttack(StatSet params) { _power = params.getDouble("power", 0); _overHit = params.getBoolean("overHit", false); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 424480b76c..11c387780e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class MagicalAttackByAbnormal extends AbstractEffect { private final double _power; - public MagicalAttackByAbnormal(StatsSet params) + public MagicalAttackByAbnormal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9c3e263a05..348e904025 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -40,7 +40,7 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect private final double _power; private final Set _abnormals; - public MagicalAttackByAbnormalSlot(StatsSet params) + public MagicalAttackByAbnormalSlot(StatSet params) { _power = params.getDouble("power", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 49dd351046..de55dd0fcd 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -38,7 +38,7 @@ public class MagicalAttackMp extends AbstractEffect private final boolean _critical; private final double _criticalLimit; - public MagicalAttackMp(StatsSet params) + public MagicalAttackMp(StatSet params) { _power = params.getDouble("power"); _critical = params.getBoolean("critical"); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 4414b36fa7..93ac560169 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class MagicalAttackRange extends AbstractEffect private final double _power; private final double _shieldDefPercent; - public MagicalAttackRange(StatsSet params) + public MagicalAttackRange(StatSet params) { _power = params.getDouble("power"); _shieldDefPercent = params.getDouble("shieldDefPercent", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java index 2e304e5f8b..1cf39ed501 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAttackSpeed extends AbstractStatEffect { - public MagicalAttackSpeed(StatsSet params) + public MagicalAttackSpeed(StatSet params) { super(params, Stat.MAGIC_ATTACK_SPEED); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 9a3a776e32..880d71f0c5 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class MagicalDamOverTime extends AbstractEffect private final double _power; private final boolean _canKill; - public MagicalDamOverTime(StatsSet params) + public MagicalDamOverTime(StatSet params) { _power = params.getDouble("power", 0); _canKill = params.getBoolean("canKill", false); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java index 80fdf87050..9b4e6061aa 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalDefence extends AbstractStatEffect { - public MagicalDefence(StatsSet params) + public MagicalDefence(StatSet params) { super(params, Stat.MAGICAL_DEFENCE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java index c3c7c404f3..4e83b80e8b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalEvasion extends AbstractStatEffect { - public MagicalEvasion(StatsSet params) + public MagicalEvasion(StatSet params) { super(params, Stat.MAGIC_EVASION_RATE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java index 6253af7373..bf419a19f7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalSkillPower extends AbstractStatEffect { - public MagicalSkillPower(StatsSet params) + public MagicalSkillPower(StatSet params) { super(params, Stat.MAGICAL_SKILL_POWER, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index d0047fedef..f4388dc16f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class MagicalSoulAttack extends AbstractEffect { private final double _power; - public MagicalSoulAttack(StatsSet params) + public MagicalSoulAttack(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java index fcc143cd4b..688243d9e1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ManaCharge extends AbstractStatAddEffect { - public ManaCharge(StatsSet params) + public ManaCharge(StatSet params) { super(params, Stat.MANA_CHARGE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index 0c84b4ab61..b889e6e824 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class ManaDamOverTime extends AbstractEffect { private final double _power; - public ManaDamOverTime(StatsSet params) + public ManaDamOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index f48011c9a2..94286df1c8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -34,7 +34,7 @@ public class ManaHeal extends AbstractEffect { private final double _power; - public ManaHeal(StatsSet params) + public ManaHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index bfdfa54380..61f15449a0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -35,7 +35,7 @@ public class ManaHealByLevel extends AbstractEffect { private final double _power; - public ManaHealByLevel(StatsSet params) + public ManaHealByLevel(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 46937a8dd0..e505c9e7a2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class ManaHealOverTime extends AbstractEffect { private final double _power; - public ManaHealOverTime(StatsSet params) + public ManaHealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 101961d1c4..71085da549 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class ManaHealPercent extends AbstractEffect { private final double _power; - public ManaHealPercent(StatsSet params) + public ManaHealPercent(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 7c9c63e3ad..07d15d826c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxCp extends AbstractStatEffect { private final boolean _heal; - public MaxCp(StatsSet params) + public MaxCp(StatSet params) { super(params, Stat.MAX_CP); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 6d2c3449bd..85867bca96 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxHp extends AbstractStatEffect { private final boolean _heal; - public MaxHp(StatsSet params) + public MaxHp(StatSet params) { super(params, Stat.MAX_HP); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index e554c63055..9ca46fda8d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxMp extends AbstractStatEffect { private final boolean _heal; - public MaxMp(StatsSet params) + public MaxMp(StatSet params) { super(params, Stat.MAX_MP); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 39cf62a95b..c27284e5f6 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -43,7 +43,7 @@ public class ModifyVital extends AbstractEffect private final int _mp; private final int _cp; - public ModifyVital(StatsSet params) + public ModifyVital(StatSet params) { _type = params.getEnum("type", ModifyType.class); if (_type != ModifyType.SET) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 29ee88f805..095d130f7f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Mp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Mp(StatsSet params) + public Mp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index 76d858ad8e..b13d7824d0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class MpConsumePerLevel extends AbstractEffect { private final double _power; - public MpConsumePerLevel(StatsSet params) + public MpConsumePerLevel(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java index 2051009805..ae7bf0c48c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpRegen extends AbstractStatEffect { - public MpRegen(StatsSet params) + public MpRegen(StatSet params) { super(params, Stat.REGENERATE_MP_RATE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MpShield.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MpShield.java index 82e307a562..a4eb3e663f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MpShield.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MpShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpShield extends AbstractStatAddEffect { - public MpShield(StatsSet params) + public MpShield(StatSet params) { super(params, Stat.MANA_SHIELD_PERCENT); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java index af2ce119cc..366e96b18f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpVampiricAttack extends AbstractStatAddEffect { - public MpVampiricAttack(StatsSet params) + public MpVampiricAttack(StatSet params) { super(params, Stat.ABSORB_MANA_DAMAGE_PERCENT); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mute.java index a7f2f76e23..7e5b5a528f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Mute extends AbstractEffect { - public Mute(StatsSet params) + public Mute(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java index 3cc4cae96f..513dc46ec7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class NoblesseBless extends AbstractEffect { - public NoblesseBless(StatsSet params) + public NoblesseBless(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index bb0f02af5c..05f8c6a99b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpenChest extends AbstractEffect { - public OpenChest(StatsSet params) + public OpenChest(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 15cd9c2a64..de0414fd23 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.RecipeController; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpenCommonRecipeBook extends AbstractEffect { - public OpenCommonRecipeBook(StatsSet params) + public OpenCommonRecipeBook(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 21dd337982..7b5effc6b4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class OpenDoor extends AbstractEffect private final int _chance; private final boolean _isItem; - public OpenDoor(StatsSet params) + public OpenDoor(StatSet params) { _chance = params.getInt("chance", 0); _isItem = params.getBoolean("isItem", false); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index b99a8f9757..3526fa5fdc 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.RecipeController; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpenDwarfRecipeBook extends AbstractEffect { - public OpenDwarfRecipeBook(StatsSet params) + public OpenDwarfRecipeBook(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PAtk.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PAtk.java index c353d03a00..7f10b9dcc7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PAtk.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PAtk.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PAtk extends AbstractConditionalHpEffect { - public PAtk(StatsSet params) + public PAtk(StatSet params) { super(params, Stat.PHYSICAL_ATTACK); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Passive.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Passive.java index cef680ca21..27ce15bb60 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Passive.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Passive.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Passive extends AbstractEffect { - public Passive(StatsSet params) + public Passive(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java index 05f55c7dac..1a9f29424f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAbnormalResist extends AbstractStatAddEffect { - public PhysicalAbnormalResist(StatsSet params) + public PhysicalAbnormalResist(StatSet params) { super(params, Stat.ABNORMAL_RESIST_PHYSICAL); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 098770705b..7e5fb14465 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -52,7 +52,7 @@ public class PhysicalAttack extends AbstractEffect private final Set _abnormals; private final double _abnormalPowerMod; - public PhysicalAttack(StatsSet params) + public PhysicalAttack(StatSet params) { _power = params.getDouble("power", 0); _pAtkMod = params.getDouble("pAtkMod", 1.0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index d325c3d5ed..f191867614 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -38,7 +38,7 @@ public class PhysicalAttackHpLink extends AbstractEffect private final double _criticalChance; private final boolean _overHit; - public PhysicalAttackHpLink(StatsSet params) + public PhysicalAttackHpLink(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index dc575c2c75..fe087a1bcc 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class PhysicalAttackMute extends AbstractEffect { - public PhysicalAttackMute(StatsSet params) + public PhysicalAttackMute(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java index 112b41eb36..2093d45264 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAttackRange extends AbstractStatEffect { - public PhysicalAttackRange(StatsSet params) + public PhysicalAttackRange(StatSet params) { super(params, Stat.PHYSICAL_ATTACK_RANGE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index d3c2dcfaf2..5d66bd4c87 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ public class PhysicalAttackSaveHp extends AbstractEffect private final boolean _overHit; private final double _saveHp; - public PhysicalAttackSaveHp(StatsSet params) + public PhysicalAttackSaveHp(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java index 167b859572..cdf34eb6f6 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAttackSpeed extends AbstractStatEffect { - public PhysicalAttackSpeed(StatsSet params) + public PhysicalAttackSpeed(StatSet params) { super(params, Stat.PHYSICAL_ATTACK_SPEED); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 61bed5561b..a1a6818a00 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class PhysicalAttackWeaponBonus extends AbstractEffect private final Map _weaponBonus = new EnumMap<>(WeaponType.class); - public PhysicalAttackWeaponBonus(StatsSet params) + public PhysicalAttackWeaponBonus(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java index fa3925e725..078c3673b9 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalDefence extends AbstractConditionalHpEffect { - public PhysicalDefence(StatsSet params) + public PhysicalDefence(StatSet params) { super(params, Stat.PHYSICAL_DEFENCE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java index 812c641ac8..9714220e1b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalEvasion extends AbstractConditionalHpEffect { - public PhysicalEvasion(StatsSet params) + public PhysicalEvasion(StatSet params) { super(params, Stat.EVASION_RATE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index b337fed6cb..fe7cf853c8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class PhysicalMute extends AbstractEffect { - public PhysicalMute(StatsSet params) + public PhysicalMute(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java index 0fd835f4e3..1b843dda3d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class PhysicalShieldAngleAll extends AbstractEffect { - public PhysicalShieldAngleAll(StatsSet params) + public PhysicalShieldAngleAll(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java index 9d3f051659..507eb57326 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalSkillPower extends AbstractStatEffect { - public PhysicalSkillPower(StatsSet params) + public PhysicalSkillPower(StatSet params) { super(params, Stat.PHYSICAL_SKILL_POWER, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index a958116ff7..9ceccea4cc 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -42,7 +42,7 @@ public class PhysicalSoulAttack extends AbstractEffect private final boolean _ignoreShieldDefence; private final boolean _overHit; - public PhysicalSoulAttack(StatsSet params) + public PhysicalSoulAttack(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index e95e09ab90..fd2b23a2ae 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class PkCount extends AbstractEffect { private final int _amount; - public PkCount(StatsSet params) + public PkCount(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index 2a356bdbc9..18cecfb90e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class Plunder extends AbstractEffect { - public Plunder(StatsSet params) + public Plunder(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index fd61584af1..3e885274b3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PolearmSingleTarget extends AbstractEffect { - public PolearmSingleTarget(StatsSet params) + public PolearmSingleTarget(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java index 86f2e2cee8..b2fb920379 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class ProtectDeathPenalty extends AbstractEffect { - public ProtectDeathPenalty(StatsSet params) + public ProtectDeathPenalty(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java index 890b8980bd..6664b36bae 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ProtectionBlessing extends AbstractEffect { - public ProtectionBlessing(StatsSet params) + public ProtectionBlessing(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index 6de78c2c82..62c480716d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class PullBack extends AbstractEffect private final int _animationSpeed; private final FlyType _type; - public PullBack(StatsSet params) + public PullBack(StatSet params) { _speed = params.getInt("speed", 0); _delay = params.getInt("delay", _speed); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java index 1019c56778..84a72299f3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveMagicalSkillDamageBonus extends AbstractStatPercentEffect { - public PveMagicalSkillDamageBonus(StatsSet params) + public PveMagicalSkillDamageBonus(StatSet params) { super(params, Stat.PVE_MAGICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java index 8da698c746..70870aa45c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveMagicalSkillDefenceBonus(StatsSet params) + public PveMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java index c7a82d4ded..8f60ea025c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalAttackDamageBonus extends AbstractStatPercentEffect { - public PvePhysicalAttackDamageBonus(StatsSet params) + public PvePhysicalAttackDamageBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_ATTACK_DAMAGE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java index 0717fe525b..ea01a4e1d8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PvePhysicalAttackDefenceBonus(StatsSet params) + public PvePhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java index 878f942877..1e8b9e76c4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvePhysicalSkillDamageBonus(StatsSet params) + public PvePhysicalSkillDamageBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java index bdfa0dcc67..b1dbb0b217 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvePhysicalSkillDefenceBonus(StatsSet params) + public PvePhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java index 94fdc26015..fbe3119ba8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveRaidMagicalSkillDefenceBonus(StatsSet params) + public PveRaidMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java index f54d849752..83352e1b2f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidPhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PveRaidPhysicalAttackDefenceBonus(StatsSet params) + public PveRaidPhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java index 0a344f96de..be05bec159 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidPhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveRaidPhysicalSkillDefenceBonus(StatsSet params) + public PveRaidPhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java index 542c019420..2f0153189a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpMagicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvpMagicalSkillDamageBonus(StatsSet params) + public PvpMagicalSkillDamageBonus(StatSet params) { super(params, Stat.PVP_MAGICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java index bb006280fc..41ad3b7749 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvpMagicalSkillDefenceBonus(StatsSet params) + public PvpMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVP_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java index 483d7b02e4..23488ea000 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalAttackDamageBonus extends AbstractStatPercentEffect { - public PvpPhysicalAttackDamageBonus(StatsSet params) + public PvpPhysicalAttackDamageBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_ATTACK_DAMAGE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java index 40c3a22ea2..ff942b3d4d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PvpPhysicalAttackDefenceBonus(StatsSet params) + public PvpPhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java index 225c7c1e39..19a7c96003 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvpPhysicalSkillDamageBonus(StatsSet params) + public PvpPhysicalSkillDamageBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java index ea2d1fa126..211d14c5e3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvpPhysicalSkillDefenceBonus(StatsSet params) + public PvpPhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 8a01583374..e500b487af 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -36,7 +36,7 @@ public class RandomizeHate extends AbstractEffect { private final int _chance; - public RandomizeHate(StatsSet params) + public RandomizeHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index 8b2801ee6c..18b07bd2d7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class RealDamage extends AbstractEffect { private final double _power; - public RealDamage(StatsSet params) + public RealDamage(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java index 4372c15bcf..86738fae0f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class RearDamage extends AbstractStatPercentEffect { - public RearDamage(StatsSet params) + public RearDamage(StatSet params) { super(params, Stat.REAR_DAMAGE_RATE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 31c7a4e4b3..82ed18faa1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RebalanceHP extends AbstractEffect { - public RebalanceHP(StatsSet params) + public RebalanceHP(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index 09d307be02..979809b533 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RebalanceHPSummon extends AbstractEffect { - public RebalanceHPSummon(StatsSet params) + public RebalanceHPSummon(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 7599b691ac..e76328929a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class RecoverVitalityInPeaceZone extends AbstractEffect private final double _amount; private final int _ticks; - public RecoverVitalityInPeaceZone(StatsSet params) + public RecoverVitalityInPeaceZone(StatSet params) { _amount = params.getDouble("amount", 0); _ticks = params.getInt("ticks", 10); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Recovery.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Recovery.java index 35c5cf3af1..30296eec4d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Recovery.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Recovery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Recovery extends AbstractEffect { - public Recovery(StatsSet params) + public Recovery(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java index 824044ae21..e52b5abafb 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ReduceCancel extends AbstractStatEffect { - public ReduceCancel(StatsSet params) + public ReduceCancel(StatSet params) { super(params, Stat.ATTACK_CANCEL); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index ecc7a10d31..be9188f3b0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -33,7 +33,7 @@ public class ReduceDamage extends AbstractEffect { private final double _amount; - public ReduceDamage(StatsSet params) + public ReduceDamage(StatSet params) { _amount = params.getDouble("amount"); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java index 8534a94fc6..7b8862f608 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ReduceDropType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -32,7 +32,7 @@ public class ReduceDropPenalty extends AbstractEffect private final double _deathPenalty; private final ReduceDropType _type; - public ReduceDropPenalty(StatsSet params) + public ReduceDropPenalty(StatSet params) { _exp = params.getDouble("exp", 0); _deathPenalty = params.getDouble("deathPenalty", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java index c15f7301b9..6436b488e0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ReflectMagic extends AbstractStatAddEffect { - public ReflectMagic(StatsSet params) + public ReflectMagic(StatSet params) { super(params, Stat.VENGEANCE_SKILL_MAGIC_DAMAGE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java index bf1d555351..583191fd4c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.BasicProperty; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ReflectSkill extends AbstractEffect private final Stat _stat; private final double _amount; - public ReflectSkill(StatsSet params) + public ReflectSkill(StatSet params) { _stat = params.getEnum("type", BasicProperty.class, BasicProperty.PHYSICAL) == BasicProperty.PHYSICAL ? Stat.REFLECT_SKILL_PHYSIC : Stat.REFLECT_SKILL_MAGIC; _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index e850ea6be9..77b96e4205 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class RefuelAirship extends AbstractEffect { private final int _value; - public RefuelAirship(StatsSet params) + public RefuelAirship(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Relax.java index c8c61fe47e..e2ba4420db 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ public class Relax extends AbstractEffect { private final double _power; - public Relax(StatsSet params) + public Relax(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 9678dc1174..0613c17234 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class ResetInstanceEntry extends AbstractEffect { private final Set _instanceId; - public ResetInstanceEntry(StatsSet params) + public ResetInstanceEntry(StatSet params) { final String instanceIds = params.getString("instanceId", null); if ((instanceIds != null) && !instanceIds.isEmpty()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java index 940c731208..f15ff56189 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ResistAbnormalByCategory extends AbstractEffect private final DispelSlotType _slot; private final double _amount; - public ResistAbnormalByCategory(StatsSet params) + public ResistAbnormalByCategory(StatSet params) { _amount = params.getDouble("amount", 0); _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.DEBUFF); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java index dae38e5246..2e29b5cc8e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ResistDDMagic extends AbstractStatPercentEffect { - public ResistDDMagic(StatsSet params) + public ResistDDMagic(StatSet params) { super(params, Stat.MAGIC_SUCCESS_RES); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java index af2b203aad..d08fcb262a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ResistDispelByCategory extends AbstractEffect private final DispelSlotType _slot; private final double _amount; - public ResistDispelByCategory(StatsSet params) + public ResistDispelByCategory(StatSet params) { _amount = params.getDouble("amount", 0); _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index af1e40bea8..cd03f1a74a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -34,7 +34,7 @@ public class ResistSkill extends AbstractEffect { private final List _skills = new ArrayList<>(); - public ResistSkill(StatsSet params) + public ResistSkill(StatSet params) { for (int i = 1;; i++) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index feb5885fb0..6f887a07cf 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class Restoration extends AbstractEffect private final int _itemCount; private final int _itemEnchantmentLevel; - public Restoration(StatsSet params) + public Restoration(StatSet params) { _itemId = params.getInt("itemId", 0); _itemCount = params.getInt("itemCount", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 37cd974643..0baf0aaae6 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -25,7 +25,7 @@ import java.util.Map.Entry; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.ExtractableProductItem; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,12 +47,12 @@ public class RestorationRandom extends AbstractEffect { private final List _products = new ArrayList<>(); - public RestorationRandom(StatsSet params) + public RestorationRandom(StatSet params) { - for (StatsSet group : params.getList("items", StatsSet.class)) + for (StatSet group : params.getList("items", StatSet.class)) { final List items = new ArrayList<>(); - for (StatsSet item : group.getList(".", StatsSet.class)) + for (StatSet item : group.getList(".", StatSet.class)) { items.add(new RestorationItemHolder(item.getInt(".id"), item.getInt(".count"), item.getInt(".minEnchant", 0), item.getInt(".maxEnchant", 0))); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index f9c10b7ff2..9b287dd419 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class Resurrection extends AbstractEffect { private final int _power; - public Resurrection(StatsSet params) + public Resurrection(StatSet params) { _power = params.getInt("power", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 18d8bdb0bd..6ef063ce91 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -39,7 +39,7 @@ public class ResurrectionSpecial extends AbstractEffect private final int _power; private final Set _instanceId; - public ResurrectionSpecial(StatsSet params) + public ResurrectionSpecial(StatSet params) { _power = params.getInt("power", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index e4d66b43d3..0e7391681b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class Reuse extends AbstractEffect private final int _magicType; private final double _amount; - public Reuse(StatsSet params) + public Reuse(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index 3716fc1922..e17cd7cc25 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ReuseSkillById extends AbstractEffect { private final int _skillId; - public ReuseSkillById(StatsSet params) + public ReuseSkillById(StatSet params) { _skillId = params.getInt("skillId", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Root.java index 1ca3492949..b6876e8e13 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Root extends AbstractEffect { - public Root(StatsSet params) + public Root(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index 66fc8d82c8..4c7ee53239 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class SacrificeSummon extends AbstractEffect { - public SacrificeSummon(StatsSet params) + public SacrificeSummon(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java index d00856c9bd..683f45bb55 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SafeFallHeight extends AbstractStatEffect { - public SafeFallHeight(StatsSet params) + public SafeFallHeight(StatSet params) { super(params, Stat.FALL); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 7f6bf69ee3..797aa95263 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -33,7 +33,7 @@ public class SendSystemMessageToClan extends AbstractEffect { private final SystemMessage _message; - public SendSystemMessageToClan(StatsSet params) + public SendSystemMessageToClan(StatSet params) { final int id = params.getInt("id", 0); _message = new SystemMessage(id); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java index 7acbf846df..a0508d73b1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class ServitorShare extends AbstractEffect { private final Map _sharedStats = new EnumMap<>(Stat.class); - public ServitorShare(StatsSet params) + public ServitorShare(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 01dfd87c71..6e8187feae 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SetHp extends AbstractEffect private final double _amount; private final StatModifierType _mode; - public SetHp(StatsSet params) + public SetHp(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index 805d18160b..fae21baa51 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SetSkill extends AbstractEffect private final int _skillId; private final int _skillLvl; - public SetSkill(StatsSet params) + public SetSkill(StatSet params) { _skillId = params.getInt("skillId", 0); _skillLvl = params.getInt("skillLvl", 1); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java index a93bb5f253..354cb42b55 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ShieldDefence extends AbstractStatEffect { - public ShieldDefence(StatsSet params) + public ShieldDefence(StatSet params) { super(params, Stat.SHIELD_DEFENCE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java index f28d0e4ad2..1fdee75f69 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ShieldDefenceRate extends AbstractStatEffect { - public ShieldDefenceRate(StatsSet params) + public ShieldDefenceRate(StatSet params) { super(params, Stat.SHIELD_DEFENCE_RATE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java index 1d649082dc..533b631f10 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class SilentMove extends AbstractEffect { - public SilentMove(StatsSet params) + public SilentMove(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java index 89dad85514..7c929a7fe8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class SkillCritical extends AbstractEffect { private final BaseStat _stat; - public SkillCritical(StatsSet params) + public SkillCritical(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java index 369bef11f5..8f054f973b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillCriticalDamage extends AbstractStatEffect { - public SkillCriticalDamage(StatsSet params) + public SkillCriticalDamage(StatSet params) { super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java index c91f2d6b49..88ecf69e77 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillCriticalProbability extends AbstractStatPercentEffect { - public SkillCriticalProbability(StatsSet params) + public SkillCriticalProbability(StatSet params) { super(params, Stat.SKILL_CRITICAL_PROBABILITY); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 7b98a9e180..1664ea1827 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class SkillEvasion extends AbstractEffect private final int _magicType; private final double _amount; - public SkillEvasion(StatsSet params) + public SkillEvasion(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java index 9cc62532b4..2880d0ccef 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillPowerAdd extends AbstractStatAddEffect { - public SkillPowerAdd(StatsSet params) + public SkillPowerAdd(StatSet params) { super(params, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 9578c88f91..7156fff2df 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SkillTurning extends AbstractEffect private final int _chance; private final boolean _staticChance; - public SkillTurning(StatsSet params) + public SkillTurning(StatSet params) { _chance = params.getInt("chance", 100); _staticChance = params.getBoolean("staticChance", false); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 45b02206a4..04691304ed 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SkillTurningOverTime extends AbstractEffect private final int _chance; private final boolean _staticChance; - public SkillTurningOverTime(StatsSet params) + public SkillTurningOverTime(StatSet params) { _chance = params.getInt("chance", 100); _staticChance = params.getBoolean("staticChance", false); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index c1dd92cedb..b919c7acac 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -36,7 +36,7 @@ public class SoulBlow extends AbstractEffect private final double _chanceBoost; private final boolean _overHit; - public SoulBlow(StatsSet params) + public SoulBlow(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 8471aa236c..4f63a84081 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; @@ -40,7 +40,7 @@ public class SoulEating extends AbstractEffect private final int _expNeeded; private final int _maxSouls; - public SoulEating(StatsSet params) + public SoulEating(StatSet params) { _expNeeded = params.getInt("expNeeded"); _maxSouls = params.getInt("maxSouls"); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a7d5c2628a..ad261845eb 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Seed; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Sow extends AbstractEffect { - public Sow(StatsSet params) + public Sow(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SpModify.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SpModify.java index 24d124ecce..c3bc6193e9 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SpModify.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SpModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SpModify extends AbstractStatAddEffect { - public SpModify(StatsSet params) + public SpModify(StatSet params) { super(params, Stat.BONUS_SP); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 0718408ca2..890438d65f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.enums.SpeedType; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -36,7 +36,7 @@ public class Speed extends AbstractEffect private final StatModifierType _mode; private List _speedType; - public Speed(StatsSet params) + public Speed(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index 91b91ad05e..db247775f3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SphericBarrier extends AbstractStatAddEffect { - public SphericBarrier(StatsSet params) + public SphericBarrier(StatSet params) { super(params, Stat.SPHERIC_BARRIER_RANGE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index d13eaf1c2e..385240377f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class Spoil extends AbstractEffect { - public Spoil(StatsSet params) + public Spoil(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index b63c24dc20..22c4132b63 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -36,7 +36,7 @@ public class StatBonusSkillCritical extends AbstractEffect private final BaseStat _stat; private final Condition _armorTypeCondition; - public StatBonusSkillCritical(StatsSet params) + public StatBonusSkillCritical(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.DEX); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index 41a20bfafe..49280eb774 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -36,7 +36,7 @@ public class StatBonusSpeed extends AbstractEffect private final BaseStat _stat; private final Condition _armorTypeCondition; - public StatBonusSpeed(StatsSet params) + public StatBonusSpeed(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.DEX); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index a007b118b2..bcf691e360 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class StatByMoveType extends AbstractEffect private final MoveType _type; private final double _value; - public StatByMoveType(StatsSet params) + public StatByMoveType(StatSet params) { _stat = params.getEnum("stat", Stat.class); _type = params.getEnum("type", MoveType.class); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StatUp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StatUp.java index a22710ca7a..29d72bb4de 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StatUp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StatUp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class StatUp extends AbstractEffect private final BaseStat _stat; private final double _amount; - public StatUp(StatsSet params) + public StatUp(StatSet params) { _amount = params.getDouble("amount", 0); _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index 0720057c19..23239887a7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.List; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -39,7 +39,7 @@ public class StealAbnormal extends AbstractEffect private final int _rate; private final int _max; - public StealAbnormal(StatsSet params) + public StealAbnormal(StatSet params) { _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); _rate = params.getInt("rate", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Summon.java index 0f95637961..7ef79d4c39 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.ServitorInstance; @@ -43,7 +43,7 @@ public class Summon extends AbstractEffect private final int _lifeTime; private final int _consumeItemInterval; - public Summon(StatsSet params) + public Summon(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index 8929e1f2b0..50c025e572 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class SummonAgathion extends AbstractEffect { private final int _npcId; - public SummonAgathion(StatsSet params) + public SummonAgathion(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index 7716d58f16..49b816f272 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.CubicData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; @@ -42,7 +42,7 @@ public class SummonCubic extends AbstractEffect private final int _cubicId; private final int _cubicLvl; - public SummonCubic(StatsSet params) + public SummonCubic(StatSet params) { _cubicId = params.getInt("cubicId", -1); _cubicLvl = params.getInt("cubicLvl", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index d0a2a82738..13d5a2eac7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoppelgangerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ public class SummonHallucination extends AbstractEffect private final int _npcId; private final int _npcCount; - public SummonHallucination(StatsSet params) + public SummonHallucination(StatSet params) { _despawnDelay = params.getInt("despawnDelay", 20000); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index bcd050e084..d61a6e5c02 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.ServitorInstance; @@ -43,7 +43,7 @@ public class SummonMulti extends AbstractEffect private final int _consumeItemInterval; private final int _summonPoints; - public SummonMulti(StatsSet params) + public SummonMulti(StatSet params) { _npcId = params.getInt("npcId"); _expMultiplier = params.getFloat("expMultiplier", 1); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index 6f4090eef0..eaff214b7c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DecoyInstance; @@ -48,7 +48,7 @@ public class SummonNpc extends AbstractEffect private final boolean _isSummonSpawn; private final boolean _singleInstance; // Only one instance of this NPC is allowed. - public SummonNpc(StatsSet params) + public SummonNpc(StatSet params) { _despawnDelay = params.getInt("despawnDelay", 20000); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 5ef621819e..534a41ee16 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.data.xml.impl.PetDataTable; import org.l2jmobius.gameserver.model.PetData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PetItemList; */ public class SummonPet extends AbstractEffect { - public SummonPet(StatsSet params) + public SummonPet(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java index 7dd690587c..b1d5ec38cb 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SummonPoints extends AbstractStatAddEffect { - public SummonPoints(StatsSet params) + public SummonPoints(StatSet params) { super(params, Stat.MAX_SUMMON_POINTS); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index d8a47b670f..ac1ddaa16a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; @@ -35,7 +35,7 @@ public class SummonTrap extends AbstractEffect private final int _despawnTime; private final int _npcId; - public SummonTrap(StatsSet params) + public SummonTrap(StatSet params) { _despawnTime = params.getInt("despawnTime", 0); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 84f6d070a8..3196bb949d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Collection; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Sweeper extends AbstractEffect { - public Sweeper(StatsSet params) + public Sweeper(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 1594a8a23b..77dc9b4af7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ public class Synergy extends AbstractEffect private final int _skillLevelScaleTo; private final int _minSlot; - public Synergy(StatsSet params) + public Synergy(StatSet params) { final String requiredSlots = params.getString("requiredSlots", null); if ((requiredSlots != null) && !requiredSlots.isEmpty()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index e35516fef5..39ed981bbf 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Castle; @@ -33,7 +33,7 @@ public class TakeCastle extends AbstractEffect { private final CastleSide _side; - public TakeCastle(StatsSet params) + public TakeCastle(StatSet params) { _side = params.getEnum("side", CastleSide.class); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 77fd9ec103..3be2bf5593 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Castle; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TakeCastleStart extends AbstractEffect { - public TakeCastleStart(StatsSet params) + public TakeCastleStart(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 70842191a7..18749c1aef 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Fort; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TakeFort extends AbstractEffect { - public TakeFort(StatsSet params) + public TakeFort(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 0eb23f6733..77355f9683 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TakeFortStart extends AbstractEffect { - public TakeFortStart(StatsSet params) + public TakeFortStart(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index cec32755ed..dd8e09278f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class TalismanSlot extends AbstractEffect { private final int _slots; - public TalismanSlot(StatsSet params) + public TalismanSlot(StatSet params) { _slots = params.getInt("slots", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 281b5322fd..32a126f499 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class TargetCancel extends AbstractEffect { private final int _chance; - public TargetCancel(StatsSet params) + public TargetCancel(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index b4463de391..86ff70c9ca 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMe extends AbstractEffect { - public TargetMe(StatsSet params) + public TargetMe(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index 11e581113e..e68a1e1faf 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class TargetMeProbability extends AbstractEffect { private final int _chance; - public TargetMeProbability(StatsSet params) + public TargetMeProbability(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 6c30519678..9ca01faf50 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -32,7 +32,7 @@ public class Teleport extends AbstractEffect { private final Location _loc; - public Teleport(StatsSet params) + public Teleport(StatSet params) { _loc = new Location(params.getInt("x", 0), params.getInt("y", 0), params.getInt("z", 0)); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index e0e715818c..bdc53208d5 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -38,7 +38,7 @@ public class TeleportToNpc extends AbstractEffect private final int _npcId; private final boolean _party; - public TeleportToNpc(StatsSet params) + public TeleportToNpc(StatSet params) { _npcId = params.getInt("npcId"); _party = params.getBoolean("party", false); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index c84c559322..4f4275fd41 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TeleportToPlayer extends AbstractEffect { - public TeleportToPlayer(StatsSet params) + public TeleportToPlayer(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index 1c9af0f535..b2d6b663de 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class TeleportToSummon extends AbstractEffect { private final double _maxDistance; - public TeleportToSummon(StatsSet params) + public TeleportToSummon(StatSet params) { _maxDistance = params.getDouble("distance", -1); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index e550302b02..c4bf787a10 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class TeleportToTarget extends AbstractEffect { - public TeleportToTarget(StatsSet params) + public TeleportToTarget(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index ba1c55c615..ff63eea817 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class TransferDamageToPlayer extends AbstractStatAddEffect { - public TransferDamageToPlayer(StatsSet params) + public TransferDamageToPlayer(StatSet params) { super(params, Stat.TRANSFER_DAMAGE_TO_PLAYER); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java index b084bfc1cb..c87d5f0554 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class TransferDamageToSummon extends AbstractStatAddEffect { - public TransferDamageToSummon(StatsSet params) + public TransferDamageToSummon(StatSet params) { super(params, Stat.TRANSFER_DAMAGE_SUMMON_PERCENT); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index e9f0292113..48bc5e3a1c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -34,7 +34,7 @@ public class TransferHate extends AbstractEffect { private final int _chance; - public TransferHate(StatsSet params) + public TransferHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 2ddf95a4db..bf593eaed8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Transformation extends AbstractEffect { private final List _id; - public Transformation(StatsSet params) + public Transformation(StatSet params) { final String ids = params.getString("transformationId", null); if ((ids != null) && !ids.isEmpty()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 103ccdf8ce..2b4af0a1d3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class TrapDetect extends AbstractEffect { private final int _power; - public TrapDetect(StatsSet params) + public TrapDetect(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index eb7b073b36..c4a6c6aed9 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.TrapAction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class TrapRemove extends AbstractEffect { private final int _power; - public TrapRemove(StatsSet params) + public TrapRemove(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 6df3874ab1..8fb87050b1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -59,7 +59,7 @@ public class TriggerSkillByAttack extends AbstractEffect * @param params */ - public TriggerSkillByAttack(StatsSet params) + public TriggerSkillByAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index ae6a3bc89f..78366b8047 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillByAvoid extends AbstractEffect /** * @param params */ - public TriggerSkillByAvoid(StatsSet params) + public TriggerSkillByAvoid(StatSet params) { _chance = params.getInt("chance", 100); _skill = new SkillHolder(params.getInt("skillId", 0), params.getInt("skillLevel", 0)); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index c24fb95246..9fe53c0622 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -48,7 +48,7 @@ public class TriggerSkillByDamage extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillByDamage(StatsSet params) + public TriggerSkillByDamage(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c086507336..8b84350293 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillByDeathBlow extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillByDeathBlow(StatsSet params) + public TriggerSkillByDeathBlow(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index a9bfcc320c..11802645f2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -37,7 +37,7 @@ public class TriggerSkillByKill extends AbstractEffect private final int _chance; private final SkillHolder _skill; - public TriggerSkillByKill(StatsSet params) + public TriggerSkillByKill(StatSet params) { _chance = params.getInt("chance", 100); _skill = new SkillHolder(params.getInt("skillId", 0), params.getInt("skillLevel", 0)); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 2893d46f33..7f2d3f9fa7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -52,7 +52,7 @@ public class TriggerSkillByMagicType extends AbstractEffect * @param params */ - public TriggerSkillByMagicType(StatsSet params) + public TriggerSkillByMagicType(StatSet params) { _chance = params.getInt("chance", 100); _magicTypes = params.getIntArray("magicTypes", ";"); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 1524e3d4f4..b77da803f5 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillBySkill extends AbstractEffect private final int _skillLevelScaleTo; private final TargetType _targetType; - public TriggerSkillBySkill(StatsSet params) + public TriggerSkillBySkill(StatSet params) { _castSkillId = params.getInt("castSkillId"); _chance = params.getInt("chance", 100); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index ec2124c44e..7bb68baec9 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -53,7 +53,7 @@ public class TriggerSkillBySkillAttack extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillBySkillAttack(StatsSet params) + public TriggerSkillBySkillAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 3f58619f0a..c209decfb3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -69,7 +69,7 @@ public class TwoHandedBluntBonus extends AbstractEffect private final double _speedAmount; private final StatModifierType _speedMode; - public TwoHandedBluntBonus(StatsSet params) + public TwoHandedBluntBonus(StatSet params) { _pAtkAmount = params.getDouble("pAtkAmount", 0); _pAtkMode = params.getEnum("pAtkMode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index b2c50c4b88..344456a925 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -69,7 +69,7 @@ public class TwoHandedSwordBonus extends AbstractEffect private final double _speedAmount; private final StatModifierType _speedMode; - public TwoHandedSwordBonus(StatsSet params) + public TwoHandedSwordBonus(StatSet params) { _pAtkAmount = params.getDouble("pAtkAmount", 0); _pAtkMode = params.getEnum("pAtkMode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 01ae8122ec..20b418c29b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ public class Unsummon extends AbstractEffect { private final int _chance; - public Unsummon(StatsSet params) + public Unsummon(StatSet params) { _chance = params.getInt("chance", -1); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 57eb89196d..f73f0f57f0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; */ public class UnsummonAgathion extends AbstractEffect { - public UnsummonAgathion(StatsSet params) + public UnsummonAgathion(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index a4fdc2c0aa..0779d018cc 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class UnsummonServitors extends AbstractEffect { - public UnsummonServitors(StatsSet params) + public UnsummonServitors(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index dbb0c700b5..ac33fcba0d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Untargetable extends AbstractEffect { - public Untargetable(StatsSet params) + public Untargetable(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java index ac6cae3d05..1c85196fe0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class VampiricAttack extends AbstractEffect private final double _amount; private final double _sum; - public VampiricAttack(StatsSet params) + public VampiricAttack(StatSet params) { _amount = params.getDouble("amount"); _sum = _amount * params.getDouble("chance"); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java index ab724714e1..571ca55bbe 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ public class VampiricDefence extends AbstractEffect { private final int _amount; - public VampiricDefence(StatsSet params) + public VampiricDefence(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java index b6a8a03728..02e8069fe3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class VitalityExpRate extends AbstractStatPercentEffect { - public VitalityExpRate(StatsSet params) + public VitalityExpRate(StatSet params) { super(params, Stat.VITALITY_EXP_RATE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index cba2b14c35..385595e03d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class VitalityPointUp extends AbstractEffect { private final int _value; - public VitalityPointUp(StatsSet params) + public VitalityPointUp(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java index 86612955dd..72f78ec177 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class VitalityPointsRate extends AbstractStatPercentEffect { - public VitalityPointsRate(StatsSet params) + public VitalityPointsRate(StatSet params) { super(params, Stat.VITALITY_CONSUME_RATE); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java index 09500b3823..bf20bd5018 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WeightLimit extends AbstractStatEffect { - public WeightLimit(StatsSet params) + public WeightLimit(StatSet params) { super(params, Stat.WEIGHT_LIMIT); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java index f9be68f493..6020399f85 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WeightPenalty extends AbstractStatAddEffect { - public WeightPenalty(StatsSet params) + public WeightPenalty(StatSet params) { super(params, Stat.WEIGHT_PENALTY); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java index bdf9aca48d..81eb9a9688 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WorldChatPoints extends AbstractStatEffect { - public WorldChatPoints(StatsSet params) + public WorldChatPoints(StatSet params) { super(params, Stat.WORLD_CHAT_POINTS); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java index 5a3842921d..127dadf9d2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class BuildAdvanceBaseSkillCondition implements ISkillCondition { - public BuildAdvanceBaseSkillCondition(StatsSet params) + public BuildAdvanceBaseSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java index a9dd2b9eba..ffb7d13539 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class BuildCampSkillCondition implements ISkillCondition { - public BuildCampSkillCondition(StatsSet params) + public BuildCampSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java index c1220c828a..aca51bafbf 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanAddMaxEntranceInzoneSkillCondition implements ISkillCondition { - public CanAddMaxEntranceInzoneSkillCondition(StatsSet params) + public CanAddMaxEntranceInzoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java index eddd45771c..6ac3c2e199 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ public class CanBookmarkAddSlotSkillCondition implements ISkillCondition { private final int _teleportBookmarkSlots; - public CanBookmarkAddSlotSkillCondition(StatsSet params) + public CanBookmarkAddSlotSkillCondition(StatSet params) { _teleportBookmarkSlots = params.getInt("teleportBookmarkSlots"); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java index 30fdb7f36f..ee1bf96e69 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanChangeVitalItemCountSkillCondition implements ISkillCondition { - public CanChangeVitalItemCountSkillCondition(StatsSet params) + public CanChangeVitalItemCountSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java index da553a6d9f..48e28e7af7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanEnchantAttributeSkillCondition implements ISkillCondition { - public CanEnchantAttributeSkillCondition(StatsSet params) + public CanEnchantAttributeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java index c14f1ffe64..2908994776 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanMountForEventSkillCondition implements ISkillCondition { - public CanMountForEventSkillCondition(StatsSet params) + public CanMountForEventSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java index d07aa9a622..9dc5f99592 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShipInstance; @@ -31,7 +31,7 @@ public class CanRefuelAirshipSkillCondition implements ISkillCondition { private final int _amount; - public CanRefuelAirshipSkillCondition(StatsSet params) + public CanRefuelAirshipSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java index d451f3c997..67206b47bd 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanRestoreVitalPointSkillCondition implements ISkillCondition { - public CanRestoreVitalPointSkillCondition(StatsSet params) + public CanRestoreVitalPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java index 7e519025b0..49232af88f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CanSummonCubicSkillCondition implements ISkillCondition { - public CanSummonCubicSkillCondition(StatsSet params) + public CanSummonCubicSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java index 23cca508c1..6610f322f1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class CanSummonMultiSkillCondition implements ISkillCondition { private final int _summonPoints; - public CanSummonMultiSkillCondition(StatsSet params) + public CanSummonMultiSkillCondition(StatSet params) { _summonPoints = params.getInt("summonPoints"); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java index 85419e1e5e..c38566dbdd 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.CharSummonTable; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; */ public class CanSummonPetSkillCondition implements ISkillCondition { - public CanSummonPetSkillCondition(StatsSet params) + public CanSummonPetSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java index ea41a2e22e..3655e158cb 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanSummonSiegeGolemSkillCondition implements ISkillCondition { - public CanSummonSiegeGolemSkillCondition(StatsSet params) + public CanSummonSiegeGolemSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java index 6248c5131f..4d59811c7b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanSummonSkillCondition implements ISkillCondition { - public CanSummonSkillCondition(StatsSet params) + public CanSummonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java index 309da529c9..bd8838d02f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanTransformInDominionSkillCondition implements ISkillCondition { - public CanTransformInDominionSkillCondition(StatsSet params) + public CanTransformInDominionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java index 81297944f1..2f4d780cab 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class CanTransformSkillCondition implements ISkillCondition // TODO: What to do with this? // private final int _transformId; - public CanTransformSkillCondition(StatsSet params) + public CanTransformSkillCondition(StatSet params) { // _transformId = params.getInt("transformId"); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java index 800d0375be..771873a553 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanUntransformSkillCondition implements ISkillCondition { - public CanUntransformSkillCondition(StatsSet params) + public CanUntransformSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java index e651b3b1d5..ffe2e4a026 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class CanUseInBattlefieldSkillCondition implements ISkillCondition { - public CanUseInBattlefieldSkillCondition(StatsSet params) + public CanUseInBattlefieldSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java index 5ff751abce..ba030b97a4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanUseInDragonLairSkillCondition implements ISkillCondition { - public CanUseInDragonLairSkillCondition(StatsSet params) + public CanUseInDragonLairSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java index 4d914c28fe..8a0cb18ac7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class CanUseSwoopCannonSkillCondition implements ISkillCondition { - public CanUseSwoopCannonSkillCondition(StatsSet params) + public CanUseSwoopCannonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java index 6a2d832a4c..e9996580fc 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanUseVitalityConsumeItemSkillCondition implements ISkillCondition { - public CanUseVitalityConsumeItemSkillCondition(StatsSet params) + public CanUseVitalityConsumeItemSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java index f694956e7e..48dafb46c3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class CannotUseInTransformSkillCondition implements ISkillCondition { private final int _transformId; - public CannotUseInTransformSkillCondition(StatsSet params) + public CannotUseInTransformSkillCondition(StatSet params) { _transformId = params.getInt("transformId", -1); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java index 141c69322f..6591233504 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -32,7 +32,7 @@ public class CheckLevelSkillCondition implements ISkillCondition private final int _maxLevel; private final SkillConditionAffectType _affectType; - public CheckLevelSkillCondition(StatsSet params) + public CheckLevelSkillCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java index 15163a3373..d72f463c4e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class CheckSexSkillCondition implements ISkillCondition { private final boolean _isFemale; - public CheckSexSkillCondition(StatsSet params) + public CheckSexSkillCondition(StatSet params) { _isFemale = params.getBoolean("isFemale"); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java index 8dee11ef9c..12e49c23a7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConsumeBodySkillCondition implements ISkillCondition { - public ConsumeBodySkillCondition(StatsSet params) + public ConsumeBodySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java index c24da9ebcd..ba1b1cdd5f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class EnergySavedSkillCondition implements ISkillCondition { private final int _amount; - public EnergySavedSkillCondition(StatsSet params) + public EnergySavedSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 192f3487e2..cbaf72bb00 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -35,7 +35,7 @@ public class EquipArmorSkillCondition implements ISkillCondition { private int _armorTypesMask = 0; - public EquipArmorSkillCondition(StatsSet params) + public EquipArmorSkillCondition(StatSet params) { final List armorTypes = params.getEnumList("armorType", ArmorType.class); if (armorTypes != null) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index e5f22008fa..708b4dd1d4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class EquipShieldSkillCondition implements ISkillCondition { - public EquipShieldSkillCondition(StatsSet params) + public EquipShieldSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 4561945254..f733f81f62 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -33,7 +33,7 @@ public class EquipWeaponSkillCondition implements ISkillCondition { private int _weaponTypesMask = 0; - public EquipWeaponSkillCondition(StatsSet params) + public EquipWeaponSkillCondition(StatSet params) { final List weaponTypes = params.getEnumList("weaponType", WeaponType.class); if (weaponTypes != null) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java index 5f77215218..e36c06fa11 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class NotFearedSkillCondition implements ISkillCondition { - public NotFearedSkillCondition(StatsSet params) + public NotFearedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java index b9096cc1a9..b6e7bcd826 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class NotInUnderwaterSkillCondition implements ISkillCondition { - public NotInUnderwaterSkillCondition(StatsSet params) + public NotInUnderwaterSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index eee6ec73e9..18d8dc8a11 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -35,7 +35,7 @@ public class Op2hWeaponSkillCondition implements ISkillCondition { private final List _weaponTypes = new ArrayList<>(); - public Op2hWeaponSkillCondition(StatsSet params) + public Op2hWeaponSkillCondition(StatSet params) { final List weaponTypes = params.getList("weaponType", String.class); if (weaponTypes != null) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 3b91f36fe4..6223172dbc 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; - public OpAffectedBySkillSkillCondition(StatsSet params) + public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java index 2eb561291e..3818df4736 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAgathionEnergySkillCondition implements ISkillCondition { - public OpAgathionEnergySkillCondition(StatsSet params) + public OpAgathionEnergySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java index 76a7ebc5a8..ee2b415021 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.enums.SkillConditionAlignment; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -32,7 +32,7 @@ public class OpAlignmentSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final SkillConditionAlignment _alignment; - public OpAlignmentSkillCondition(StatsSet params) + public OpAlignmentSkillCondition(StatSet params) { _affectType = params.getEnum("affectType", SkillConditionAffectType.class); _alignment = params.getEnum("alignment", SkillConditionAlignment.class); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index 1c83d18f4e..bcc6715bb2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -33,7 +33,7 @@ public class OpBlinkSkillCondition implements ISkillCondition private final int _angle; private final int _range; - public OpBlinkSkillCondition(StatsSet params) + public OpBlinkSkillCondition(StatSet params) { switch (params.getEnum("direction", Position.class)) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java index 5215f86ae6..fde0c7f0f8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpCallPcSkillCondition implements ISkillCondition { - public OpCallPcSkillCondition(StatsSet params) + public OpCallPcSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java index dddafec6f0..1de2a32550 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCanEscapeSkillCondition implements ISkillCondition { - public OpCanEscapeSkillCondition(StatsSet params) + public OpCanEscapeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java index 3f1685a1e0..a87fd8adb6 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCanNotUseAirshipSkillCondition implements ISkillCondition { - public OpCanNotUseAirshipSkillCondition(StatsSet params) + public OpCanNotUseAirshipSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java index 8eec19a568..ac7a81c015 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCannotUseTargetWithPrivateStoreSkillCondition implements ISkillCondition { - public OpCannotUseTargetWithPrivateStoreSkillCondition(StatsSet params) + public OpCannotUseTargetWithPrivateStoreSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 91de0adc8c..4030b79d00 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Weapon; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpChangeWeaponSkillCondition implements ISkillCondition { - public OpChangeWeaponSkillCondition(StatsSet params) + public OpChangeWeaponSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java index c2de03de1e..3e304e7d9d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.AbnormalType; @@ -34,7 +34,7 @@ public class OpCheckAbnormalSkillCondition implements ISkillCondition private final boolean _hasAbnormal; private final SkillConditionAffectType _affectType; - public OpCheckAbnormalSkillCondition(StatsSet params) + public OpCheckAbnormalSkillCondition(StatSet params) { _type = params.getEnum("type", AbnormalType.class); _level = params.getInt("level"); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java index 65084182b1..c70b58dc50 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCheckAccountTypeSkillCondition implements ISkillCondition { - public OpCheckAccountTypeSkillCondition(StatsSet params) + public OpCheckAccountTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java index 3d4f0a58a0..11eb804274 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpCheckCastRangeSkillCondition implements ISkillCondition { private final int _distance; - public OpCheckCastRangeSkillCondition(StatsSet params) + public OpCheckCastRangeSkillCondition(StatSet params) { _distance = params.getInt("distance"); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java index 7e2e391595..03af1ac63d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.ClassId; @@ -35,7 +35,7 @@ public class OpCheckClassListSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final boolean _isWithin; - public OpCheckClassListSkillCondition(StatsSet params) + public OpCheckClassListSkillCondition(StatSet params) { _classIds = params.getEnumList("classIds", ClassId.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java index 9f779f937a..9702804304 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.ClassId; @@ -33,7 +33,7 @@ public class OpCheckClassSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final boolean _isWithin; - public OpCheckClassSkillCondition(StatsSet params) + public OpCheckClassSkillCondition(StatSet params) { _classId = params.getEnum("classId", ClassId.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java index 3bf6b65dc8..ad997dced7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckCrtEffectSkillCondition implements ISkillCondition { - public OpCheckCrtEffectSkillCondition(StatsSet params) + public OpCheckCrtEffectSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java index 61c3aa66a4..c0bb54afe0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class OpCheckFlagSkillCondition implements ISkillCondition { - public OpCheckFlagSkillCondition(StatsSet params) + public OpCheckFlagSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java index 75af2ab89a..2e0c07d040 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckOnGoingEventCampaignSkillCondition implements ISkillCondition { - public OpCheckOnGoingEventCampaignSkillCondition(StatsSet params) + public OpCheckOnGoingEventCampaignSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java index c64f7c6722..f11569f43c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckPcbangPointSkillCondition implements ISkillCondition { - public OpCheckPcbangPointSkillCondition(StatsSet params) + public OpCheckPcbangPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java index 252519f7ff..997a4d0fec 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.data.xml.impl.ClanHallData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -35,7 +35,7 @@ public class OpCheckResidenceSkillCondition implements ISkillCondition private final List _residencesId; private final boolean _isWithin; - public OpCheckResidenceSkillCondition(StatsSet params) + public OpCheckResidenceSkillCondition(StatSet params) { _residencesId = params.getList("residencesId", Integer.class); _isWithin = params.getBoolean("isWithin"); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java index 6abeed7d35..3a1bcf424c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -34,7 +34,7 @@ public class OpCheckSkillListSkillCondition implements ISkillCondition private final List _skillIds; private final SkillConditionAffectType _affectType; - public OpCheckSkillListSkillCondition(StatsSet params) + public OpCheckSkillListSkillCondition(StatSet params) { _skillIds = params.getList("skillIds", Integer.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java index 984338b2c0..af563d983f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpCheckSkillSkillCondition implements ISkillCondition private final int _skillId; private final SkillConditionAffectType _affectType; - public OpCheckSkillSkillCondition(StatsSet params) + public OpCheckSkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java index ea882c3635..5d85a2dbdb 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionCompanionType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpCompanionSkillCondition implements ISkillCondition { private final SkillConditionCompanionType _type; - public OpCompanionSkillCondition(StatsSet params) + public OpCompanionSkillCondition(StatSet params) { _type = params.getEnum("type", SkillConditionCompanionType.class); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java index 069b9d1759..464853c00c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpEnchantRangeSkillCondition implements ISkillCondition { - public OpEnchantRangeSkillCondition(StatsSet params) + public OpEnchantRangeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java index 99f22bb16a..e12f3ae007 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class OpEncumberedSkillCondition implements ISkillCondition private final int _slotsPercent; private final int _weightPercent; - public OpEncumberedSkillCondition(StatsSet params) + public OpEncumberedSkillCondition(StatSet params) { _slotsPercent = params.getInt("slotsPercent"); _weightPercent = params.getInt("weightPercent"); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java index 187dfba744..49cf8e2cb8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpEnergyMaxSkillCondition implements ISkillCondition { private final int _amount; - public OpEnergyMaxSkillCondition(StatsSet params) + public OpEnergyMaxSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 75bdf465e0..82eb70b770 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class OpEquipItemSkillCondition implements ISkillCondition private final int _itemId; private final SkillConditionAffectType _affectType; - public OpEquipItemSkillCondition(StatsSet params) + public OpEquipItemSkillCondition(StatSet params) { _itemId = params.getInt("itemId"); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java index 2c4576c2fa..fa6e82082b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ public class OpExistNpcSkillCondition implements ISkillCondition private final int _range; private final boolean _isAround; - public OpExistNpcSkillCondition(StatsSet params) + public OpExistNpcSkillCondition(StatSet params) { _npcIds = params.getList("npcIds", Integer.class); _range = params.getInt("range"); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java index 27cc3e90a9..8299b40047 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingCastSkillCondition implements ISkillCondition { - public OpFishingCastSkillCondition(StatsSet params) + public OpFishingCastSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java index 84cc031a24..4b43eb834e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingPumpingSkillCondition implements ISkillCondition { - public OpFishingPumpingSkillCondition(StatsSet params) + public OpFishingPumpingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java index 86aa667bee..a6a400f96f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingReelingSkillCondition implements ISkillCondition { - public OpFishingReelingSkillCondition(StatsSet params) + public OpFishingReelingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java index d22733df7e..50e6dafb82 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpHaveSummonSkillCondition implements ISkillCondition { - public OpHaveSummonSkillCondition(StatsSet params) + public OpHaveSummonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 2e854ca2b8..cceb4e937b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { private final int _npcId; - public OpHaveSummonedNpcSkillCondition(StatsSet params) + public OpHaveSummonedNpcSkillCondition(StatSet params) { _npcId = params.getInt("npcId"); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java index 16932ce531..374a75bfab 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.impl.ClanHallData; import org.l2jmobius.gameserver.enums.ResidenceType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -34,7 +34,7 @@ public class OpHomeSkillCondition implements ISkillCondition { private final ResidenceType _type; - public OpHomeSkillCondition(StatsSet params) + public OpHomeSkillCondition(StatSet params) { _type = params.getEnum("type", ResidenceType.class); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java index 9482a0bf55..62ad48bdcc 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpInSiegeTimeSkillCondition implements ISkillCondition { - public OpInSiegeTimeSkillCondition(StatsSet params) + public OpInSiegeTimeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java index 1bffdacd6c..f2fb298398 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -30,7 +30,7 @@ public class OpInstantzoneSkillCondition implements ISkillCondition { private final int _instanceId; - public OpInstantzoneSkillCondition(StatsSet params) + public OpInstantzoneSkillCondition(StatSet params) { _instanceId = params.getInt("instanceId"); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java index 76703cc53b..7418ef9b64 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpMainjobSkillCondition implements ISkillCondition { - public OpMainjobSkillCondition(StatsSet params) + public OpMainjobSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java index d4c9f1f331..3c81369bbb 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNeedAgathionSkillCondition implements ISkillCondition { - public OpNeedAgathionSkillCondition(StatsSet params) + public OpNeedAgathionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java index 96f6774f25..e7a477b0ee 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; @@ -34,7 +34,7 @@ public class OpNeedSummonOrPetSkillCondition implements ISkillCondition { private final List _npcIds = new ArrayList<>(); - public OpNeedSummonOrPetSkillCondition(StatsSet params) + public OpNeedSummonOrPetSkillCondition(StatSet params) { final List npcIds = params.getList("npcIds", String.class); if (npcIds != null) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java index 9701002065..ae1edfd719 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotCursedSkillCondition implements ISkillCondition { - public OpNotCursedSkillCondition(StatsSet params) + public OpNotCursedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInCeremonyOfChaosSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInCeremonyOfChaosSkillCondition.java index 9549fdc2ac..b5cefc61cc 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInCeremonyOfChaosSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInCeremonyOfChaosSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotInCeremonyOfChaosSkillCondition implements ISkillCondition { - public OpNotInCeremonyOfChaosSkillCondition(StatsSet params) + public OpNotInCeremonyOfChaosSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java index bf909425d8..1de79f388a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpNotInPeacezoneSkillCondition implements ISkillCondition { - public OpNotInPeacezoneSkillCondition(StatsSet params) + public OpNotInPeacezoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java index 0752ba4a6a..0d3e4cb4dd 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotInstantzoneSkillCondition implements ISkillCondition { - public OpNotInstantzoneSkillCondition(StatsSet params) + public OpNotInstantzoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java index 45891cd0ac..7ea02159ba 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotOlympiadSkillCondition implements ISkillCondition { - public OpNotOlympiadSkillCondition(StatsSet params) + public OpNotOlympiadSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java index 5c5d293ae8..2397a68e99 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpNotTerritorySkillCondition implements ISkillCondition { - public OpNotTerritorySkillCondition(StatsSet params) + public OpNotTerritorySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java index 874872bb2e..d9f8c1fa3b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpPeacezoneSkillCondition implements ISkillCondition { - public OpPeacezoneSkillCondition(StatsSet params) + public OpPeacezoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java index c20c4665bb..08d6bb095a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpPkcountSkillCondition implements ISkillCondition { private final SkillConditionAffectType _affectType; - public OpPkcountSkillCondition(StatsSet params) + public OpPkcountSkillCondition(StatSet params) { _affectType = params.getEnum("affectType", SkillConditionAffectType.class); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java index 879fc88c4c..d393c5ddc3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -30,7 +30,7 @@ public class OpPledgeSkillCondition implements ISkillCondition { private final int _level; - public OpPledgeSkillCondition(StatsSet params) + public OpPledgeSkillCondition(StatSet params) { _level = params.getInt("level"); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java index 9adc89b98d..adf16f8feb 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpRestartPointSkillCondition implements ISkillCondition { - public OpRestartPointSkillCondition(StatsSet params) + public OpRestartPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java index bbd1d9d7d1..6874091ba2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class OpResurrectionSkillCondition implements ISkillCondition { - public OpResurrectionSkillCondition(StatsSet params) + public OpResurrectionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java index 8bbf796ad2..566f935a50 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpSiegeHammerSkillCondition implements ISkillCondition { - public OpSiegeHammerSkillCondition(StatsSet params) + public OpSiegeHammerSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java index be3ad18e05..cbfc1a25b2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition private final int _skillId; private final boolean _hasLearned; - public OpSkillAcquireSkillCondition(StatsSet params) + public OpSkillAcquireSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _hasLearned = params.getBoolean("hasLearned"); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java index c8789d28e4..a8382b83b3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpSkillSkillCondition implements ISkillCondition private final int _skillLevel; private final boolean _hasLearned; - public OpSkillSkillCondition(StatsSet params) + public OpSkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _skillLevel = params.getInt("skillLevel"); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java index 5127071683..a3d188f3eb 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpSocialClassSkillCondition implements ISkillCondition { private final int _socialClass; - public OpSocialClassSkillCondition(StatsSet params) + public OpSocialClassSkillCondition(StatSet params) { _socialClass = params.getInt("socialClass"); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java index b9d37d18c0..c86984a218 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class OpSoulMaxSkillCondition implements ISkillCondition { - public OpSoulMaxSkillCondition(StatsSet params) + public OpSoulMaxSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java index 4780c13a58..0faa676bbe 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpSubjobSkillCondition implements ISkillCondition { - public OpSubjobSkillCondition(StatsSet params) + public OpSubjobSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java index 17a9a1a9e3..a14192847a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.concurrent.atomic.AtomicBoolean; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpSweeperSkillCondition implements ISkillCondition { - public OpSweeperSkillCondition(StatsSet params) + public OpSweeperSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java index b36585bf00..c4b3923e92 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTargetAllItemTypeSkillCondition implements ISkillCondition { - public OpTargetAllItemTypeSkillCondition(StatsSet params) + public OpTargetAllItemTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 6b85389d62..5492e96e1a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTargetArmorTypeSkillCondition implements ISkillCondition { - public OpTargetArmorTypeSkillCondition(StatsSet params) + public OpTargetArmorTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java index 80c63112a6..c4881a974e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpTargetDoorSkillCondition implements ISkillCondition { private final List _doorIds; - public OpTargetDoorSkillCondition(StatsSet params) + public OpTargetDoorSkillCondition(StatSet params) { _doorIds = params.getList("doorIds", Integer.class); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java index 6fbc3cda10..eaabf4a73d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpTargetMyPledgeAcademySkillCondition implements ISkillCondition { - public OpTargetMyPledgeAcademySkillCondition(StatsSet params) + public OpTargetMyPledgeAcademySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java index d5820600dd..14a744613d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpTargetNpcSkillCondition implements ISkillCondition { private final List _npcId; - public OpTargetNpcSkillCondition(StatsSet params) + public OpTargetNpcSkillCondition(StatSet params) { _npcId = params.getList("npcIds", Integer.class); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java index 854225a75a..b0c5e50ae3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpTargetPcSkillCondition implements ISkillCondition { - public OpTargetPcSkillCondition(StatsSet params) + public OpTargetPcSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index 7faecb2ffd..62fd4b365f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Weapon; @@ -34,7 +34,7 @@ public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition { private final List _weaponTypes = new ArrayList<>(); - public OpTargetWeaponAttackTypeSkillCondition(StatsSet params) + public OpTargetWeaponAttackTypeSkillCondition(StatSet params) { final List weaponTypes = params.getList("weaponType", String.class); if (weaponTypes != null) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java index 8451365885..e114c03412 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTerritorySkillCondition implements ISkillCondition { - public OpTerritorySkillCondition(StatsSet params) + public OpTerritorySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java index 13f287687e..fde1293086 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpUnlockSkillCondition implements ISkillCondition { - public OpUnlockSkillCondition(StatsSet params) + public OpUnlockSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java index 8cc76a34bb..46dea5bbcb 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpUseFirecrackerSkillCondition implements ISkillCondition { - public OpUseFirecrackerSkillCondition(StatsSet params) + public OpUseFirecrackerSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java index f3b54bbad7..651dade274 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpUsePraseedSkillCondition implements ISkillCondition { - public OpUsePraseedSkillCondition(StatsSet params) + public OpUsePraseedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java index 890b0fcd5f..dd57df0e13 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.MountType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpWyvernSkillCondition implements ISkillCondition { - public OpWyvernSkillCondition(StatsSet params) + public OpWyvernSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java index 8a4c974840..5ac80d3e62 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class PossessHolythingSkillCondition implements ISkillCondition { - public PossessHolythingSkillCondition(StatsSet params) + public PossessHolythingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java index 8b0fb55554..38b5644fb1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class RemainCpPerSkillCondition implements ISkillCondition private final int _amount; private final SkillConditionPercentType _percentType; - public RemainCpPerSkillCondition(StatsSet params) + public RemainCpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java index 612367a233..1ad96100ad 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -33,7 +33,7 @@ public class RemainHpPerSkillCondition implements ISkillCondition private final SkillConditionPercentType _percentType; private final SkillConditionAffectType _affectType; - public RemainHpPerSkillCondition(StatsSet params) + public RemainHpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java index 5455c1587a..39085349d9 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class RemainMpPerSkillCondition implements ISkillCondition private final int _amount; private final SkillConditionPercentType _percentType; - public RemainMpPerSkillCondition(StatsSet params) + public RemainMpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java index 7de47f103f..6e9e5ad821 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class SoulSavedSkillCondition implements ISkillCondition { private final int _amount; - public SoulSavedSkillCondition(StatsSet params) + public SoulSavedSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java index 0b75a5a623..f4bdbaaecb 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class TargetItemCrystalTypeSkillCondition implements ISkillCondition { - public TargetItemCrystalTypeSkillCondition(StatsSet params) + public TargetItemCrystalTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java index 51502ff209..604a41f904 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.MentorManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMyMenteeSkillCondition implements ISkillCondition { - public TargetMyMenteeSkillCondition(StatsSet params) + public TargetMyMenteeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java index fc621365a9..4bfb496634 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class TargetMyPartySkillCondition implements ISkillCondition { private final boolean _includeMe; - public TargetMyPartySkillCondition(StatsSet params) + public TargetMyPartySkillCondition(StatSet params) { _includeMe = params.getBoolean("includeMe"); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java index 9ebec0e691..d44a1bc8a9 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMyPledgeSkillCondition implements ISkillCondition { - public TargetMyPledgeSkillCondition(StatsSet params) + public TargetMyPledgeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java index f4da8d6079..5045aa3848 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class TargetRaceSkillCondition implements ISkillCondition { private final Race _race; - public TargetRaceSkillCondition(StatsSet params) + public TargetRaceSkillCondition(StatSet params) { _race = params.getEnum("race", Race.class); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java index 55734b03bb..d1aac35879 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -350,7 +350,7 @@ public class ChamberOfDelusion extends AbstractInstance protected void changeRoom(Instance world) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); final List locations = world.getEnterLocations(); int newRoom = params.getInt("currentRoom", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java index 95a96bb16e..bef23aa88c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java @@ -19,7 +19,7 @@ package instances.CrystalCaverns; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -64,12 +64,12 @@ public class CrystalCavernsCoralGarden extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (event) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java index d977f82481..5d6a8dda61 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java @@ -17,7 +17,7 @@ package instances.CrystalCaverns; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -90,13 +90,13 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); - final StatsSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); final int baseId = npcParams.getInt("base_id", -1); switch (event) @@ -156,7 +156,7 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (npc.getId()) { @@ -205,7 +205,7 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); final int baseId = npcParams.getInt("base_id", -1); switch (npc.getId()) @@ -365,7 +365,7 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance { case WATER_CANNON: { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); final int baseId = npcParams.getInt("base_id", -1); if (baseId != 1) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java index b9662a5d06..7624504082 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java @@ -19,7 +19,7 @@ package instances.CrystalCaverns; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -83,12 +83,12 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (event) { @@ -180,7 +180,7 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); switch (npc.getId()) { @@ -224,7 +224,7 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance final Instance instance = receiver.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = receiver.getParameters(); + final StatSet npcParams = receiver.getParameters(); if (eventName.equals(String.valueOf(24220005 + npcParams.getInt("Terri_ID", 0)))) { @@ -265,7 +265,7 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); final int killTarget = instance.getParameters().getInt("KILL_TARGET", 5); int currentKillCount = instance.getParameters().getInt("KILL_COUNT", 0); @@ -377,7 +377,7 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance if (isInInstance(instance) && creature.isPlayer()) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); switch (npc.getId()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java index 0d9724e766..1245a89ed0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -404,7 +404,7 @@ public class DarkCloudMansion extends AbstractInstance { if (CommonUtil.contains(BELETH_SAMPLE, npc.getId())) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); if (!params.getBoolean("blocked", false)) { if (npc.isScriptValue(1)) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java index 85c7a898db..3e913de57d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java @@ -18,7 +18,7 @@ package instances.FaeronTrainingGrounds1; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -273,7 +273,7 @@ public class FaeronTrainingGrounds1 extends AbstractInstance final Instance world = player.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); for (int i = 0; i < MOB_SPAWNS.length; i++) { if (params.getObject("Mob" + i, Npc.class) == null) @@ -295,7 +295,7 @@ public class FaeronTrainingGrounds1 extends AbstractInstance final Instance world = player.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); for (int i = 0; i < MOB_SPAWNS.length; i++) { final Npc mob = params.getObject("Mob" + i, Npc.class); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java index 9a8123b6cf..b038186d7f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java @@ -18,7 +18,7 @@ package instances.FaeronTrainingGrounds2; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -270,7 +270,7 @@ public class FaeronTrainingGrounds2 extends AbstractInstance final Instance world = player.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); for (int i = 0; i < MOB_SPAWNS.length; i++) { if (params.getObject("Mob" + i, Npc.class) == null) @@ -292,7 +292,7 @@ public class FaeronTrainingGrounds2 extends AbstractInstance final Instance world = player.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); for (int i = 0; i < MOB_SPAWNS.length; i++) { final Npc mob = params.getObject("Mob" + i, Npc.class); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java index 20046a664b..54b93c8ccb 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -566,7 +566,7 @@ public class HarnakUndergroundRuins extends AbstractInstance } case 2: { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); final int waveNpc = params.getInt("waveNpcId"); if (world.getAliveNpcs(waveNpc).isEmpty()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaBoss.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaBoss.java index 181f892fbe..3ef76e5f72 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaBoss.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaBoss.java @@ -17,7 +17,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureAttacked; @@ -70,7 +70,7 @@ public class KartiaBoss extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SAY") && npc.isTargetable()) { @@ -107,7 +107,7 @@ public class KartiaBoss extends AbstractNpcAI public void spawnMinions(Npc npc) { - final StatsSet param = npc.getParameters(); + final StatSet param = npc.getParameters(); final int kartiaLevel = param.getInt("cartia_level", 0); final boolean isParty = param.getInt("party_type", 0) == 1; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java index bd312c7fe6..721a32deb0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -97,12 +97,12 @@ public class KartiaHelperAdolph extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if ((instance != null) && event.equals("CHECK_ACTION")) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final PlayerInstance plr = npcVars.getObject("PLAYER_OBJECT", PlayerInstance.class); if (plr != null) { @@ -159,7 +159,7 @@ public class KartiaHelperAdolph extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder skill_01 = instParams.getSkillHolder("adolphHate"); final SkillHolder skill_02 = instParams.getSkillHolder("adolphPunish"); final SkillHolder skill_03 = instParams.getSkillHolder("adolphShield"); @@ -256,7 +256,7 @@ public class KartiaHelperAdolph extends AbstractNpcAI { npc.setTarget(event.getAttacker()); addAttackDesire(npc, (Creature) npc.getTarget()); - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder hateSkill = instParams.getSkillHolder("adolphHate"); if ((hateSkill != null) && SkillCaster.checkUseConditions(npc, hateSkill.getSkill())) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java index e9aada8d07..c87c49ae5b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java @@ -19,7 +19,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -92,7 +92,7 @@ public class KartiaHelperBarton extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if ((instance != null) && event.equals("CHECK_ACTION")) @@ -170,7 +170,7 @@ public class KartiaHelperBarton extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder skill01 = instParams.getSkillHolder("bartonInfinity"); final SkillHolder skill02 = instParams.getSkillHolder("bartonBerserker"); final SkillHolder skill03 = instParams.getSkillHolder("bartonHurricane"); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java index e383a62d49..01edde0bd4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java @@ -26,7 +26,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -115,12 +115,12 @@ public class KartiaHelperElise extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if ((instance != null) && event.equals("CHECK_ACTION")) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final FriendlyNpcInstance adolph = npcVars.getObject("ADOLPH_OBJECT", FriendlyNpcInstance.class); if (!npc.isCastingNow()) { @@ -153,8 +153,8 @@ public class KartiaHelperElise extends AbstractNpcAI final Instance instance = npc.getInstanceWorld(); if (instance != null) { - final StatsSet npcVars = npc.getVariables(); - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet npcVars = npc.getVariables(); + final StatSet instParams = instance.getTemplateParameters(); if (!npc.isCastingNow()) { final PlayerInstance plr = npcVars.getObject("PLAYER_OBJECT", PlayerInstance.class); @@ -248,7 +248,7 @@ public class KartiaHelperElise extends AbstractNpcAI { if (creature.isPlayer() || (creature instanceof FriendlyNpcInstance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); if (creature.isPlayer()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperEliyah.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperEliyah.java index 244110429c..cb3013c46c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperEliyah.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperEliyah.java @@ -18,7 +18,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance; @@ -87,7 +87,7 @@ public class KartiaHelperEliyah extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if ((instance != null) && event.equals("CHECK_ACTION")) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java index 07fe730289..123414862a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java @@ -18,7 +18,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -96,7 +96,7 @@ public class KartiaHelperGuardian extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (instance == null) @@ -183,7 +183,7 @@ public class KartiaHelperGuardian extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder skill01 = instParams.getSkillHolder("guardianSpiritsBlow"); final SkillHolder skill02 = instParams.getSkillHolder("guardianSpiritsWrath"); final int numberOfActiveSkills = 2; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java index 1541261bac..45fdfece27 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java @@ -19,7 +19,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -93,7 +93,7 @@ public class KartiaHelperHayuk extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (instance == null) @@ -176,7 +176,7 @@ public class KartiaHelperHayuk extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder skill01 = instParams.getSkillHolder("hayukPinpointShot"); final SkillHolder skill02 = instParams.getSkillHolder("hayukRecoilShot"); final SkillHolder skill03 = instParams.getSkillHolder("hayukMultipleArrow"); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaSupportTroop.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaSupportTroop.java index bfdc9b4cd3..d17653b8e3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaSupportTroop.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaSupportTroop.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -49,7 +49,7 @@ public class KartiaSupportTroop extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SAY") && !npc.isDead()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java index 0bf65e9c9b..01d0a1ab7a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -273,7 +273,7 @@ public class KartiasLabyrinth extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = (npc != null) ? npc.getInstanceWorld() : player.getInstanceWorld(); if (instance != null) @@ -363,7 +363,7 @@ public class KartiasLabyrinth extends AbstractInstance if (instance != null) { - final StatsSet param = instance.getParameters(); + final StatSet param = instance.getParameters(); if (param.getBoolean("BOSS_KILL_OPEN_DOOR", false) && CommonUtil.contains(MINI_BOSSES, npc.getId())) { instance.setParameter("BOSS_KILL_OPEN_DOOR", true); @@ -562,7 +562,7 @@ public class KartiasLabyrinth extends AbstractInstance private void manageProgressInInstance(Instance instance) { - final StatsSet param = instance.getParameters(); + final StatSet param = instance.getParameters(); final int room = param.getInt("ROOM", 1); final int stage = param.getInt("STAGE", 1); final int wave = param.getInt("WAVE", 1); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java index f15af5684c..8b67da1f73 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -452,7 +452,7 @@ public class LabyrinthOfBelis extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (world != null) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java index f9c6c2b1af..7cd9254745 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -445,7 +445,7 @@ public class MemoryOfDisaster extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Nursery/Nursery.java index 4e85e49c12..ff1ff2587e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Nursery/Nursery.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Nursery/Nursery.java @@ -19,7 +19,7 @@ package instances.Nursery; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -80,12 +80,12 @@ public class Nursery extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int gameStage = npcVars.getInt("GAME_STAGE", 0); switch (event) @@ -142,7 +142,7 @@ public class Nursery extends AbstractInstance if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int gameStage = npcVars.getInt("GAME_STAGE", 0); switch (gameStage) @@ -200,7 +200,7 @@ public class Nursery extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int gameStage = npcVars.getInt("GAME_STAGE", 0); switch (event) @@ -281,7 +281,7 @@ public class Nursery extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int maguenStatus = npcVars.getInt("MAGUEN_STATUS", 0); switch (maguenStatus) @@ -407,8 +407,8 @@ public class Nursery extends AbstractInstance final Npc gameManager = instance.getNpc(TIE); if (gameManager != null) { - final StatsSet managerVars = gameManager.getVariables(); - final StatsSet npcVars = npc.getVariables(); + final StatSet managerVars = gameManager.getVariables(); + final StatSet npcVars = npc.getVariables(); final int gamePoints = managerVars.getInt("GAME_POINTS", 0); if (gamePoints > 0) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java index 501ea07ad2..1d546871e9 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java @@ -19,7 +19,7 @@ package instances.PailakaInjuredDragon; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -172,7 +172,7 @@ public class PailakaInjuredDragon extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (isInInstance(world)) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java index 8de90bca71..cd31666b75 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java @@ -19,7 +19,7 @@ package instances.PrisonOfDarkness; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -122,12 +122,12 @@ public class PrisonOfDarkness extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (event) { @@ -187,7 +187,7 @@ public class PrisonOfDarkness extends AbstractInstance if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (event) { @@ -327,7 +327,7 @@ public class PrisonOfDarkness extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (npc.getId()) { @@ -360,7 +360,7 @@ public class PrisonOfDarkness extends AbstractInstance if (isInInstance(instance) && (npc.getId() == EXIT_PORTAL)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (npcVars.getInt("PORTAL_STATE", 0)) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java index 415395c724..7d06cdeb54 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java @@ -18,7 +18,7 @@ package instances.TaintedDimension; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -97,7 +97,7 @@ public class TaintedDimension extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java index ea2c993d9d..a5e71ce2ae 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java @@ -18,7 +18,7 @@ package quests.Q10771_VolatilePower; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.quest.Quest; @@ -179,7 +179,7 @@ public class Q10771_VolatilePower extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java index 98953e5ec5..b9ff741914 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java @@ -19,7 +19,7 @@ package quests.Q10772_ReportsFromCrumaTowerPart1; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -160,7 +160,7 @@ public class Q10772_ReportsFromCrumaTowerPart1 extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("DESPAWN_OWL") && (npc != null) && (npc.getId() == MAGIC_OWL)) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java index c5a67dbc68..1e7ffec6b6 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java @@ -19,7 +19,7 @@ package quests.Q10776_TheWrathOfTheGiants; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.quest.Quest; @@ -238,7 +238,7 @@ public class Q10776_TheWrathOfTheGiants extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java index cf9ddf1f88..badb40ec0c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java @@ -19,7 +19,7 @@ package quests.Q10777_ReportsFromCrumaTowerPart2; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -162,7 +162,7 @@ public class Q10777_ReportsFromCrumaTowerPart2 extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if ((npc != null) && (npc.getId() == MAGIC_OWL) && event.equals("DESPAWN_OWL")) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java index 59796b30a1..539b6fbd1b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java @@ -17,7 +17,7 @@ package quests.Q10787_ASpyMission; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -156,7 +156,7 @@ public class Q10787_ASpyMission extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if ((npc != null) && (npc.getId() == SUSPICIOUS_BOX) && event.equals("DESPAWN")) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java index b1d0ec8553..7e9236b634 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.ActionDataHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -57,7 +57,7 @@ public class ActionData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "action", actionNode -> { - final ActionDataHolder holder = new ActionDataHolder(new StatsSet(parseAttributes(actionNode))); + final ActionDataHolder holder = new ActionDataHolder(new StatSet(parseAttributes(actionNode))); _actionData.put(holder.getId(), holder); })); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java index 36002572b0..f7762ab07b 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java @@ -32,7 +32,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.AdminCommandAccessRight; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -72,7 +72,7 @@ public class AdminData implements IXmlReader { NamedNodeMap attrs; Node attr; - StatsSet set; + StatSet set; AccessLevel level; AdminCommandAccessRight command; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -83,7 +83,7 @@ public class AdminData implements IXmlReader { if ("access".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -99,7 +99,7 @@ public class AdminData implements IXmlReader } else if ("admin".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java index b425296a19..6a14a867fc 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java @@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.alchemy.AlchemyCraftData; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -55,7 +55,7 @@ public class AlchemyData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node att; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -67,7 +67,7 @@ public class AlchemyData implements IXmlReader if ("skill".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index 6d25769eab..817f0cabde 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; @@ -83,7 +83,7 @@ public class AppearanceItemData implements IXmlReader { if ("appearance_stone".equalsIgnoreCase(d.getNodeName())) { - final AppearanceStone stone = new AppearanceStone(new StatsSet(parseAttributes(d))); + final AppearanceStone stone = new AppearanceStone(new StatSet(parseAttributes(d))); for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) { switch (c.getNodeName()) @@ -120,7 +120,7 @@ public class AppearanceItemData implements IXmlReader } case "visual": { - stone.addVisualId(new AppearanceHolder(new StatsSet(parseAttributes(c)))); + stone.addVisualId(new AppearanceHolder(new StatSet(parseAttributes(c)))); } } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java index 6c96d3874a..6eac3240e7 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -64,7 +64,7 @@ public class AttendanceRewardData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "item", rewardNode -> { - final StatsSet set = new StatsSet(parseAttributes(rewardNode)); + final StatSet set = new StatSet(parseAttributes(rewardNode)); final int itemId = set.getInt("id"); final int itemCount = set.getInt("count"); if (ItemTable.getInstance().getTemplate(itemId) == null) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java index 891d19fcf2..3054b0e7ef 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.beautyshop.BeautyData; import org.l2jmobius.gameserver.model.beautyshop.BeautyItem; @@ -56,7 +56,7 @@ public class BeautyShopData implements IXmlReader public void parseDocument(Document doc, File f) { NamedNodeMap attrs; - StatsSet set; + StatSet set; Node att; Race race = null; Sex sex = null; @@ -92,7 +92,7 @@ public class BeautyShopData implements IXmlReader if ("hair".equalsIgnoreCase(a.getNodeName())) { attrs = a.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -105,7 +105,7 @@ public class BeautyShopData implements IXmlReader if ("color".equalsIgnoreCase(g.getNodeName())) { attrs = g.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -119,7 +119,7 @@ public class BeautyShopData implements IXmlReader else if ("face".equalsIgnoreCase(a.getNodeName())) { attrs = a.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java index 37e977c51e..530a5d975a 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java @@ -34,7 +34,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.entity.ClanHall; @@ -66,7 +66,7 @@ public class ClanHallData implements IXmlReader final List doors = new ArrayList<>(); final List npcs = new ArrayList<>(); final List teleports = new ArrayList<>(); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); for (Node listNode = doc.getFirstChild(); listNode != null; listNode = listNode.getNextSibling()) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java index ae608cefb6..f1a23734e0 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.combination.CombinationItem; import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; @@ -57,7 +57,7 @@ public class CombinationItemsData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "item", itemNode -> { - final CombinationItem item = new CombinationItem(new StatsSet(parseAttributes(itemNode))); + final CombinationItem item = new CombinationItem(new StatSet(parseAttributes(itemNode))); forEach(itemNode, "reward", rewardNode -> { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java index 038738b138..4af039b48d 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.CubicSkill; import org.l2jmobius.gameserver.model.cubic.ICubicConditionHolder; @@ -61,7 +61,7 @@ public class CubicData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - forEach(doc, "list", listNode -> forEach(listNode, "cubic", cubicNode -> parseTemplate(cubicNode, new CubicTemplate(new StatsSet(parseAttributes(cubicNode)))))); + forEach(doc, "list", listNode -> forEach(listNode, "cubic", cubicNode -> parseTemplate(cubicNode, new CubicTemplate(new StatSet(parseAttributes(cubicNode)))))); } /** @@ -137,7 +137,7 @@ public class CubicData implements IXmlReader { forEach(cubicNode, "skill", skillNode -> { - final CubicSkill skill = new CubicSkill(new StatsSet(parseAttributes(skillNode))); + final CubicSkill skill = new CubicSkill(new StatSet(parseAttributes(skillNode))); forEach(cubicNode, "conditions", conditionNode -> parseConditions(cubicNode, template, skill)); template.getSkills().add(skill); }); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java index 3d19bee079..ede9b72202 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -62,7 +62,7 @@ public class DailyMissionData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "reward", rewardNode -> { - final StatsSet set = new StatsSet(parseAttributes(rewardNode)); + final StatSet set = new StatSet(parseAttributes(rewardNode)); final List items = new ArrayList<>(1); forEach(rewardNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> @@ -80,14 +80,14 @@ public class DailyMissionData implements IXmlReader // Initial values in case handler doesn't exists set.set("handler", ""); - set.set("params", StatsSet.EMPTY_STATSET); + set.set("params", StatSet.EMPTY_STATSET); // Parse handler and parameters forEach(rewardNode, "handler", handlerNode -> { set.set("handler", parseString(handlerNode.getAttributes(), "name")); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); set.set("params", params); forEach(handlerNode, "param", paramNode -> params.set(parseString(paramNode.getAttributes(), "name"), paramNode.getTextContent())); }); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java index 835eab4fe9..53248de524 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java @@ -35,7 +35,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -51,7 +51,7 @@ public class DoorData implements IXmlReader // Info holders private final Map> _groups = new HashMap<>(); private final Map _doors = new HashMap<>(); - private final Map _templates = new HashMap<>(); + private final Map _templates = new HashMap<>(); private final Map> _regions = new HashMap<>(); protected DoorData() @@ -75,9 +75,9 @@ public class DoorData implements IXmlReader LOGGER.info(getClass().getSimpleName() + ": Loaded " + _doors.size() + " Door Templates for " + _regions.size() + " regions."); } - public StatsSet parseDoor(Node doorNode) + public StatSet parseDoor(Node doorNode) { - final StatsSet params = new StatsSet(parseAttributes(doorNode)); + final StatSet params = new StatSet(parseAttributes(doorNode)); params.set("baseHpMax", 1); // Avoid doors without HP value created dead due to default value 0 in CreatureTemplate forEach(doorNode, IXmlReader::isNode, innerDoorNode -> @@ -115,7 +115,7 @@ public class DoorData implements IXmlReader /** * @param set */ - private void applyCollisions(StatsSet set) + private void applyCollisions(StatSet set) { // Insert Collision data if (set.contains("nodeX_0") && set.contains("nodeY_0") && set.contains("nodeX_1") && set.contains("nodeY_1")) @@ -142,7 +142,7 @@ public class DoorData implements IXmlReader * @param set * @return */ - public DoorInstance spawnDoor(StatsSet set) + public DoorInstance spawnDoor(StatSet set) { // Create door template + door instance final DoorTemplate template = new DoorTemplate(set); @@ -183,7 +183,7 @@ public class DoorData implements IXmlReader return door; } - public StatsSet getDoorTemplate(int doorId) + public StatSet getDoorTemplate(int doorId) { return _templates.get(doorId); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java index eca42a9a34..637ef1e953 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -64,7 +64,7 @@ public class EnchantItemData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node att; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -76,7 +76,7 @@ public class EnchantItemData implements IXmlReader if ("enchant".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -107,7 +107,7 @@ public class EnchantItemData implements IXmlReader else if ("support".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java index 46701fd777..bb1e8026b7 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.SkillEnchantType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.EnchantSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -69,10 +69,10 @@ public class EnchantSkillGroupsData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "enchant", enchantNode -> { - final EnchantSkillHolder enchantSkillHolder = new EnchantSkillHolder(new StatsSet(parseAttributes(enchantNode))); + final EnchantSkillHolder enchantSkillHolder = new EnchantSkillHolder(new StatSet(parseAttributes(enchantNode))); forEach(enchantNode, "sps", spsNode -> forEach(spsNode, "sp", spNode -> enchantSkillHolder.addSp(parseEnum(spNode.getAttributes(), SkillEnchantType.class, "type"), parseInteger(spNode.getAttributes(), "amount")))); forEach(enchantNode, "chances", chancesNode -> forEach(chancesNode, "chance", chanceNode -> enchantSkillHolder.addChance(parseEnum(chanceNode.getAttributes(), SkillEnchantType.class, "type"), parseInteger(chanceNode.getAttributes(), "value")))); - forEach(enchantNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> enchantSkillHolder.addRequiredItem(parseEnum(itemNode.getAttributes(), SkillEnchantType.class, "type"), new ItemHolder(new StatsSet(parseAttributes(itemNode)))))); + forEach(enchantNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> enchantSkillHolder.addRequiredItem(parseEnum(itemNode.getAttributes(), SkillEnchantType.class, "type"), new ItemHolder(new StatSet(parseAttributes(itemNode)))))); _enchantSkillHolders.put(parseInteger(enchantNode.getAttributes(), "level"), enchantSkillHolder); })); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java index a8bb0397ac..037af7e1ae 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java @@ -34,7 +34,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.eventengine.AbstractEventManager; import org.l2jmobius.gameserver.model.eventengine.EventMethodNotification; import org.l2jmobius.gameserver.model.eventengine.EventScheduler; @@ -156,7 +156,7 @@ public class EventEngineData implements IXmlReader */ private void parseVariables(AbstractEventManager eventManager, Node innerNode) { - final StatsSet variables = new StatsSet(LinkedHashMap::new); + final StatSet variables = new StatSet(LinkedHashMap::new); for (Node variableNode = innerNode.getFirstChild(); variableNode != null; variableNode = variableNode.getNextSibling()) { if ("variable".equals(variableNode.getNodeName())) @@ -188,7 +188,7 @@ public class EventEngineData implements IXmlReader { if ("schedule".equals(scheduleNode.getNodeName())) { - final StatsSet params = new StatsSet(LinkedHashMap::new); + final StatSet params = new StatSet(LinkedHashMap::new); final NamedNodeMap attrs = scheduleNode.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -235,7 +235,7 @@ public class EventEngineData implements IXmlReader } else if ("conditionalSchedule".equals(scheduleNode.getNodeName())) { - final StatsSet params = new StatsSet(LinkedHashMap::new); + final StatSet params = new StatSet(LinkedHashMap::new); final NamedNodeMap attrs = scheduleNode.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -346,7 +346,7 @@ public class EventEngineData implements IXmlReader * @param variableNode */ @SuppressWarnings("unchecked") - private void parseListVariables(AbstractEventManager eventManager, StatsSet variables, Node variableNode) + private void parseListVariables(AbstractEventManager eventManager, StatSet variables, Node variableNode) { final String name = parseString(variableNode.getAttributes(), "name"); final String type = parseString(variableNode.getAttributes(), "type"); @@ -419,7 +419,7 @@ public class EventEngineData implements IXmlReader * @param variableNode */ @SuppressWarnings("unchecked") - private void parseMapVariables(AbstractEventManager eventManager, StatsSet variables, Node variableNode) + private void parseMapVariables(AbstractEventManager eventManager, StatSet variables, Node variableNode) { final String name = parseString(variableNode.getAttributes(), "name"); final String keyType = parseString(variableNode.getAttributes(), "keyType"); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java index db19c5fdff..0724877d9d 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.ConditionHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.ICondition; import org.l2jmobius.gameserver.model.holders.ExtendDropDataHolder; import org.l2jmobius.gameserver.model.holders.ExtendDropItemHolder; @@ -62,7 +62,7 @@ public class ExtendDropData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "drop", dropNode -> { - final StatsSet set = new StatsSet(parseAttributes(dropNode)); + final StatSet set = new StatSet(parseAttributes(dropNode)); final List items = new ArrayList<>(1); forEach(dropNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> @@ -80,8 +80,8 @@ public class ExtendDropData implements IXmlReader forEach(dropNode, "conditions", conditionsNode -> forEach(conditionsNode, "condition", conditionNode -> { final String conditionName = parseString(conditionNode.getAttributes(), "name"); - final StatsSet params = (StatsSet) parseValue(conditionNode); - final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); + final StatSet params = (StatSet) parseValue(conditionNode); + final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); if (conditionFunction != null) { conditions.add(conditionFunction.apply(params)); @@ -109,7 +109,7 @@ public class ExtendDropData implements IXmlReader private Object parseValue(Node node) { - StatsSet statsSet = null; + StatSet statSet = null; List list = null; Object text = null; for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) @@ -145,12 +145,12 @@ public class ExtendDropData implements IXmlReader final Object value = parseValue(node); if (value != null) { - if (statsSet == null) + if (statSet == null) { - statsSet = new StatsSet(); + statSet = new StatSet(); } - statsSet.set(nodeName, value); + statSet.set(nodeName, value); } } } @@ -161,9 +161,9 @@ public class ExtendDropData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", list); + statSet.set(".", list); } else { @@ -176,16 +176,16 @@ public class ExtendDropData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", text); + statSet.set(".", text); } else { return text; } } - return statsSet; + return statSet; } public ExtendDropDataHolder getExtendDropById(int id) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java index 57a16d6390..608f4702b8 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.FakePlayerHolder; @@ -72,7 +72,7 @@ public class FakePlayerData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayer", fakePlayerNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerNode)); final int npcId = set.getInt("npcId"); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); final String name = template.getName(); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java index 18cc499b71..a5ade27c03 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.FenceState; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldRegion; import org.l2jmobius.gameserver.model.actor.instance.FenceInstance; @@ -79,7 +79,7 @@ public class FenceData implements IXmlReader private void spawnFence(Node fenceNode) { - final StatsSet set = new StatsSet(parseAttributes(fenceNode)); + final StatSet set = new StatSet(parseAttributes(fenceNode)); spawnFence(set.getInt("x"), set.getInt("y"), set.getInt("z"), set.getString("name"), set.getInt("width"), set.getInt("length"), set.getInt("height"), 0, set.getEnum("state", FenceState.class, FenceState.CLOSED)); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java index 67dd4e396b..02efb756f2 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.Henna; import org.l2jmobius.gameserver.model.skills.Skill; @@ -86,7 +86,7 @@ public class HennaData implements IXmlReader */ private void parseHenna(Node d) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final List wearClassIds = new ArrayList<>(); final List skills = new ArrayList<>(); NamedNodeMap attrs = d.getAttributes(); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java index 03ad8ab79e..d81e85948d 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; @@ -93,7 +93,7 @@ public class InitialEquipmentData implements IXmlReader { if ("item".equalsIgnoreCase(c.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java index 72080aa4ac..54b1909d60 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemPointHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; @@ -55,17 +55,17 @@ public class LuckyGameData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "luckygame", rewardNode -> { - final LuckyGameDataHolder holder = new LuckyGameDataHolder(new StatsSet(parseAttributes(rewardNode))); + final LuckyGameDataHolder holder = new LuckyGameDataHolder(new StatSet(parseAttributes(rewardNode))); forEach(rewardNode, "common_reward", commonRewardNode -> forEach(commonRewardNode, "item", itemNode -> { - final StatsSet stats = new StatsSet(parseAttributes(itemNode)); + final StatSet stats = new StatSet(parseAttributes(itemNode)); holder.addCommonReward(new ItemChanceHolder(stats.getInt("id"), stats.getDouble("chance"), stats.getLong("count"))); })); forEach(rewardNode, "unique_reward", uniqueRewardNode -> forEach(uniqueRewardNode, "item", itemNode -> { - holder.addUniqueReward(new ItemPointHolder(new StatsSet(parseAttributes(itemNode)))); + holder.addUniqueReward(new ItemPointHolder(new StatSet(parseAttributes(itemNode)))); })); forEach(rewardNode, "modify_reward", uniqueRewardNode -> @@ -74,7 +74,7 @@ public class LuckyGameData implements IXmlReader holder.setMaxModifyRewardGame(parseInteger(uniqueRewardNode.getAttributes(), "max_game")); forEach(uniqueRewardNode, "item", itemNode -> { - final StatsSet stats = new StatsSet(parseAttributes(itemNode)); + final StatSet stats = new StatSet(parseAttributes(itemNode)); holder.addModifyReward(new ItemChanceHolder(stats.getInt("id"), stats.getDouble("chance"), stats.getLong("count"))); }); }); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java index 75bb48ed37..190653cdec 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java @@ -35,7 +35,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.SpecialItemType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; @@ -90,7 +90,7 @@ public class MultisellData implements IXmlReader { forEach(doc, "list", listNode -> { - final StatsSet set = new StatsSet(parseAttributes(listNode)); + final StatSet set = new StatSet(parseAttributes(listNode)); final int listId = Integer.parseInt(f.getName().substring(0, f.getName().length() - 4)); final List entries = new ArrayList<>(listNode.getChildNodes().getLength()); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java index 12ad0f9f0e..de0567af09 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.enums.AISkillScope; import org.l2jmobius.gameserver.enums.DropType; import org.l2jmobius.gameserver.enums.MpRewardAffectType; import org.l2jmobius.gameserver.enums.MpRewardType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.DropHolder; @@ -95,7 +95,7 @@ public class NpcData implements IXmlReader if ("npc".equalsIgnoreCase(listNode.getNodeName())) { NamedNodeMap attrs = listNode.getAttributes(); - final StatsSet set = new StatsSet(new HashMap<>()); + final StatSet set = new StatSet(new HashMap<>()); final int npcId = parseInteger(attrs, "id"); Map parameters = null; Map skills = null; @@ -511,11 +511,11 @@ public class NpcData implements IXmlReader if (parameters != null) { // Using unmodifiable map parameters of template are not meant to be changed at runtime. - template.setParameters(new StatsSet(Collections.unmodifiableMap(parameters))); + template.setParameters(new StatSet(Collections.unmodifiableMap(parameters))); } else { - template.setParameters(StatsSet.EMPTY_STATSET); + template.setParameters(StatSet.EMPTY_STATSET); } if (skills != null) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java index 3712cca6af..373f87ecfc 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -79,7 +79,7 @@ public class NpcNameLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); NPC_NAME_LOCALISATIONS.get(_lang).put(set.getInt("id"), new String[] { set.getString("name"), diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 55dcd539aa..36c5897ecd 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.EffectHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; @@ -71,7 +71,7 @@ public class OptionData implements IXmlReader forEach(innerNode, "effect", effectNode -> { final String name = parseString(effectNode.getAttributes(), "name"); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); forEach(effectNode, IXmlReader::isNode, paramNode -> params.set(paramNode.getNodeName(), SkillData.getInstance().parseValue(paramNode, true, false, Collections.emptyMap()))); option.addEffect(EffectHandler.getInstance().getHandlerFactory(name).apply(params)); }); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java index b1bb74baf6..c893725bc3 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.PetLevelData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * This class parse and hold all pet parameters.
@@ -116,7 +116,7 @@ public class PetDataTable implements IXmlReader if (s.getNodeName().equals("stat")) { final int level = Integer.parseInt(s.getAttributes().getNamedItem("level").getNodeValue()); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (Node bean = s.getFirstChild(); bean != null; bean = bean.getNextSibling()) { if (bean.getNodeName().equals("set")) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java index ab1cb3b257..b646782547 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.base.ClassId; @@ -83,7 +83,7 @@ public class PlayerTemplateData implements IXmlReader } else if ("staticData".equalsIgnoreCase(d.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.set("classId", classId); final List creationPoints = new ArrayList<>(); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java index 34a04edd9b..35b879e73f 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; @@ -83,7 +83,7 @@ public class PrimeShopData implements IXmlReader { NamedNodeMap attrs = d.getAttributes(); Node att; - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java index b7ed4c8fba..43e5d84784 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.RecipeInstance; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.RecipeStatInstance; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; /** @@ -82,7 +82,7 @@ public class RecipeData implements IXmlReader Node att; int id = -1; boolean haveRare = false; - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); att = attrs.getNamedItem("id"); if (att == null) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java index 796f5ae085..9a8397e085 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java @@ -29,7 +29,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate; /** @@ -60,7 +60,7 @@ public class ResidenceFunctionsData implements IXmlReader forEach(doc, "list", list -> forEach(list, "function", func -> { final NamedNodeMap attrs = func.getAttributes(); - final StatsSet set = new StatsSet(HashMap::new); + final StatSet set = new StatSet(HashMap::new); for (int i = 0; i < attrs.getLength(); i++) { final Node node = attrs.item(i); @@ -69,7 +69,7 @@ public class ResidenceFunctionsData implements IXmlReader forEach(func, "function", levelNode -> { final NamedNodeMap levelAttrs = levelNode.getAttributes(); - final StatsSet levelSet = new StatsSet(HashMap::new); + final StatSet levelSet = new StatSet(HashMap::new); levelSet.merge(set); for (int i = 0; i < levelAttrs.getLength(); i++) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java index 053d9089ce..d6b28a5962 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; /** @@ -82,7 +82,7 @@ public class SendMessageLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); SEND_MESSAGE_LOCALISATIONS.get(_lang).put(set.getString("message").split(SPLIT_STRING), set.getString("translation").split(SPLIT_STRING)); })); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java index e473030c56..c3eda1f3b8 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.actor.instance.ShuttleInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; @@ -72,7 +72,7 @@ public class ShuttleData implements IXmlReader public void parseDocument(Document doc, File f) { NamedNodeMap attrs; - StatsSet set; + StatSet set; Node att; ShuttleDataHolder data; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -84,7 +84,7 @@ public class ShuttleData implements IXmlReader if ("shuttle".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -164,7 +164,7 @@ public class ShuttleData implements IXmlReader { for (ShuttleDataHolder data : _shuttles.values()) { - final ShuttleInstance shuttle = new ShuttleInstance(new CreatureTemplate(new StatsSet())); + final ShuttleInstance shuttle = new ShuttleInstance(new CreatureTemplate(new StatSet())); shuttle.setData(data); shuttle.setHeading(data.getLocation().getHeading()); shuttle.setLocationInvisible(data.getLocation()); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java index 9db0b5f64b..ba000649f2 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.SiegeScheduleDate; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.util.Util; /** @@ -54,7 +54,7 @@ public class SiegeScheduleData implements IXmlReader LOGGER.info(getClass().getSimpleName() + ": Loaded " + _scheduleData.size() + " siege schedulers."); if (_scheduleData.isEmpty()) { - _scheduleData.add(new SiegeScheduleDate(new StatsSet())); + _scheduleData.add(new SiegeScheduleDate(new StatSet())); LOGGER.info(getClass().getSimpleName() + ": Emergency loaded " + _scheduleData.size() + " default siege schedulers."); } } @@ -72,7 +72,7 @@ public class SiegeScheduleData implements IXmlReader { case "schedule": { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final NamedNodeMap attrs = cd.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java index cc019c4dbb..2592b3ed97 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java @@ -40,7 +40,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.EffectHandler; import org.l2jmobius.gameserver.handler.SkillConditionHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.EffectScope; @@ -67,9 +67,9 @@ public class SkillData implements IXmlReader private final Integer _toLevel; private final Integer _fromSubLevel; private final Integer _toSubLevel; - private final Map> _info; + private final Map> _info; - public NamedParamInfo(String name, Integer fromLevel, Integer toLevel, Integer fromSubLevel, Integer toSubLevel, Map> info) + public NamedParamInfo(String name, Integer fromLevel, Integer toLevel, Integer fromSubLevel, Integer toSubLevel, Map> info) { _name = name; _fromLevel = fromLevel; @@ -104,7 +104,7 @@ public class SkillData implements IXmlReader return _toSubLevel; } - public Map> getInfo() + public Map> getInfo() { return _info; } @@ -241,8 +241,8 @@ public class SkillData implements IXmlReader { NamedNodeMap attributes = listNode.getAttributes(); final Map> levels = new HashMap<>(); - final Map> skillInfo = new HashMap<>(); - final StatsSet generalSkillInfo = skillInfo.computeIfAbsent(-1, k -> new HashMap<>()).computeIfAbsent(-1, k -> new StatsSet()); + final Map> skillInfo = new HashMap<>(); + final StatSet generalSkillInfo = skillInfo.computeIfAbsent(-1, k -> new HashMap<>()).computeIfAbsent(-1, k -> new StatSet()); parseAttributes(attributes, "", generalSkillInfo); @@ -321,7 +321,7 @@ public class SkillData implements IXmlReader { return; } - subLevelMap.forEach((subLevel, statsSet) -> + subLevelMap.forEach((subLevel, statSet) -> { if (subLevel == -1) { @@ -339,7 +339,7 @@ public class SkillData implements IXmlReader { return; } - subLevelMap.forEach((subLevel, statsSet) -> + subLevelMap.forEach((subLevel, statSet) -> { if (subLevel == -1) { @@ -371,31 +371,31 @@ public class SkillData implements IXmlReader levels.forEach((level, subLevels) -> subLevels.forEach(subLevel -> { - final StatsSet statsSet = Optional.ofNullable(skillInfo.getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatsSet::new); - skillInfo.getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(statsSet.getSet()::putIfAbsent); - skillInfo.getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(statsSet.getSet()::putIfAbsent); - statsSet.set(".level", level); - statsSet.set(".subLevel", subLevel); - final Skill skill = new Skill(statsSet); + final StatSet statSet = Optional.ofNullable(skillInfo.getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatSet::new); + skillInfo.getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(statSet.getSet()::putIfAbsent); + skillInfo.getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(statSet.getSet()::putIfAbsent); + statSet.set(".level", level); + statSet.set(".subLevel", subLevel); + final Skill skill = new Skill(statSet); forEachNamedParamInfoParam(effectParamInfo, level, subLevel, ((effectScope, params) -> { final String effectName = params.getString(".name"); params.remove(".name"); try { - final Function effectFunction = EffectHandler.getInstance().getHandlerFactory(effectName); + final Function effectFunction = EffectHandler.getInstance().getHandlerFactory(effectName); if (effectFunction != null) { skill.addEffect(effectScope, effectFunction.apply(params)); } else { - LOGGER.warning(getClass().getSimpleName() + ": Missing effect for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]"); + LOGGER.warning(getClass().getSimpleName() + ": Missing effect for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]"); } } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading effect for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading effect for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]", e); } })); @@ -405,19 +405,19 @@ public class SkillData implements IXmlReader params.remove(".name"); try { - final Function conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName); + final Function conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName); if (conditionFunction != null) { skill.addCondition(skillConditionScope, conditionFunction.apply(params)); } else { - LOGGER.warning(getClass().getSimpleName() + ": Missing condition for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + skillConditionScope + "] Effect Name[" + conditionName + "]"); + LOGGER.warning(getClass().getSimpleName() + ": Missing condition for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + skillConditionScope + "] Effect Name[" + conditionName + "]"); } } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading condition for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Condition Scope[" + skillConditionScope + "] Condition Name[" + conditionName + "]", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading condition for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Condition Scope[" + skillConditionScope + "] Condition Name[" + conditionName + "]", e); } })); @@ -434,16 +434,16 @@ public class SkillData implements IXmlReader } } - private void forEachNamedParamInfoParam(Map> paramInfo, int level, int subLevel, BiConsumer consumer) + private void forEachNamedParamInfoParam(Map> paramInfo, int level, int subLevel, BiConsumer consumer) { paramInfo.forEach((scope, namedParamInfos) -> namedParamInfos.forEach(namedParamInfo -> { if ((((namedParamInfo.getFromLevel() == null) && (namedParamInfo.getToLevel() == null)) || ((namedParamInfo.getFromLevel() <= level) && (namedParamInfo.getToLevel() >= level))) // && (((namedParamInfo.getFromSubLevel() == null) && (namedParamInfo.getToSubLevel() == null)) || ((namedParamInfo.getFromSubLevel() <= subLevel) && (namedParamInfo.getToSubLevel() >= subLevel)))) { - final StatsSet params = Optional.ofNullable(namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatsSet::new); - namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); - namedParamInfo.getInfo().getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); + final StatSet params = Optional.ofNullable(namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatSet::new); + namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); + namedParamInfo.getInfo().getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); params.set(".name", namedParamInfo.getName()); consumer.accept(scope, params); } @@ -460,7 +460,7 @@ public class SkillData implements IXmlReader final Integer subLevel = parseInteger(attributes, "subLevel"); final Integer fromSubLevel = parseInteger(attributes, "fromSubLevel", subLevel); final Integer toSubLevel = parseInteger(attributes, "toSubLevel", subLevel); - final Map> info = new HashMap<>(); + final Map> info = new HashMap<>(); for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) { if (!node.getNodeName().equals("#text")) @@ -471,7 +471,7 @@ public class SkillData implements IXmlReader return new NamedParamInfo(name, fromLevel, toLevel, fromSubLevel, toSubLevel, info); } - private void parseInfo(Node node, Map>> variableValues, Map> info) + private void parseInfo(Node node, Map>> variableValues, Map> info) { Map> values = parseValues(node); final Object generalValue = values.getOrDefault(-1, Collections.emptyMap()).get(-1); @@ -492,7 +492,7 @@ public class SkillData implements IXmlReader } } - values.forEach((level, subLevelMap) -> subLevelMap.forEach((subLevel, value) -> info.computeIfAbsent(level, k -> new HashMap<>()).computeIfAbsent(subLevel, k -> new StatsSet()).set(node.getNodeName(), value))); + values.forEach((level, subLevelMap) -> subLevelMap.forEach((subLevel, value) -> info.computeIfAbsent(level, k -> new HashMap<>()).computeIfAbsent(subLevel, k -> new StatSet()).set(node.getNodeName(), value))); } private Map> parseValues(Node node) @@ -535,7 +535,7 @@ public class SkillData implements IXmlReader variables.put("index", (i - fromLevel) + 1d); variables.put("subIndex", (j - fromSubLevel) + 1d); final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1); - if ((base != null) && !(base instanceof StatsSet)) + if ((base != null) && !(base instanceof StatSet)) { variables.put("base", Double.parseDouble(String.valueOf(base))); } @@ -555,13 +555,13 @@ public class SkillData implements IXmlReader Object parseValue(Node node, boolean blockValue, boolean parseAttributes, Map variables) { - StatsSet statsSet = null; + StatSet statSet = null; List list = null; Object text = null; if (parseAttributes && (!node.getNodeName().equals("value") || !blockValue) && (node.getAttributes().getLength() > 0)) { - statsSet = new StatsSet(); - parseAttributes(node.getAttributes(), "", statsSet, variables); + statSet = new StatSet(); + parseAttributes(node.getAttributes(), "", statSet, variables); } for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) { @@ -604,12 +604,12 @@ public class SkillData implements IXmlReader final Object value = parseValue(node, false, true, variables); if (value != null) { - if (statsSet == null) + if (statSet == null) { - statsSet = new StatsSet(); + statSet = new StatSet(); } - statsSet.set(nodeName, value); + statSet.set(nodeName, value); } } } @@ -620,9 +620,9 @@ public class SkillData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", list); + statSet.set(".", list); } else { @@ -635,30 +635,30 @@ public class SkillData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", text); + statSet.set(".", text); } else { return text; } } - return statsSet; + return statSet; } - private void parseAttributes(NamedNodeMap attributes, String prefix, StatsSet statsSet, Map variables) + private void parseAttributes(NamedNodeMap attributes, String prefix, StatSet statSet, Map variables) { for (int i = 0; i < attributes.getLength(); i++) { final Node attributeNode = attributes.item(i); - statsSet.set(prefix + "." + attributeNode.getNodeName(), parseNodeValue(attributeNode.getNodeValue(), variables)); + statSet.set(prefix + "." + attributeNode.getNodeName(), parseNodeValue(attributeNode.getNodeValue(), variables)); } } - private void parseAttributes(NamedNodeMap attributes, String prefix, StatsSet statsSet) + private void parseAttributes(NamedNodeMap attributes, String prefix, StatSet statSet) { - parseAttributes(attributes, prefix, statsSet, Collections.emptyMap()); + parseAttributes(attributes, prefix, statSet, Collections.emptyMap()); } private Object parseNodeValue(String value, Map variables) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java index f1fc07cea5..b85011b133 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.SubclassType; import org.l2jmobius.gameserver.model.SkillLearn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.base.ClassId; @@ -229,7 +229,7 @@ public class SkillTreesData implements IXmlReader { if ("skill".equalsIgnoreCase(c.getNodeName())) { - final StatsSet learnSkillSet = new StatsSet(); + final StatSet learnSkillSet = new StatSet(); attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java index 87915d89eb..78c22d1e7d 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java @@ -36,7 +36,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.ChanceLocation; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.MinionHolder; import org.l2jmobius.gameserver.model.interfaces.IParameterized; @@ -169,7 +169,7 @@ public class SpawnsData implements IXmlReader public void parseSpawn(Node spawnsNode, File file, Collection spawns) { - final SpawnTemplate spawnTemplate = new SpawnTemplate(new StatsSet(parseAttributes(spawnsNode)), file); + final SpawnTemplate spawnTemplate = new SpawnTemplate(new StatSet(parseAttributes(spawnsNode)), file); SpawnGroup defaultGroup = null; for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling()) { @@ -185,7 +185,7 @@ public class SpawnsData implements IXmlReader { if (defaultGroup == null) { - defaultGroup = new SpawnGroup(StatsSet.EMPTY_STATSET); + defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET); } parseNpc(innerNode, spawnTemplate, defaultGroup); } @@ -244,7 +244,7 @@ public class SpawnsData implements IXmlReader private void parseGroup(Node n, SpawnTemplate spawnTemplate) { - final SpawnGroup group = new SpawnGroup(new StatsSet(parseAttributes(n))); + final SpawnGroup group = new SpawnGroup(new StatSet(parseAttributes(n))); forEach(n, IXmlReader::isNode, npcNode -> { switch (npcNode.getNodeName()) @@ -271,7 +271,7 @@ public class SpawnsData implements IXmlReader */ private void parseNpc(Node n, SpawnTemplate spawnTemplate, SpawnGroup group) { - final NpcSpawnTemplate npcTemplate = new NpcSpawnTemplate(spawnTemplate, group, new StatsSet(parseAttributes(n))); + final NpcSpawnTemplate npcTemplate = new NpcSpawnTemplate(spawnTemplate, group, new StatSet(parseAttributes(n))); final NpcTemplate template = NpcData.getInstance().getTemplate(npcTemplate.getId()); if (template == null) { @@ -332,10 +332,10 @@ public class SpawnsData implements IXmlReader * @param n * @param npcTemplate */ - private void parseParameters(Node n, IParameterized npcTemplate) + private void parseParameters(Node n, IParameterized npcTemplate) { final Map params = parseParameters(n); - npcTemplate.setParameters(!params.isEmpty() ? new StatsSet(Collections.unmodifiableMap(params)) : StatsSet.EMPTY_STATSET); + npcTemplate.setParameters(!params.isEmpty() ? new StatSet(Collections.unmodifiableMap(params)) : StatSet.EMPTY_STATSET); } /** @@ -344,7 +344,7 @@ public class SpawnsData implements IXmlReader */ private void parseMinions(Node n, NpcSpawnTemplate npcTemplate) { - forEach(n, "minion", minionNode -> npcTemplate.addMinion(new MinionHolder(new StatsSet(parseAttributes(minionNode))))); + forEach(n, "minion", minionNode -> npcTemplate.addMinion(new MinionHolder(new StatSet(parseAttributes(minionNode))))); } /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java index 98d333446c..ef93935404 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; @@ -69,7 +69,7 @@ public class StaticObjectData implements IXmlReader if ("object".equalsIgnoreCase(d.getNodeName())) { final NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -86,9 +86,9 @@ public class StaticObjectData implements IXmlReader * Initialize an static object based on the stats set and add it to the map. * @param set the stats set to add. */ - private void addObject(StatsSet set) + private void addObject(StatSet set) { - final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatsSet()), set.getInt("id")); + final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatSet()), set.getInt("id")); obj.setType(set.getInt("type", 0)); obj.setName(set.getString("name")); obj.setMap(set.getString("texture", "none"), set.getInt("map_x", 0), set.getInt("map_y", 0)); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java index 7c8c9a538d..487bae9dea 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.TeleportType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.teleporter.TeleportHolder; /** @@ -74,7 +74,7 @@ public class TeleportersData implements IXmlReader final String name = parseString(nodeAttrs, "name", type.name()); // Parse locations final TeleportHolder holder = new TeleportHolder(name, type); - forEach(node, "location", location -> holder.registerLocation(new StatsSet(parseAttributes(location)))); + forEach(node, "location", location -> holder.registerLocation(new StatSet(parseAttributes(location)))); // Register holder if (teleList.putIfAbsent(name, holder) != null) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java index b6b3bf2e90..c2f5f94adb 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java @@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.transform.Transform; import org.l2jmobius.gameserver.model.actor.transform.TransformLevelData; import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate; @@ -70,7 +70,7 @@ public class TransformData implements IXmlReader if ("transform".equalsIgnoreCase(d.getNodeName())) { NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -192,7 +192,7 @@ public class TransformData implements IXmlReader transform.setTemplate(isMale, templateData); } - final StatsSet levelsSet = new StatsSet(); + final StatSet levelsSet = new StatSet(); for (Node s = z.getFirstChild(); s != null; s = s.getNextSibling()) { if ("level".equals(s.getNodeName())) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/engines/DocumentBase.java index ba3fc7f6b4..d178b10006 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/engines/DocumentBase.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/engines/DocumentBase.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.PlayerState; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionCategoryType; @@ -178,7 +178,7 @@ public abstract class DocumentBase protected abstract void parseDocument(Document doc); - protected abstract StatsSet getStatsSet(); + protected abstract StatSet getStatSet(); protected abstract String getTableValue(String name); @@ -1245,7 +1245,7 @@ public abstract class DocumentBase setTable(name, array.toArray(new String[array.size()])); } - protected void parseBeanSet(Node n, StatsSet set, Integer level) + protected void parseBeanSet(Node n, StatSet set, Integer level) { final String name = n.getAttributes().getNamedItem("name").getNodeValue().trim(); final String value = n.getAttributes().getNamedItem("val").getNodeValue().trim(); @@ -1260,7 +1260,7 @@ public abstract class DocumentBase } } - protected void setExtractableSkillData(StatsSet set, String value) + protected void setExtractableSkillData(StatSet set, String value) { set.set("capsuled_items_skill", value); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java index e8c77b206e..46f8f9be1f 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java @@ -21,7 +21,7 @@ import java.io.File; import org.w3c.dom.Document; import org.w3c.dom.Node; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; /** @@ -41,7 +41,7 @@ public class DocumentBaseGeneral extends DocumentBase } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return null; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java index 3ea7f41bb6..419552cf68 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.engines.DocumentBase; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -57,7 +57,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return _currentItem.set; } @@ -111,7 +111,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader _currentItem.id = itemId; _currentItem.name = itemName; _currentItem.type = className; - _currentItem.set = new StatsSet(); + _currentItem.set = new StatSet(); _currentItem.set.set("item_id", itemId); _currentItem.set.set("name", itemName); _currentItem.set.set("additionalName", additionalName); @@ -218,7 +218,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatsSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (Item) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java index 56e5b21a9f..967c1fc34d 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.engines.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; public class ItemDataHolder @@ -24,7 +24,7 @@ public class ItemDataHolder int id; String type; String name; - StatsSet set; + StatSet set; int currentLevel; Item item; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/handler/ConditionHandler.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/handler/ConditionHandler.java index 47f24d690d..b53f170fb3 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/handler/ConditionHandler.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/handler/ConditionHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.ICondition; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class ConditionHandler { - private final Map> _conditionHandlerFactories = new HashMap<>(); + private final Map> _conditionHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _conditionHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _conditionHandlerFactories.get(name); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/handler/EffectHandler.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/handler/EffectHandler.java index a58de8efb4..328265d9db 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/handler/EffectHandler.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/handler/EffectHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class EffectHandler { - private final Map> _effectHandlerFactories = new HashMap<>(); + private final Map> _effectHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _effectHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _effectHandlerFactories.get(name); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java index a6e2275d04..32438040e0 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class SkillConditionHandler { - private final Map> _skillConditionHandlerFactories = new HashMap<>(); + private final Map> _skillConditionHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _skillConditionHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _skillConditionHandlerFactories.get(name); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java index 6992dd5366..65a8c52d7e 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.model.AirShipTeleportList; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShipInstance; @@ -45,13 +45,13 @@ public class AirShipManager private static final String UPDATE_DB = "UPDATE airships SET fuel=? WHERE owner_id=?"; private CreatureTemplate _airShipTemplate = null; - private final Map _airShipsInfo = new HashMap<>(); + private final Map _airShipsInfo = new HashMap<>(); private final Map _airShips = new HashMap<>(); private final Map _teleports = new HashMap<>(); protected AirShipManager() { - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", 9); npcDat.set("level", 0); npcDat.set("jClass", "boat"); @@ -113,7 +113,7 @@ public class AirShipManager public AirShipInstance getNewAirShip(int x, int y, int z, int heading, int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return null; @@ -147,7 +147,7 @@ public class AirShipManager if (ship.getOwnerId() != 0) { storeInDb(ship.getOwnerId()); - final StatsSet info = _airShipsInfo.get(ship.getOwnerId()); + final StatSet info = _airShipsInfo.get(ship.getOwnerId()); if (info != null) { info.set("fuel", ship.getFuel()); @@ -164,7 +164,7 @@ public class AirShipManager { if (!_airShipsInfo.containsKey(ownerId)) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("fuel", 600); _airShipsInfo.put(ownerId, info); @@ -264,10 +264,10 @@ public class AirShipManager Statement s = con.createStatement(); ResultSet rs = s.executeQuery(LOAD_DB)) { - StatsSet info; + StatSet info; while (rs.next()) { - info = new StatsSet(); + info = new StatSet(); info.set("fuel", rs.getInt("fuel")); _airShipsInfo.put(rs.getInt("owner_id"), info); } @@ -285,7 +285,7 @@ public class AirShipManager private void storeInDb(int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java index 2db10dd045..e5c610b3f2 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.BoatInstance; @@ -57,7 +57,7 @@ public class BoatManager return null; } - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", boatId); npcDat.set("level", 0); npcDat.set("jClass", "boat"); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 99a9678ece..56f08422cd 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.enums.ManorMode; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; import org.l2jmobius.gameserver.model.SeedProduction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.entity.Castle; @@ -126,7 +126,7 @@ public class CastleManorManager implements IXmlReader, IStorable @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; NamedNodeMap attrs; Node att; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -142,7 +142,7 @@ public class CastleManorManager implements IXmlReader, IStorable { if ("crop".equalsIgnoreCase(c.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); set.set("castleId", castleId); attrs = c.getAttributes(); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java index 04c215a397..0fbd35091a 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java @@ -27,7 +27,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosState; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -181,7 +181,7 @@ public class CeremonyOfChaosManager extends AbstractEventManager _npcs = new ConcurrentHashMap<>(); protected final Map _spawns = new ConcurrentHashMap<>(); - protected final Map _storedInfo = new ConcurrentHashMap<>(); + protected final Map _storedInfo = new ConcurrentHashMap<>(); protected final Map> _schedules = new ConcurrentHashMap<>(); /** @@ -161,7 +161,7 @@ public class DBSpawnManager { npc.setDBStatus(RaidBossStatus.ALIVE); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getCurrentHp()); info.set("currentMP", npc.getCurrentMp()); info.set("respawnTime", 0); @@ -181,7 +181,7 @@ public class DBSpawnManager */ public void updateStatus(Npc npc, boolean isNpcDead) { - final StatsSet info = _storedInfo.get(npc.getId()); + final StatSet info = _storedInfo.get(npc.getId()); if (info == null) { return; @@ -254,7 +254,7 @@ public class DBSpawnManager _npcs.put(npcId, npc); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", currentHP); info.set("currentMP", currentMP); info.set("respawnTime", 0); @@ -316,7 +316,7 @@ public class DBSpawnManager } npc.setDBStatus(RaidBossStatus.ALIVE); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", 0); @@ -401,7 +401,7 @@ public class DBSpawnManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("UPDATE npc_respawns SET respawnTime = ?, currentHP = ?, currentMP = ? WHERE id = ?")) { - for (Entry entry : _storedInfo.entrySet()) + for (Entry entry : _storedInfo.entrySet()) { final Integer npcId = entry.getKey(); if (npcId == null) @@ -420,7 +420,7 @@ public class DBSpawnManager updateStatus(npc, false); } - final StatsSet info = entry.getValue(); + final StatSet info = entry.getValue(); if (info == null) { continue; @@ -529,7 +529,7 @@ public class DBSpawnManager */ public void notifySpawnNightNpc(Npc npc) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getCurrentHp()); info.set("currentMP", npc.getCurrentMp()); info.set("respawnTime", 0); @@ -572,7 +572,7 @@ public class DBSpawnManager * Gets the stored info. * @return the stored info */ - public Map getStoredInfo() + public Map getStoredInfo() { return _storedInfo; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index 3dd4e3f652..767bed6954 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.datatables.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.FakePlayerChatHolder; @@ -73,7 +73,7 @@ public class FakePlayerChatManager implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayerChat", fakePlayerChatNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerChatNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerChatNode)); MESSAGES.add(new FakePlayerChatHolder(set.getString("fpcName"), set.getString("searchMethod"), set.getString("searchText"), set.getString("answers"))); })); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java index 3bc57b3856..f91a16f65a 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java @@ -33,7 +33,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.tasks.GrandBossManagerStoreTask; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; import org.l2jmobius.gameserver.model.interfaces.IStorable; @@ -51,7 +51,7 @@ public class GrandBossManager implements IStorable protected static Map _bosses = new ConcurrentHashMap<>(); - protected static Map _storedInfo = new HashMap<>(); + protected static Map _storedInfo = new HashMap<>(); private final Map _bossStatus = new HashMap<>(); @@ -72,7 +72,7 @@ public class GrandBossManager implements IStorable final int bossId = rs.getInt("boss_id"); if (NpcData.getInstance().getTemplate(bossId) != null) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("loc_x", rs.getInt("loc_x")); info.set("loc_y", rs.getInt("loc_y")); info.set("loc_z", rs.getInt("loc_z")); @@ -136,12 +136,12 @@ public class GrandBossManager implements IStorable return _bosses.get(bossId); } - public StatsSet getStatsSet(int bossId) + public StatSet getStatSet(int bossId) { return _storedInfo.get(bossId); } - public void setStatsSet(int bossId, StatsSet info) + public void setStatSet(int bossId, StatSet info) { _storedInfo.put(bossId, info); updateDb(bossId, false); @@ -152,10 +152,10 @@ public class GrandBossManager implements IStorable { try (Connection con = DatabaseFactory.getConnection()) { - for (Entry e : _storedInfo.entrySet()) + for (Entry e : _storedInfo.entrySet()) { final GrandBossInstance boss = _bosses.get(e.getKey()); - final StatsSet info = e.getValue(); + final StatSet info = e.getValue(); if ((boss == null) || (info == null)) { try (PreparedStatement update = con.prepareStatement(UPDATE_GRAND_BOSS_DATA2)) @@ -205,7 +205,7 @@ public class GrandBossManager implements IStorable try (Connection con = DatabaseFactory.getConnection()) { final GrandBossInstance boss = _bosses.get(bossId); - final StatsSet info = _storedInfo.get(bossId); + final StatSet info = _storedInfo.get(bossId); if (statusOnly || (boss == null) || (info == null)) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index d77642378f..29e517b0cd 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.enums.InstanceReenterType; import org.l2jmobius.gameserver.enums.InstanceRemoveBuffType; import org.l2jmobius.gameserver.enums.InstanceTeleportType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.holders.InstanceReenterTimeHolder; @@ -151,7 +151,7 @@ public class InstanceManager implements IXmlReader return; } - final InstanceTemplate template = new InstanceTemplate(new StatsSet(parseAttributes(instanceNode))); + final InstanceTemplate template = new InstanceTemplate(new StatSet(parseAttributes(instanceNode))); // Update name if wasn't provided if (template.getName() == null) @@ -241,10 +241,10 @@ public class InstanceManager implements IXmlReader { if (doorNode.getNodeName().equals("door")) { - final StatsSet parsedSet = DoorData.getInstance().parseDoor(doorNode); - final StatsSet mergedSet = new StatsSet(); + final StatSet parsedSet = DoorData.getInstance().parseDoor(doorNode); + final StatSet mergedSet = new StatSet(); final int doorId = parsedSet.getInt("id"); - final StatsSet templateSet = DoorData.getInstance().getDoorTemplate(doorId); + final StatSet templateSet = DoorData.getInstance().getDoorTemplate(doorId); if (templateSet != null) { mergedSet.merge(templateSet); @@ -324,14 +324,14 @@ public class InstanceManager implements IXmlReader final boolean onlyLeader = parseBoolean(attrs, "onlyLeader", false); final boolean showMessageAndHtml = parseBoolean(attrs, "showMessageAndHtml", false); // Load parameters - StatsSet params = null; + StatSet params = null; for (Node f = conditionNode.getFirstChild(); f != null; f = f.getNextSibling()) { if (f.getNodeName().equals("param")) { if (params == null) { - params = new StatsSet(); + params = new StatSet(); } params.set(parseString(f.getAttributes(), "name"), parseString(f.getAttributes(), "value")); @@ -341,14 +341,14 @@ public class InstanceManager implements IXmlReader // If none parameters found then set empty StatSet if (params == null) { - params = StatsSet.EMPTY_STATSET; + params = StatSet.EMPTY_STATSET; } // Now when everything is loaded register condition to template try { final Class clazz = Class.forName("org.l2jmobius.gameserver.model.instancezone.conditions.Condition" + type); - final Constructor constructor = clazz.getConstructor(InstanceTemplate.class, StatsSet.class, boolean.class, boolean.class); + final Constructor constructor = clazz.getConstructor(InstanceTemplate.class, StatSet.class, boolean.class, boolean.class); conditions.add((Condition) constructor.newInstance(template, params, onlyLeader, showMessageAndHtml)); } catch (Exception ex) @@ -378,7 +378,7 @@ public class InstanceManager implements IXmlReader */ public Instance createInstance() { - return new Instance(getNewInstanceId(), new InstanceTemplate(StatsSet.EMPTY_STATSET), null); + return new Instance(getNewInstanceId(), new InstanceTemplate(StatSet.EMPTY_STATSET), null); } /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/AccessLevel.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/AccessLevel.java index 772c1fe77e..72b77905e1 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/AccessLevel.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/AccessLevel.java @@ -52,7 +52,7 @@ public class AccessLevel /** Flag to gain exp in party */ private boolean _gainExp = false; - public AccessLevel(StatsSet set) + public AccessLevel(StatSet set) { _accessLevel = set.getInt("level"); _name = set.getString("name"); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ActionDataHolder.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ActionDataHolder.java index 4887bedba8..ca6d9ee685 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ActionDataHolder.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ActionDataHolder.java @@ -25,7 +25,7 @@ public class ActionDataHolder private final String _handler; private final int _optionId; - public ActionDataHolder(StatsSet set) + public ActionDataHolder(StatSet set) { _id = set.getInt("id"); _handler = set.getString("handler"); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java index 656119098e..3f88e455d7 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java @@ -27,7 +27,7 @@ public class AdminCommandAccessRight private final int _accessLevel; private final boolean _requireConfirm; - public AdminCommandAccessRight(StatsSet set) + public AdminCommandAccessRight(StatSet set) { _adminCommand = set.getString("command"); _requireConfirm = set.getBoolean("confirmDlg", false); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index 5223b47ae9..cead2c2ce9 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -36,12 +36,12 @@ public class DailyMissionDataHolder private final List _rewardsItems; private final List _classRestriction; private final int _requiredCompletions; - private final StatsSet _params; + private final StatSet _params; private final boolean _dailyReset; private final boolean _isOneTime; private final AbstractDailyMissionHandler _handler; - public DailyMissionDataHolder(StatsSet set) + public DailyMissionDataHolder(StatSet set) { final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); @@ -50,7 +50,7 @@ public class DailyMissionDataHolder _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); - _params = set.getObject("params", StatsSet.class); + _params = set.getObject("params", StatSet.class); _dailyReset = set.getBoolean("dailyReset", true); _isOneTime = set.getBoolean("isOneTime", true); _handler = handler != null ? handler.apply(this) : null; @@ -81,7 +81,7 @@ public class DailyMissionDataHolder return _requiredCompletions; } - public StatsSet getParams() + public StatSet getParams() { return _params; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Location.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Location.java index 1c61740e4d..024c71075f 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Location.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Location.java @@ -49,7 +49,7 @@ public class Location implements IPositionable this(obj.getX(), obj.getY(), obj.getZ(), obj.getHeading()); } - public Location(StatsSet set) + public Location(StatSet set) { _x = set.getInt("x"); _y = set.getInt("y"); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/PetLevelData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/PetLevelData.java index e46b215b5f..7cad1a225a 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/PetLevelData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/PetLevelData.java @@ -46,7 +46,7 @@ public class PetLevelData private final double _slowFlySpeedOnRide; private final double _fastFlySpeedOnRide; - public PetLevelData(StatsSet set) + public PetLevelData(StatSet set) { _ownerExpTaken = set.getInt("get_exp_type"); _petMaxExp = set.getLong("exp"); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/RecipeList.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/RecipeList.java index 9e4a3b2387..a81bbb1802 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/RecipeList.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/RecipeList.java @@ -68,7 +68,7 @@ public class RecipeList * @param set * @param haveRare */ - public RecipeList(StatsSet set, boolean haveRare) + public RecipeList(StatSet set, boolean haveRare) { _recipes = new RecipeInstance[0]; _statUse = new RecipeStatInstance[0]; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Seed.java index 6d31ffc60f..54ef8acd9f 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Seed.java @@ -35,7 +35,7 @@ public class Seed private final int _seedReferencePrice; private final int _cropReferencePrice; - public Seed(StatsSet set) + public Seed(StatSet set) { _cropId = set.getInt("id"); _seedId = set.getInt("seedId"); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java index 78897cf4f1..4de77df228 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java @@ -27,7 +27,7 @@ public class SiegeScheduleDate private final int _hour; private final int _maxConcurrent; - public SiegeScheduleDate(StatsSet set) + public SiegeScheduleDate(StatSet set) { _day = set.getInt("day", Calendar.SUNDAY); _hour = set.getInt("hour", 16); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/SkillLearn.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/SkillLearn.java index e2ccdd6331..00f53c0cb9 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/SkillLearn.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/SkillLearn.java @@ -58,7 +58,7 @@ public class SkillLearn * Constructor for SkillLearn. * @param set the set with the SkillLearn data. */ - public SkillLearn(StatsSet set) + public SkillLearn(StatSet set) { _skillName = set.getString("skillName"); _skillId = set.getInt("skillId"); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/StatsSet.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/StatSet.java similarity index 95% rename from L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/StatsSet.java rename to L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/StatSet.java index 5ce013ebd2..3c824d9fa4 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/StatsSet.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/StatSet.java @@ -39,25 +39,25 @@ import org.l2jmobius.gameserver.util.Util; * They are stored as object but can be retrieved in any type wanted. As long as cast is available.
* @author mkizub */ -public class StatsSet implements IParserAdvUtils +public class StatSet implements IParserAdvUtils { - private static final Logger LOGGER = Logger.getLogger(StatsSet.class.getName()); + private static final Logger LOGGER = Logger.getLogger(StatSet.class.getName()); /** Static empty immutable map, used to avoid multiple null checks over the source. */ - public static final StatsSet EMPTY_STATSET = new StatsSet(Collections.emptyMap()); + public static final StatSet EMPTY_STATSET = new StatSet(Collections.emptyMap()); private final Map _set; - public StatsSet() + public StatSet() { this(ConcurrentHashMap::new); } - public StatsSet(Supplier> mapFactory) + public StatSet(Supplier> mapFactory) { this(mapFactory.get()); } - public StatsSet(Map map) + public StatSet(Map map) { _set = map; } @@ -73,9 +73,9 @@ public class StatsSet implements IParserAdvUtils /** * Add a set of couple values in the current set - * @param newSet : StatsSet pointing out the list of couples to add in the current set + * @param newSet : StatSet pointing out the list of couples to add in the current set */ - public void merge(StatsSet newSet) + public void merge(StatSet newSet) { _set.putAll(newSet.getSet()); } @@ -871,7 +871,7 @@ public class StatsSet implements IParserAdvUtils return (Map) obj; } - public StatsSet set(String name, Object value) + public StatSet set(String name, Object value) { if (value == null) { @@ -881,49 +881,49 @@ public class StatsSet implements IParserAdvUtils return this; } - public StatsSet set(String key, boolean value) + public StatSet set(String key, boolean value) { _set.put(key, value); return this; } - public StatsSet set(String key, byte value) + public StatSet set(String key, byte value) { _set.put(key, value); return this; } - public StatsSet set(String key, short value) + public StatSet set(String key, short value) { _set.put(key, value); return this; } - public StatsSet set(String key, int value) + public StatSet set(String key, int value) { _set.put(key, value); return this; } - public StatsSet set(String key, long value) + public StatSet set(String key, long value) { _set.put(key, value); return this; } - public StatsSet set(String key, float value) + public StatSet set(String key, float value) { _set.put(key, value); return this; } - public StatsSet set(String key, double value) + public StatSet set(String key, double value) { _set.put(key, value); return this; } - public StatsSet set(String key, String value) + public StatSet set(String key, String value) { if (value == null) { @@ -933,7 +933,7 @@ public class StatsSet implements IParserAdvUtils return this; } - public StatsSet set(String key, Enum value) + public StatSet set(String key, Enum value) { if (value == null) { @@ -943,9 +943,9 @@ public class StatsSet implements IParserAdvUtils return this; } - public static StatsSet valueOf(String key, Object value) + public static StatSet valueOf(String key, Object value) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.set(key, value); return set; } @@ -963,6 +963,6 @@ public class StatsSet implements IParserAdvUtils @Override public String toString() { - return "StatsSet{_set=" + _set + '}'; + return "StatSet{_set=" + _set + '}'; } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Npc.java index a1a7e98aba..2b90533cc5 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.MpRewardTask; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.FishermanInstance; @@ -148,7 +148,7 @@ public class Npc extends Creature private NpcStringId _titleString; private NpcStringId _nameString; - private StatsSet _params; + private StatSet _params; private RaidBossStatus _raidStatus; /** Contains information about local tax payments. */ @@ -1756,7 +1756,7 @@ public class Npc extends Creature /** * @return the parameters of the npc merged with the spawn parameters (if there are any) */ - public StatsSet getParameters() + public StatSet getParameters() { if (_params != null) { @@ -1768,10 +1768,10 @@ public class Npc extends Creature final NpcSpawnTemplate npcSpawnTemplate = _spawn.getNpcSpawnTemplate(); if ((npcSpawnTemplate != null) && (npcSpawnTemplate.getParameters() != null) && !npcSpawnTemplate.getParameters().isEmpty()) { - final StatsSet params = getTemplate().getParameters(); + final StatSet params = getTemplate().getParameters(); if ((params != null) && !params.getSet().isEmpty()) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.merge(params); set.merge(npcSpawnTemplate.getParameters()); _params = set; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 82f429bc18..4cb0835220 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -21,7 +21,7 @@ import java.util.EnumMap; import java.util.Map; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; @@ -49,12 +49,12 @@ public class CreatureTemplate extends ListenersContainer /** The creature's race. */ private Race _race; - public CreatureTemplate(StatsSet set) + public CreatureTemplate(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { // Base stats _baseValues.put(Stat.STAT_STR, set.getDouble("baseSTR", 0)); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java index 86441c678c..14f0e9cae8 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.CubicInstance; @@ -46,7 +46,7 @@ public class CubicTemplate implements ICubicConditionHolder private final List _conditions = new ArrayList<>(); public List _skills = new ArrayList<>(); - public CubicTemplate(StatsSet set) + public CubicTemplate(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java index c40883ac75..410040bc86 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.templates; import org.l2jmobius.gameserver.enums.DoorOpenType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -57,7 +57,7 @@ public class DoorTemplate extends CreatureTemplate implements IIdentifiable private final boolean _stealth; private final boolean _isInverted; - public DoorTemplate(StatsSet set) + public DoorTemplate(StatSet set) { super(set); _doorId = set.getInt("id"); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 767743de2e..8ab41c70e3 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.enums.MpRewardAffectType; import org.l2jmobius.gameserver.enums.MpRewardType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -63,7 +63,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private boolean _usingServerSideName; private String _title; private boolean _usingServerSideTitle; - private StatsSet _parameters; + private StatSet _parameters; private Sex _sex; private int _chestId; private int _rhandId; @@ -123,15 +123,15 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable /** * Constructor of Creature. - * @param set The StatsSet object to transfer data to the method + * @param set The StatSet object to transfer data to the method */ - public NpcTemplate(StatsSet set) + public NpcTemplate(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _id = set.getInt("id"); @@ -320,12 +320,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _usingServerSideTitle; } - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } - public void setParameters(StatsSet set) + public void setParameters(StatSet set) { _parameters = set; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 50292b8bc8..28458aa09e 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -50,7 +50,7 @@ public class PlayerTemplate extends CreatureTemplate private final List _creationPoints; private final Map _baseSlotDef; - public PlayerTemplate(StatsSet set, List creationPoints) + public PlayerTemplate(StatSet set, List creationPoints) { super(set); _classId = ClassId.getClassId(set.getInt("classId")); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index aa28a0f648..260da48365 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -23,7 +23,7 @@ import java.util.Objects; import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import org.l2jmobius.gameserver.enums.InventoryBlockType; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -57,7 +57,7 @@ public class Transform implements IIdentifiable private TransformTemplate _maleTemplate; private TransformTemplate _femaleTemplate; - public Transform(StatsSet set) + public Transform(StatSet set) { _id = set.getInt("id"); _displayId = set.getInt("displayId", _id); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java index 5660852a01..729998503f 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.actor.transform; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -31,7 +31,7 @@ public class TransformLevelData private final double _levelMod; private Map _stats; - public TransformLevelData(StatsSet set) + public TransformLevelData(StatSet set) { _level = set.getInt("val"); _levelMod = set.getDouble("levelMod"); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 4de84b8bdc..7aca059f91 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -23,7 +23,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -49,7 +49,7 @@ public class TransformTemplate private ExBasicActionList _list; private final Map _data = new LinkedHashMap<>(100); - public TransformTemplate(StatsSet set) + public TransformTemplate(StatSet set) { _collisionRadius = set.contains("radius") ? set.getDouble("radius") : null; _collisionHeight = set.contains("height") ? set.getDouble("height") : null; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java index d808a6b8bf..02550d2818 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -36,7 +36,7 @@ public class AlchemyCraftData private ItemHolder _productionSuccess; private ItemHolder _productionFailure; - public AlchemyCraftData(StatsSet set) + public AlchemyCraftData(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java index 0bd061d3c4..79dd6c0207 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.beautyshop; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -32,7 +32,7 @@ public class BeautyItem private final int _beautyShopTicket; private final Map _colors = new HashMap<>(); - public BeautyItem(StatsSet set) + public BeautyItem(StatSet set) { _id = set.getInt("id"); _adena = set.getInt("adena", 0); @@ -60,7 +60,7 @@ public class BeautyItem return _beautyShopTicket; } - public void addColor(StatsSet set) + public void addColor(StatSet set) { final BeautyItem color = new BeautyItem(set); _colors.put(set.getInt("id"), color); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index 689a61464d..8b32364c1a 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party.MessageType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.appearance.PlayerAppearance; @@ -244,7 +244,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent player.teleToLocation(_instance.getEnterLocations().get(index++), 0, _instance); } - getTimers().addTimer("match_start_countdown", StatsSet.valueOf("time", 60), 100, null, null); + getTimers().addTimer("match_start_countdown", StatSet.valueOf("time", 60), 100, null, null); getTimers().addTimer("teleport_message1", 10000, null, null); getTimers().addTimer("teleport_message2", 14000, null, null); @@ -400,7 +400,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent } } getTimers().cancelTimer("update", null, null); - getTimers().addTimer("match_end_countdown", StatsSet.valueOf("time", 30), 30 * 1000, null, null); + getTimers().addTimer("match_end_countdown", StatSet.valueOf("time", 30), 30 * 1000, null, null); EventDispatcher.getInstance().notifyEvent(new OnCeremonyOfChaosMatchResult(winners, members)); } @@ -493,7 +493,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java index 39f9196d93..371f8dc459 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.conditions.ICubicCondition; @@ -38,7 +38,7 @@ public class CubicSkill extends SkillHolder implements ICubicConditionHolder private final List _conditions = new ArrayList<>(); private final boolean _targetDebuff; - public CubicSkill(StatsSet set) + public CubicSkill(StatSet set) { super(set.getInt("id"), set.getInt("level")); _triggerRate = set.getInt("triggerRate", 100); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/ClanHall.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/ClanHall.java index 8da77477fd..22af370709 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/ClanHall.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/ClanHall.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -75,7 +75,7 @@ public class ClanHall extends AbstractResidence private static final String LOAD_CLANHALL = "SELECT * FROM clanhall WHERE id=?"; private static final String UPDATE_CLANHALL = "UPDATE clanhall SET ownerId=?,paidUntil=? WHERE id=?"; - public ClanHall(StatsSet params) + public ClanHall(StatSet params) { super(params.getInt("id")); // Set static parameters diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Hero.java index ef005ff325..aee8b019ee 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Hero.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Hero.java @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.data.xml.impl.ClassListData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -74,13 +74,13 @@ public class Hero // delete hero items private static final String DELETE_ITEMS = "DELETE FROM items WHERE item_id IN (30392, 30393, 30394, 30395, 30396, 30397, 30398, 30399, 30400, 30401, 30402, 30403, 30404, 30405, 30372, 30373, 6842, 6611, 6612, 6613, 6614, 6615, 6616, 6617, 6618, 6619, 6620, 6621, 9388, 9389, 9390) AND owner_id NOT IN (SELECT charId FROM characters WHERE accesslevel > 0)"; - private static final Map HEROES = new ConcurrentHashMap<>(); - private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); + private static final Map HEROES = new ConcurrentHashMap<>(); + private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); - private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); - private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); + private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); + private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); - private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); + private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); private static final Map HERO_MESSAGE = new ConcurrentHashMap<>(); public static final String COUNT = "count"; @@ -118,7 +118,7 @@ public class Hero { while (rset.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset.getInt(Olympiad.CLASS_ID)); @@ -137,7 +137,7 @@ public class Hero while (rset2.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset2.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset2.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset2.getInt(Olympiad.CLASS_ID)); @@ -159,7 +159,7 @@ public class Hero LOGGER.info("Hero System: Loaded " + COMPLETE_HEROS.size() + " all time Heroes."); } - private void processHeros(PreparedStatement ps, int charId, StatsSet hero) throws SQLException + private void processHeros(PreparedStatement ps, int charId, StatSet hero) throws SQLException { ps.setInt(1, charId); try (ResultSet rs = ps.executeQuery()) @@ -224,7 +224,7 @@ public class Hero public void loadDiary(int charId) { - final List diary = new ArrayList<>(); + final List diary = new ArrayList<>(); int diaryentries = 0; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement("SELECT * FROM heroes_diary WHERE charId=? ORDER BY time ASC")) @@ -234,7 +234,7 @@ public class Hero { while (rset.next()) { - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final long time = rset.getLong("time"); final int action = rset.getInt("action"); @@ -279,8 +279,8 @@ public class Hero public void loadFights(int charId) { - final List fights = new ArrayList<>(); - final StatsSet heroCountData = new StatsSet(); + final List fights = new ArrayList<>(); + final StatSet heroCountData = new StatSet(); final Calendar data = Calendar.getInstance(); data.set(Calendar.DAY_OF_MONTH, 1); data.set(Calendar.HOUR_OF_DAY, 0); @@ -326,7 +326,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charTwoClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -362,7 +362,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charOneClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -410,14 +410,14 @@ public class Hero } } - public Map getHeroes() + public Map getHeroes() { return HEROES; } public int getHeroByClass(int classid) { - for (Entry e : HEROES.entrySet()) + for (Entry e : HEROES.entrySet()) { if (e.getValue().getInt(Olympiad.CLASS_ID) == classid) { @@ -438,7 +438,7 @@ public class Hero public void showHeroDiary(PlayerInstance player, int heroclass, int charid, int page) { final int perpage = 10; - final List mainList = HERO_DIARY.get(charid); + final List mainList = HERO_DIARY.get(charid); if (mainList != null) { final NpcHtmlMessage diaryReply = new NpcHtmlMessage(); @@ -453,7 +453,7 @@ public class Hero if (!mainList.isEmpty()) { - final List list = new ArrayList<>(mainList); + final List list = new ArrayList<>(mainList); Collections.reverse(list); boolean color = true; @@ -463,7 +463,7 @@ public class Hero for (int i = (page - 1) * perpage; i < list.size(); i++) { breakat = i; - final StatsSet diaryEntry = list.get(i); + final StatSet diaryEntry = list.get(i); fList.append(""); if (color) { @@ -524,7 +524,7 @@ public class Hero int loss = 0; int draw = 0; - final List heroFights = HERO_FIGHTS.get(charid); + final List heroFights = HERO_FIGHTS.get(charid); if (heroFights != null) { final NpcHtmlMessage fightReply = new NpcHtmlMessage(); @@ -536,7 +536,7 @@ public class Hero if (!heroFights.isEmpty()) { - final StatsSet heroCount = HERO_COUNTS.get(charid); + final StatSet heroCount = HERO_COUNTS.get(charid); if (heroCount != null) { win = heroCount.getInt("victory"); @@ -551,7 +551,7 @@ public class Hero for (int i = (page - 1) * perpage; i < heroFights.size(); i++) { breakat = i; - final StatsSet fight = heroFights.get(i); + final StatSet fight = heroFights.get(i); fList.append(""); if (color) { @@ -609,7 +609,7 @@ public class Hero } } - public synchronized void computeNewHeroes(List newHeroes) + public synchronized void computeNewHeroes(List newHeroes) { updateHeroes(true); @@ -659,13 +659,13 @@ public class Hero return; } - for (StatsSet hero : newHeroes) + for (StatSet hero : newHeroes) { final int charId = hero.getInt(Olympiad.CHAR_ID); if (COMPLETE_HEROS.containsKey(charId)) { - final StatsSet oldHero = COMPLETE_HEROS.get(charId); + final StatSet oldHero = COMPLETE_HEROS.get(charId); final int count = oldHero.getInt(COUNT); oldHero.set(COUNT, count + 1); oldHero.set(PLAYED, 1); @@ -674,7 +674,7 @@ public class Hero } else { - final StatsSet newHero = new StatsSet(); + final StatSet newHero = new StatSet(); newHero.set(Olympiad.CHAR_NAME, hero.getString(Olympiad.CHAR_NAME)); newHero.set(Olympiad.CLASS_ID, hero.getInt(Olympiad.CLASS_ID)); newHero.set(COUNT, 1); @@ -700,9 +700,9 @@ public class Hero } else { - StatsSet hero; + StatSet hero; int heroId; - for (Entry entry : HEROES.entrySet()) + for (Entry entry : HEROES.entrySet()) { hero = entry.getValue(); heroId = entry.getKey(); @@ -787,13 +787,13 @@ public class Hero setDiaryData(charId, ACTION_RAID_KILLED, npcId); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (template == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -806,13 +806,13 @@ public class Hero setDiaryData(charId, ACTION_CASTLE_TAKEN, castleId); final Castle castle = CastleManager.getInstance().getCastleById(castleId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (castle == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -922,10 +922,10 @@ public class Hero */ public void claimHero(PlayerInstance player) { - StatsSet hero = HEROES.get(player.getObjectId()); + StatSet hero = HEROES.get(player.getObjectId()); if (hero == null) { - hero = new StatsSet(); + hero = new StatSet(); HEROES.put(player.getObjectId(), hero); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java index f1263e8d44..c52f487402 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java @@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.atomic.AtomicReference; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.eventengine.drop.IEventDrop; import org.l2jmobius.gameserver.model.events.AbstractScript; @@ -42,7 +42,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout public abstract class AbstractEventManager>extends AbstractScript { private String _name; - private StatsSet _variables = StatsSet.EMPTY_STATSET; + private StatSet _variables = StatSet.EMPTY_STATSET; private Set _schedulers = Collections.emptySet(); private Set _conditionalSchedulers = Collections.emptySet(); private Map _rewards = Collections.emptyMap(); @@ -67,14 +67,14 @@ public abstract class AbstractEventManager>extends Ab /* ********************** */ - public StatsSet getVariables() + public StatSet getVariables() { return _variables; } - public void setVariables(StatsSet variables) + public void setVariables(StatSet variables) { - _variables = new StatsSet(Collections.unmodifiableMap(variables.getSet())); + _variables = new StatSet(Collections.unmodifiableMap(variables.getSet())); } /* ********************** */ diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java index 59c64b812c..e41af41d1a 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.util.cron4j.PastPredictor; import org.l2jmobius.gameserver.util.cron4j.Predictor; @@ -45,7 +45,7 @@ public class EventScheduler private List _notifications; private ScheduledFuture _task; - public EventScheduler(AbstractEventManager manager, StatsSet set) + public EventScheduler(AbstractEventManager manager, StatSet set) { _eventManager = manager; _name = set.getString("name", ""); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 153b768796..59143ed335 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -50,7 +50,7 @@ import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -182,12 +182,12 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime onTimerCancel(holder.getEvent(), holder.getParams(), holder.getNpc(), holder.getPlayer()); } - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { LOGGER.warning("[" + getClass().getSimpleName() + "]: Timer event arrived at non overriden onTimerEvent method event: " + event + " npc: " + npc + " player: " + player); } - public void onTimerCancel(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerCancel(String event, StatSet params, Npc npc, PlayerInstance player) { } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java index 400fb64b6e..861c4a9b31 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java @@ -24,7 +24,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.timers.IEventTimerCancel; @@ -69,7 +69,7 @@ public class TimerExecutor * @param eventTimer * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - public boolean addTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) + public boolean addTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) { return addTimer(new TimerHolder<>(event, params, time, npc, player, false, eventTimer, _cancelListener, this)); } @@ -95,7 +95,7 @@ public class TimerExecutor * @param player * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - public boolean addTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player) + public boolean addTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player) { return addTimer(event, params, time, npc, player, _eventListener); } @@ -123,7 +123,7 @@ public class TimerExecutor * @param eventTimer * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - private boolean addRepeatingTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) + private boolean addRepeatingTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) { return addTimer(new TimerHolder<>(event, params, time, npc, player, true, eventTimer, _cancelListener, this)); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java index ab8fa150ca..0fcafba759 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java @@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.gameserver.instancemanager.TimersManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.TimerExecutor; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.events.TimerExecutor; public class TimerHolder implements Runnable { private final T _event; - private final StatsSet _params; + private final StatSet _params; private final long _time; private final Npc _npc; private final PlayerInstance _player; @@ -44,7 +44,7 @@ public class TimerHolder implements Runnable private final TimerExecutor _postExecutor; private final ScheduledFuture _task; - public TimerHolder(T event, StatsSet params, long time, Npc npc, PlayerInstance player, boolean isRepeating, IEventTimerEvent eventScript, IEventTimerCancel cancelScript, TimerExecutor postExecutor) + public TimerHolder(T event, StatSet params, long time, Npc npc, PlayerInstance player, boolean isRepeating, IEventTimerEvent eventScript, IEventTimerCancel cancelScript, TimerExecutor postExecutor) { Objects.requireNonNull(event, getClass().getSimpleName() + ": \"event\" cannot be null!"); Objects.requireNonNull(eventScript, getClass().getSimpleName() + ": \"script\" cannot be null!"); @@ -73,7 +73,7 @@ public class TimerHolder implements Runnable /** * @return the parameters of this timer */ - public StatsSet getParams() + public StatSet getParams() { return _params; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index 4a017eaaa2..78b7d0eaa3 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; @@ -37,7 +37,7 @@ public class AppearanceHolder private final AppearanceTargetType _targetType; private final Integer _bodyPart; - public AppearanceHolder(StatsSet set) + public AppearanceHolder(StatSet set) { _visualId = set.getInt("id", 0); _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java index 29740873cd..0f9488448d 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Nik @@ -43,7 +43,7 @@ public class AttachSkillHolder extends SkillHolder return _requiredSkillLevel; } - public static AttachSkillHolder fromStatsSet(StatsSet set) + public static AttachSkillHolder fromStatSet(StatSet set) { return new AttachSkillHolder(set.getInt("skillId"), set.getInt("skillLevel", 1), set.getInt("requiredSkillId"), set.getInt("requiredSkillLevel", 1)); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java index cc41724532..57b6d47c40 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Set; import org.l2jmobius.gameserver.enums.SkillEnchantType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -36,7 +36,7 @@ public class EnchantSkillHolder private final Map _chance = new EnumMap<>(SkillEnchantType.class); private final Map> _requiredItems = new EnumMap<>(SkillEnchantType.class); - public EnchantSkillHolder(StatsSet set) + public EnchantSkillHolder(StatSet set) { _level = set.getInt("level"); _enchantFailLevel = set.getInt("enchantFailLevel"); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java index e6706c8467..33d14e4345 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Map; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -36,7 +36,7 @@ public class ExtendDropDataHolder private final List _conditions; private final Map _systemMessages; - public ExtendDropDataHolder(StatsSet set) + public ExtendDropDataHolder(StatSet set) { _id = set.getInt("id"); _items = set.getList("items", ExtendDropItemHolder.class); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java index 16454d764a..d63d4eb775 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -52,7 +52,7 @@ public class FakePlayerHolder private final int _clanId; private final int _pledgeStatus; - public FakePlayerHolder(StatsSet set) + public FakePlayerHolder(StatSet set) { _classId = set.getInt("classId", 182); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java index a9c72776cd..86af0c1405 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -29,7 +29,7 @@ public class ItemHolder implements IIdentifiable private final int _id; private final long _count; - public ItemHolder(StatsSet set) + public ItemHolder(StatSet set) { _id = set.getInt("id"); _count = set.getLong("count"); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java index 5b581c4cfe..a54dfa8300 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -25,7 +25,7 @@ public class ItemPointHolder extends ItemHolder { private final int _points; - public ItemPointHolder(StatsSet params) + public ItemPointHolder(StatSet params) { this(params.getInt("id"), params.getLong("count"), params.getInt("points")); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java index 22c6c327eb..0ba78224d3 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.holders; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -34,7 +34,7 @@ public class LuckyGameDataHolder private int _minModifyRewardGame; private int _maxModifyRewardGame; - public LuckyGameDataHolder(StatsSet params) + public LuckyGameDataHolder(StatSet params) { _index = params.getInt("index"); _turningPoints = params.getInt("turning_point"); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java index f77e380e8d..9fa8c99654 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.holders; import java.time.Duration; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -32,7 +32,7 @@ public class MinionHolder implements IIdentifiable private final long _respawnTime; private final int _weightPoint; - public MinionHolder(StatsSet set) + public MinionHolder(StatSet set) { _id = set.getInt("id"); _count = set.getInt("count", 1); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java index f4173594d1..36ac70176d 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -52,7 +52,7 @@ public class MultisellListHolder implements IIdentifiable } @SuppressWarnings("unchecked") - public MultisellListHolder(StatsSet set) + public MultisellListHolder(StatSet set) { _listId = set.getInt("listId"); _isChanceMultisell = set.getBoolean("isChanceMultisell", false); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index f1b98ee9ac..ecd1069283 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -45,7 +45,7 @@ import org.l2jmobius.gameserver.enums.InstanceReenterType; import org.l2jmobius.gameserver.enums.InstanceTeleportType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -87,7 +87,7 @@ public class Instance implements IIdentifiable, INamable private final Set _players = ConcurrentHashMap.newKeySet(); // Players inside instance private final Set _npcs = ConcurrentHashMap.newKeySet(); // Spawned NPCs inside instance private final Map _doors = new HashMap<>(); // Spawned doors inside instance - private final StatsSet _parameters = new StatsSet(); + private final StatSet _parameters = new StatSet(); // Timers private final Map> _ejectDeadTasks = new ConcurrentHashMap<>(); private ScheduledFuture _cleanUpTask = null; @@ -171,7 +171,7 @@ public class Instance implements IIdentifiable, INamable * Get instance world parameters. * @return instance parameters */ - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } @@ -1020,7 +1020,7 @@ public class Instance implements IIdentifiable, INamable * Get parameters from instance template.
* @return template parameters */ - public StatsSet getTemplateParameters() + public StatSet getTemplateParameters() { return _template.getParameters(); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 2a196f73ef..b53b0a819d 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.AbstractPlayerGroup; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -71,7 +71,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl private float _spRate = Config.RATE_INSTANCE_SP; private float _expPartyRate = Config.RATE_INSTANCE_PARTY_XP; private float _spPartyRate = Config.RATE_INSTANCE_PARTY_SP; - private StatsSet _parameters = StatsSet.EMPTY_STATSET; + private StatSet _parameters = StatSet.EMPTY_STATSET; private final Map _doors = new HashMap<>(); private final List _spawns = new ArrayList<>(); // Locations @@ -92,7 +92,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl /** * @param set */ - public InstanceTemplate(StatsSet set) + public InstanceTemplate(StatSet set) { _templateId = set.getInt("id", 0); _name = set.getString("name", null); @@ -178,7 +178,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (!set.isEmpty()) { - _parameters = new StatsSet(Collections.unmodifiableMap(set)); + _parameters = new StatSet(Collections.unmodifiableMap(set)); } } @@ -469,7 +469,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl * Get instance template parameters. * @return parameters of template */ - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java index 3b67ff72f4..3627959662 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; import java.util.function.BiConsumer; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public abstract class Condition { private final InstanceTemplate _template; - private final StatsSet _parameters; + private final StatSet _parameters; private final boolean _leaderOnly; private final boolean _showMessageAndHtml; private SystemMessageId _systemMsg = null; @@ -46,7 +46,7 @@ public abstract class Condition * @param onlyLeader flag which means if only leader should be affected (leader means player who wants to enter not group leader!) * @param showMessageAndHtml if {@code true} and HTML message is defined then both are send, otherwise only HTML or message is send */ - public Condition(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public Condition(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { _template = template; _parameters = parameters; @@ -58,7 +58,7 @@ public abstract class Condition * Gets parameters of condition. * @return set of parameters */ - protected final StatsSet getParameters() + protected final StatSet getParameters() { return _parameters; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java index e379741b59..c27d92d662 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionCommandChannel extends Condition { - public ConditionCommandChannel(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionCommandChannel(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_CANNOT_ENTER_BECAUSE_YOU_ARE_NOT_ASSOCIATED_WITH_THE_CURRENT_COMMAND_CHANNEL); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java index ed434e3524..a828dcceae 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.model.AbstractPlayerGroup; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionCommandChannelLeader extends Condition { - public ConditionCommandChannelLeader(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionCommandChannelLeader(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java index d2a60816d0..423a37a94e 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionDistance extends Condition { - public ConditionDistance(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionDistance(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); setSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED, (message, player) -> message.addString(player.getName())); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java index 3dc78a98c7..8aa68b7e08 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionGroupMax extends Condition { - public ConditionGroupMax(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionGroupMax(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_CANNOT_ENTER_DUE_TO_THE_PARTY_HAVING_EXCEEDED_THE_LIMIT); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java index f7930b1d8c..fde9d13439 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionGroupMin extends Condition { - public ConditionGroupMin(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionGroupMin(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_MUST_HAVE_A_MINIMUM_OF_S1_PEOPLE_TO_ENTER_THIS_INSTANCED_ZONE, (msg, player) -> msg.addInt(getLimit())); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 3088d8ae64..53fee609aa 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.enums.ResidenceType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; */ public class ConditionHasResidence extends Condition { - public ConditionHasResidence(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionHasResidence(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); } @@ -43,7 +43,7 @@ public class ConditionHasResidence extends Condition return false; } - final StatsSet params = getParameters(); + final StatSet params = getParameters(); final int id = params.getInt("id"); boolean test = false; switch (params.getEnum("type", ResidenceType.class)) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java index 4e1c407325..eed350db38 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -32,7 +32,7 @@ public class ConditionItem extends Condition private final long _count; private final boolean _take; - public ConditionItem(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionItem(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Load params diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java index 7d509a20c7..b38f8c0e2c 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -32,7 +32,7 @@ public class ConditionLevel extends Condition private final int _min; private final int _max; - public ConditionLevel(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionLevel(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Load params diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java index b91deeffdb..d71e6d0a39 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; */ public class ConditionNoParty extends Condition { - public ConditionNoParty(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionNoParty(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java index dd31bf3ca5..5bf768a03e 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionParty extends Condition { - public ConditionParty(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionParty(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java index 524a59675a..0363715536 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionPartyLeader extends Condition { - public ConditionPartyLeader(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionPartyLeader(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java index 481cb251ce..48d7fc7981 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.instancemanager.QuestManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionQuest extends Condition { - public ConditionQuest(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionQuest(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Set message diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 899b17aff9..a073129734 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionReenter extends Condition { - public ConditionReenter(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionReenter(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); setSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET, (message, player) -> message.addString(player.getName())); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java index ec255025c3..fafafe5604 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.itemauction; import java.util.Calendar; import java.util.concurrent.TimeUnit; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Forsaiken @@ -40,7 +40,7 @@ public class AuctionDateGenerator private int _hour_of_day; private int _minute_of_hour; - public AuctionDateGenerator(StatsSet config) + public AuctionDateGenerator(StatSet config) { _calendar = Calendar.getInstance(); _interval = config.getInt(FIELD_INTERVAL, -1); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 64bf0a6ff1..cb554e4dce 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.itemauction; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.idfactory.IdFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,9 +34,9 @@ public class AuctionItem private final int _itemId; private final long _itemCount; @SuppressWarnings("unused") - private final StatsSet _itemExtra; + private final StatSet _itemExtra; - public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatsSet itemExtra) + public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatSet itemExtra) { _auctionItemId = auctionItemId; _auctionLength = auctionLength; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 6dff6e3a4d..dc3a7f6f6b 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -44,7 +44,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -84,7 +84,7 @@ public class ItemAuctionInstance _items = new ArrayList<>(); final NamedNodeMap nanode = node.getAttributes(); - final StatsSet generatorConfig = new StatsSet(); + final StatSet generatorConfig = new StatSet(); for (int i = nanode.getLength(); i-- > 0;) { final Node n = nanode.item(i); @@ -115,7 +115,7 @@ public class ItemAuctionInstance throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } - final StatsSet itemExtra = new StatsSet(); + final StatSet itemExtra = new StatSet(); final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/Armor.java index ac707b015b..c87f7ed45e 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/Armor.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.type.ArmorType; /** @@ -28,15 +28,15 @@ public class Armor extends Item /** * Constructor for Armor. - * @param set the StatsSet designating the set of couples (key,value) characterizing the armor. + * @param set the StatSet designating the set of couples (key,value) characterizing the armor. */ - public Armor(StatsSet set) + public Armor(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/EtcItem.java index 86d7291595..a902860c0d 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/EtcItem.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -38,15 +38,15 @@ public class EtcItem extends Item /** * Constructor for EtcItem. - * @param set StatsSet designating the set of couples (key,value) for description of the Etc + * @param set StatSet designating the set of couples (key,value) for description of the Etc */ - public EtcItem(StatsSet set) + public EtcItem(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/Henna.java index c669b86eec..c4c32e7cda 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -21,7 +21,7 @@ import java.util.EnumMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; @@ -45,7 +45,7 @@ public class Henna private final List _skills; private final List _wear_class; - public Henna(StatsSet set) + public Henna(StatSet set) { _dyeId = set.getInt("dyeId"); _dyeItemId = set.getInt("dyeItemId"); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/Item.java index 4a5c714d97..7ed78ba385 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/Item.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.enums.ItemGrade; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; @@ -175,14 +175,14 @@ public abstract class Item extends ListenersContainer implements IIdentifiable /** * Constructor of the Item that fill class variables.
*
- * @param set : StatsSet corresponding to a set of couples (key,value) for description of the item + * @param set : StatSet corresponding to a set of couples (key,value) for description of the item */ - protected Item(StatsSet set) + protected Item(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { _itemId = set.getInt("item_id"); _displayId = set.getInt("displayId", _itemId); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java index ab196007a8..3ca228cbe5 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -29,7 +29,7 @@ public class PlayerItemTemplate extends ItemHolder /** * @param set the set containing the values for this object */ - public PlayerItemTemplate(StatsSet set) + public PlayerItemTemplate(StatSet set) { super(set.getInt("id"), set.getInt("count")); _equipped = set.getBoolean("equipped", false); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/Weapon.java index 16f0c47287..5f9f8507bd 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/Weapon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.items; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ItemSkillType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -58,15 +58,15 @@ public class Weapon extends Item /** * Constructor for Weapon. - * @param set the StatsSet designating the set of couples (key,value) characterizing the weapon. + * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. */ - public Weapon(StatsSet set) + public Weapon(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java index 422054b245..aa1f33acce 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java @@ -23,7 +23,7 @@ import java.util.List; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -54,7 +54,7 @@ public class AppearanceStone private List _racesNot; private List _allVisualIds; - public AppearanceStone(StatsSet set) + public AppearanceStone(StatSet set) { _id = set.getInt("id"); _visualId = set.getInt("visualId", 0); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java index f3b53f1a67..a2897ba911 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.items.combination; import java.util.EnumMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -31,7 +31,7 @@ public class CombinationItem private final int _chance; private final Map _rewards = new EnumMap<>(CombinationItemType.class); - public CombinationItem(StatsSet set) + public CombinationItem(StatSet set) { _itemOne = set.getInt("one"); _itemTwo = set.getInt("two"); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java index 1cde38a6d6..a7f1326bd8 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.CrystalType; @@ -59,7 +59,7 @@ public abstract class AbstractEnchantItem private final int _maxEnchantLevel; private final double _bonusRate; - public AbstractEnchantItem(StatsSet set) + public AbstractEnchantItem(StatSet set) { _id = set.getInt("id"); if (getItem() == null) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java index 36ccf3a5a4..310a7643ec 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -40,7 +40,7 @@ public class EnchantScroll extends AbstractEnchantItem private final int _scrollGroupId; private Set _items; - public EnchantScroll(StatsSet set) + public EnchantScroll(StatSet set) { super(set); _scrollGroupId = set.getInt("scrollGroupId", 0); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java index c02095428b..978e38d533 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items.enchant; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.items.type.ItemType; @@ -30,7 +30,7 @@ public class EnchantSupportItem extends AbstractEnchantItem private final boolean _isGiant; private final ItemType type; - public EnchantSupportItem(StatsSet set) + public EnchantSupportItem(StatSet set) { super(set); type = getItem().getItemType(); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 714e3b3ac1..375bd2d16a 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.data.xml.impl.CategoryData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.entity.Hero; @@ -61,7 +61,7 @@ public class Olympiad extends ListenersContainer protected static final Logger LOGGER = Logger.getLogger(Olympiad.class.getName()); protected static final Logger LOGGER_OLYMPIAD = Logger.getLogger("olympiad"); - private static final Map NOBLES = new ConcurrentHashMap<>(); + private static final Map NOBLES = new ConcurrentHashMap<>(); private static final Map NOBLES_RANK = new HashMap<>(); public static final String OLYMPIAD_HTML_PATH = "data/html/olympiad/"; @@ -229,10 +229,10 @@ public class Olympiad extends ListenersContainer PreparedStatement statement = con.prepareStatement(OLYMPIAD_LOAD_NOBLES); ResultSet rset = statement.executeQuery()) { - StatsSet statData; + StatSet statData; while (rset.next()) { - statData = new StatsSet(); + statData = new StatSet(); statData.set(CLASS_ID, rset.getInt(CLASS_ID)); statData.set(CHAR_NAME, rset.getString(CHAR_NAME)); statData.set(POINTS, rset.getInt(POINTS)); @@ -461,7 +461,7 @@ public class Olympiad extends ListenersContainer saveNobleData(); _period = 1; - final List heroesToBe = sortHerosToBe(); + final List heroesToBe = sortHerosToBe(); Hero.getInstance().resetData(); Hero.getInstance().computeNewHeroes(heroesToBe); @@ -495,7 +495,7 @@ public class Olympiad extends ListenersContainer return NOBLES.size(); } - public static StatsSet getNobleStats(int playerId) + public static StatSet getNobleStats(int playerId) { return NOBLES.get(playerId); } @@ -814,7 +814,7 @@ public class Olympiad extends ListenersContainer } int currentPoints; - for (StatsSet nobleInfo : NOBLES.values()) + for (StatSet nobleInfo : NOBLES.values()) { currentPoints = nobleInfo.getInt(POINTS); currentPoints += WEEKLY_POINTS; @@ -832,7 +832,7 @@ public class Olympiad extends ListenersContainer return; } - for (StatsSet nobleInfo : NOBLES.values()) + for (StatSet nobleInfo : NOBLES.values()) { nobleInfo.set(COMP_DONE_WEEK, 0); nobleInfo.set(COMP_DONE_WEEK_CLASSED, 0); @@ -868,9 +868,9 @@ public class Olympiad extends ListenersContainer try (Connection con = DatabaseFactory.getConnection()) { - for (Entry entry : NOBLES.entrySet()) + for (Entry entry : NOBLES.entrySet()) { - final StatsSet nobleInfo = entry.getValue(); + final StatSet nobleInfo = entry.getValue(); if (nobleInfo == null) { @@ -992,7 +992,7 @@ public class Olympiad extends ListenersContainer } } - protected List sortHerosToBe() + protected List sortHerosToBe() { if (_period != 1) { @@ -1000,8 +1000,8 @@ public class Olympiad extends ListenersContainer } LOGGER_OLYMPIAD.info("Noble,charid,classid,compDone,points"); - StatsSet nobleInfo; - for (Entry entry : NOBLES.entrySet()) + StatSet nobleInfo; + for (Entry entry : NOBLES.entrySet()) { nobleInfo = entry.getValue(); if (nobleInfo == null) @@ -1018,12 +1018,12 @@ public class Olympiad extends ListenersContainer LOGGER_OLYMPIAD.info(charName + "," + charId + "," + classId + "," + compDone + "," + points); } - final List heroesToBe = new LinkedList<>(); + final List heroesToBe = new LinkedList<>(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(OLYMPIAD_GET_HEROS)) { - StatsSet hero; + StatSet hero; for (int element : HERO_IDS) { statement.setInt(1, element); @@ -1032,7 +1032,7 @@ public class Olympiad extends ListenersContainer { if (rset.next()) { - hero = new StatsSet(); + hero = new StatSet(); hero.set(CLASS_ID, element); hero.set(CHAR_ID, rset.getInt(CHAR_ID)); hero.set(CHAR_NAME, rset.getString(CHAR_NAME)); @@ -1086,7 +1086,7 @@ public class Olympiad extends ListenersContainer return 0; } - final StatsSet noble = NOBLES.get(objectId); + final StatSet noble = NOBLES.get(objectId); if ((noble == null) || (noble.getInt(POINTS) == 0)) { return 0; @@ -1136,7 +1136,7 @@ public class Olympiad extends ListenersContainer { if (!NOBLES.containsKey(player.getObjectId())) { - final StatsSet statDat = new StatsSet(); + final StatSet statDat = new StatSet(); statDat.set(CLASS_ID, player.getBaseClass()); statDat.set(CHAR_NAME, player.getName()); statDat.set(POINTS, DEFAULT_POINTS); @@ -1318,7 +1318,7 @@ public class Olympiad extends ListenersContainer * @param data the stats set data to add. * @return the old stats set if the noble is already present, null otherwise. */ - public static StatsSet addNobleStats(int charId, StatsSet data) + public static StatSet addNobleStats(int charId, StatSet data) { return NOBLES.put(charId, data); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Participant.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Participant.java index 670066ac32..b6d879b902 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Participant.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Participant.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.olympiad; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class Participant private final int baseClass; private boolean disconnected = false; private boolean defaulted = false; - private final StatsSet stats; + private final StatSet stats; public String clanName; public int clanId; @@ -125,7 +125,7 @@ public class Participant /** * @return the stats */ - public StatsSet getStats() + public StatSet getStats() { return stats; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java index 4d5231ca5d..c1fb0f88f6 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.primeshop; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -49,7 +49,7 @@ public class PrimeShopGroup private final int _availableCount; private final List _items; - public PrimeShopGroup(StatsSet set, List items) + public PrimeShopGroup(StatSet set, List items) { _brId = set.getInt("id"); _category = set.getInt("cat", 0); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java index d150ec98cd..88795e0721 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.residences; import java.time.Duration; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -33,7 +33,7 @@ public class ResidenceFunctionTemplate private final Duration _duration; private final double _value; - public ResidenceFunctionTemplate(StatsSet set) + public ResidenceFunctionTemplate(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java index 4f15efda0b..b19f8e59d5 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; /** @@ -34,7 +34,7 @@ public class ShuttleDataHolder private final List _stops = new ArrayList<>(2); private final List _routes = new ArrayList<>(2); - public ShuttleDataHolder(StatsSet set) + public ShuttleDataHolder(StatSet set) { _id = set.getInt("id"); _loc = new Location(set); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/Skill.java index c44b45a781..0e97466a3a 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.handler.IAffectScopeHandler; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.CubicInstance; @@ -210,7 +210,7 @@ public class Skill implements IIdentifiable private final SkillBuffType _buffType; private final boolean _displayInList; - public Skill(StatsSet set) + public Skill(StatSet set) { _id = set.getInt(".id"); _level = set.getInt(".level"); @@ -391,7 +391,7 @@ public class Skill implements IIdentifiable _toggleGroupId = set.getInt("toggleGroupId", -1); _attachToggleGroupId = set.getInt("attachToggleGroupId", -1); - _attachSkills = set.getList("attachSkillList", StatsSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatsSet).collect(Collectors.toList()); + _attachSkills = set.getList("attachSkillList", StatSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatSet).collect(Collectors.toList()); final String abnormalResist = set.getString("abnormalResists", null); if (abnormalResist != null) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java index bfc25bddde..39b738dbca 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.ChanceLocation; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory; /** * @author UnAfraid */ -public class NpcSpawnTemplate implements Cloneable, IParameterized +public class NpcSpawnTemplate implements Cloneable, IParameterized { private static final Logger LOGGER = Logger.getLogger(NpcSpawnTemplate.class.getName()); @@ -56,7 +56,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized private final Duration _respawnTimeRandom; private List _locations; private SpawnTerritory _zone; - private StatsSet _parameters; + private StatSet _parameters; private final boolean _spawnAnimation; private final boolean _saveInDB; private final String _dbName; @@ -82,7 +82,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized _minions = template._minions; } - public NpcSpawnTemplate(SpawnTemplate spawnTemplate, SpawnGroup group, StatsSet set) + public NpcSpawnTemplate(SpawnTemplate spawnTemplate, SpawnGroup group, StatSet set) { _spawnTemplate = spawnTemplate; _group = group; @@ -128,14 +128,14 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized mergeParameters(spawnTemplate, group); } - private StatsSet mergeParameters(SpawnTemplate spawnTemplate, SpawnGroup group) + private StatSet mergeParameters(SpawnTemplate spawnTemplate, SpawnGroup group) { if ((_parameters == null) && (spawnTemplate.getParameters() == null) && (group.getParameters() == null)) { return null; } - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); if (spawnTemplate.getParameters() != null) { set.merge(spawnTemplate.getParameters()); @@ -206,13 +206,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized } @Override - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } @Override - public void setParameters(StatsSet parameters) + public void setParameters(StatSet parameters) { if (_parameters == null) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java index 6723863c93..7ceb2d46af 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IParameterized; import org.l2jmobius.gameserver.model.interfaces.ITerritorized; @@ -31,16 +31,16 @@ import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory; /** * @author UnAfraid */ -public class SpawnGroup implements Cloneable, ITerritorized, IParameterized +public class SpawnGroup implements Cloneable, ITerritorized, IParameterized { private final String _name; private final boolean _spawnByDefault; private List _territories; private List _bannedTerritories; private final List _spawns = new ArrayList<>(); - private StatsSet _parameters; + private StatSet _parameters; - public SpawnGroup(StatsSet set) + public SpawnGroup(StatSet set) { this(set.getString("name", null), set.getBoolean("spawnByDefault", true)); } @@ -104,13 +104,13 @@ public class SpawnGroup implements Cloneable, ITerritorized, IParameterized +public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized { private final String _name; private final String _ai; @@ -45,9 +45,9 @@ public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized _territories; private List _bannedTerritories; private final List _groups = new ArrayList<>(); - private StatsSet _parameters; + private StatSet _parameters; - public SpawnTemplate(StatsSet set, File file) + public SpawnTemplate(StatSet set, File file) { this(set.getString("name", null), set.getString("ai", null), set.getBoolean("spawnByDefault", true), file); } @@ -128,13 +128,13 @@ public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized _castleId; - public TeleportLocation(int id, StatsSet set) + public TeleportLocation(int id, StatSet set) { super(set); _id = id; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java index 916ae0790c..33cf6ac3bc 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.variables; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.IRestorable; import org.l2jmobius.gameserver.model.interfaces.IStorable; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.interfaces.IStorable; /** * @author UnAfraid */ -public abstract class AbstractVariables extends StatsSet implements IRestorable, IStorable, IDeletable +public abstract class AbstractVariables extends StatSet implements IRestorable, IStorable, IDeletable { private final AtomicBoolean _hasChanges = new AtomicBoolean(false); @@ -41,42 +41,42 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, */ @Override - public StatsSet set(String name, boolean value) + public StatSet set(String name, boolean value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, double value) + public StatSet set(String name, double value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, Enum value) + public StatSet set(String name, Enum value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, int value) + public StatSet set(String name, int value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, long value) + public StatSet set(String name, long value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, String value) + public StatSet set(String name, String value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); @@ -89,7 +89,7 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, * @param markAsChanged * @return */ - public StatsSet set(String name, String value, boolean markAsChanged) + public StatSet set(String name, String value, boolean markAsChanged) { if (markAsChanged) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index a057b3e170..e54c80dbfd 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExHeroList implements IClientOutgoingPacket { - private final Map _heroList; + private final Map _heroList; public ExHeroList() { @@ -42,7 +42,7 @@ public class ExHeroList implements IClientOutgoingPacket OutgoingPackets.EX_HERO_LIST.writeId(packet); packet.writeD(_heroList.size()); - for (StatsSet hero : _heroList.values()) + for (StatSet hero : _heroList.values()) { packet.writeS(hero.getString(Olympiad.CHAR_NAME)); packet.writeD(hero.getInt(Olympiad.CLASS_ID)); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/BypassParser.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/BypassParser.java index 414125bdeb..a80323ba1f 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/BypassParser.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/BypassParser.java @@ -20,12 +20,12 @@ import java.util.LinkedHashMap; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid */ -public class BypassParser extends StatsSet +public class BypassParser extends StatSet { private static final String ALLOWED_CHARS = "a-zA-Z0-9-_`!@#%^&*()\\[\\]|\\\\/"; private static final Pattern PATTERN = Pattern.compile(String.format("([%s]*)=('([%s ]*)'|[%s]*)", ALLOWED_CHARS, ALLOWED_CHARS, ALLOWED_CHARS)); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java index 2ceebc156a..a3f07a6ad5 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java @@ -18,7 +18,7 @@ package ai.areas.BeastFarm; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -133,7 +133,7 @@ public class ImprovedBabyPets extends AbstractNpcAI private boolean castBuff(Summon summon, int stepNumber, int buffNumber) { final PlayerInstance owner = summon.getOwner(); - final StatsSet parameters = summon.getTemplate().getParameters(); + final StatSet parameters = summon.getTemplate().getParameters(); final SkillHolder skill = parameters.getObject("step" + stepNumber + "_buff0" + buffNumber, SkillHolder.class); if ((skill != null) && (owner != null)) @@ -174,7 +174,7 @@ public class ImprovedBabyPets extends AbstractNpcAI { final boolean previousFollowStatus = summon.getFollowStatus(); final PlayerInstance owner = summon.getOwner(); - final StatsSet parameters = summon.getTemplate().getParameters(); + final StatSet parameters = summon.getTemplate().getParameters(); final SkillHolder skill = parameters.getObject("step" + stepNumber + "_heal0" + healNumber, SkillHolder.class); final int targetType = parameters.getInt("step" + stepNumber + "_heal_target0" + healNumber, 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java index efdbdd4460..9ff1875b62 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java @@ -18,7 +18,7 @@ package ai.areas.FairySettlement; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -50,11 +50,11 @@ public class Wisp extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("DELETE_NPC")) { - params = new StatsSet(); + params = new StatSet(); params.set("LOCATION_OBJECT", npc.getLocation()); getTimers().addTimer("RESPAWN_WISP_" + npc.getObjectId(), params, getRandom(RESPAWN_MIN, RESPAWN_MAX), null, null); npc.deleteMe(); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java index 5cd6622513..b52be69c96 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java @@ -19,7 +19,7 @@ package ai.areas.Parnassus.EntrancePortalToCrystalCaverns; import java.util.Calendar; import org.l2jmobius.gameserver.instancemanager.QuestManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -107,7 +107,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("LOOP_TIMER")) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/SeedOfHellfire/Zofan.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/SeedOfHellfire/Zofan.java index b6c122da75..03f451c9fd 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/SeedOfHellfire/Zofan.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/SeedOfHellfire/Zofan.java @@ -16,7 +16,7 @@ */ package ai.areas.SeedOfHellfire; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -61,7 +61,7 @@ public class Zofan extends AbstractNpcAI { if ((npc.getInstanceWorld() == null) && (npc.getSpawn() != null)) { - final StatsSet params = npc.getParameters(); + final StatSet params = npc.getParameters(); if (params.getInt("i_childrengarden_guard", 0) == 0) { for (String param : MINION_PARAMS) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Allada.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Allada.java index 5ccca8c99a..4291aeb5ec 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Allada.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Allada.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -45,7 +45,7 @@ public class Allada extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Mei.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Mei.java index 015ee0bc9a..7ad9623ec2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Mei.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Mei.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -40,7 +40,7 @@ public class Mei extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SHOUT")) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Remons.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Remons.java index 41ec3c1bff..a1ea6ba90c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Remons.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Remons.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -43,7 +43,7 @@ public class Remons extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rinne.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rinne.java index 55ab4fc1a7..1d6eafa48a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rinne.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rinne.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -42,7 +42,7 @@ public class Rinne extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rotina.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rotina.java index 24ad1b6041..d0c8f2a81b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rotina.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rotina.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -45,7 +45,7 @@ public class Rotina extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Soros.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Soros.java index d7862030aa..632d1a78a8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Soros.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Soros.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -40,7 +40,7 @@ public class Soros extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java index cbe7cc9ac9..4a2aaf21c4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java @@ -17,7 +17,7 @@ package ai.areas.WallOfArgos.ElmoredenServantsGhost; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -58,7 +58,7 @@ public class ElmoredenServantsGhost extends AbstractNpcAI takeItems(player, USED_GRAVE_PASS, 1); final Location loc; - final StatsSet npcParameters = npc.getParameters(); + final StatSet npcParameters = npc.getParameters(); if (event.equals("teleport1")) { loc = new Location(npcParameters.getInt("TelPos_X1", 0), npcParameters.getInt("TelPos_Y1", 0), npcParameters.getInt("TelPos_Z1", 0)); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java index aca502d2cc..a46695ea27 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -341,7 +341,7 @@ public class Anakim extends AbstractNpcAI addSkillSeeId(ALL_MOBS); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANAKIM); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM); final int status = GrandBossManager.getInstance().getBossStatus(ANAKIM); if (status == DEAD) { @@ -613,9 +613,9 @@ public class Anakim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(ANAKIM, DEAD); final long respawnTime = getRespawnTime(); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANAKIM); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(ANAKIM, info); + GrandBossManager.getInstance().setStatSet(ANAKIM, info); startQuestTimer("unlock_anakim", respawnTime, null, null); startQuestTimer("end_anakim", 900000, null, null); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index b837d839d8..d12c29d422 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -138,7 +138,7 @@ public class Antharas extends AbstractNpcAI addAttackId(ANTHARAS, BOMBER, BEHEMOTH, TERASQUE); addKillId(ANTHARAS, TERASQUE, BEHEMOTH); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANTHARAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANTHARAS); final double curr_hp = info.getDouble("currentHP"); final double curr_mp = info.getDouble("currentMP"); final int loc_x = info.getInt("loc_x"); @@ -761,7 +761,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(PlayerInstance attacker, int damage) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Baium/Baium.java index c0d8221ff5..1d319f5910 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -112,7 +112,7 @@ public class Baium extends AbstractNpcAI addSeeCreatureId(BAIUM); addSpellFinishedId(BAIUM); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(BAIUM); + final StatSet info = GrandBossManager.getInstance().getStatSet(BAIUM); switch (getStatus()) { @@ -666,7 +666,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java index 768ebbc11d..ebf5e78a5a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -122,7 +122,7 @@ public class BalokWarzone extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (isInInstance(world)) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java index 9919e58ce5..e8a2e67509 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java @@ -17,7 +17,7 @@ package ai.bosses.Baylor; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -77,7 +77,7 @@ public class BaylorWarzone extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (isInInstance(world)) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java index 1e80c81840..e8e9fa8756 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; @@ -104,7 +104,7 @@ public class Beleth extends AbstractNpcAI addStartNpc(STONE_COFFIN); addTalkId(STONE_COFFIN); addFirstTalkId(ELF); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(REAL_BELETH); + final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH); if (status == DEAD) { @@ -750,9 +750,9 @@ public class Beleth extends AbstractNpcAI setBelethKiller(killer); GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD); final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(REAL_BELETH); + final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(REAL_BELETH, info); + GrandBossManager.getInstance().setStatSet(REAL_BELETH, info); startQuestTimer("BELETH_UNLOCK", respawnTime, null, null); deleteAll(); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Core/Core.java index bfa7212b8c..c1452bf9de 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; @@ -85,7 +85,7 @@ public class Core extends AbstractNpcAI registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR); _firstAttacked = false; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. @@ -205,9 +205,9 @@ public class Core extends AbstractNpcAI final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000; startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(CORE, info); + GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java index 6ef025304c..764df30625 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -175,7 +175,7 @@ public class IceQueensCastleBattle extends AbstractInstance final Instance world = npc.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); final Npc controller = params.getObject("controller", Npc.class); final Npc freya = params.getObject("freya", Npc.class); switch (event) @@ -734,7 +734,7 @@ public class IceQueensCastleBattle extends AbstractInstance final Instance world = npc.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); switch (npc.getId()) { case FREYA_THRONE: @@ -1069,7 +1069,7 @@ public class IceQueensCastleBattle extends AbstractInstance final Instance world = npc.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); final Npc controller = params.getObject("controller", Npc.class); switch (npc.getId()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Helios/Helios.java index 7faa1d8823..0f70177f83 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Helios/Helios.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Helios/Helios.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.zone.type.NoSummonFriendZone; @@ -58,7 +58,7 @@ public class Helios extends AbstractNpcAI // Zone bossZone = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(HELIOS3); + final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3); final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3); if (status == DEAD) { @@ -136,9 +136,9 @@ public class Helios extends AbstractNpcAI bossZone.broadcastPacket(new ExShowScreenMessage(NpcStringId.HELIOS_DEFEATED_TAKES_FLIGHT_DEEP_IN_TO_THE_SUPERION_FORT_HIS_THRONE_IS_RENDERED_INACTIVE, ExShowScreenMessage.TOP_CENTER, 10000, true)); GrandBossManager.getInstance().setBossStatus(HELIOS3, DEAD); final long respawnTime = (Config.HELIOS_SPAWN_INTERVAL + getRandom(-Config.HELIOS_SPAWN_RANDOM, Config.HELIOS_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(HELIOS3); + final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(HELIOS3, info); + GrandBossManager.getInstance().setStatSet(HELIOS3, info); startQuestTimer("unlock_helios", respawnTime, null, null); break; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java index dc6e826093..b863874cd2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.AggroInfo; import org.l2jmobius.gameserver.model.DamageDoneInfo; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -153,13 +153,13 @@ public class IstinaCavern extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); - final StatsSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); switch (event) { case "DEATH_TIMER": @@ -391,7 +391,7 @@ public class IstinaCavern extends AbstractInstance } else { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); if (skillId == npcParams.getSkillHolder("Istina_Death_Skill01").getSkillId()) { @@ -440,7 +440,7 @@ public class IstinaCavern extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int stage = npcVars.getInt("ISTINA_STAGE", -1); if (npc.getId() == BALLISTA) @@ -657,7 +657,7 @@ public class IstinaCavern extends AbstractInstance private PlayerInstance setPlayerRewardInfo(Npc npc) { final Map rewards = new ConcurrentHashMap<>(); - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); PlayerInstance maxDealer = null; long maxDamage = 0; int totalDamage = 0; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index 61b663a0f3..7aebfa337d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -116,7 +116,7 @@ public class Kelbim extends AbstractNpcAI addKillId(KELBIM); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(KELBIM); + final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM); final int status = GrandBossManager.getInstance().getBossStatus(KELBIM); if (status == DEAD) { @@ -429,9 +429,9 @@ public class Kelbim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(KELBIM, DEAD); final long respawnTime = (Config.KELBIM_SPAWN_INTERVAL + getRandom(-Config.KELBIM_SPAWN_RANDOM, Config.KELBIM_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(KELBIM); + final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(KELBIM, info); + GrandBossManager.getInstance().setStatSet(KELBIM, info); startQuestTimer("unlock_kelbim", respawnTime, null, null); startQuestTimer("end_kelbim", 1800000, null, null); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java index 31be0ec32d..f023ad5f8e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java @@ -19,7 +19,7 @@ package ai.bosses.Kimerian; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -83,7 +83,7 @@ public class KimerianCommon extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) @@ -345,8 +345,8 @@ public class KimerianCommon extends AbstractInstance { final Creature creature = event.getSeen(); final Npc npc = (Npc) event.getSeer(); - final StatsSet npcParams = npc.getParameters(); - final StatsSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java index 9fbe2e6026..51ffd45923 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -367,7 +367,7 @@ public class Lilith extends AbstractNpcAI addSkillSeeId(ALL_MOBS); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LILITH); + final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH); final int status = GrandBossManager.getInstance().getBossStatus(LILITH); if (status == DEAD) { @@ -629,9 +629,9 @@ public class Lilith extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LILITH, DEAD); final long respawnTime = getRespawnTime(); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LILITH); + final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(LILITH, info); + GrandBossManager.getInstance().setStatSet(LILITH, info); startQuestTimer("unlock_lilith", respawnTime, null, null); startQuestTimer("end_lilith", 900000, null, null); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index 9ef473069d..cc00a33356 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -244,7 +244,7 @@ public class Lindvior extends AbstractNpcAI addSeeCreatureId(INVISIBLE); _zoneLair = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LINDVIOR_RAID); + final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID); final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID); if (status == DEAD) { @@ -821,9 +821,9 @@ public class Lindvior extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD); final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LINDVIOR_RAID); + final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(LINDVIOR_RAID, info); + GrandBossManager.getInstance().setStatSet(LINDVIOR_RAID, info); startQuestTimer("unlock_lindvior", respawnTime, null, null); } else if (npc.getId() == NPC_GENERATOR) @@ -867,7 +867,7 @@ public class Lindvior extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SHOUT") && (npc != null) && !npc.isDead()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/LionelHunter.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/LionelHunter.java index e02f478232..0677792823 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/LionelHunter.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/LionelHunter.java @@ -18,7 +18,7 @@ package ai.bosses.Lindvior; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.WalkingManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -43,7 +43,7 @@ public class LionelHunter extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SHOUT") && (npc != null)) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java index b9c19644c4..c5c62c8f2f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -152,13 +152,13 @@ public class OctavisWarzone extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (isInInstance(world)) { - final StatsSet npcVars = npc.getVariables(); - final StatsSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); switch (event) { @@ -378,7 +378,7 @@ public class OctavisWarzone extends AbstractInstance } else if (CommonUtil.contains(OCTAVIS_STAGE_2, npc.getId())) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); if (npcVars.getBoolean("START_TIMERS", true)) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index 38eebefc7b..5e525a6caa 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -92,7 +92,7 @@ public class Orfen extends AbstractNpcAI registerMobs(mobs); _IsTeleported = false; ZONE = ZoneManager.getInstance().getZoneById(12013); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); final int status = GrandBossManager.getInstance().getBossStatus(ORFEN); if (status == DEAD) { @@ -327,9 +327,9 @@ public class Orfen extends AbstractNpcAI respawnTime *= 3600000; startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(ORFEN, info); + GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); startQuestTimer("despawn_minions", 20000, null, null); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index c2564917c7..b9fdddaaf7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; @@ -91,7 +91,7 @@ public class QueenAnt extends AbstractNpcAI addFactionCallId(NURSE); _zone = ZoneManager.getInstance().getZoneById(12012); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); final int status = GrandBossManager.getInstance().getBossStatus(QUEEN); if (status == DEAD) { @@ -367,9 +367,9 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("action", npc, null); cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(QUEEN, info); + GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); _larva.deleteMe(); _larva = null; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java index 6cad246a41..e154809d9c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java @@ -19,7 +19,7 @@ package ai.bosses.Spezion.Cannon; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -171,7 +171,7 @@ public class Cannon extends AbstractNpcAI { if (skill.getId() == PRESENT_SKILL.getSkillId()) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); npc.broadcastPacket(new Earthquake(npc, 10, 5)); npc.broadcastPacket(new OnEventTrigger(npcParams.getInt("TRIGGER_ID"), true)); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java index 086615be42..4af559d521 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -105,13 +105,13 @@ public class TeredorWarzone extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); - final StatsSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); switch (event) { @@ -236,7 +236,7 @@ public class TeredorWarzone extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); switch (npc.getId()) { @@ -292,7 +292,7 @@ public class TeredorWarzone extends AbstractInstance if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); switch (npc.getId()) { @@ -472,7 +472,7 @@ public class TeredorWarzone extends AbstractInstance { case TEREDOR: { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int hpPer = npc.getCurrentHpPercent(); int teredorStatus = npcVars.getInt("TEREDOR_STATUS", 1); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java index 9d9a79d53a..1610356a26 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -322,7 +322,7 @@ public class Trasken extends AbstractNpcAI DoorData.getInstance().getDoor(DOOR).openMe(); } // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(TRASKEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN); final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN); if (status == DEAD) { @@ -603,9 +603,9 @@ public class Trasken extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD); final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(TRASKEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(TRASKEN, info); + GrandBossManager.getInstance().setStatSet(TRASKEN, info); startQuestTimer("unlock_trasken", respawnTime, null, null); break; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java index 9414859da4..7233381898 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; @@ -123,7 +123,7 @@ public class Valakas extends AbstractNpcAI registerMobs(VALAKAS); ZONE = ZoneManager.getInstance().getZoneById(12010); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(VALAKAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); final int status = GrandBossManager.getInstance().getBossStatus(VALAKAS); if (status == DEAD) @@ -446,9 +446,9 @@ public class Valakas extends AbstractNpcAI final long respawnTime = (Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM)) * 3600000; startQuestTimer("valakas_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(VALAKAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(VALAKAS, info); + GrandBossManager.getInstance().setStatSet(VALAKAS, info); return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java index c73ef9d83c..703e55428a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -189,8 +189,8 @@ public class CavernOfThePirateCaptain extends AbstractInstance final Instance world = npc.getInstanceWorld(); if (world != null) { - final StatsSet templParams = world.getTemplateParameters(); - final StatsSet params = world.getParameters(); + final StatSet templParams = world.getTemplateParameters(); + final StatSet params = world.getParameters(); switch (event) { case "BURN_BLUE": diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AreaSkillNpc.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AreaSkillNpc.java index 155cfb90b1..bf17680d0b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AreaSkillNpc.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AreaSkillNpc.java @@ -17,7 +17,7 @@ package ai.others; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -115,7 +115,7 @@ public class AreaSkillNpc extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java index 01b37387a8..ef9e26a221 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -101,7 +101,7 @@ public class CastleTeleporter extends AbstractNpcAI if (st.hasMoreTokens()) { final int unknowInt = Integer.parseInt(st.nextToken()); - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); Location teleLoc = null; switch (unknowInt) { @@ -191,7 +191,7 @@ public class CastleTeleporter extends AbstractNpcAI return htmltext; } - private Location getTeleportLocation(StatsSet npcParams, String paramName1, String paramName2, String paramName3) + private Location getTeleportLocation(StatSet npcParams, String paramName1, String paramName2, String paramName3) { final Location loc; if (getRandom(100) < 33) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java index b1355fa9c5..c05c1b184b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java @@ -16,7 +16,7 @@ */ package ai.others.NpcBuffers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ class NpcBufferSkillData private final int _scaleToLevel; private final int _initialDelay; - NpcBufferSkillData(StatsSet set) + NpcBufferSkillData(StatSet set) { _skill = new SkillHolder(set.getInt("id"), set.getInt("level")); _scaleToLevel = set.getInt("scaleToLevel", -1); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java index dd7f4187be..ecae9d2861 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -54,7 +54,7 @@ class NpcBuffersData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node attr; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -75,7 +75,7 @@ class NpcBuffersData implements IXmlReader case "skill": { attrs = c.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { attr = attrs.item(i); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Servitors/ClanFlag.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Servitors/ClanFlag.java index 558d57b407..b09a5f38e9 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Servitors/ClanFlag.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Servitors/ClanFlag.java @@ -17,7 +17,7 @@ package ai.others.Servitors; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -51,7 +51,7 @@ public class ClanFlag extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java index 55c9613eab..a50c042b7f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -68,7 +68,7 @@ public class GateOfUnlimitedSummoning extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java index f19f5dea69..c817501830 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java @@ -17,7 +17,7 @@ package ai.others.Servitors; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -52,7 +52,7 @@ public class TreeOfLife extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (player != null) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java index 3ee8063427..ee96be41d8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -91,7 +91,7 @@ public class TersisHerald extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("DESPAWN_NPCS")) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index 2e5331f903..55dc363405 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.zone.type.NoRestartZone; @@ -309,7 +309,7 @@ public class AdminGrandBoss implements IAdminCommandHandler } } - final StatsSet info = GrandBossManager.getInstance().getStatsSet(grandBossId); + final StatSet info = GrandBossManager.getInstance().getStatSet(grandBossId); final String bossRespawn = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(info.getLong("respawn_time")); final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java index 1fe6c7c424..807c4c6ab4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java @@ -19,7 +19,7 @@ package handlers.admincommandhandlers; import java.util.StringTokenizer; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -114,7 +114,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.getNobleLevel() > 0) { - final StatsSet statDat = getPlayerSet(player); + final StatSet statDat = getPlayerSet(player); final int oldpoints = Olympiad.getInstance().getNoblePoints(player); final int points = Math.max(oldpoints + val, 0); if (points > 1000) @@ -155,7 +155,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.getNobleLevel() > 0) { - final StatsSet playerStat = Olympiad.getNobleStats(player.getObjectId()); + final StatSet playerStat = Olympiad.getNobleStats(player.getObjectId()); if (playerStat == null) { BuilderUtil.sendSysMessage(activeChar, "This player hasn't played on Olympiad yet!"); @@ -197,7 +197,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.getNobleLevel() > 0) { - final StatsSet statDat = getPlayerSet(player); + final StatSet statDat = getPlayerSet(player); final int oldpoints = Olympiad.getInstance().getNoblePoints(player); final int points = oldpoints - val; if ((points < 1) && (points > 1000)) @@ -237,12 +237,12 @@ public class AdminOlympiad implements IAdminCommandHandler return Integer.decode(token); } - private StatsSet getPlayerSet(PlayerInstance player) + private StatSet getPlayerSet(PlayerInstance player) { - StatsSet statDat = Olympiad.getNobleStats(player.getObjectId()); + StatSet statDat = Olympiad.getNobleStats(player.getObjectId()); if (statDat == null) { - statDat = new StatsSet(); + statDat = new StatSet(); statDat.set(Olympiad.CLASS_ID, player.getBaseClass()); statDat.set(Olympiad.CHAR_NAME, player.getName()); statDat.set(Olympiad.POINTS, Olympiad.DEFAULT_POINTS); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java index d8a3d6e5ce..6382651e6c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java @@ -19,7 +19,7 @@ package handlers.conditions; import java.util.List; import org.l2jmobius.gameserver.enums.CategoryType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -31,7 +31,7 @@ public class CategoryTypeCondition implements ICondition { private final List _categoryTypes; - public CategoryTypeCondition(StatsSet params) + public CategoryTypeCondition(StatSet params) { _categoryTypes = params.getEnumList("category", CategoryType.class); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java index b24cfa0f14..9a14cb6fa2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java @@ -16,7 +16,7 @@ */ package handlers.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -29,7 +29,7 @@ public class NpcLevelCondition implements ICondition private final int _minLevel; private final int _maxLevel; - public NpcLevelCondition(StatsSet params) + public NpcLevelCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java index afffe7a0c5..9e3deaa8ce 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java @@ -16,7 +16,7 @@ */ package handlers.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -29,7 +29,7 @@ public class PlayerLevelCondition implements ICondition private final int _minLevel; private final int _maxLevel; - public PlayerLevelCondition(StatsSet params) + public PlayerLevelCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 09f609dc37..0e81066579 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -32,7 +32,7 @@ public class AbnormalShield extends AbstractEffect { private final int _times; - public AbnormalShield(StatsSet params) + public AbnormalShield(StatSet params) { _times = params.getInt("times", -1); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 0496c9068d..9c508c8c52 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Objects; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class AbnormalTimeChange extends AbstractEffect private final int _time; private final int _mode; - public AbnormalTimeChange(StatsSet params) + public AbnormalTimeChange(StatSet params) { final String abnormals = params.getString("slot", null); if ((abnormals != null) && !abnormals.isEmpty()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 98f85c7b21..3f9132b8e3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -37,7 +37,7 @@ public class AbsorbDamage extends AbstractEffect private final double _damage; private static final Map _damageHolder = new ConcurrentHashMap<>(); - public AbsorbDamage(StatsSet params) + public AbsorbDamage(StatSet params) { _damage = params.getDouble("damage", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 26f51d5351..86fef7cf6d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; @@ -38,7 +38,7 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect private final int _hpPercent; private final Map _updates = new ConcurrentHashMap<>(); - protected AbstractConditionalHpEffect(StatsSet params, Stat stat) + protected AbstractConditionalHpEffect(StatSet params, Stat stat) { super(params, stat); _hpPercent = params.getInt("hpPercent", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java index 2e40124e39..f010f84271 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AbstractStatAddEffect extends AbstractEffect private final Stat _stat; protected final double _amount; - public AbstractStatAddEffect(StatsSet params, Stat stat) + public AbstractStatAddEffect(StatSet params, Stat stat) { _stat = stat; _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index da6a575c44..29e439684b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; @@ -42,12 +42,12 @@ public abstract class AbstractStatEffect extends AbstractEffect protected final StatModifierType _mode; protected final List _conditions = new ArrayList<>(); - public AbstractStatEffect(StatsSet params, Stat stat) + public AbstractStatEffect(StatSet params, Stat stat) { this(params, stat, stat); } - public AbstractStatEffect(StatsSet params, Stat mulStat, Stat addStat) + public AbstractStatEffect(StatSet params, Stat mulStat, Stat addStat) { _addStat = addStat; _mulStat = mulStat; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java index 9811f395aa..33d08bff36 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AbstractStatPercentEffect extends AbstractEffect private final Stat _stat; protected final double _amount; - public AbstractStatPercentEffect(StatsSet params, Stat stat) + public AbstractStatPercentEffect(StatSet params, Stat stat) { _stat = stat; _amount = params.getDouble("amount", 1); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java index 539814ef2a..79c022a23c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class Accuracy extends AbstractStatEffect { - public Accuracy(StatsSet params) + public Accuracy(StatSet params) { super(params, Stat.ACCURACY_COMBAT); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index 0c1fcbd92b..48d69968c5 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddHate extends AbstractEffect private final double _power; private final boolean _affectSummoner; - public AddHate(StatsSet params) + public AddHate(StatSet params) { _power = params.getDouble("power", 0); _affectSummoner = params.getBoolean("affectSummoner", false); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java index e90d5cc7f3..324927947a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddSkillBySkill extends AbstractEffect private final int _existingSkillLevel; private final SkillHolder _addedSkill; - public AddSkillBySkill(StatsSet params) + public AddSkillBySkill(StatSet params) { _existingSkillId = params.getInt("existingSkillId"); _existingSkillLevel = params.getInt("existingSkillLevel"); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index bdd8314dd7..205bc82200 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddTeleportBookmarkSlot extends AbstractEffect { private final int _amount; - public AddTeleportBookmarkSlot(StatsSet params) + public AddTeleportBookmarkSlot(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java index c26ec5442f..658931ecb2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionCp extends AbstractStatAddEffect { - public AdditionalPotionCp(StatsSet params) + public AdditionalPotionCp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_CP); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java index 6b68e40f32..57d54c7d3b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionHp extends AbstractStatAddEffect { - public AdditionalPotionHp(StatsSet params) + public AdditionalPotionHp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_HP); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java index c9e1cc237e..007547ebe7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionMp extends AbstractStatAddEffect { - public AdditionalPotionMp(StatsSet params) + public AdditionalPotionMp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_MP); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index cbbd845e23..c01bdec653 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -22,7 +22,7 @@ import java.util.Map; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -78,7 +78,7 @@ public class AirBind extends AbstractEffect _chainedAirSkills.put(ClassId.AEORE_SHILLIEN_SAINT, 11999); // Heavy Hit } - public AirBind(StatsSet params) + public AirBind(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java index f5cbb63465..9255ba1877 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AreaDamage extends AbstractStatAddEffect { - public AreaDamage(StatsSet params) + public AreaDamage(StatSet params) { super(params, Stat.DAMAGE_ZONE_VULN); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java index 2ded14e7ae..a5d56477f5 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AttackAttribute extends AbstractEffect private final AttributeType _attribute; private final double _amount; - public AttackAttribute(StatsSet params) + public AttackAttribute(StatSet params) { _amount = params.getDouble("amount", 0); _attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java index ff58d09cc7..795366850d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class AttackAttributeAdd extends AbstractEffect { private final double _amount; - public AttackAttributeAdd(StatsSet params) + public AttackAttributeAdd(StatSet params) { _amount = params.getDouble("amount", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java index 37bfbf341a..fcd2b48c99 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class AttackBehind extends AbstractEffect { - public AttackBehind(StatsSet params) + public AttackBehind(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index 062c325a55..4136f5d530 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class AttackTrait extends AbstractEffect { private final Map _attackTraits = new EnumMap<>(TraitType.class); - public AttackTrait(StatsSet params) + public AttackTrait(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 02d6a8d78c..8ac42d45c3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -37,7 +37,7 @@ public class Backstab extends AbstractEffect private final double _criticalChance; private final boolean _overHit; - public Backstab(StatsSet params) + public Backstab(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Betray.java index 32e3c65c55..79e8bd3360 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Betray extends AbstractEffect { - public Betray(StatsSet params) + public Betray(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Blink.java index ba1caed6ac..56d3f628fd 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -52,7 +52,7 @@ public class Blink extends AbstractEffect private final int _flyDelay; private final int _animationSpeed; - public Blink(StatsSet params) + public Blink(StatSet params) { _flyCourse = params.getInt("angle", 0); _flyRadius = params.getInt("range", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 8677f72407..596d4b752f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; */ public class BlinkSwap extends AbstractEffect { - public BlinkSwap(StatsSet params) + public BlinkSwap(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 7bec602aef..cea12039d2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -20,7 +20,7 @@ import java.util.Arrays; import java.util.Set; import java.util.stream.Collectors; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class BlockAbnormalSlot extends AbstractEffect { private final Set _blockAbnormalSlots; - public BlockAbnormalSlot(StatsSet params) + public BlockAbnormalSlot(StatSet params) { _blockAbnormalSlots = Arrays.stream(params.getString("slot").split(";")).map(slot -> Enum.valueOf(AbnormalType.class, slot)).collect(Collectors.toSet()); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index b4839ab322..348881f970 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -21,7 +21,7 @@ import java.util.Set; import org.l2jmobius.gameserver.datatables.BotReportTable; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class BlockAction extends AbstractEffect { private final Set _blockedActions = new HashSet<>(); - public BlockAction(StatsSet params) + public BlockAction(StatSet params) { final String[] actions = params.getString("blockedActions").split(","); for (String action : actions) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index 68f6586e3e..635d2735f9 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -22,7 +22,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class BlockActions extends AbstractEffect { private final Set _allowedSkills; - public BlockActions(StatsSet params) + public BlockActions(StatSet params) { final String[] allowedSkills = params.getString("allowedSkills", "").split(";"); _allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet()); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 99af987208..3502d140d0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockChat extends AbstractEffect { - public BlockChat(StatsSet params) + public BlockChat(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java index 6160114414..a2b084c918 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; */ public class BlockControl extends AbstractEffect { - public BlockControl(StatsSet params) + public BlockControl(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java index 3d96329b6d..69b390ae8f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BlockEscape extends AbstractEffect { - public BlockEscape(StatsSet params) + public BlockEscape(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index 8bbd7ac018..85d89180e7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockMove extends AbstractEffect { - public BlockMove(StatsSet params) + public BlockMove(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index 316f82f855..9e28fc403a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockParty extends AbstractEffect { - public BlockParty(StatsSet params) + public BlockParty(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java index ae2ac8b035..d3235fc34f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BlockResurrection extends AbstractEffect { - public BlockResurrection(StatsSet params) + public BlockResurrection(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index f7f119691f..f2cc65b782 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -35,7 +35,7 @@ public class BlockSkill extends AbstractEffect { private final int[] _magicTypes; - public BlockSkill(StatsSet params) + public BlockSkill(StatSet params) { _magicTypes = params.getIntArray("magicTypes", ";"); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index d9b3d3a34d..9f0b7143d2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockTarget extends AbstractEffect { - public BlockTarget(StatsSet params) + public BlockTarget(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index bc4cbd6320..bef60ad003 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class Bluff extends AbstractEffect { private final int _chance; - public Bluff(StatsSet params) + public Bluff(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java index 2ace40a596..69583d613b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusDropAmount extends AbstractStatPercentEffect { - public BonusDropAmount(StatsSet params) + public BonusDropAmount(StatSet params) { super(params, Stat.BONUS_DROP_AMOUNT); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java index b81560b040..e63c8f79f4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusDropRate extends AbstractStatPercentEffect { - public BonusDropRate(StatsSet params) + public BonusDropRate(StatSet params) { super(params, Stat.BONUS_DROP_RATE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java index b984404cb2..e0fb54b162 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusSpoilRate extends AbstractStatPercentEffect { - public BonusSpoilRate(StatsSet params) + public BonusSpoilRate(StatSet params) { super(params, Stat.BONUS_SPOIL_RATE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Breath.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Breath.java index 859f341f3c..4235319f22 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Breath.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Breath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class Breath extends AbstractStatEffect { - public Breath(StatsSet params) + public Breath(StatSet params) { super(params, Stat.BREATH); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java index a6d25f3c36..4102506e6c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BuffBlock extends AbstractEffect { - public BuffBlock(StatsSet params) + public BuffBlock(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index de7497f8bf..4f470b06c7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class CallLearnedSkill extends AbstractEffect { private final int _skillId; - public CallLearnedSkill(StatsSet params) + public CallLearnedSkill(StatSet params) { _skillId = params.getInt("skillId"); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index e6096be4be..b41daf073c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CallParty extends AbstractEffect { - public CallParty(StatsSet params) + public CallParty(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index 0760fb675e..eb4bdf2349 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class CallPc extends AbstractEffect private final int _itemId; private final int _itemCount; - public CallPc(StatsSet params) + public CallPc(StatSet params) { _itemId = params.getInt("itemId", 0); _itemCount = params.getInt("itemCount", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index d6d5cb721d..0da3802665 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -35,7 +35,7 @@ public class CallRandomSkill extends AbstractEffect { private final List _skills = new ArrayList<>(); - public CallRandomSkill(StatsSet params) + public CallRandomSkill(StatSet params) { final String skills = params.getString("skills", null); if (skills != null) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index 99c1494223..f8e4b226c4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -35,7 +35,7 @@ public class CallSkill extends AbstractEffect private final SkillHolder _skill; private final int _skillLevelScaleTo; - public CallSkill(StatsSet params) + public CallSkill(StatSet params) { _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0)); _skillLevelScaleTo = params.getInt("skillLevelScaleTo", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index b340de4ae1..ff98639c37 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.Collections; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ public class CallSkillOnActionTime extends AbstractEffect { private final SkillHolder _skill; - public CallSkillOnActionTime(StatsSet params) + public CallSkillOnActionTime(StatSet params) { _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0)); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index d48eb90fb3..32753a71a0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CallTargetParty extends AbstractEffect { - public CallTargetParty(StatsSet params) + public CallTargetParty(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index ef01f4a8ed..d4331bf5b7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ public class ChameleonRest extends AbstractEffect { private final double _power; - public ChameleonRest(StatsSet params) + public ChameleonRest(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index e3b846674d..37054f2fd0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; @@ -35,9 +35,9 @@ public class ChangeBody extends AbstractEffect { private final Set _transformations = new HashSet<>(); - public ChangeBody(StatsSet params) + public ChangeBody(StatSet params) { - for (StatsSet item : params.getList("templates", StatsSet.class)) + for (StatSet item : params.getList("templates", StatSet.class)) { _transformations.add(new TemplateChanceHolder(item.getInt(".templateId"), item.getInt(".minChance"), item.getInt(".maxChance"))); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 76c6e03aa6..6b6386909e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeFace extends AbstractEffect { private final int _value; - public ChangeFace(StatsSet params) + public ChangeFace(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java index cee3ac1a6f..304afa821c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; /** @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; */ public class ChangeFishingMastery extends AbstractEffect { - public ChangeFishingMastery(StatsSet params) + public ChangeFishingMastery(StatSet params) { } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index 0c583cbc13..64ac49f5d5 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeHairColor extends AbstractEffect { private final int _value; - public ChangeHairColor(StatsSet params) + public ChangeHairColor(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index ad2efbe6a0..ae7d6c6da1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeHairStyle extends AbstractEffect { private final int _value; - public ChangeHairStyle(StatsSet params) + public ChangeHairStyle(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java index 2d536029fd..4d7c380c75 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class CheapShot extends AbstractEffect { - public CheapShot(StatsSet params) + public CheapShot(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index 207b7f0a3e..1a6a44fb31 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.SubclassInfoType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class ClassChange extends AbstractEffect private final int _index; private static final int IDENTITY_CRISIS_SKILL_ID = 1570; - public ClassChange(StatsSet params) + public ClassChange(StatSet params) { _index = params.getInt("index", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index ccf7598eff..e184022afc 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.stats.Formulas; */ public class Compelling extends AbstractEffect { - public Compelling(StatsSet params) + public Compelling(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index b6aa30f604..f164ac6f3f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class Confuse extends AbstractEffect { private final int _chance; - public Confuse(StatsSet params) + public Confuse(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 25e29532eb..78293c1b0f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ConsumeBody extends AbstractEffect { - public ConsumeBody(StatsSet params) + public ConsumeBody(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index e915eb0391..6ddd0d72eb 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class ConvertItem extends AbstractEffect { - public ConvertItem(StatsSet params) + public ConvertItem(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java index 9402fdb06d..857df659c0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CounterPhysicalSkill extends AbstractStatAddEffect { - public CounterPhysicalSkill(StatsSet params) + public CounterPhysicalSkill(StatSet params) { super(params, Stat.VENGEANCE_SKILL_PHYSICAL_DAMAGE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 67bca7fd1b..598682037b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Cp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Cp(StatsSet params) + public Cp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index e0cd52808e..37303b0e7a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class CpHeal extends AbstractEffect { private final double _power; - public CpHeal(StatsSet params) + public CpHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index e2e8ee3479..54de5adfc6 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class CpHealOverTime extends AbstractEffect { private final double _power; - public CpHealOverTime(StatsSet params) + public CpHealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index 5665e937dc..b4a994d6df 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CpHealPercent extends AbstractEffect { private final double _power; - public CpHealPercent(StatsSet params) + public CpHealPercent(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java index 1cc851b2af..efb020bbd5 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CpRegen extends AbstractStatEffect { - public CpRegen(StatsSet params) + public CpRegen(StatSet params) { super(params, Stat.REGENERATE_CP_RATE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java index 8983497026..0b93eef45e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CriticalDamage extends AbstractStatEffect { - public CriticalDamage(StatsSet params) + public CriticalDamage(StatSet params) { super(params, Stat.CRITICAL_DAMAGE, Stat.CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 7ef4f0ecb4..0630f087b7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.Position; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CriticalDamagePosition extends AbstractEffect private final double _amount; private final Position _position; - public CriticalDamagePosition(StatsSet params) + public CriticalDamagePosition(StatSet params) { _amount = params.getDouble("amount", 0); _position = params.getEnum("position", Position.class, Position.FRONT); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java index 01f49380eb..0d4bded60e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; public class CriticalRate extends AbstractConditionalHpEffect { - public CriticalRate(StatsSet params) + public CriticalRate(StatSet params) { super(params, Stat.CRITICAL_RATE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 863b385ca3..4d65fa84eb 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.Position; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CriticalRatePositionBonus extends AbstractEffect private final double _amount; private final Position _position; - public CriticalRatePositionBonus(StatsSet params) + public CriticalRatePositionBonus(StatSet params) { _amount = params.getDouble("amount", 0); _position = params.getEnum("position", Position.class, Position.FRONT); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index 2e8ec38347..9d04575ae2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class CrystalGradeModify extends AbstractEffect { private final int _grade; - public CrystalGradeModify(StatsSet params) + public CrystalGradeModify(StatSet params) { _grade = params.getInt("grade", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java index 94ff8e64e2..79ee5b994e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CubicMastery extends AbstractStatAddEffect { - public CubicMastery(StatsSet params) + public CubicMastery(StatSet params) { super(params, Stat.MAX_CUBIC); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index 36abf0accf..e6bb53fdea 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class DamOverTime extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTime(StatsSet params) + public DamOverTime(StatSet params) { _canKill = params.getBoolean("canKill", false); _power = params.getDouble("power"); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 13e57099e0..b5f25db4d8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class DamOverTimePercent extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTimePercent(StatsSet params) + public DamOverTimePercent(StatSet params) { _canKill = params.getBoolean("canKill", false); _power = params.getDouble("power"); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java index dc7a45198f..c9567ea034 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ public class DamageBlock extends AbstractEffect private final boolean _blockHp; private final boolean _blockMp; - public DamageBlock(StatsSet params) + public DamageBlock(StatSet params) { final String type = params.getString("type", null); _blockHp = type.equalsIgnoreCase("BLOCK_HP"); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java index bfa716eacc..9eb0b4e233 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DamageByAttackType; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -38,7 +38,7 @@ public class DamageByAttack extends AbstractEffect private final double _value; private final DamageByAttackType _type; - public DamageByAttack(StatsSet params) + public DamageByAttack(StatSet params) { _value = params.getDouble("amount"); _type = params.getEnum("type", DamageByAttackType.class, DamageByAttackType.NONE); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java index 5a7629482a..e823a9824a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DamageShield extends AbstractStatAddEffect { - public DamageShield(StatsSet params) + public DamageShield(StatSet params) { super(params, Stat.REFLECT_DAMAGE_PERCENT); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java index db1abe264d..3029a3f0aa 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DamageShieldResist extends AbstractStatAddEffect { - public DamageShieldResist(StatsSet params) + public DamageShieldResist(StatSet params) { super(params, Stat.REFLECT_DAMAGE_PERCENT_DEFENSE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index 8561ff46b0..369bd5483d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class DeathLink extends AbstractEffect { private final double _power; - public DeathLink(StatsSet params) + public DeathLink(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java index b948fad1fc..54261c6229 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class DebuffBlock extends AbstractEffect { - public DebuffBlock(StatsSet params) + public DebuffBlock(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java index 217ef3dfaa..4bc08271fa 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class DefenceAttribute extends AbstractEffect private final AttributeType _attribute; private final double _amount; - public DefenceAttribute(StatsSet params) + public DefenceAttribute(StatSet params) { _amount = params.getDouble("amount", 0); _attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java index 0c0c2e8d6a..daff53d9e1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceCriticalDamage extends AbstractStatEffect { - public DefenceCriticalDamage(StatsSet params) + public DefenceCriticalDamage(StatSet params) { super(params, Stat.DEFENCE_CRITICAL_DAMAGE, Stat.DEFENCE_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java index 131eb500ea..74a729e38c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceCriticalRate extends AbstractStatEffect { - public DefenceCriticalRate(StatsSet params) + public DefenceCriticalRate(StatSet params) { super(params, Stat.DEFENCE_CRITICAL_RATE, Stat.DEFENCE_CRITICAL_RATE_ADD); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java index 1abee78e08..c664939977 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceMagicCriticalDamage extends AbstractStatEffect { - public DefenceMagicCriticalDamage(StatsSet params) + public DefenceMagicCriticalDamage(StatSet params) { super(params, Stat.DEFENCE_MAGIC_CRITICAL_DAMAGE, Stat.DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java index 2146b89551..6594dda2b3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceMagicCriticalRate extends AbstractStatEffect { - public DefenceMagicCriticalRate(StatsSet params) + public DefenceMagicCriticalRate(StatSet params) { super(params, Stat.DEFENCE_MAGIC_CRITICAL_RATE, Stat.DEFENCE_MAGIC_CRITICAL_RATE_ADD); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index bd80f690cd..134ed56979 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class DefenceTrait extends AbstractEffect { private final Map _defenceTraits = new EnumMap<>(TraitType.class); - public DefenceTrait(StatsSet params) + public DefenceTrait(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index bab5e1a762..7cee616006 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class DeleteHate extends AbstractEffect { private final int _chance; - public DeleteHate(StatsSet params) + public DeleteHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index 85985653b8..f10f189e68 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class DeleteHateOfMe extends AbstractEffect { private final int _chance; - public DeleteHateOfMe(StatsSet params) + public DeleteHateOfMe(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index d3664ad00f..82833ac79d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class DeleteTopAgro extends AbstractEffect { private final int _chance; - public DeleteTopAgro(StatsSet params) + public DeleteTopAgro(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index ae1f2a5942..ba6dad4698 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DoorOpenType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DetectHiddenObjects extends AbstractEffect { - public DetectHiddenObjects(StatsSet params) + public DetectHiddenObjects(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Detection.java index 078360ff35..a20cbcb348 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Detection extends AbstractEffect { - public Detection(StatsSet params) + public Detection(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java index d679c71919..5227885bb5 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class DisableSkill extends AbstractEffect private final Set disableSkills; private Skill knownSKill; - public DisableSkill(StatsSet params) + public DisableSkill(StatSet params) { final String disable = params.getString("disable"); if ((disable != null) && !disable.isEmpty()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 8567a94d12..32ee715df7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DisableTargeting extends AbstractEffect { - public DisableTargeting(StatsSet params) + public DisableTargeting(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index fa06ec7221..5a80971f51 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Disarm extends AbstractEffect { - public Disarm(StatsSet params) + public Disarm(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index 0133906661..8b06598d83 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class Disarmor extends AbstractEffect private final Map _unequippedItems; // PlayerObjId, ItemObjId private final int _slot; - public Disarmor(StatsSet params) + public Disarmor(StatSet params) { _unequippedItems = new ConcurrentHashMap<>(); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 95de0300bb..a652a023f5 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DispelAll extends AbstractEffect { - public DispelAll(StatsSet params) + public DispelAll(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 88d979a0d9..040271d2a7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.List; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -38,7 +38,7 @@ public class DispelByCategory extends AbstractEffect private final int _rate; private final int _max; - public DispelByCategory(StatsSet params) + public DispelByCategory(StatSet params) { _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); _rate = params.getInt("rate", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index a6e4c7cd19..ab79e046b2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.EnumMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -37,7 +37,7 @@ public class DispelBySlot extends AbstractEffect private final String _dispel; private final Map _dispelAbnormals; - public DispelBySlot(StatsSet params) + public DispelBySlot(StatSet params) { _dispel = params.getString("dispel"); if ((_dispel != null) && !_dispel.isEmpty()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 1ba6612e23..d1341d10b9 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class DispelBySlotMyself extends AbstractEffect { private final Set _dispelAbnormals; - public DispelBySlotMyself(StatsSet params) + public DispelBySlotMyself(StatSet params) { final String dispel = params.getString("dispel"); if ((dispel != null) && !dispel.isEmpty()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 845980e59d..b58723058e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -37,7 +37,7 @@ public class DispelBySlotProbability extends AbstractEffect private final Set _dispelAbnormals; private final int _rate; - public DispelBySlotProbability(StatsSet params) + public DispelBySlotProbability(StatSet params) { final String[] dispelEffects = params.getString("dispel").split(";"); _rate = params.getInt("rate", 100); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index 7acd9c4a6c..688d77a703 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -45,7 +45,7 @@ public class DoubleCast extends AbstractEffect private final Map> _addedToggles; - public DoubleCast(StatsSet params) + public DoubleCast(StatSet params) { _addedToggles = new HashMap<>(); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java index d7f067a2a0..d1e21edeb0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DuelistFury extends AbstractEffect { - public DuelistFury(StatsSet params) + public DuelistFury(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index 409fed6a23..de397bb5ff 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class EnableCloak extends AbstractEffect { - public EnableCloak(StatsSet params) + public EnableCloak(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index e855c4ba1a..2fe2bef99f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -43,7 +43,7 @@ public class EnergyAttack extends AbstractEffect private final boolean _overHit; private final double _pDefMod; - public EnergyAttack(StatsSet params) + public EnergyAttack(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getInt("criticalChance", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index a8f108573f..ae463ef2a4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class EnlargeAbnormalSlot extends AbstractEffect { private final int _slots; - public EnlargeAbnormalSlot(StatsSet params) + public EnlargeAbnormalSlot(StatSet params) { _slots = params.getInt("slots", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java index c43ea04413..c4073b1a47 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StorageType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class EnlargeSlot extends AbstractEffect private final StorageType _type; private final double _amount; - public EnlargeSlot(StatsSet params) + public EnlargeSlot(StatSet params) { _amount = params.getDouble("amount", 0); _type = params.getEnum("type", StorageType.class, StorageType.INVENTORY_NORMAL); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Escape.java index 936f82d8ce..f3a07c9d15 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class Escape extends AbstractEffect { private final TeleportWhereType _escapeType; - public Escape(StatsSet params) + public Escape(StatSet params) { _escapeType = params.getEnum("escapeType", TeleportWhereType.class, null); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java index 76dbc8171c..eb68d24af8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ExpModify extends AbstractStatAddEffect { - public ExpModify(StatsSet params) + public ExpModify(StatSet params) { super(params, Stat.BONUS_EXP); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java index bf11db6e4b..1100ca25be 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Faceoff extends AbstractEffect { - public Faceoff(StatsSet params) + public Faceoff(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index e256209e39..79f7b43503 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -34,7 +34,7 @@ public class FakeDeath extends AbstractEffect { private final double _power; - public FakeDeath(StatsSet params) + public FakeDeath(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index a94c75d310..780d5cefba 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -44,7 +44,7 @@ public class FatalBlow extends AbstractEffect private final double _abnormalPower; private final boolean _overHit; - public FatalBlow(StatsSet params) + public FatalBlow(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java index c8ff8f7acb..6e7597e63d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class FatalBlowRate extends AbstractEffect private final double _amount; private final StatModifierType _mode; - public FatalBlowRate(StatsSet params) + public FatalBlowRate(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 9731e75e5d..ec2659ea2c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DefenderInstance; import org.l2jmobius.gameserver.model.actor.instance.FortCommanderInstance; @@ -40,7 +40,7 @@ public class Fear extends AbstractEffect { private static final int FEAR_RANGE = 500; - public Fear(StatsSet params) + public Fear(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 5e04e46d60..94d9912bdf 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.MountType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ public class Feed extends AbstractEffect private final int _ride; private final int _wyvern; - public Feed(StatsSet params) + public Feed(StatSet params) { _normal = params.getInt("normal", 0); _ride = params.getInt("ride", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java index 0b22a4d4c9..146e3b73e6 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class FishingExpSpBonus extends AbstractStatPercentEffect { - public FishingExpSpBonus(StatsSet params) + public FishingExpSpBonus(StatSet params) { super(params, Stat.FISHING_EXP_SP_BONUS); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Flag.java index c1469eab19..2442cbdb35 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Flag extends AbstractEffect { - public Flag(StatsSet params) + public Flag(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index 0243f0f543..74a9754a95 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.BlockInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class FlipBlock extends AbstractEffect { - public FlipBlock(StatsSet params) + public FlipBlock(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 7fc7da5fe6..3412e4d36d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class FlyAway extends AbstractEffect { private final int _radius; - public FlyAway(StatsSet params) + public FlyAway(StatSet params) { _radius = params.getInt("radius"); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java index fd3216286d..590fbbcd44 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class FocusEnergy extends AbstractStatAddEffect { - public FocusEnergy(StatsSet params) + public FocusEnergy(StatSet params) { super(params, Stat.MAX_MOMENTUM); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index efbd93f304..19f0163e42 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class FocusMaxMomentum extends AbstractEffect { - public FocusMaxMomentum(StatsSet params) + public FocusMaxMomentum(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index 284d19ee5f..e8c18e9682 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -36,7 +36,7 @@ public class FocusMomentum extends AbstractEffect private final int _amount; private final int _maxCharges; - public FocusMomentum(StatsSet params) + public FocusMomentum(StatSet params) { _amount = params.getInt("amount", 1); _maxCharges = params.getInt("maxCharges", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 18a9864bbc..debd491cfe 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class FocusSouls extends AbstractEffect { private final int _charge; - public FocusSouls(StatsSet params) + public FocusSouls(StatSet params) { _charge = params.getInt("charge", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 8540ccd49c..23328db910 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Set; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class GetAgro extends AbstractEffect { - public GetAgro(StatsSet params) + public GetAgro(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java index 1ca8722709..e91002d04b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class GetDamageLimit extends AbstractStatAddEffect { - public GetDamageLimit(StatsSet params) + public GetDamageLimit(StatSet params) { super(params, Stat.DAMAGE_LIMIT); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 2dfd3bf8c4..439f3e8e3a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class GetMomentum extends AbstractEffect { private static int _ticks; - public GetMomentum(StatsSet params) + public GetMomentum(StatSet params) { _ticks = params.getInt("ticks", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index 7c1c0f3fa2..2c842101ed 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class GiveClanReputation extends AbstractEffect { private final int _reputation; - public GiveClanReputation(StatsSet params) + public GiveClanReputation(StatSet params) { _reputation = params.getInt("reputation", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index fd4d61fa73..9052c63154 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class GiveExpAndSp extends AbstractEffect private final int _xp; private final int _sp; - public GiveExpAndSp(StatsSet params) + public GiveExpAndSp(StatSet params) { _xp = params.getInt("xp", 0); _sp = params.getInt("sp", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index 3448e09797..9d41a4395b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ public class GiveFame extends AbstractEffect { private final int _fame; - public GiveFame(StatsSet params) + public GiveFame(StatSet params) { _fame = params.getInt("fame", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index c948fa0948..617a8ef88a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class GiveRecommendation extends AbstractEffect { private final int _amount; - public GiveRecommendation(StatsSet params) + public GiveRecommendation(StatSet params) { _amount = params.getInt("amount", 0); if (_amount == 0) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index 5fe06566c7..75a16fe828 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class GiveSp extends AbstractEffect { private final int _sp; - public GiveSp(StatsSet params) + public GiveSp(StatSet params) { _sp = params.getInt("sp", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index e32735f4e9..7779c6f413 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class GiveXp extends AbstractEffect { private final long _xp; - public GiveXp(StatsSet params) + public GiveXp(StatSet params) { _xp = params.getLong("xp", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 17095c209a..5cf4994f32 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Grow extends AbstractEffect { - public Grow(StatsSet params) + public Grow(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index a2200e1a2f..350c8e659f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.UserInfoType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class HairAccessorySet extends AbstractEffect { - public HairAccessorySet(StatsSet params) + public HairAccessorySet(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index 04b0b8ac6f..8211e03c01 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Harvesting extends AbstractEffect { - public Harvesting(StatsSet params) + public Harvesting(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java index ac1c9f49d8..097db6604a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HateAttack extends AbstractStatPercentEffect { - public HateAttack(StatsSet params) + public HateAttack(StatSet params) { super(params, Stat.HATE_ATTACK); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index 00f569eb17..9963ff1336 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlagInstance; @@ -34,7 +34,7 @@ public class HeadquarterCreate extends AbstractEffect private static final int HQ_NPC_ID = 35062; private final boolean _isAdvanced; - public HeadquarterCreate(StatsSet params) + public HeadquarterCreate(StatSet params) { _isAdvanced = params.getBoolean("isAdvanced", false); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 6e611144f1..139972a272 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -40,7 +40,7 @@ public class Heal extends AbstractEffect { private final double _power; - public Heal(StatsSet params) + public Heal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java index 5a7457d3df..a9f75ab036 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HealEffect extends AbstractStatEffect { - public HealEffect(StatsSet params) + public HealEffect(StatSet params) { super(params, Stat.HEAL_EFFECT, Stat.HEAL_EFFECT_ADD); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 86e28dc8b4..da76f33058 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class HealOverTime extends AbstractEffect { private final double _power; - public HealOverTime(StatsSet params) + public HealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index 6c9c8986bb..8b1c821a0a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class HealPercent extends AbstractEffect { private final int _power; - public HealPercent(StatsSet params) + public HealPercent(StatSet params) { _power = params.getInt("power", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Hide.java index e431277964..d02898bac5 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Hide extends AbstractEffect { - public Hide(StatsSet params) + public Hide(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index e7e5f3f91b..78fa1c9392 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.GameTimeController; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HitAtNight extends AbstractStatEffect { - public HitAtNight(StatsSet params) + public HitAtNight(StatSet params) { super(params, Stat.HIT_AT_NIGHT); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java index 1fd98e7aa9..f14b922308 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HitNumber extends AbstractStatEffect { - public HitNumber(StatsSet params) + public HitNumber(StatSet params) { super(params, Stat.ATTACK_COUNT_MAX); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 3611fd7d74..c2426f8d11 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Hp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Hp(StatsSet params) + public Hp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index 3d125565fe..6244c76428 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class HpByLevel extends AbstractEffect { private final double _power; - public HpByLevel(StatsSet params) + public HpByLevel(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 3cdb210bba..80b4af9b46 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -40,7 +40,7 @@ public class HpCpHeal extends AbstractEffect { private final double _power; - public HpCpHeal(StatsSet params) + public HpCpHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java index 0394dab996..6f96c2dcb3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class HpCpHealCritical extends AbstractEffect { - public HpCpHealCritical(StatsSet params) + public HpCpHealCritical(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 554b1cec79..7cf47c3a65 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class HpDrain extends AbstractEffect private final double _power; private final double _percentage; - public HpDrain(StatsSet params) + public HpDrain(StatSet params) { _power = params.getDouble("power", 0); _percentage = params.getDouble("percentage", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java index cb1d2bc3a7..b170bc62ba 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HpRegen extends AbstractStatEffect { - public HpRegen(StatsSet params) + public HpRegen(StatSet params) { super(params, Stat.REGENERATE_HP_RATE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 235e89a79b..f346fbaad8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class HpToOwner extends AbstractEffect private final double _power; private final int _stealAmount; - public HpToOwner(StatsSet params) + public HpToOwner(StatSet params) { _power = params.getDouble("power"); _stealAmount = params.getInt("stealAmount"); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java index 9829519da9..c659684ae8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class IgnoreDeath extends AbstractEffect { - public IgnoreDeath(StatsSet params) + public IgnoreDeath(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index f7c9baa155..44dceba10e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ImmobilePetBuff extends AbstractEffect { - public ImmobilePetBuff(StatsSet params) + public ImmobilePetBuff(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java index a60fc45d15..a03eff933a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ public class InstantKillResist extends AbstractEffect { private final int _amount; - public InstantKillResist(StatsSet params) + public InstantKillResist(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java index 7e1fc8abe4..265a9aab97 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class JewelSlot extends AbstractStatAddEffect { - public JewelSlot(StatsSet params) + public JewelSlot(StatSet params) { super(params, Stat.BROOCH_JEWELS); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 3d5ff2dda3..a34d7cc5b3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class KarmaCount extends AbstractEffect private final int _amount; private final int _mode; - public KarmaCount(StatsSet params) + public KarmaCount(StatSet params) { _amount = params.getInt("amount", 0); switch (params.getString("mode", "DIFF")) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index b6f5b03994..cffa4427c6 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -94,7 +94,7 @@ public class KnockBack extends AbstractEffect _chainKnockSkills.put(ClassId.AEORE_SHILLIEN_SAINT, 12000); // Heavy Hit } - public KnockBack(StatsSet params) + public KnockBack(StatSet params) { _distance = params.getInt("distance", 50); _speed = params.getInt("speed", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index 7bfac989cf..1affb1b141 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -38,7 +38,7 @@ public class Lethal extends AbstractEffect private final double _fullLethal; private final double _halfLethal; - public Lethal(StatsSet params) + public Lethal(StatSet params) { _fullLethal = params.getDouble("fullLethal", 0); _halfLethal = params.getDouble("halfLethal", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java index aeb42458a6..43b17877ad 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitCp extends AbstractStatEffect { - public LimitCp(StatsSet params) + public LimitCp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_CP); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java index cf76ec482a..45d8f37355 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitHp extends AbstractStatEffect { - public LimitHp(StatsSet params) + public LimitHp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_HP); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java index f5eda36ba6..8d31633d0a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitMp extends AbstractStatEffect { - public LimitMp(StatsSet params) + public LimitMp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_MP); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Lucky.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Lucky.java index 3775d2361d..4ff5ea9a01 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Lucky.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Lucky.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Lucky extends AbstractEffect { - public Lucky(StatsSet params) + public Lucky(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MAtk.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MAtk.java index 5f9ad5f32b..38c2fc9067 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MAtk.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MAtk.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MAtk extends AbstractStatEffect { - public MAtk(StatsSet params) + public MAtk(StatSet params) { super(params, Stat.MAGIC_ATTACK); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java index 2b9ae2e9e6..393d0d2d30 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicAccuracy extends AbstractStatEffect { - public MagicAccuracy(StatsSet params) + public MagicAccuracy(StatSet params) { super(params, Stat.ACCURACY_MAGIC); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java index 123706eb55..b9a58b09f3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicCriticalDamage extends AbstractStatEffect { - public MagicCriticalDamage(StatsSet params) + public MagicCriticalDamage(StatSet params) { super(params, Stat.MAGIC_CRITICAL_DAMAGE, Stat.MAGIC_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java index 0c10014e50..c9fa9a4240 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicCriticalRate extends AbstractStatEffect { - public MagicCriticalRate(StatsSet params) + public MagicCriticalRate(StatSet params) { super(params, Stat.MAGIC_CRITICAL_RATE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index e8b6f5e8bf..5281bf8445 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class MagicMpCost extends AbstractEffect private final int _magicType; private final double _amount; - public MagicMpCost(StatsSet params) + public MagicMpCost(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index ed4a3fca8b..283a99176c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class MagicalAbnormalDispelAttack extends AbstractEffect private final double _power; private final AbnormalType _abnormalType; - public MagicalAbnormalDispelAttack(StatsSet params) + public MagicalAbnormalDispelAttack(StatSet params) { _power = params.getDouble("power", 0); _abnormalType = AbnormalType.getAbnormalType(params.getString("abnormalType", null)); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java index 8234db1c43..be6403077c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAbnormalResist extends AbstractStatAddEffect { - public MagicalAbnormalResist(StatsSet params) + public MagicalAbnormalResist(StatSet params) { super(params, Stat.ABNORMAL_RESIST_MAGICAL); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index 4e938809f1..25c7d25954 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -37,7 +37,7 @@ public class MagicalAttack extends AbstractEffect private final boolean _overHit; private final double _debuffModifier; - public MagicalAttack(StatsSet params) + public MagicalAttack(StatSet params) { _power = params.getDouble("power", 0); _overHit = params.getBoolean("overHit", false); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 424480b76c..11c387780e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class MagicalAttackByAbnormal extends AbstractEffect { private final double _power; - public MagicalAttackByAbnormal(StatsSet params) + public MagicalAttackByAbnormal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9c3e263a05..348e904025 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -40,7 +40,7 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect private final double _power; private final Set _abnormals; - public MagicalAttackByAbnormalSlot(StatsSet params) + public MagicalAttackByAbnormalSlot(StatSet params) { _power = params.getDouble("power", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 49dd351046..de55dd0fcd 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -38,7 +38,7 @@ public class MagicalAttackMp extends AbstractEffect private final boolean _critical; private final double _criticalLimit; - public MagicalAttackMp(StatsSet params) + public MagicalAttackMp(StatSet params) { _power = params.getDouble("power"); _critical = params.getBoolean("critical"); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 4414b36fa7..93ac560169 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class MagicalAttackRange extends AbstractEffect private final double _power; private final double _shieldDefPercent; - public MagicalAttackRange(StatsSet params) + public MagicalAttackRange(StatSet params) { _power = params.getDouble("power"); _shieldDefPercent = params.getDouble("shieldDefPercent", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java index 2e304e5f8b..1cf39ed501 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAttackSpeed extends AbstractStatEffect { - public MagicalAttackSpeed(StatsSet params) + public MagicalAttackSpeed(StatSet params) { super(params, Stat.MAGIC_ATTACK_SPEED); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 9a3a776e32..880d71f0c5 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class MagicalDamOverTime extends AbstractEffect private final double _power; private final boolean _canKill; - public MagicalDamOverTime(StatsSet params) + public MagicalDamOverTime(StatSet params) { _power = params.getDouble("power", 0); _canKill = params.getBoolean("canKill", false); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java index 80fdf87050..9b4e6061aa 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalDefence extends AbstractStatEffect { - public MagicalDefence(StatsSet params) + public MagicalDefence(StatSet params) { super(params, Stat.MAGICAL_DEFENCE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java index c3c7c404f3..4e83b80e8b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalEvasion extends AbstractStatEffect { - public MagicalEvasion(StatsSet params) + public MagicalEvasion(StatSet params) { super(params, Stat.MAGIC_EVASION_RATE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java index 6253af7373..bf419a19f7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalSkillPower extends AbstractStatEffect { - public MagicalSkillPower(StatsSet params) + public MagicalSkillPower(StatSet params) { super(params, Stat.MAGICAL_SKILL_POWER, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index d0047fedef..f4388dc16f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class MagicalSoulAttack extends AbstractEffect { private final double _power; - public MagicalSoulAttack(StatsSet params) + public MagicalSoulAttack(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java index fcc143cd4b..688243d9e1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ManaCharge extends AbstractStatAddEffect { - public ManaCharge(StatsSet params) + public ManaCharge(StatSet params) { super(params, Stat.MANA_CHARGE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index 0c84b4ab61..b889e6e824 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class ManaDamOverTime extends AbstractEffect { private final double _power; - public ManaDamOverTime(StatsSet params) + public ManaDamOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index f48011c9a2..94286df1c8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -34,7 +34,7 @@ public class ManaHeal extends AbstractEffect { private final double _power; - public ManaHeal(StatsSet params) + public ManaHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index bfdfa54380..61f15449a0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -35,7 +35,7 @@ public class ManaHealByLevel extends AbstractEffect { private final double _power; - public ManaHealByLevel(StatsSet params) + public ManaHealByLevel(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 46937a8dd0..e505c9e7a2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class ManaHealOverTime extends AbstractEffect { private final double _power; - public ManaHealOverTime(StatsSet params) + public ManaHealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 101961d1c4..71085da549 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class ManaHealPercent extends AbstractEffect { private final double _power; - public ManaHealPercent(StatsSet params) + public ManaHealPercent(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 7c9c63e3ad..07d15d826c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxCp extends AbstractStatEffect { private final boolean _heal; - public MaxCp(StatsSet params) + public MaxCp(StatSet params) { super(params, Stat.MAX_CP); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 6d2c3449bd..85867bca96 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxHp extends AbstractStatEffect { private final boolean _heal; - public MaxHp(StatsSet params) + public MaxHp(StatSet params) { super(params, Stat.MAX_HP); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index e554c63055..9ca46fda8d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxMp extends AbstractStatEffect { private final boolean _heal; - public MaxMp(StatsSet params) + public MaxMp(StatSet params) { super(params, Stat.MAX_MP); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 39cf62a95b..c27284e5f6 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -43,7 +43,7 @@ public class ModifyVital extends AbstractEffect private final int _mp; private final int _cp; - public ModifyVital(StatsSet params) + public ModifyVital(StatSet params) { _type = params.getEnum("type", ModifyType.class); if (_type != ModifyType.SET) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 29ee88f805..095d130f7f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Mp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Mp(StatsSet params) + public Mp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index 76d858ad8e..b13d7824d0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class MpConsumePerLevel extends AbstractEffect { private final double _power; - public MpConsumePerLevel(StatsSet params) + public MpConsumePerLevel(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java index 2051009805..ae7bf0c48c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpRegen extends AbstractStatEffect { - public MpRegen(StatsSet params) + public MpRegen(StatSet params) { super(params, Stat.REGENERATE_MP_RATE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MpShield.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MpShield.java index 82e307a562..a4eb3e663f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MpShield.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MpShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpShield extends AbstractStatAddEffect { - public MpShield(StatsSet params) + public MpShield(StatSet params) { super(params, Stat.MANA_SHIELD_PERCENT); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java index af2ce119cc..366e96b18f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpVampiricAttack extends AbstractStatAddEffect { - public MpVampiricAttack(StatsSet params) + public MpVampiricAttack(StatSet params) { super(params, Stat.ABSORB_MANA_DAMAGE_PERCENT); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mute.java index a7f2f76e23..7e5b5a528f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Mute extends AbstractEffect { - public Mute(StatsSet params) + public Mute(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java index 3cc4cae96f..513dc46ec7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class NoblesseBless extends AbstractEffect { - public NoblesseBless(StatsSet params) + public NoblesseBless(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index bb0f02af5c..05f8c6a99b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpenChest extends AbstractEffect { - public OpenChest(StatsSet params) + public OpenChest(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 15cd9c2a64..de0414fd23 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.RecipeController; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpenCommonRecipeBook extends AbstractEffect { - public OpenCommonRecipeBook(StatsSet params) + public OpenCommonRecipeBook(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 21dd337982..7b5effc6b4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class OpenDoor extends AbstractEffect private final int _chance; private final boolean _isItem; - public OpenDoor(StatsSet params) + public OpenDoor(StatSet params) { _chance = params.getInt("chance", 0); _isItem = params.getBoolean("isItem", false); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index b99a8f9757..3526fa5fdc 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.RecipeController; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpenDwarfRecipeBook extends AbstractEffect { - public OpenDwarfRecipeBook(StatsSet params) + public OpenDwarfRecipeBook(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PAtk.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PAtk.java index c353d03a00..7f10b9dcc7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PAtk.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PAtk.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PAtk extends AbstractConditionalHpEffect { - public PAtk(StatsSet params) + public PAtk(StatSet params) { super(params, Stat.PHYSICAL_ATTACK); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Passive.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Passive.java index cef680ca21..27ce15bb60 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Passive.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Passive.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Passive extends AbstractEffect { - public Passive(StatsSet params) + public Passive(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java index 05f55c7dac..1a9f29424f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAbnormalResist extends AbstractStatAddEffect { - public PhysicalAbnormalResist(StatsSet params) + public PhysicalAbnormalResist(StatSet params) { super(params, Stat.ABNORMAL_RESIST_PHYSICAL); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 098770705b..7e5fb14465 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -52,7 +52,7 @@ public class PhysicalAttack extends AbstractEffect private final Set _abnormals; private final double _abnormalPowerMod; - public PhysicalAttack(StatsSet params) + public PhysicalAttack(StatSet params) { _power = params.getDouble("power", 0); _pAtkMod = params.getDouble("pAtkMod", 1.0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index d325c3d5ed..f191867614 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -38,7 +38,7 @@ public class PhysicalAttackHpLink extends AbstractEffect private final double _criticalChance; private final boolean _overHit; - public PhysicalAttackHpLink(StatsSet params) + public PhysicalAttackHpLink(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index dc575c2c75..fe087a1bcc 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class PhysicalAttackMute extends AbstractEffect { - public PhysicalAttackMute(StatsSet params) + public PhysicalAttackMute(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java index 112b41eb36..2093d45264 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAttackRange extends AbstractStatEffect { - public PhysicalAttackRange(StatsSet params) + public PhysicalAttackRange(StatSet params) { super(params, Stat.PHYSICAL_ATTACK_RANGE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index d3c2dcfaf2..5d66bd4c87 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ public class PhysicalAttackSaveHp extends AbstractEffect private final boolean _overHit; private final double _saveHp; - public PhysicalAttackSaveHp(StatsSet params) + public PhysicalAttackSaveHp(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java index 167b859572..cdf34eb6f6 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAttackSpeed extends AbstractStatEffect { - public PhysicalAttackSpeed(StatsSet params) + public PhysicalAttackSpeed(StatSet params) { super(params, Stat.PHYSICAL_ATTACK_SPEED); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 61bed5561b..a1a6818a00 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class PhysicalAttackWeaponBonus extends AbstractEffect private final Map _weaponBonus = new EnumMap<>(WeaponType.class); - public PhysicalAttackWeaponBonus(StatsSet params) + public PhysicalAttackWeaponBonus(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java index fa3925e725..078c3673b9 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalDefence extends AbstractConditionalHpEffect { - public PhysicalDefence(StatsSet params) + public PhysicalDefence(StatSet params) { super(params, Stat.PHYSICAL_DEFENCE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java index 812c641ac8..9714220e1b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalEvasion extends AbstractConditionalHpEffect { - public PhysicalEvasion(StatsSet params) + public PhysicalEvasion(StatSet params) { super(params, Stat.EVASION_RATE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index b337fed6cb..fe7cf853c8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class PhysicalMute extends AbstractEffect { - public PhysicalMute(StatsSet params) + public PhysicalMute(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java index 0fd835f4e3..1b843dda3d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class PhysicalShieldAngleAll extends AbstractEffect { - public PhysicalShieldAngleAll(StatsSet params) + public PhysicalShieldAngleAll(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java index 9d3f051659..507eb57326 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalSkillPower extends AbstractStatEffect { - public PhysicalSkillPower(StatsSet params) + public PhysicalSkillPower(StatSet params) { super(params, Stat.PHYSICAL_SKILL_POWER, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index a958116ff7..9ceccea4cc 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -42,7 +42,7 @@ public class PhysicalSoulAttack extends AbstractEffect private final boolean _ignoreShieldDefence; private final boolean _overHit; - public PhysicalSoulAttack(StatsSet params) + public PhysicalSoulAttack(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index e95e09ab90..fd2b23a2ae 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class PkCount extends AbstractEffect { private final int _amount; - public PkCount(StatsSet params) + public PkCount(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index 2a356bdbc9..18cecfb90e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class Plunder extends AbstractEffect { - public Plunder(StatsSet params) + public Plunder(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index fd61584af1..3e885274b3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PolearmSingleTarget extends AbstractEffect { - public PolearmSingleTarget(StatsSet params) + public PolearmSingleTarget(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java index 86f2e2cee8..b2fb920379 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class ProtectDeathPenalty extends AbstractEffect { - public ProtectDeathPenalty(StatsSet params) + public ProtectDeathPenalty(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java index 890b8980bd..6664b36bae 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ProtectionBlessing extends AbstractEffect { - public ProtectionBlessing(StatsSet params) + public ProtectionBlessing(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index 6de78c2c82..62c480716d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class PullBack extends AbstractEffect private final int _animationSpeed; private final FlyType _type; - public PullBack(StatsSet params) + public PullBack(StatSet params) { _speed = params.getInt("speed", 0); _delay = params.getInt("delay", _speed); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java index 1019c56778..84a72299f3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveMagicalSkillDamageBonus extends AbstractStatPercentEffect { - public PveMagicalSkillDamageBonus(StatsSet params) + public PveMagicalSkillDamageBonus(StatSet params) { super(params, Stat.PVE_MAGICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java index 8da698c746..70870aa45c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveMagicalSkillDefenceBonus(StatsSet params) + public PveMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java index c7a82d4ded..8f60ea025c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalAttackDamageBonus extends AbstractStatPercentEffect { - public PvePhysicalAttackDamageBonus(StatsSet params) + public PvePhysicalAttackDamageBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_ATTACK_DAMAGE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java index 0717fe525b..ea01a4e1d8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PvePhysicalAttackDefenceBonus(StatsSet params) + public PvePhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java index 878f942877..1e8b9e76c4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvePhysicalSkillDamageBonus(StatsSet params) + public PvePhysicalSkillDamageBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java index bdfa0dcc67..b1dbb0b217 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvePhysicalSkillDefenceBonus(StatsSet params) + public PvePhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java index 94fdc26015..fbe3119ba8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveRaidMagicalSkillDefenceBonus(StatsSet params) + public PveRaidMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java index f54d849752..83352e1b2f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidPhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PveRaidPhysicalAttackDefenceBonus(StatsSet params) + public PveRaidPhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java index 0a344f96de..be05bec159 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidPhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveRaidPhysicalSkillDefenceBonus(StatsSet params) + public PveRaidPhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java index 542c019420..2f0153189a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpMagicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvpMagicalSkillDamageBonus(StatsSet params) + public PvpMagicalSkillDamageBonus(StatSet params) { super(params, Stat.PVP_MAGICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java index bb006280fc..41ad3b7749 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvpMagicalSkillDefenceBonus(StatsSet params) + public PvpMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVP_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java index 483d7b02e4..23488ea000 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalAttackDamageBonus extends AbstractStatPercentEffect { - public PvpPhysicalAttackDamageBonus(StatsSet params) + public PvpPhysicalAttackDamageBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_ATTACK_DAMAGE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java index 40c3a22ea2..ff942b3d4d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PvpPhysicalAttackDefenceBonus(StatsSet params) + public PvpPhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java index 225c7c1e39..19a7c96003 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvpPhysicalSkillDamageBonus(StatsSet params) + public PvpPhysicalSkillDamageBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java index ea2d1fa126..211d14c5e3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvpPhysicalSkillDefenceBonus(StatsSet params) + public PvpPhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 8a01583374..e500b487af 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -36,7 +36,7 @@ public class RandomizeHate extends AbstractEffect { private final int _chance; - public RandomizeHate(StatsSet params) + public RandomizeHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index 8b2801ee6c..18b07bd2d7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class RealDamage extends AbstractEffect { private final double _power; - public RealDamage(StatsSet params) + public RealDamage(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java index 4372c15bcf..86738fae0f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class RearDamage extends AbstractStatPercentEffect { - public RearDamage(StatsSet params) + public RearDamage(StatSet params) { super(params, Stat.REAR_DAMAGE_RATE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 31c7a4e4b3..82ed18faa1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RebalanceHP extends AbstractEffect { - public RebalanceHP(StatsSet params) + public RebalanceHP(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index 09d307be02..979809b533 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RebalanceHPSummon extends AbstractEffect { - public RebalanceHPSummon(StatsSet params) + public RebalanceHPSummon(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 7599b691ac..e76328929a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class RecoverVitalityInPeaceZone extends AbstractEffect private final double _amount; private final int _ticks; - public RecoverVitalityInPeaceZone(StatsSet params) + public RecoverVitalityInPeaceZone(StatSet params) { _amount = params.getDouble("amount", 0); _ticks = params.getInt("ticks", 10); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Recovery.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Recovery.java index 35c5cf3af1..30296eec4d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Recovery.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Recovery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Recovery extends AbstractEffect { - public Recovery(StatsSet params) + public Recovery(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java index 824044ae21..e52b5abafb 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ReduceCancel extends AbstractStatEffect { - public ReduceCancel(StatsSet params) + public ReduceCancel(StatSet params) { super(params, Stat.ATTACK_CANCEL); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index ecc7a10d31..be9188f3b0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -33,7 +33,7 @@ public class ReduceDamage extends AbstractEffect { private final double _amount; - public ReduceDamage(StatsSet params) + public ReduceDamage(StatSet params) { _amount = params.getDouble("amount"); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java index 8534a94fc6..7b8862f608 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ReduceDropType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -32,7 +32,7 @@ public class ReduceDropPenalty extends AbstractEffect private final double _deathPenalty; private final ReduceDropType _type; - public ReduceDropPenalty(StatsSet params) + public ReduceDropPenalty(StatSet params) { _exp = params.getDouble("exp", 0); _deathPenalty = params.getDouble("deathPenalty", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java index c15f7301b9..6436b488e0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ReflectMagic extends AbstractStatAddEffect { - public ReflectMagic(StatsSet params) + public ReflectMagic(StatSet params) { super(params, Stat.VENGEANCE_SKILL_MAGIC_DAMAGE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java index bf1d555351..583191fd4c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.BasicProperty; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ReflectSkill extends AbstractEffect private final Stat _stat; private final double _amount; - public ReflectSkill(StatsSet params) + public ReflectSkill(StatSet params) { _stat = params.getEnum("type", BasicProperty.class, BasicProperty.PHYSICAL) == BasicProperty.PHYSICAL ? Stat.REFLECT_SKILL_PHYSIC : Stat.REFLECT_SKILL_MAGIC; _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index e850ea6be9..77b96e4205 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class RefuelAirship extends AbstractEffect { private final int _value; - public RefuelAirship(StatsSet params) + public RefuelAirship(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Relax.java index c8c61fe47e..e2ba4420db 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ public class Relax extends AbstractEffect { private final double _power; - public Relax(StatsSet params) + public Relax(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 9678dc1174..0613c17234 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class ResetInstanceEntry extends AbstractEffect { private final Set _instanceId; - public ResetInstanceEntry(StatsSet params) + public ResetInstanceEntry(StatSet params) { final String instanceIds = params.getString("instanceId", null); if ((instanceIds != null) && !instanceIds.isEmpty()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java index 940c731208..f15ff56189 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ResistAbnormalByCategory extends AbstractEffect private final DispelSlotType _slot; private final double _amount; - public ResistAbnormalByCategory(StatsSet params) + public ResistAbnormalByCategory(StatSet params) { _amount = params.getDouble("amount", 0); _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.DEBUFF); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java index dae38e5246..2e29b5cc8e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ResistDDMagic extends AbstractStatPercentEffect { - public ResistDDMagic(StatsSet params) + public ResistDDMagic(StatSet params) { super(params, Stat.MAGIC_SUCCESS_RES); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java index af2b203aad..d08fcb262a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ResistDispelByCategory extends AbstractEffect private final DispelSlotType _slot; private final double _amount; - public ResistDispelByCategory(StatsSet params) + public ResistDispelByCategory(StatSet params) { _amount = params.getDouble("amount", 0); _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index af1e40bea8..cd03f1a74a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -34,7 +34,7 @@ public class ResistSkill extends AbstractEffect { private final List _skills = new ArrayList<>(); - public ResistSkill(StatsSet params) + public ResistSkill(StatSet params) { for (int i = 1;; i++) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index feb5885fb0..6f887a07cf 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class Restoration extends AbstractEffect private final int _itemCount; private final int _itemEnchantmentLevel; - public Restoration(StatsSet params) + public Restoration(StatSet params) { _itemId = params.getInt("itemId", 0); _itemCount = params.getInt("itemCount", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 37cd974643..0baf0aaae6 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -25,7 +25,7 @@ import java.util.Map.Entry; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.ExtractableProductItem; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,12 +47,12 @@ public class RestorationRandom extends AbstractEffect { private final List _products = new ArrayList<>(); - public RestorationRandom(StatsSet params) + public RestorationRandom(StatSet params) { - for (StatsSet group : params.getList("items", StatsSet.class)) + for (StatSet group : params.getList("items", StatSet.class)) { final List items = new ArrayList<>(); - for (StatsSet item : group.getList(".", StatsSet.class)) + for (StatSet item : group.getList(".", StatSet.class)) { items.add(new RestorationItemHolder(item.getInt(".id"), item.getInt(".count"), item.getInt(".minEnchant", 0), item.getInt(".maxEnchant", 0))); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index f9c10b7ff2..9b287dd419 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class Resurrection extends AbstractEffect { private final int _power; - public Resurrection(StatsSet params) + public Resurrection(StatSet params) { _power = params.getInt("power", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 18d8bdb0bd..6ef063ce91 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -39,7 +39,7 @@ public class ResurrectionSpecial extends AbstractEffect private final int _power; private final Set _instanceId; - public ResurrectionSpecial(StatsSet params) + public ResurrectionSpecial(StatSet params) { _power = params.getInt("power", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index e4d66b43d3..0e7391681b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class Reuse extends AbstractEffect private final int _magicType; private final double _amount; - public Reuse(StatsSet params) + public Reuse(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index 3716fc1922..e17cd7cc25 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ReuseSkillById extends AbstractEffect { private final int _skillId; - public ReuseSkillById(StatsSet params) + public ReuseSkillById(StatSet params) { _skillId = params.getInt("skillId", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Root.java index 1ca3492949..b6876e8e13 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Root extends AbstractEffect { - public Root(StatsSet params) + public Root(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index 66fc8d82c8..4c7ee53239 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class SacrificeSummon extends AbstractEffect { - public SacrificeSummon(StatsSet params) + public SacrificeSummon(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java index d00856c9bd..683f45bb55 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SafeFallHeight extends AbstractStatEffect { - public SafeFallHeight(StatsSet params) + public SafeFallHeight(StatSet params) { super(params, Stat.FALL); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 7f6bf69ee3..797aa95263 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -33,7 +33,7 @@ public class SendSystemMessageToClan extends AbstractEffect { private final SystemMessage _message; - public SendSystemMessageToClan(StatsSet params) + public SendSystemMessageToClan(StatSet params) { final int id = params.getInt("id", 0); _message = new SystemMessage(id); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java index 7acbf846df..a0508d73b1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class ServitorShare extends AbstractEffect { private final Map _sharedStats = new EnumMap<>(Stat.class); - public ServitorShare(StatsSet params) + public ServitorShare(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 01dfd87c71..6e8187feae 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SetHp extends AbstractEffect private final double _amount; private final StatModifierType _mode; - public SetHp(StatsSet params) + public SetHp(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index 805d18160b..fae21baa51 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SetSkill extends AbstractEffect private final int _skillId; private final int _skillLvl; - public SetSkill(StatsSet params) + public SetSkill(StatSet params) { _skillId = params.getInt("skillId", 0); _skillLvl = params.getInt("skillLvl", 1); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java index a93bb5f253..354cb42b55 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ShieldDefence extends AbstractStatEffect { - public ShieldDefence(StatsSet params) + public ShieldDefence(StatSet params) { super(params, Stat.SHIELD_DEFENCE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java index f28d0e4ad2..1fdee75f69 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ShieldDefenceRate extends AbstractStatEffect { - public ShieldDefenceRate(StatsSet params) + public ShieldDefenceRate(StatSet params) { super(params, Stat.SHIELD_DEFENCE_RATE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java index 1d649082dc..533b631f10 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class SilentMove extends AbstractEffect { - public SilentMove(StatsSet params) + public SilentMove(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java index 89dad85514..7c929a7fe8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class SkillCritical extends AbstractEffect { private final BaseStat _stat; - public SkillCritical(StatsSet params) + public SkillCritical(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java index 369bef11f5..8f054f973b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillCriticalDamage extends AbstractStatEffect { - public SkillCriticalDamage(StatsSet params) + public SkillCriticalDamage(StatSet params) { super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java index c91f2d6b49..88ecf69e77 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillCriticalProbability extends AbstractStatPercentEffect { - public SkillCriticalProbability(StatsSet params) + public SkillCriticalProbability(StatSet params) { super(params, Stat.SKILL_CRITICAL_PROBABILITY); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 7b98a9e180..1664ea1827 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class SkillEvasion extends AbstractEffect private final int _magicType; private final double _amount; - public SkillEvasion(StatsSet params) + public SkillEvasion(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java index 9cc62532b4..2880d0ccef 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillPowerAdd extends AbstractStatAddEffect { - public SkillPowerAdd(StatsSet params) + public SkillPowerAdd(StatSet params) { super(params, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 9578c88f91..7156fff2df 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SkillTurning extends AbstractEffect private final int _chance; private final boolean _staticChance; - public SkillTurning(StatsSet params) + public SkillTurning(StatSet params) { _chance = params.getInt("chance", 100); _staticChance = params.getBoolean("staticChance", false); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 45b02206a4..04691304ed 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SkillTurningOverTime extends AbstractEffect private final int _chance; private final boolean _staticChance; - public SkillTurningOverTime(StatsSet params) + public SkillTurningOverTime(StatSet params) { _chance = params.getInt("chance", 100); _staticChance = params.getBoolean("staticChance", false); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index c1dd92cedb..b919c7acac 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -36,7 +36,7 @@ public class SoulBlow extends AbstractEffect private final double _chanceBoost; private final boolean _overHit; - public SoulBlow(StatsSet params) + public SoulBlow(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 8471aa236c..4f63a84081 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; @@ -40,7 +40,7 @@ public class SoulEating extends AbstractEffect private final int _expNeeded; private final int _maxSouls; - public SoulEating(StatsSet params) + public SoulEating(StatSet params) { _expNeeded = params.getInt("expNeeded"); _maxSouls = params.getInt("maxSouls"); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a7d5c2628a..ad261845eb 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Seed; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Sow extends AbstractEffect { - public Sow(StatsSet params) + public Sow(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SpModify.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SpModify.java index 24d124ecce..c3bc6193e9 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SpModify.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SpModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SpModify extends AbstractStatAddEffect { - public SpModify(StatsSet params) + public SpModify(StatSet params) { super(params, Stat.BONUS_SP); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 0718408ca2..890438d65f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.enums.SpeedType; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -36,7 +36,7 @@ public class Speed extends AbstractEffect private final StatModifierType _mode; private List _speedType; - public Speed(StatsSet params) + public Speed(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index 91b91ad05e..db247775f3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SphericBarrier extends AbstractStatAddEffect { - public SphericBarrier(StatsSet params) + public SphericBarrier(StatSet params) { super(params, Stat.SPHERIC_BARRIER_RANGE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index d13eaf1c2e..385240377f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class Spoil extends AbstractEffect { - public Spoil(StatsSet params) + public Spoil(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index b63c24dc20..22c4132b63 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -36,7 +36,7 @@ public class StatBonusSkillCritical extends AbstractEffect private final BaseStat _stat; private final Condition _armorTypeCondition; - public StatBonusSkillCritical(StatsSet params) + public StatBonusSkillCritical(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.DEX); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index 41a20bfafe..49280eb774 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -36,7 +36,7 @@ public class StatBonusSpeed extends AbstractEffect private final BaseStat _stat; private final Condition _armorTypeCondition; - public StatBonusSpeed(StatsSet params) + public StatBonusSpeed(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.DEX); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index a007b118b2..bcf691e360 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class StatByMoveType extends AbstractEffect private final MoveType _type; private final double _value; - public StatByMoveType(StatsSet params) + public StatByMoveType(StatSet params) { _stat = params.getEnum("stat", Stat.class); _type = params.getEnum("type", MoveType.class); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StatUp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StatUp.java index a22710ca7a..29d72bb4de 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StatUp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StatUp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class StatUp extends AbstractEffect private final BaseStat _stat; private final double _amount; - public StatUp(StatsSet params) + public StatUp(StatSet params) { _amount = params.getDouble("amount", 0); _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index 0720057c19..23239887a7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.List; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -39,7 +39,7 @@ public class StealAbnormal extends AbstractEffect private final int _rate; private final int _max; - public StealAbnormal(StatsSet params) + public StealAbnormal(StatSet params) { _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); _rate = params.getInt("rate", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Summon.java index 0f95637961..7ef79d4c39 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.ServitorInstance; @@ -43,7 +43,7 @@ public class Summon extends AbstractEffect private final int _lifeTime; private final int _consumeItemInterval; - public Summon(StatsSet params) + public Summon(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index 8929e1f2b0..50c025e572 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class SummonAgathion extends AbstractEffect { private final int _npcId; - public SummonAgathion(StatsSet params) + public SummonAgathion(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index 7716d58f16..49b816f272 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.CubicData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; @@ -42,7 +42,7 @@ public class SummonCubic extends AbstractEffect private final int _cubicId; private final int _cubicLvl; - public SummonCubic(StatsSet params) + public SummonCubic(StatSet params) { _cubicId = params.getInt("cubicId", -1); _cubicLvl = params.getInt("cubicLvl", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index d0a2a82738..13d5a2eac7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoppelgangerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ public class SummonHallucination extends AbstractEffect private final int _npcId; private final int _npcCount; - public SummonHallucination(StatsSet params) + public SummonHallucination(StatSet params) { _despawnDelay = params.getInt("despawnDelay", 20000); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index bcd050e084..d61a6e5c02 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.ServitorInstance; @@ -43,7 +43,7 @@ public class SummonMulti extends AbstractEffect private final int _consumeItemInterval; private final int _summonPoints; - public SummonMulti(StatsSet params) + public SummonMulti(StatSet params) { _npcId = params.getInt("npcId"); _expMultiplier = params.getFloat("expMultiplier", 1); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index 6f4090eef0..eaff214b7c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DecoyInstance; @@ -48,7 +48,7 @@ public class SummonNpc extends AbstractEffect private final boolean _isSummonSpawn; private final boolean _singleInstance; // Only one instance of this NPC is allowed. - public SummonNpc(StatsSet params) + public SummonNpc(StatSet params) { _despawnDelay = params.getInt("despawnDelay", 20000); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 5ef621819e..534a41ee16 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.data.xml.impl.PetDataTable; import org.l2jmobius.gameserver.model.PetData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PetItemList; */ public class SummonPet extends AbstractEffect { - public SummonPet(StatsSet params) + public SummonPet(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java index 7dd690587c..b1d5ec38cb 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SummonPoints extends AbstractStatAddEffect { - public SummonPoints(StatsSet params) + public SummonPoints(StatSet params) { super(params, Stat.MAX_SUMMON_POINTS); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index d8a47b670f..ac1ddaa16a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; @@ -35,7 +35,7 @@ public class SummonTrap extends AbstractEffect private final int _despawnTime; private final int _npcId; - public SummonTrap(StatsSet params) + public SummonTrap(StatSet params) { _despawnTime = params.getInt("despawnTime", 0); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 84f6d070a8..3196bb949d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Collection; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Sweeper extends AbstractEffect { - public Sweeper(StatsSet params) + public Sweeper(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 1594a8a23b..77dc9b4af7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ public class Synergy extends AbstractEffect private final int _skillLevelScaleTo; private final int _minSlot; - public Synergy(StatsSet params) + public Synergy(StatSet params) { final String requiredSlots = params.getString("requiredSlots", null); if ((requiredSlots != null) && !requiredSlots.isEmpty()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index e35516fef5..39ed981bbf 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Castle; @@ -33,7 +33,7 @@ public class TakeCastle extends AbstractEffect { private final CastleSide _side; - public TakeCastle(StatsSet params) + public TakeCastle(StatSet params) { _side = params.getEnum("side", CastleSide.class); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 77fd9ec103..3be2bf5593 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Castle; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TakeCastleStart extends AbstractEffect { - public TakeCastleStart(StatsSet params) + public TakeCastleStart(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 70842191a7..18749c1aef 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Fort; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TakeFort extends AbstractEffect { - public TakeFort(StatsSet params) + public TakeFort(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 0eb23f6733..77355f9683 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TakeFortStart extends AbstractEffect { - public TakeFortStart(StatsSet params) + public TakeFortStart(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index cec32755ed..dd8e09278f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class TalismanSlot extends AbstractEffect { private final int _slots; - public TalismanSlot(StatsSet params) + public TalismanSlot(StatSet params) { _slots = params.getInt("slots", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 281b5322fd..32a126f499 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class TargetCancel extends AbstractEffect { private final int _chance; - public TargetCancel(StatsSet params) + public TargetCancel(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index b4463de391..86ff70c9ca 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMe extends AbstractEffect { - public TargetMe(StatsSet params) + public TargetMe(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index 11e581113e..e68a1e1faf 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class TargetMeProbability extends AbstractEffect { private final int _chance; - public TargetMeProbability(StatsSet params) + public TargetMeProbability(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 6c30519678..9ca01faf50 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -32,7 +32,7 @@ public class Teleport extends AbstractEffect { private final Location _loc; - public Teleport(StatsSet params) + public Teleport(StatSet params) { _loc = new Location(params.getInt("x", 0), params.getInt("y", 0), params.getInt("z", 0)); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index e0e715818c..bdc53208d5 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -38,7 +38,7 @@ public class TeleportToNpc extends AbstractEffect private final int _npcId; private final boolean _party; - public TeleportToNpc(StatsSet params) + public TeleportToNpc(StatSet params) { _npcId = params.getInt("npcId"); _party = params.getBoolean("party", false); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index c84c559322..4f4275fd41 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TeleportToPlayer extends AbstractEffect { - public TeleportToPlayer(StatsSet params) + public TeleportToPlayer(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index 1c9af0f535..b2d6b663de 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class TeleportToSummon extends AbstractEffect { private final double _maxDistance; - public TeleportToSummon(StatsSet params) + public TeleportToSummon(StatSet params) { _maxDistance = params.getDouble("distance", -1); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index e550302b02..c4bf787a10 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class TeleportToTarget extends AbstractEffect { - public TeleportToTarget(StatsSet params) + public TeleportToTarget(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index ba1c55c615..ff63eea817 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class TransferDamageToPlayer extends AbstractStatAddEffect { - public TransferDamageToPlayer(StatsSet params) + public TransferDamageToPlayer(StatSet params) { super(params, Stat.TRANSFER_DAMAGE_TO_PLAYER); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java index b084bfc1cb..c87d5f0554 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class TransferDamageToSummon extends AbstractStatAddEffect { - public TransferDamageToSummon(StatsSet params) + public TransferDamageToSummon(StatSet params) { super(params, Stat.TRANSFER_DAMAGE_SUMMON_PERCENT); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index e9f0292113..48bc5e3a1c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -34,7 +34,7 @@ public class TransferHate extends AbstractEffect { private final int _chance; - public TransferHate(StatsSet params) + public TransferHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 2ddf95a4db..bf593eaed8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Transformation extends AbstractEffect { private final List _id; - public Transformation(StatsSet params) + public Transformation(StatSet params) { final String ids = params.getString("transformationId", null); if ((ids != null) && !ids.isEmpty()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 103ccdf8ce..2b4af0a1d3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class TrapDetect extends AbstractEffect { private final int _power; - public TrapDetect(StatsSet params) + public TrapDetect(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index eb7b073b36..c4a6c6aed9 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.TrapAction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class TrapRemove extends AbstractEffect { private final int _power; - public TrapRemove(StatsSet params) + public TrapRemove(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 6df3874ab1..8fb87050b1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -59,7 +59,7 @@ public class TriggerSkillByAttack extends AbstractEffect * @param params */ - public TriggerSkillByAttack(StatsSet params) + public TriggerSkillByAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index ae6a3bc89f..78366b8047 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillByAvoid extends AbstractEffect /** * @param params */ - public TriggerSkillByAvoid(StatsSet params) + public TriggerSkillByAvoid(StatSet params) { _chance = params.getInt("chance", 100); _skill = new SkillHolder(params.getInt("skillId", 0), params.getInt("skillLevel", 0)); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index c24fb95246..9fe53c0622 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -48,7 +48,7 @@ public class TriggerSkillByDamage extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillByDamage(StatsSet params) + public TriggerSkillByDamage(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c086507336..8b84350293 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillByDeathBlow extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillByDeathBlow(StatsSet params) + public TriggerSkillByDeathBlow(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index a9bfcc320c..11802645f2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -37,7 +37,7 @@ public class TriggerSkillByKill extends AbstractEffect private final int _chance; private final SkillHolder _skill; - public TriggerSkillByKill(StatsSet params) + public TriggerSkillByKill(StatSet params) { _chance = params.getInt("chance", 100); _skill = new SkillHolder(params.getInt("skillId", 0), params.getInt("skillLevel", 0)); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 2893d46f33..7f2d3f9fa7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -52,7 +52,7 @@ public class TriggerSkillByMagicType extends AbstractEffect * @param params */ - public TriggerSkillByMagicType(StatsSet params) + public TriggerSkillByMagicType(StatSet params) { _chance = params.getInt("chance", 100); _magicTypes = params.getIntArray("magicTypes", ";"); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 1524e3d4f4..b77da803f5 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillBySkill extends AbstractEffect private final int _skillLevelScaleTo; private final TargetType _targetType; - public TriggerSkillBySkill(StatsSet params) + public TriggerSkillBySkill(StatSet params) { _castSkillId = params.getInt("castSkillId"); _chance = params.getInt("chance", 100); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index ec2124c44e..7bb68baec9 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -53,7 +53,7 @@ public class TriggerSkillBySkillAttack extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillBySkillAttack(StatsSet params) + public TriggerSkillBySkillAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 3f58619f0a..c209decfb3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -69,7 +69,7 @@ public class TwoHandedBluntBonus extends AbstractEffect private final double _speedAmount; private final StatModifierType _speedMode; - public TwoHandedBluntBonus(StatsSet params) + public TwoHandedBluntBonus(StatSet params) { _pAtkAmount = params.getDouble("pAtkAmount", 0); _pAtkMode = params.getEnum("pAtkMode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index b2c50c4b88..344456a925 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -69,7 +69,7 @@ public class TwoHandedSwordBonus extends AbstractEffect private final double _speedAmount; private final StatModifierType _speedMode; - public TwoHandedSwordBonus(StatsSet params) + public TwoHandedSwordBonus(StatSet params) { _pAtkAmount = params.getDouble("pAtkAmount", 0); _pAtkMode = params.getEnum("pAtkMode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 01ae8122ec..20b418c29b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ public class Unsummon extends AbstractEffect { private final int _chance; - public Unsummon(StatsSet params) + public Unsummon(StatSet params) { _chance = params.getInt("chance", -1); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 57eb89196d..f73f0f57f0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; */ public class UnsummonAgathion extends AbstractEffect { - public UnsummonAgathion(StatsSet params) + public UnsummonAgathion(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index a4fdc2c0aa..0779d018cc 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class UnsummonServitors extends AbstractEffect { - public UnsummonServitors(StatsSet params) + public UnsummonServitors(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index dbb0c700b5..ac33fcba0d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Untargetable extends AbstractEffect { - public Untargetable(StatsSet params) + public Untargetable(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java index ac6cae3d05..1c85196fe0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class VampiricAttack extends AbstractEffect private final double _amount; private final double _sum; - public VampiricAttack(StatsSet params) + public VampiricAttack(StatSet params) { _amount = params.getDouble("amount"); _sum = _amount * params.getDouble("chance"); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java index ab724714e1..571ca55bbe 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ public class VampiricDefence extends AbstractEffect { private final int _amount; - public VampiricDefence(StatsSet params) + public VampiricDefence(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java index f8b9d76f3a..caaa8d02b4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class VitalityExpRate extends AbstractStatPercentEffect { - public VitalityExpRate(StatsSet params) + public VitalityExpRate(StatSet params) { super(params, Stat.VITALITY_EXP_RATE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index cba2b14c35..385595e03d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class VitalityPointUp extends AbstractEffect { private final int _value; - public VitalityPointUp(StatsSet params) + public VitalityPointUp(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java index 86612955dd..72f78ec177 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class VitalityPointsRate extends AbstractStatPercentEffect { - public VitalityPointsRate(StatsSet params) + public VitalityPointsRate(StatSet params) { super(params, Stat.VITALITY_CONSUME_RATE); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java index 09500b3823..bf20bd5018 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WeightLimit extends AbstractStatEffect { - public WeightLimit(StatsSet params) + public WeightLimit(StatSet params) { super(params, Stat.WEIGHT_LIMIT); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java index f9be68f493..6020399f85 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WeightPenalty extends AbstractStatAddEffect { - public WeightPenalty(StatsSet params) + public WeightPenalty(StatSet params) { super(params, Stat.WEIGHT_PENALTY); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java index bdf9aca48d..81eb9a9688 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WorldChatPoints extends AbstractStatEffect { - public WorldChatPoints(StatsSet params) + public WorldChatPoints(StatSet params) { super(params, Stat.WORLD_CHAT_POINTS); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java index 5a3842921d..127dadf9d2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class BuildAdvanceBaseSkillCondition implements ISkillCondition { - public BuildAdvanceBaseSkillCondition(StatsSet params) + public BuildAdvanceBaseSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java index a9dd2b9eba..ffb7d13539 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class BuildCampSkillCondition implements ISkillCondition { - public BuildCampSkillCondition(StatsSet params) + public BuildCampSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java index c1220c828a..aca51bafbf 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanAddMaxEntranceInzoneSkillCondition implements ISkillCondition { - public CanAddMaxEntranceInzoneSkillCondition(StatsSet params) + public CanAddMaxEntranceInzoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java index eddd45771c..6ac3c2e199 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ public class CanBookmarkAddSlotSkillCondition implements ISkillCondition { private final int _teleportBookmarkSlots; - public CanBookmarkAddSlotSkillCondition(StatsSet params) + public CanBookmarkAddSlotSkillCondition(StatSet params) { _teleportBookmarkSlots = params.getInt("teleportBookmarkSlots"); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java index 30fdb7f36f..ee1bf96e69 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanChangeVitalItemCountSkillCondition implements ISkillCondition { - public CanChangeVitalItemCountSkillCondition(StatsSet params) + public CanChangeVitalItemCountSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java index da553a6d9f..48e28e7af7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanEnchantAttributeSkillCondition implements ISkillCondition { - public CanEnchantAttributeSkillCondition(StatsSet params) + public CanEnchantAttributeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java index c14f1ffe64..2908994776 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanMountForEventSkillCondition implements ISkillCondition { - public CanMountForEventSkillCondition(StatsSet params) + public CanMountForEventSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java index d07aa9a622..9dc5f99592 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShipInstance; @@ -31,7 +31,7 @@ public class CanRefuelAirshipSkillCondition implements ISkillCondition { private final int _amount; - public CanRefuelAirshipSkillCondition(StatsSet params) + public CanRefuelAirshipSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java index d451f3c997..67206b47bd 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanRestoreVitalPointSkillCondition implements ISkillCondition { - public CanRestoreVitalPointSkillCondition(StatsSet params) + public CanRestoreVitalPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java index 7e519025b0..49232af88f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CanSummonCubicSkillCondition implements ISkillCondition { - public CanSummonCubicSkillCondition(StatsSet params) + public CanSummonCubicSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java index 23cca508c1..6610f322f1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class CanSummonMultiSkillCondition implements ISkillCondition { private final int _summonPoints; - public CanSummonMultiSkillCondition(StatsSet params) + public CanSummonMultiSkillCondition(StatSet params) { _summonPoints = params.getInt("summonPoints"); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java index 85419e1e5e..c38566dbdd 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.CharSummonTable; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; */ public class CanSummonPetSkillCondition implements ISkillCondition { - public CanSummonPetSkillCondition(StatsSet params) + public CanSummonPetSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java index ea41a2e22e..3655e158cb 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanSummonSiegeGolemSkillCondition implements ISkillCondition { - public CanSummonSiegeGolemSkillCondition(StatsSet params) + public CanSummonSiegeGolemSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java index 6248c5131f..4d59811c7b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanSummonSkillCondition implements ISkillCondition { - public CanSummonSkillCondition(StatsSet params) + public CanSummonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java index 309da529c9..bd8838d02f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanTransformInDominionSkillCondition implements ISkillCondition { - public CanTransformInDominionSkillCondition(StatsSet params) + public CanTransformInDominionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java index 81297944f1..2f4d780cab 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class CanTransformSkillCondition implements ISkillCondition // TODO: What to do with this? // private final int _transformId; - public CanTransformSkillCondition(StatsSet params) + public CanTransformSkillCondition(StatSet params) { // _transformId = params.getInt("transformId"); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java index 800d0375be..771873a553 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanUntransformSkillCondition implements ISkillCondition { - public CanUntransformSkillCondition(StatsSet params) + public CanUntransformSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java index e651b3b1d5..ffe2e4a026 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class CanUseInBattlefieldSkillCondition implements ISkillCondition { - public CanUseInBattlefieldSkillCondition(StatsSet params) + public CanUseInBattlefieldSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java index 5ff751abce..ba030b97a4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanUseInDragonLairSkillCondition implements ISkillCondition { - public CanUseInDragonLairSkillCondition(StatsSet params) + public CanUseInDragonLairSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java index 4d914c28fe..8a0cb18ac7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class CanUseSwoopCannonSkillCondition implements ISkillCondition { - public CanUseSwoopCannonSkillCondition(StatsSet params) + public CanUseSwoopCannonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java index 6a2d832a4c..e9996580fc 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanUseVitalityConsumeItemSkillCondition implements ISkillCondition { - public CanUseVitalityConsumeItemSkillCondition(StatsSet params) + public CanUseVitalityConsumeItemSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java index f694956e7e..48dafb46c3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class CannotUseInTransformSkillCondition implements ISkillCondition { private final int _transformId; - public CannotUseInTransformSkillCondition(StatsSet params) + public CannotUseInTransformSkillCondition(StatSet params) { _transformId = params.getInt("transformId", -1); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java index 141c69322f..6591233504 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -32,7 +32,7 @@ public class CheckLevelSkillCondition implements ISkillCondition private final int _maxLevel; private final SkillConditionAffectType _affectType; - public CheckLevelSkillCondition(StatsSet params) + public CheckLevelSkillCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java index 15163a3373..d72f463c4e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class CheckSexSkillCondition implements ISkillCondition { private final boolean _isFemale; - public CheckSexSkillCondition(StatsSet params) + public CheckSexSkillCondition(StatSet params) { _isFemale = params.getBoolean("isFemale"); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java index 8dee11ef9c..12e49c23a7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConsumeBodySkillCondition implements ISkillCondition { - public ConsumeBodySkillCondition(StatsSet params) + public ConsumeBodySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java index c24da9ebcd..ba1b1cdd5f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class EnergySavedSkillCondition implements ISkillCondition { private final int _amount; - public EnergySavedSkillCondition(StatsSet params) + public EnergySavedSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 192f3487e2..cbaf72bb00 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -35,7 +35,7 @@ public class EquipArmorSkillCondition implements ISkillCondition { private int _armorTypesMask = 0; - public EquipArmorSkillCondition(StatsSet params) + public EquipArmorSkillCondition(StatSet params) { final List armorTypes = params.getEnumList("armorType", ArmorType.class); if (armorTypes != null) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index e5f22008fa..708b4dd1d4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class EquipShieldSkillCondition implements ISkillCondition { - public EquipShieldSkillCondition(StatsSet params) + public EquipShieldSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 4561945254..f733f81f62 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -33,7 +33,7 @@ public class EquipWeaponSkillCondition implements ISkillCondition { private int _weaponTypesMask = 0; - public EquipWeaponSkillCondition(StatsSet params) + public EquipWeaponSkillCondition(StatSet params) { final List weaponTypes = params.getEnumList("weaponType", WeaponType.class); if (weaponTypes != null) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java index 5f77215218..e36c06fa11 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class NotFearedSkillCondition implements ISkillCondition { - public NotFearedSkillCondition(StatsSet params) + public NotFearedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java index b9096cc1a9..b6e7bcd826 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class NotInUnderwaterSkillCondition implements ISkillCondition { - public NotInUnderwaterSkillCondition(StatsSet params) + public NotInUnderwaterSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index eee6ec73e9..18d8dc8a11 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -35,7 +35,7 @@ public class Op2hWeaponSkillCondition implements ISkillCondition { private final List _weaponTypes = new ArrayList<>(); - public Op2hWeaponSkillCondition(StatsSet params) + public Op2hWeaponSkillCondition(StatSet params) { final List weaponTypes = params.getList("weaponType", String.class); if (weaponTypes != null) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 3b91f36fe4..6223172dbc 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; - public OpAffectedBySkillSkillCondition(StatsSet params) + public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java index 2eb561291e..3818df4736 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAgathionEnergySkillCondition implements ISkillCondition { - public OpAgathionEnergySkillCondition(StatsSet params) + public OpAgathionEnergySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java index 76a7ebc5a8..ee2b415021 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.enums.SkillConditionAlignment; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -32,7 +32,7 @@ public class OpAlignmentSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final SkillConditionAlignment _alignment; - public OpAlignmentSkillCondition(StatsSet params) + public OpAlignmentSkillCondition(StatSet params) { _affectType = params.getEnum("affectType", SkillConditionAffectType.class); _alignment = params.getEnum("alignment", SkillConditionAlignment.class); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index 1c83d18f4e..bcc6715bb2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -33,7 +33,7 @@ public class OpBlinkSkillCondition implements ISkillCondition private final int _angle; private final int _range; - public OpBlinkSkillCondition(StatsSet params) + public OpBlinkSkillCondition(StatSet params) { switch (params.getEnum("direction", Position.class)) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java index 5215f86ae6..fde0c7f0f8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpCallPcSkillCondition implements ISkillCondition { - public OpCallPcSkillCondition(StatsSet params) + public OpCallPcSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java index dddafec6f0..1de2a32550 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCanEscapeSkillCondition implements ISkillCondition { - public OpCanEscapeSkillCondition(StatsSet params) + public OpCanEscapeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java index 3f1685a1e0..a87fd8adb6 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCanNotUseAirshipSkillCondition implements ISkillCondition { - public OpCanNotUseAirshipSkillCondition(StatsSet params) + public OpCanNotUseAirshipSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java index 8eec19a568..ac7a81c015 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCannotUseTargetWithPrivateStoreSkillCondition implements ISkillCondition { - public OpCannotUseTargetWithPrivateStoreSkillCondition(StatsSet params) + public OpCannotUseTargetWithPrivateStoreSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 91de0adc8c..4030b79d00 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Weapon; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpChangeWeaponSkillCondition implements ISkillCondition { - public OpChangeWeaponSkillCondition(StatsSet params) + public OpChangeWeaponSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java index c2de03de1e..3e304e7d9d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.AbnormalType; @@ -34,7 +34,7 @@ public class OpCheckAbnormalSkillCondition implements ISkillCondition private final boolean _hasAbnormal; private final SkillConditionAffectType _affectType; - public OpCheckAbnormalSkillCondition(StatsSet params) + public OpCheckAbnormalSkillCondition(StatSet params) { _type = params.getEnum("type", AbnormalType.class); _level = params.getInt("level"); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java index 65084182b1..c70b58dc50 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCheckAccountTypeSkillCondition implements ISkillCondition { - public OpCheckAccountTypeSkillCondition(StatsSet params) + public OpCheckAccountTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java index 3d4f0a58a0..11eb804274 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpCheckCastRangeSkillCondition implements ISkillCondition { private final int _distance; - public OpCheckCastRangeSkillCondition(StatsSet params) + public OpCheckCastRangeSkillCondition(StatSet params) { _distance = params.getInt("distance"); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java index 7e2e391595..03af1ac63d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.ClassId; @@ -35,7 +35,7 @@ public class OpCheckClassListSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final boolean _isWithin; - public OpCheckClassListSkillCondition(StatsSet params) + public OpCheckClassListSkillCondition(StatSet params) { _classIds = params.getEnumList("classIds", ClassId.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java index 9f779f937a..9702804304 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.ClassId; @@ -33,7 +33,7 @@ public class OpCheckClassSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final boolean _isWithin; - public OpCheckClassSkillCondition(StatsSet params) + public OpCheckClassSkillCondition(StatSet params) { _classId = params.getEnum("classId", ClassId.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java index 3bf6b65dc8..ad997dced7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckCrtEffectSkillCondition implements ISkillCondition { - public OpCheckCrtEffectSkillCondition(StatsSet params) + public OpCheckCrtEffectSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java index 61c3aa66a4..c0bb54afe0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class OpCheckFlagSkillCondition implements ISkillCondition { - public OpCheckFlagSkillCondition(StatsSet params) + public OpCheckFlagSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java index 75af2ab89a..2e0c07d040 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckOnGoingEventCampaignSkillCondition implements ISkillCondition { - public OpCheckOnGoingEventCampaignSkillCondition(StatsSet params) + public OpCheckOnGoingEventCampaignSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java index c64f7c6722..f11569f43c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckPcbangPointSkillCondition implements ISkillCondition { - public OpCheckPcbangPointSkillCondition(StatsSet params) + public OpCheckPcbangPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java index 252519f7ff..997a4d0fec 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.data.xml.impl.ClanHallData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -35,7 +35,7 @@ public class OpCheckResidenceSkillCondition implements ISkillCondition private final List _residencesId; private final boolean _isWithin; - public OpCheckResidenceSkillCondition(StatsSet params) + public OpCheckResidenceSkillCondition(StatSet params) { _residencesId = params.getList("residencesId", Integer.class); _isWithin = params.getBoolean("isWithin"); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java index 6abeed7d35..3a1bcf424c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -34,7 +34,7 @@ public class OpCheckSkillListSkillCondition implements ISkillCondition private final List _skillIds; private final SkillConditionAffectType _affectType; - public OpCheckSkillListSkillCondition(StatsSet params) + public OpCheckSkillListSkillCondition(StatSet params) { _skillIds = params.getList("skillIds", Integer.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java index 984338b2c0..af563d983f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpCheckSkillSkillCondition implements ISkillCondition private final int _skillId; private final SkillConditionAffectType _affectType; - public OpCheckSkillSkillCondition(StatsSet params) + public OpCheckSkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java index ea882c3635..5d85a2dbdb 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionCompanionType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpCompanionSkillCondition implements ISkillCondition { private final SkillConditionCompanionType _type; - public OpCompanionSkillCondition(StatsSet params) + public OpCompanionSkillCondition(StatSet params) { _type = params.getEnum("type", SkillConditionCompanionType.class); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java index 069b9d1759..464853c00c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpEnchantRangeSkillCondition implements ISkillCondition { - public OpEnchantRangeSkillCondition(StatsSet params) + public OpEnchantRangeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java index 99f22bb16a..e12f3ae007 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class OpEncumberedSkillCondition implements ISkillCondition private final int _slotsPercent; private final int _weightPercent; - public OpEncumberedSkillCondition(StatsSet params) + public OpEncumberedSkillCondition(StatSet params) { _slotsPercent = params.getInt("slotsPercent"); _weightPercent = params.getInt("weightPercent"); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java index 187dfba744..49cf8e2cb8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpEnergyMaxSkillCondition implements ISkillCondition { private final int _amount; - public OpEnergyMaxSkillCondition(StatsSet params) + public OpEnergyMaxSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 75bdf465e0..82eb70b770 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class OpEquipItemSkillCondition implements ISkillCondition private final int _itemId; private final SkillConditionAffectType _affectType; - public OpEquipItemSkillCondition(StatsSet params) + public OpEquipItemSkillCondition(StatSet params) { _itemId = params.getInt("itemId"); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java index 2c4576c2fa..fa6e82082b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ public class OpExistNpcSkillCondition implements ISkillCondition private final int _range; private final boolean _isAround; - public OpExistNpcSkillCondition(StatsSet params) + public OpExistNpcSkillCondition(StatSet params) { _npcIds = params.getList("npcIds", Integer.class); _range = params.getInt("range"); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java index 27cc3e90a9..8299b40047 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingCastSkillCondition implements ISkillCondition { - public OpFishingCastSkillCondition(StatsSet params) + public OpFishingCastSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java index 84cc031a24..4b43eb834e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingPumpingSkillCondition implements ISkillCondition { - public OpFishingPumpingSkillCondition(StatsSet params) + public OpFishingPumpingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java index 86aa667bee..a6a400f96f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingReelingSkillCondition implements ISkillCondition { - public OpFishingReelingSkillCondition(StatsSet params) + public OpFishingReelingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java index d22733df7e..50e6dafb82 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpHaveSummonSkillCondition implements ISkillCondition { - public OpHaveSummonSkillCondition(StatsSet params) + public OpHaveSummonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 2e854ca2b8..cceb4e937b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { private final int _npcId; - public OpHaveSummonedNpcSkillCondition(StatsSet params) + public OpHaveSummonedNpcSkillCondition(StatSet params) { _npcId = params.getInt("npcId"); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java index 16932ce531..374a75bfab 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.impl.ClanHallData; import org.l2jmobius.gameserver.enums.ResidenceType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -34,7 +34,7 @@ public class OpHomeSkillCondition implements ISkillCondition { private final ResidenceType _type; - public OpHomeSkillCondition(StatsSet params) + public OpHomeSkillCondition(StatSet params) { _type = params.getEnum("type", ResidenceType.class); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java index 9482a0bf55..62ad48bdcc 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpInSiegeTimeSkillCondition implements ISkillCondition { - public OpInSiegeTimeSkillCondition(StatsSet params) + public OpInSiegeTimeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java index 1bffdacd6c..f2fb298398 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -30,7 +30,7 @@ public class OpInstantzoneSkillCondition implements ISkillCondition { private final int _instanceId; - public OpInstantzoneSkillCondition(StatsSet params) + public OpInstantzoneSkillCondition(StatSet params) { _instanceId = params.getInt("instanceId"); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java index 76703cc53b..7418ef9b64 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpMainjobSkillCondition implements ISkillCondition { - public OpMainjobSkillCondition(StatsSet params) + public OpMainjobSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java index d4c9f1f331..3c81369bbb 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNeedAgathionSkillCondition implements ISkillCondition { - public OpNeedAgathionSkillCondition(StatsSet params) + public OpNeedAgathionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java index 96f6774f25..e7a477b0ee 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; @@ -34,7 +34,7 @@ public class OpNeedSummonOrPetSkillCondition implements ISkillCondition { private final List _npcIds = new ArrayList<>(); - public OpNeedSummonOrPetSkillCondition(StatsSet params) + public OpNeedSummonOrPetSkillCondition(StatSet params) { final List npcIds = params.getList("npcIds", String.class); if (npcIds != null) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java index 9701002065..ae1edfd719 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotCursedSkillCondition implements ISkillCondition { - public OpNotCursedSkillCondition(StatsSet params) + public OpNotCursedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInCeremonyOfChaosSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInCeremonyOfChaosSkillCondition.java index 9549fdc2ac..b5cefc61cc 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInCeremonyOfChaosSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInCeremonyOfChaosSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotInCeremonyOfChaosSkillCondition implements ISkillCondition { - public OpNotInCeremonyOfChaosSkillCondition(StatsSet params) + public OpNotInCeremonyOfChaosSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java index bf909425d8..1de79f388a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpNotInPeacezoneSkillCondition implements ISkillCondition { - public OpNotInPeacezoneSkillCondition(StatsSet params) + public OpNotInPeacezoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java index 0752ba4a6a..0d3e4cb4dd 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotInstantzoneSkillCondition implements ISkillCondition { - public OpNotInstantzoneSkillCondition(StatsSet params) + public OpNotInstantzoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java index 45891cd0ac..7ea02159ba 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotOlympiadSkillCondition implements ISkillCondition { - public OpNotOlympiadSkillCondition(StatsSet params) + public OpNotOlympiadSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java index 5c5d293ae8..2397a68e99 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpNotTerritorySkillCondition implements ISkillCondition { - public OpNotTerritorySkillCondition(StatsSet params) + public OpNotTerritorySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java index 874872bb2e..d9f8c1fa3b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpPeacezoneSkillCondition implements ISkillCondition { - public OpPeacezoneSkillCondition(StatsSet params) + public OpPeacezoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java index c20c4665bb..08d6bb095a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpPkcountSkillCondition implements ISkillCondition { private final SkillConditionAffectType _affectType; - public OpPkcountSkillCondition(StatsSet params) + public OpPkcountSkillCondition(StatSet params) { _affectType = params.getEnum("affectType", SkillConditionAffectType.class); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java index 879fc88c4c..d393c5ddc3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -30,7 +30,7 @@ public class OpPledgeSkillCondition implements ISkillCondition { private final int _level; - public OpPledgeSkillCondition(StatsSet params) + public OpPledgeSkillCondition(StatSet params) { _level = params.getInt("level"); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java index 9adc89b98d..adf16f8feb 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpRestartPointSkillCondition implements ISkillCondition { - public OpRestartPointSkillCondition(StatsSet params) + public OpRestartPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java index bbd1d9d7d1..6874091ba2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class OpResurrectionSkillCondition implements ISkillCondition { - public OpResurrectionSkillCondition(StatsSet params) + public OpResurrectionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java index 8bbf796ad2..566f935a50 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpSiegeHammerSkillCondition implements ISkillCondition { - public OpSiegeHammerSkillCondition(StatsSet params) + public OpSiegeHammerSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java index be3ad18e05..cbfc1a25b2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition private final int _skillId; private final boolean _hasLearned; - public OpSkillAcquireSkillCondition(StatsSet params) + public OpSkillAcquireSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _hasLearned = params.getBoolean("hasLearned"); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java index c8789d28e4..a8382b83b3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpSkillSkillCondition implements ISkillCondition private final int _skillLevel; private final boolean _hasLearned; - public OpSkillSkillCondition(StatsSet params) + public OpSkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _skillLevel = params.getInt("skillLevel"); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java index 5127071683..a3d188f3eb 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpSocialClassSkillCondition implements ISkillCondition { private final int _socialClass; - public OpSocialClassSkillCondition(StatsSet params) + public OpSocialClassSkillCondition(StatSet params) { _socialClass = params.getInt("socialClass"); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java index b9d37d18c0..c86984a218 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class OpSoulMaxSkillCondition implements ISkillCondition { - public OpSoulMaxSkillCondition(StatsSet params) + public OpSoulMaxSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java index 4780c13a58..0faa676bbe 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpSubjobSkillCondition implements ISkillCondition { - public OpSubjobSkillCondition(StatsSet params) + public OpSubjobSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java index 17a9a1a9e3..a14192847a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.concurrent.atomic.AtomicBoolean; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpSweeperSkillCondition implements ISkillCondition { - public OpSweeperSkillCondition(StatsSet params) + public OpSweeperSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java index b36585bf00..c4b3923e92 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTargetAllItemTypeSkillCondition implements ISkillCondition { - public OpTargetAllItemTypeSkillCondition(StatsSet params) + public OpTargetAllItemTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 6b85389d62..5492e96e1a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTargetArmorTypeSkillCondition implements ISkillCondition { - public OpTargetArmorTypeSkillCondition(StatsSet params) + public OpTargetArmorTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java index 0c0090fbc4..97e07a1822 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpTargetDoorSkillCondition implements ISkillCondition { private final List _doorIds; - public OpTargetDoorSkillCondition(StatsSet params) + public OpTargetDoorSkillCondition(StatSet params) { _doorIds = params.getList("doorIds", Integer.class); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java index 6fbc3cda10..eaabf4a73d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpTargetMyPledgeAcademySkillCondition implements ISkillCondition { - public OpTargetMyPledgeAcademySkillCondition(StatsSet params) + public OpTargetMyPledgeAcademySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java index d5820600dd..14a744613d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpTargetNpcSkillCondition implements ISkillCondition { private final List _npcId; - public OpTargetNpcSkillCondition(StatsSet params) + public OpTargetNpcSkillCondition(StatSet params) { _npcId = params.getList("npcIds", Integer.class); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java index 854225a75a..b0c5e50ae3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpTargetPcSkillCondition implements ISkillCondition { - public OpTargetPcSkillCondition(StatsSet params) + public OpTargetPcSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index 7faecb2ffd..62fd4b365f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Weapon; @@ -34,7 +34,7 @@ public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition { private final List _weaponTypes = new ArrayList<>(); - public OpTargetWeaponAttackTypeSkillCondition(StatsSet params) + public OpTargetWeaponAttackTypeSkillCondition(StatSet params) { final List weaponTypes = params.getList("weaponType", String.class); if (weaponTypes != null) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java index 8451365885..e114c03412 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTerritorySkillCondition implements ISkillCondition { - public OpTerritorySkillCondition(StatsSet params) + public OpTerritorySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java index 13f287687e..fde1293086 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpUnlockSkillCondition implements ISkillCondition { - public OpUnlockSkillCondition(StatsSet params) + public OpUnlockSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java index 8cc76a34bb..46dea5bbcb 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpUseFirecrackerSkillCondition implements ISkillCondition { - public OpUseFirecrackerSkillCondition(StatsSet params) + public OpUseFirecrackerSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java index f3b54bbad7..651dade274 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpUsePraseedSkillCondition implements ISkillCondition { - public OpUsePraseedSkillCondition(StatsSet params) + public OpUsePraseedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java index 890b0fcd5f..dd57df0e13 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.MountType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpWyvernSkillCondition implements ISkillCondition { - public OpWyvernSkillCondition(StatsSet params) + public OpWyvernSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java index 8a4c974840..5ac80d3e62 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class PossessHolythingSkillCondition implements ISkillCondition { - public PossessHolythingSkillCondition(StatsSet params) + public PossessHolythingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java index 8b0fb55554..38b5644fb1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class RemainCpPerSkillCondition implements ISkillCondition private final int _amount; private final SkillConditionPercentType _percentType; - public RemainCpPerSkillCondition(StatsSet params) + public RemainCpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java index 612367a233..1ad96100ad 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -33,7 +33,7 @@ public class RemainHpPerSkillCondition implements ISkillCondition private final SkillConditionPercentType _percentType; private final SkillConditionAffectType _affectType; - public RemainHpPerSkillCondition(StatsSet params) + public RemainHpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java index 5455c1587a..39085349d9 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class RemainMpPerSkillCondition implements ISkillCondition private final int _amount; private final SkillConditionPercentType _percentType; - public RemainMpPerSkillCondition(StatsSet params) + public RemainMpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java index 7de47f103f..6e9e5ad821 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class SoulSavedSkillCondition implements ISkillCondition { private final int _amount; - public SoulSavedSkillCondition(StatsSet params) + public SoulSavedSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java index 0b75a5a623..f4bdbaaecb 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class TargetItemCrystalTypeSkillCondition implements ISkillCondition { - public TargetItemCrystalTypeSkillCondition(StatsSet params) + public TargetItemCrystalTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java index 51502ff209..604a41f904 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.MentorManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMyMenteeSkillCondition implements ISkillCondition { - public TargetMyMenteeSkillCondition(StatsSet params) + public TargetMyMenteeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java index fc621365a9..4bfb496634 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class TargetMyPartySkillCondition implements ISkillCondition { private final boolean _includeMe; - public TargetMyPartySkillCondition(StatsSet params) + public TargetMyPartySkillCondition(StatSet params) { _includeMe = params.getBoolean("includeMe"); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java index 9ebec0e691..d44a1bc8a9 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMyPledgeSkillCondition implements ISkillCondition { - public TargetMyPledgeSkillCondition(StatsSet params) + public TargetMyPledgeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java index f4da8d6079..5045aa3848 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class TargetRaceSkillCondition implements ISkillCondition { private final Race _race; - public TargetRaceSkillCondition(StatsSet params) + public TargetRaceSkillCondition(StatSet params) { _race = params.getEnum("race", Race.class); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java index 55734b03bb..d1aac35879 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -350,7 +350,7 @@ public class ChamberOfDelusion extends AbstractInstance protected void changeRoom(Instance world) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); final List locations = world.getEnterLocations(); int newRoom = params.getInt("currentRoom", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java index 95a96bb16e..bef23aa88c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java @@ -19,7 +19,7 @@ package instances.CrystalCaverns; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -64,12 +64,12 @@ public class CrystalCavernsCoralGarden extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (event) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java index d977f82481..5d6a8dda61 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java @@ -17,7 +17,7 @@ package instances.CrystalCaverns; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -90,13 +90,13 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); - final StatsSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); final int baseId = npcParams.getInt("base_id", -1); switch (event) @@ -156,7 +156,7 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (npc.getId()) { @@ -205,7 +205,7 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); final int baseId = npcParams.getInt("base_id", -1); switch (npc.getId()) @@ -365,7 +365,7 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance { case WATER_CANNON: { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); final int baseId = npcParams.getInt("base_id", -1); if (baseId != 1) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java index b9662a5d06..7624504082 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java @@ -19,7 +19,7 @@ package instances.CrystalCaverns; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -83,12 +83,12 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (event) { @@ -180,7 +180,7 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); switch (npc.getId()) { @@ -224,7 +224,7 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance final Instance instance = receiver.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = receiver.getParameters(); + final StatSet npcParams = receiver.getParameters(); if (eventName.equals(String.valueOf(24220005 + npcParams.getInt("Terri_ID", 0)))) { @@ -265,7 +265,7 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); final int killTarget = instance.getParameters().getInt("KILL_TARGET", 5); int currentKillCount = instance.getParameters().getInt("KILL_COUNT", 0); @@ -377,7 +377,7 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance if (isInInstance(instance) && creature.isPlayer()) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); switch (npc.getId()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java index 0d9724e766..1245a89ed0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -404,7 +404,7 @@ public class DarkCloudMansion extends AbstractInstance { if (CommonUtil.contains(BELETH_SAMPLE, npc.getId())) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); if (!params.getBoolean("blocked", false)) { if (npc.isScriptValue(1)) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java index 85c7a898db..3e913de57d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java @@ -18,7 +18,7 @@ package instances.FaeronTrainingGrounds1; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -273,7 +273,7 @@ public class FaeronTrainingGrounds1 extends AbstractInstance final Instance world = player.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); for (int i = 0; i < MOB_SPAWNS.length; i++) { if (params.getObject("Mob" + i, Npc.class) == null) @@ -295,7 +295,7 @@ public class FaeronTrainingGrounds1 extends AbstractInstance final Instance world = player.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); for (int i = 0; i < MOB_SPAWNS.length; i++) { final Npc mob = params.getObject("Mob" + i, Npc.class); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java index 9a8123b6cf..b038186d7f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java @@ -18,7 +18,7 @@ package instances.FaeronTrainingGrounds2; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -270,7 +270,7 @@ public class FaeronTrainingGrounds2 extends AbstractInstance final Instance world = player.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); for (int i = 0; i < MOB_SPAWNS.length; i++) { if (params.getObject("Mob" + i, Npc.class) == null) @@ -292,7 +292,7 @@ public class FaeronTrainingGrounds2 extends AbstractInstance final Instance world = player.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); for (int i = 0; i < MOB_SPAWNS.length; i++) { final Npc mob = params.getObject("Mob" + i, Npc.class); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java index 20046a664b..54b93c8ccb 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -566,7 +566,7 @@ public class HarnakUndergroundRuins extends AbstractInstance } case 2: { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); final int waveNpc = params.getInt("waveNpcId"); if (world.getAliveNpcs(waveNpc).isEmpty()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaBoss.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaBoss.java index 181f892fbe..3ef76e5f72 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaBoss.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaBoss.java @@ -17,7 +17,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureAttacked; @@ -70,7 +70,7 @@ public class KartiaBoss extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SAY") && npc.isTargetable()) { @@ -107,7 +107,7 @@ public class KartiaBoss extends AbstractNpcAI public void spawnMinions(Npc npc) { - final StatsSet param = npc.getParameters(); + final StatSet param = npc.getParameters(); final int kartiaLevel = param.getInt("cartia_level", 0); final boolean isParty = param.getInt("party_type", 0) == 1; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java index bd312c7fe6..721a32deb0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -97,12 +97,12 @@ public class KartiaHelperAdolph extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if ((instance != null) && event.equals("CHECK_ACTION")) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final PlayerInstance plr = npcVars.getObject("PLAYER_OBJECT", PlayerInstance.class); if (plr != null) { @@ -159,7 +159,7 @@ public class KartiaHelperAdolph extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder skill_01 = instParams.getSkillHolder("adolphHate"); final SkillHolder skill_02 = instParams.getSkillHolder("adolphPunish"); final SkillHolder skill_03 = instParams.getSkillHolder("adolphShield"); @@ -256,7 +256,7 @@ public class KartiaHelperAdolph extends AbstractNpcAI { npc.setTarget(event.getAttacker()); addAttackDesire(npc, (Creature) npc.getTarget()); - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder hateSkill = instParams.getSkillHolder("adolphHate"); if ((hateSkill != null) && SkillCaster.checkUseConditions(npc, hateSkill.getSkill())) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java index e9aada8d07..c87c49ae5b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java @@ -19,7 +19,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -92,7 +92,7 @@ public class KartiaHelperBarton extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if ((instance != null) && event.equals("CHECK_ACTION")) @@ -170,7 +170,7 @@ public class KartiaHelperBarton extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder skill01 = instParams.getSkillHolder("bartonInfinity"); final SkillHolder skill02 = instParams.getSkillHolder("bartonBerserker"); final SkillHolder skill03 = instParams.getSkillHolder("bartonHurricane"); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java index e383a62d49..01edde0bd4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java @@ -26,7 +26,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -115,12 +115,12 @@ public class KartiaHelperElise extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if ((instance != null) && event.equals("CHECK_ACTION")) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final FriendlyNpcInstance adolph = npcVars.getObject("ADOLPH_OBJECT", FriendlyNpcInstance.class); if (!npc.isCastingNow()) { @@ -153,8 +153,8 @@ public class KartiaHelperElise extends AbstractNpcAI final Instance instance = npc.getInstanceWorld(); if (instance != null) { - final StatsSet npcVars = npc.getVariables(); - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet npcVars = npc.getVariables(); + final StatSet instParams = instance.getTemplateParameters(); if (!npc.isCastingNow()) { final PlayerInstance plr = npcVars.getObject("PLAYER_OBJECT", PlayerInstance.class); @@ -248,7 +248,7 @@ public class KartiaHelperElise extends AbstractNpcAI { if (creature.isPlayer() || (creature instanceof FriendlyNpcInstance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); if (creature.isPlayer()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperEliyah.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperEliyah.java index 244110429c..cb3013c46c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperEliyah.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperEliyah.java @@ -18,7 +18,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance; @@ -87,7 +87,7 @@ public class KartiaHelperEliyah extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if ((instance != null) && event.equals("CHECK_ACTION")) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java index 07fe730289..123414862a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java @@ -18,7 +18,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -96,7 +96,7 @@ public class KartiaHelperGuardian extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (instance == null) @@ -183,7 +183,7 @@ public class KartiaHelperGuardian extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder skill01 = instParams.getSkillHolder("guardianSpiritsBlow"); final SkillHolder skill02 = instParams.getSkillHolder("guardianSpiritsWrath"); final int numberOfActiveSkills = 2; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java index 1541261bac..45fdfece27 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java @@ -19,7 +19,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -93,7 +93,7 @@ public class KartiaHelperHayuk extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (instance == null) @@ -176,7 +176,7 @@ public class KartiaHelperHayuk extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder skill01 = instParams.getSkillHolder("hayukPinpointShot"); final SkillHolder skill02 = instParams.getSkillHolder("hayukRecoilShot"); final SkillHolder skill03 = instParams.getSkillHolder("hayukMultipleArrow"); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaSupportTroop.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaSupportTroop.java index bfdc9b4cd3..d17653b8e3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaSupportTroop.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaSupportTroop.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -49,7 +49,7 @@ public class KartiaSupportTroop extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SAY") && !npc.isDead()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java index 0bf65e9c9b..01d0a1ab7a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -273,7 +273,7 @@ public class KartiasLabyrinth extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = (npc != null) ? npc.getInstanceWorld() : player.getInstanceWorld(); if (instance != null) @@ -363,7 +363,7 @@ public class KartiasLabyrinth extends AbstractInstance if (instance != null) { - final StatsSet param = instance.getParameters(); + final StatSet param = instance.getParameters(); if (param.getBoolean("BOSS_KILL_OPEN_DOOR", false) && CommonUtil.contains(MINI_BOSSES, npc.getId())) { instance.setParameter("BOSS_KILL_OPEN_DOOR", true); @@ -562,7 +562,7 @@ public class KartiasLabyrinth extends AbstractInstance private void manageProgressInInstance(Instance instance) { - final StatsSet param = instance.getParameters(); + final StatSet param = instance.getParameters(); final int room = param.getInt("ROOM", 1); final int stage = param.getInt("STAGE", 1); final int wave = param.getInt("WAVE", 1); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java index 5b0129dc4b..e3ab6bdbed 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -451,7 +451,7 @@ public class LabyrinthOfBelis extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (world != null) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java index f9c6c2b1af..7cd9254745 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -445,7 +445,7 @@ public class MemoryOfDisaster extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java index c5ebb7aa47..f1981550e1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java @@ -19,7 +19,7 @@ package instances.MuseumDungeon; import java.util.List; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -161,7 +161,7 @@ public class MuseumDungeon extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); final Attackable toyron = (Attackable) instance.getNpc(TOYRON); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Nursery/Nursery.java index 4e85e49c12..ff1ff2587e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Nursery/Nursery.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Nursery/Nursery.java @@ -19,7 +19,7 @@ package instances.Nursery; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -80,12 +80,12 @@ public class Nursery extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int gameStage = npcVars.getInt("GAME_STAGE", 0); switch (event) @@ -142,7 +142,7 @@ public class Nursery extends AbstractInstance if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int gameStage = npcVars.getInt("GAME_STAGE", 0); switch (gameStage) @@ -200,7 +200,7 @@ public class Nursery extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int gameStage = npcVars.getInt("GAME_STAGE", 0); switch (event) @@ -281,7 +281,7 @@ public class Nursery extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int maguenStatus = npcVars.getInt("MAGUEN_STATUS", 0); switch (maguenStatus) @@ -407,8 +407,8 @@ public class Nursery extends AbstractInstance final Npc gameManager = instance.getNpc(TIE); if (gameManager != null) { - final StatsSet managerVars = gameManager.getVariables(); - final StatsSet npcVars = npc.getVariables(); + final StatSet managerVars = gameManager.getVariables(); + final StatSet npcVars = npc.getVariables(); final int gamePoints = managerVars.getInt("GAME_POINTS", 0); if (gamePoints > 0) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java index 501ea07ad2..1d546871e9 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java @@ -19,7 +19,7 @@ package instances.PailakaInjuredDragon; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -172,7 +172,7 @@ public class PailakaInjuredDragon extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (isInInstance(world)) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java index 8de90bca71..cd31666b75 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java @@ -19,7 +19,7 @@ package instances.PrisonOfDarkness; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -122,12 +122,12 @@ public class PrisonOfDarkness extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (event) { @@ -187,7 +187,7 @@ public class PrisonOfDarkness extends AbstractInstance if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (event) { @@ -327,7 +327,7 @@ public class PrisonOfDarkness extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (npc.getId()) { @@ -360,7 +360,7 @@ public class PrisonOfDarkness extends AbstractInstance if (isInInstance(instance) && (npc.getId() == EXIT_PORTAL)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (npcVars.getInt("PORTAL_STATE", 0)) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java index 415395c724..7d06cdeb54 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java @@ -18,7 +18,7 @@ package instances.TaintedDimension; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -97,7 +97,7 @@ public class TaintedDimension extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java index ea2c993d9d..a5e71ce2ae 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java @@ -18,7 +18,7 @@ package quests.Q10771_VolatilePower; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.quest.Quest; @@ -179,7 +179,7 @@ public class Q10771_VolatilePower extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java index 98953e5ec5..b9ff741914 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java @@ -19,7 +19,7 @@ package quests.Q10772_ReportsFromCrumaTowerPart1; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -160,7 +160,7 @@ public class Q10772_ReportsFromCrumaTowerPart1 extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("DESPAWN_OWL") && (npc != null) && (npc.getId() == MAGIC_OWL)) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java index c5a67dbc68..1e7ffec6b6 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java @@ -19,7 +19,7 @@ package quests.Q10776_TheWrathOfTheGiants; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.quest.Quest; @@ -238,7 +238,7 @@ public class Q10776_TheWrathOfTheGiants extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java index cf9ddf1f88..badb40ec0c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java @@ -19,7 +19,7 @@ package quests.Q10777_ReportsFromCrumaTowerPart2; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -162,7 +162,7 @@ public class Q10777_ReportsFromCrumaTowerPart2 extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if ((npc != null) && (npc.getId() == MAGIC_OWL) && event.equals("DESPAWN_OWL")) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java index 59796b30a1..539b6fbd1b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java @@ -17,7 +17,7 @@ package quests.Q10787_ASpyMission; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -156,7 +156,7 @@ public class Q10787_ASpyMission extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if ((npc != null) && (npc.getId() == SUSPICIOUS_BOX) && event.equals("DESPAWN")) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java index b1d0ec8553..7e9236b634 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.ActionDataHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -57,7 +57,7 @@ public class ActionData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "action", actionNode -> { - final ActionDataHolder holder = new ActionDataHolder(new StatsSet(parseAttributes(actionNode))); + final ActionDataHolder holder = new ActionDataHolder(new StatSet(parseAttributes(actionNode))); _actionData.put(holder.getId(), holder); })); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java index 36002572b0..f7762ab07b 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java @@ -32,7 +32,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.AdminCommandAccessRight; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -72,7 +72,7 @@ public class AdminData implements IXmlReader { NamedNodeMap attrs; Node attr; - StatsSet set; + StatSet set; AccessLevel level; AdminCommandAccessRight command; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -83,7 +83,7 @@ public class AdminData implements IXmlReader { if ("access".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -99,7 +99,7 @@ public class AdminData implements IXmlReader } else if ("admin".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java index b425296a19..6a14a867fc 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java @@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.alchemy.AlchemyCraftData; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -55,7 +55,7 @@ public class AlchemyData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node att; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -67,7 +67,7 @@ public class AlchemyData implements IXmlReader if ("skill".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index 6d25769eab..817f0cabde 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; @@ -83,7 +83,7 @@ public class AppearanceItemData implements IXmlReader { if ("appearance_stone".equalsIgnoreCase(d.getNodeName())) { - final AppearanceStone stone = new AppearanceStone(new StatsSet(parseAttributes(d))); + final AppearanceStone stone = new AppearanceStone(new StatSet(parseAttributes(d))); for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) { switch (c.getNodeName()) @@ -120,7 +120,7 @@ public class AppearanceItemData implements IXmlReader } case "visual": { - stone.addVisualId(new AppearanceHolder(new StatsSet(parseAttributes(c)))); + stone.addVisualId(new AppearanceHolder(new StatSet(parseAttributes(c)))); } } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java index 6c96d3874a..6eac3240e7 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -64,7 +64,7 @@ public class AttendanceRewardData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "item", rewardNode -> { - final StatsSet set = new StatsSet(parseAttributes(rewardNode)); + final StatSet set = new StatSet(parseAttributes(rewardNode)); final int itemId = set.getInt("id"); final int itemCount = set.getInt("count"); if (ItemTable.getInstance().getTemplate(itemId) == null) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java index 891d19fcf2..3054b0e7ef 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.beautyshop.BeautyData; import org.l2jmobius.gameserver.model.beautyshop.BeautyItem; @@ -56,7 +56,7 @@ public class BeautyShopData implements IXmlReader public void parseDocument(Document doc, File f) { NamedNodeMap attrs; - StatsSet set; + StatSet set; Node att; Race race = null; Sex sex = null; @@ -92,7 +92,7 @@ public class BeautyShopData implements IXmlReader if ("hair".equalsIgnoreCase(a.getNodeName())) { attrs = a.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -105,7 +105,7 @@ public class BeautyShopData implements IXmlReader if ("color".equalsIgnoreCase(g.getNodeName())) { attrs = g.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -119,7 +119,7 @@ public class BeautyShopData implements IXmlReader else if ("face".equalsIgnoreCase(a.getNodeName())) { attrs = a.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java index 37e977c51e..530a5d975a 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java @@ -34,7 +34,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.entity.ClanHall; @@ -66,7 +66,7 @@ public class ClanHallData implements IXmlReader final List doors = new ArrayList<>(); final List npcs = new ArrayList<>(); final List teleports = new ArrayList<>(); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); for (Node listNode = doc.getFirstChild(); listNode != null; listNode = listNode.getNextSibling()) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java index ae608cefb6..f1a23734e0 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.combination.CombinationItem; import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; @@ -57,7 +57,7 @@ public class CombinationItemsData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "item", itemNode -> { - final CombinationItem item = new CombinationItem(new StatsSet(parseAttributes(itemNode))); + final CombinationItem item = new CombinationItem(new StatSet(parseAttributes(itemNode))); forEach(itemNode, "reward", rewardNode -> { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java index 038738b138..4af039b48d 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.CubicSkill; import org.l2jmobius.gameserver.model.cubic.ICubicConditionHolder; @@ -61,7 +61,7 @@ public class CubicData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - forEach(doc, "list", listNode -> forEach(listNode, "cubic", cubicNode -> parseTemplate(cubicNode, new CubicTemplate(new StatsSet(parseAttributes(cubicNode)))))); + forEach(doc, "list", listNode -> forEach(listNode, "cubic", cubicNode -> parseTemplate(cubicNode, new CubicTemplate(new StatSet(parseAttributes(cubicNode)))))); } /** @@ -137,7 +137,7 @@ public class CubicData implements IXmlReader { forEach(cubicNode, "skill", skillNode -> { - final CubicSkill skill = new CubicSkill(new StatsSet(parseAttributes(skillNode))); + final CubicSkill skill = new CubicSkill(new StatSet(parseAttributes(skillNode))); forEach(cubicNode, "conditions", conditionNode -> parseConditions(cubicNode, template, skill)); template.getSkills().add(skill); }); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java index 3d19bee079..ede9b72202 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -62,7 +62,7 @@ public class DailyMissionData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "reward", rewardNode -> { - final StatsSet set = new StatsSet(parseAttributes(rewardNode)); + final StatSet set = new StatSet(parseAttributes(rewardNode)); final List items = new ArrayList<>(1); forEach(rewardNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> @@ -80,14 +80,14 @@ public class DailyMissionData implements IXmlReader // Initial values in case handler doesn't exists set.set("handler", ""); - set.set("params", StatsSet.EMPTY_STATSET); + set.set("params", StatSet.EMPTY_STATSET); // Parse handler and parameters forEach(rewardNode, "handler", handlerNode -> { set.set("handler", parseString(handlerNode.getAttributes(), "name")); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); set.set("params", params); forEach(handlerNode, "param", paramNode -> params.set(parseString(paramNode.getAttributes(), "name"), paramNode.getTextContent())); }); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java index 835eab4fe9..53248de524 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java @@ -35,7 +35,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -51,7 +51,7 @@ public class DoorData implements IXmlReader // Info holders private final Map> _groups = new HashMap<>(); private final Map _doors = new HashMap<>(); - private final Map _templates = new HashMap<>(); + private final Map _templates = new HashMap<>(); private final Map> _regions = new HashMap<>(); protected DoorData() @@ -75,9 +75,9 @@ public class DoorData implements IXmlReader LOGGER.info(getClass().getSimpleName() + ": Loaded " + _doors.size() + " Door Templates for " + _regions.size() + " regions."); } - public StatsSet parseDoor(Node doorNode) + public StatSet parseDoor(Node doorNode) { - final StatsSet params = new StatsSet(parseAttributes(doorNode)); + final StatSet params = new StatSet(parseAttributes(doorNode)); params.set("baseHpMax", 1); // Avoid doors without HP value created dead due to default value 0 in CreatureTemplate forEach(doorNode, IXmlReader::isNode, innerDoorNode -> @@ -115,7 +115,7 @@ public class DoorData implements IXmlReader /** * @param set */ - private void applyCollisions(StatsSet set) + private void applyCollisions(StatSet set) { // Insert Collision data if (set.contains("nodeX_0") && set.contains("nodeY_0") && set.contains("nodeX_1") && set.contains("nodeY_1")) @@ -142,7 +142,7 @@ public class DoorData implements IXmlReader * @param set * @return */ - public DoorInstance spawnDoor(StatsSet set) + public DoorInstance spawnDoor(StatSet set) { // Create door template + door instance final DoorTemplate template = new DoorTemplate(set); @@ -183,7 +183,7 @@ public class DoorData implements IXmlReader return door; } - public StatsSet getDoorTemplate(int doorId) + public StatSet getDoorTemplate(int doorId) { return _templates.get(doorId); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java index eca42a9a34..637ef1e953 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -64,7 +64,7 @@ public class EnchantItemData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node att; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -76,7 +76,7 @@ public class EnchantItemData implements IXmlReader if ("enchant".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -107,7 +107,7 @@ public class EnchantItemData implements IXmlReader else if ("support".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java index 46701fd777..bb1e8026b7 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.SkillEnchantType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.EnchantSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -69,10 +69,10 @@ public class EnchantSkillGroupsData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "enchant", enchantNode -> { - final EnchantSkillHolder enchantSkillHolder = new EnchantSkillHolder(new StatsSet(parseAttributes(enchantNode))); + final EnchantSkillHolder enchantSkillHolder = new EnchantSkillHolder(new StatSet(parseAttributes(enchantNode))); forEach(enchantNode, "sps", spsNode -> forEach(spsNode, "sp", spNode -> enchantSkillHolder.addSp(parseEnum(spNode.getAttributes(), SkillEnchantType.class, "type"), parseInteger(spNode.getAttributes(), "amount")))); forEach(enchantNode, "chances", chancesNode -> forEach(chancesNode, "chance", chanceNode -> enchantSkillHolder.addChance(parseEnum(chanceNode.getAttributes(), SkillEnchantType.class, "type"), parseInteger(chanceNode.getAttributes(), "value")))); - forEach(enchantNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> enchantSkillHolder.addRequiredItem(parseEnum(itemNode.getAttributes(), SkillEnchantType.class, "type"), new ItemHolder(new StatsSet(parseAttributes(itemNode)))))); + forEach(enchantNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> enchantSkillHolder.addRequiredItem(parseEnum(itemNode.getAttributes(), SkillEnchantType.class, "type"), new ItemHolder(new StatSet(parseAttributes(itemNode)))))); _enchantSkillHolders.put(parseInteger(enchantNode.getAttributes(), "level"), enchantSkillHolder); })); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java index a8bb0397ac..037af7e1ae 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java @@ -34,7 +34,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.eventengine.AbstractEventManager; import org.l2jmobius.gameserver.model.eventengine.EventMethodNotification; import org.l2jmobius.gameserver.model.eventengine.EventScheduler; @@ -156,7 +156,7 @@ public class EventEngineData implements IXmlReader */ private void parseVariables(AbstractEventManager eventManager, Node innerNode) { - final StatsSet variables = new StatsSet(LinkedHashMap::new); + final StatSet variables = new StatSet(LinkedHashMap::new); for (Node variableNode = innerNode.getFirstChild(); variableNode != null; variableNode = variableNode.getNextSibling()) { if ("variable".equals(variableNode.getNodeName())) @@ -188,7 +188,7 @@ public class EventEngineData implements IXmlReader { if ("schedule".equals(scheduleNode.getNodeName())) { - final StatsSet params = new StatsSet(LinkedHashMap::new); + final StatSet params = new StatSet(LinkedHashMap::new); final NamedNodeMap attrs = scheduleNode.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -235,7 +235,7 @@ public class EventEngineData implements IXmlReader } else if ("conditionalSchedule".equals(scheduleNode.getNodeName())) { - final StatsSet params = new StatsSet(LinkedHashMap::new); + final StatSet params = new StatSet(LinkedHashMap::new); final NamedNodeMap attrs = scheduleNode.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -346,7 +346,7 @@ public class EventEngineData implements IXmlReader * @param variableNode */ @SuppressWarnings("unchecked") - private void parseListVariables(AbstractEventManager eventManager, StatsSet variables, Node variableNode) + private void parseListVariables(AbstractEventManager eventManager, StatSet variables, Node variableNode) { final String name = parseString(variableNode.getAttributes(), "name"); final String type = parseString(variableNode.getAttributes(), "type"); @@ -419,7 +419,7 @@ public class EventEngineData implements IXmlReader * @param variableNode */ @SuppressWarnings("unchecked") - private void parseMapVariables(AbstractEventManager eventManager, StatsSet variables, Node variableNode) + private void parseMapVariables(AbstractEventManager eventManager, StatSet variables, Node variableNode) { final String name = parseString(variableNode.getAttributes(), "name"); final String keyType = parseString(variableNode.getAttributes(), "keyType"); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java index db19c5fdff..0724877d9d 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.ConditionHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.ICondition; import org.l2jmobius.gameserver.model.holders.ExtendDropDataHolder; import org.l2jmobius.gameserver.model.holders.ExtendDropItemHolder; @@ -62,7 +62,7 @@ public class ExtendDropData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "drop", dropNode -> { - final StatsSet set = new StatsSet(parseAttributes(dropNode)); + final StatSet set = new StatSet(parseAttributes(dropNode)); final List items = new ArrayList<>(1); forEach(dropNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> @@ -80,8 +80,8 @@ public class ExtendDropData implements IXmlReader forEach(dropNode, "conditions", conditionsNode -> forEach(conditionsNode, "condition", conditionNode -> { final String conditionName = parseString(conditionNode.getAttributes(), "name"); - final StatsSet params = (StatsSet) parseValue(conditionNode); - final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); + final StatSet params = (StatSet) parseValue(conditionNode); + final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); if (conditionFunction != null) { conditions.add(conditionFunction.apply(params)); @@ -109,7 +109,7 @@ public class ExtendDropData implements IXmlReader private Object parseValue(Node node) { - StatsSet statsSet = null; + StatSet statSet = null; List list = null; Object text = null; for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) @@ -145,12 +145,12 @@ public class ExtendDropData implements IXmlReader final Object value = parseValue(node); if (value != null) { - if (statsSet == null) + if (statSet == null) { - statsSet = new StatsSet(); + statSet = new StatSet(); } - statsSet.set(nodeName, value); + statSet.set(nodeName, value); } } } @@ -161,9 +161,9 @@ public class ExtendDropData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", list); + statSet.set(".", list); } else { @@ -176,16 +176,16 @@ public class ExtendDropData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", text); + statSet.set(".", text); } else { return text; } } - return statsSet; + return statSet; } public ExtendDropDataHolder getExtendDropById(int id) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java index 57a16d6390..608f4702b8 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.FakePlayerHolder; @@ -72,7 +72,7 @@ public class FakePlayerData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayer", fakePlayerNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerNode)); final int npcId = set.getInt("npcId"); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); final String name = template.getName(); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java index 18cc499b71..a5ade27c03 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.FenceState; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldRegion; import org.l2jmobius.gameserver.model.actor.instance.FenceInstance; @@ -79,7 +79,7 @@ public class FenceData implements IXmlReader private void spawnFence(Node fenceNode) { - final StatsSet set = new StatsSet(parseAttributes(fenceNode)); + final StatSet set = new StatSet(parseAttributes(fenceNode)); spawnFence(set.getInt("x"), set.getInt("y"), set.getInt("z"), set.getString("name"), set.getInt("width"), set.getInt("length"), set.getInt("height"), 0, set.getEnum("state", FenceState.class, FenceState.CLOSED)); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java index 67dd4e396b..02efb756f2 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.Henna; import org.l2jmobius.gameserver.model.skills.Skill; @@ -86,7 +86,7 @@ public class HennaData implements IXmlReader */ private void parseHenna(Node d) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final List wearClassIds = new ArrayList<>(); final List skills = new ArrayList<>(); NamedNodeMap attrs = d.getAttributes(); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java index 03ad8ab79e..d81e85948d 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; @@ -93,7 +93,7 @@ public class InitialEquipmentData implements IXmlReader { if ("item".equalsIgnoreCase(c.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java index 72080aa4ac..54b1909d60 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemPointHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; @@ -55,17 +55,17 @@ public class LuckyGameData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "luckygame", rewardNode -> { - final LuckyGameDataHolder holder = new LuckyGameDataHolder(new StatsSet(parseAttributes(rewardNode))); + final LuckyGameDataHolder holder = new LuckyGameDataHolder(new StatSet(parseAttributes(rewardNode))); forEach(rewardNode, "common_reward", commonRewardNode -> forEach(commonRewardNode, "item", itemNode -> { - final StatsSet stats = new StatsSet(parseAttributes(itemNode)); + final StatSet stats = new StatSet(parseAttributes(itemNode)); holder.addCommonReward(new ItemChanceHolder(stats.getInt("id"), stats.getDouble("chance"), stats.getLong("count"))); })); forEach(rewardNode, "unique_reward", uniqueRewardNode -> forEach(uniqueRewardNode, "item", itemNode -> { - holder.addUniqueReward(new ItemPointHolder(new StatsSet(parseAttributes(itemNode)))); + holder.addUniqueReward(new ItemPointHolder(new StatSet(parseAttributes(itemNode)))); })); forEach(rewardNode, "modify_reward", uniqueRewardNode -> @@ -74,7 +74,7 @@ public class LuckyGameData implements IXmlReader holder.setMaxModifyRewardGame(parseInteger(uniqueRewardNode.getAttributes(), "max_game")); forEach(uniqueRewardNode, "item", itemNode -> { - final StatsSet stats = new StatsSet(parseAttributes(itemNode)); + final StatSet stats = new StatSet(parseAttributes(itemNode)); holder.addModifyReward(new ItemChanceHolder(stats.getInt("id"), stats.getDouble("chance"), stats.getLong("count"))); }); }); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java index 75bb48ed37..190653cdec 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java @@ -35,7 +35,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.SpecialItemType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; @@ -90,7 +90,7 @@ public class MultisellData implements IXmlReader { forEach(doc, "list", listNode -> { - final StatsSet set = new StatsSet(parseAttributes(listNode)); + final StatSet set = new StatSet(parseAttributes(listNode)); final int listId = Integer.parseInt(f.getName().substring(0, f.getName().length() - 4)); final List entries = new ArrayList<>(listNode.getChildNodes().getLength()); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java index 12ad0f9f0e..de0567af09 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.enums.AISkillScope; import org.l2jmobius.gameserver.enums.DropType; import org.l2jmobius.gameserver.enums.MpRewardAffectType; import org.l2jmobius.gameserver.enums.MpRewardType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.DropHolder; @@ -95,7 +95,7 @@ public class NpcData implements IXmlReader if ("npc".equalsIgnoreCase(listNode.getNodeName())) { NamedNodeMap attrs = listNode.getAttributes(); - final StatsSet set = new StatsSet(new HashMap<>()); + final StatSet set = new StatSet(new HashMap<>()); final int npcId = parseInteger(attrs, "id"); Map parameters = null; Map skills = null; @@ -511,11 +511,11 @@ public class NpcData implements IXmlReader if (parameters != null) { // Using unmodifiable map parameters of template are not meant to be changed at runtime. - template.setParameters(new StatsSet(Collections.unmodifiableMap(parameters))); + template.setParameters(new StatSet(Collections.unmodifiableMap(parameters))); } else { - template.setParameters(StatsSet.EMPTY_STATSET); + template.setParameters(StatSet.EMPTY_STATSET); } if (skills != null) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java index 3712cca6af..373f87ecfc 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -79,7 +79,7 @@ public class NpcNameLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); NPC_NAME_LOCALISATIONS.get(_lang).put(set.getInt("id"), new String[] { set.getString("name"), diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 55dcd539aa..36c5897ecd 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.EffectHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; @@ -71,7 +71,7 @@ public class OptionData implements IXmlReader forEach(innerNode, "effect", effectNode -> { final String name = parseString(effectNode.getAttributes(), "name"); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); forEach(effectNode, IXmlReader::isNode, paramNode -> params.set(paramNode.getNodeName(), SkillData.getInstance().parseValue(paramNode, true, false, Collections.emptyMap()))); option.addEffect(EffectHandler.getInstance().getHandlerFactory(name).apply(params)); }); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java index b1bb74baf6..c893725bc3 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.PetLevelData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * This class parse and hold all pet parameters.
@@ -116,7 +116,7 @@ public class PetDataTable implements IXmlReader if (s.getNodeName().equals("stat")) { final int level = Integer.parseInt(s.getAttributes().getNamedItem("level").getNodeValue()); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (Node bean = s.getFirstChild(); bean != null; bean = bean.getNextSibling()) { if (bean.getNodeName().equals("set")) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java index ab1cb3b257..b646782547 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.base.ClassId; @@ -83,7 +83,7 @@ public class PlayerTemplateData implements IXmlReader } else if ("staticData".equalsIgnoreCase(d.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.set("classId", classId); final List creationPoints = new ArrayList<>(); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java index 34a04edd9b..35b879e73f 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; @@ -83,7 +83,7 @@ public class PrimeShopData implements IXmlReader { NamedNodeMap attrs = d.getAttributes(); Node att; - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java index b7ed4c8fba..43e5d84784 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.RecipeInstance; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.RecipeStatInstance; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; /** @@ -82,7 +82,7 @@ public class RecipeData implements IXmlReader Node att; int id = -1; boolean haveRare = false; - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); att = attrs.getNamedItem("id"); if (att == null) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java index 796f5ae085..9a8397e085 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java @@ -29,7 +29,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate; /** @@ -60,7 +60,7 @@ public class ResidenceFunctionsData implements IXmlReader forEach(doc, "list", list -> forEach(list, "function", func -> { final NamedNodeMap attrs = func.getAttributes(); - final StatsSet set = new StatsSet(HashMap::new); + final StatSet set = new StatSet(HashMap::new); for (int i = 0; i < attrs.getLength(); i++) { final Node node = attrs.item(i); @@ -69,7 +69,7 @@ public class ResidenceFunctionsData implements IXmlReader forEach(func, "function", levelNode -> { final NamedNodeMap levelAttrs = levelNode.getAttributes(); - final StatsSet levelSet = new StatsSet(HashMap::new); + final StatSet levelSet = new StatSet(HashMap::new); levelSet.merge(set); for (int i = 0; i < levelAttrs.getLength(); i++) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java index 053d9089ce..d6b28a5962 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; /** @@ -82,7 +82,7 @@ public class SendMessageLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); SEND_MESSAGE_LOCALISATIONS.get(_lang).put(set.getString("message").split(SPLIT_STRING), set.getString("translation").split(SPLIT_STRING)); })); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java index e473030c56..c3eda1f3b8 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.actor.instance.ShuttleInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; @@ -72,7 +72,7 @@ public class ShuttleData implements IXmlReader public void parseDocument(Document doc, File f) { NamedNodeMap attrs; - StatsSet set; + StatSet set; Node att; ShuttleDataHolder data; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -84,7 +84,7 @@ public class ShuttleData implements IXmlReader if ("shuttle".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -164,7 +164,7 @@ public class ShuttleData implements IXmlReader { for (ShuttleDataHolder data : _shuttles.values()) { - final ShuttleInstance shuttle = new ShuttleInstance(new CreatureTemplate(new StatsSet())); + final ShuttleInstance shuttle = new ShuttleInstance(new CreatureTemplate(new StatSet())); shuttle.setData(data); shuttle.setHeading(data.getLocation().getHeading()); shuttle.setLocationInvisible(data.getLocation()); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java index 9db0b5f64b..ba000649f2 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.SiegeScheduleDate; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.util.Util; /** @@ -54,7 +54,7 @@ public class SiegeScheduleData implements IXmlReader LOGGER.info(getClass().getSimpleName() + ": Loaded " + _scheduleData.size() + " siege schedulers."); if (_scheduleData.isEmpty()) { - _scheduleData.add(new SiegeScheduleDate(new StatsSet())); + _scheduleData.add(new SiegeScheduleDate(new StatSet())); LOGGER.info(getClass().getSimpleName() + ": Emergency loaded " + _scheduleData.size() + " default siege schedulers."); } } @@ -72,7 +72,7 @@ public class SiegeScheduleData implements IXmlReader { case "schedule": { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final NamedNodeMap attrs = cd.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java index cc019c4dbb..2592b3ed97 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java @@ -40,7 +40,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.EffectHandler; import org.l2jmobius.gameserver.handler.SkillConditionHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.EffectScope; @@ -67,9 +67,9 @@ public class SkillData implements IXmlReader private final Integer _toLevel; private final Integer _fromSubLevel; private final Integer _toSubLevel; - private final Map> _info; + private final Map> _info; - public NamedParamInfo(String name, Integer fromLevel, Integer toLevel, Integer fromSubLevel, Integer toSubLevel, Map> info) + public NamedParamInfo(String name, Integer fromLevel, Integer toLevel, Integer fromSubLevel, Integer toSubLevel, Map> info) { _name = name; _fromLevel = fromLevel; @@ -104,7 +104,7 @@ public class SkillData implements IXmlReader return _toSubLevel; } - public Map> getInfo() + public Map> getInfo() { return _info; } @@ -241,8 +241,8 @@ public class SkillData implements IXmlReader { NamedNodeMap attributes = listNode.getAttributes(); final Map> levels = new HashMap<>(); - final Map> skillInfo = new HashMap<>(); - final StatsSet generalSkillInfo = skillInfo.computeIfAbsent(-1, k -> new HashMap<>()).computeIfAbsent(-1, k -> new StatsSet()); + final Map> skillInfo = new HashMap<>(); + final StatSet generalSkillInfo = skillInfo.computeIfAbsent(-1, k -> new HashMap<>()).computeIfAbsent(-1, k -> new StatSet()); parseAttributes(attributes, "", generalSkillInfo); @@ -321,7 +321,7 @@ public class SkillData implements IXmlReader { return; } - subLevelMap.forEach((subLevel, statsSet) -> + subLevelMap.forEach((subLevel, statSet) -> { if (subLevel == -1) { @@ -339,7 +339,7 @@ public class SkillData implements IXmlReader { return; } - subLevelMap.forEach((subLevel, statsSet) -> + subLevelMap.forEach((subLevel, statSet) -> { if (subLevel == -1) { @@ -371,31 +371,31 @@ public class SkillData implements IXmlReader levels.forEach((level, subLevels) -> subLevels.forEach(subLevel -> { - final StatsSet statsSet = Optional.ofNullable(skillInfo.getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatsSet::new); - skillInfo.getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(statsSet.getSet()::putIfAbsent); - skillInfo.getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(statsSet.getSet()::putIfAbsent); - statsSet.set(".level", level); - statsSet.set(".subLevel", subLevel); - final Skill skill = new Skill(statsSet); + final StatSet statSet = Optional.ofNullable(skillInfo.getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatSet::new); + skillInfo.getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(statSet.getSet()::putIfAbsent); + skillInfo.getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(statSet.getSet()::putIfAbsent); + statSet.set(".level", level); + statSet.set(".subLevel", subLevel); + final Skill skill = new Skill(statSet); forEachNamedParamInfoParam(effectParamInfo, level, subLevel, ((effectScope, params) -> { final String effectName = params.getString(".name"); params.remove(".name"); try { - final Function effectFunction = EffectHandler.getInstance().getHandlerFactory(effectName); + final Function effectFunction = EffectHandler.getInstance().getHandlerFactory(effectName); if (effectFunction != null) { skill.addEffect(effectScope, effectFunction.apply(params)); } else { - LOGGER.warning(getClass().getSimpleName() + ": Missing effect for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]"); + LOGGER.warning(getClass().getSimpleName() + ": Missing effect for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]"); } } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading effect for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading effect for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]", e); } })); @@ -405,19 +405,19 @@ public class SkillData implements IXmlReader params.remove(".name"); try { - final Function conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName); + final Function conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName); if (conditionFunction != null) { skill.addCondition(skillConditionScope, conditionFunction.apply(params)); } else { - LOGGER.warning(getClass().getSimpleName() + ": Missing condition for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + skillConditionScope + "] Effect Name[" + conditionName + "]"); + LOGGER.warning(getClass().getSimpleName() + ": Missing condition for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + skillConditionScope + "] Effect Name[" + conditionName + "]"); } } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading condition for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Condition Scope[" + skillConditionScope + "] Condition Name[" + conditionName + "]", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading condition for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Condition Scope[" + skillConditionScope + "] Condition Name[" + conditionName + "]", e); } })); @@ -434,16 +434,16 @@ public class SkillData implements IXmlReader } } - private void forEachNamedParamInfoParam(Map> paramInfo, int level, int subLevel, BiConsumer consumer) + private void forEachNamedParamInfoParam(Map> paramInfo, int level, int subLevel, BiConsumer consumer) { paramInfo.forEach((scope, namedParamInfos) -> namedParamInfos.forEach(namedParamInfo -> { if ((((namedParamInfo.getFromLevel() == null) && (namedParamInfo.getToLevel() == null)) || ((namedParamInfo.getFromLevel() <= level) && (namedParamInfo.getToLevel() >= level))) // && (((namedParamInfo.getFromSubLevel() == null) && (namedParamInfo.getToSubLevel() == null)) || ((namedParamInfo.getFromSubLevel() <= subLevel) && (namedParamInfo.getToSubLevel() >= subLevel)))) { - final StatsSet params = Optional.ofNullable(namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatsSet::new); - namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); - namedParamInfo.getInfo().getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); + final StatSet params = Optional.ofNullable(namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatSet::new); + namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); + namedParamInfo.getInfo().getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); params.set(".name", namedParamInfo.getName()); consumer.accept(scope, params); } @@ -460,7 +460,7 @@ public class SkillData implements IXmlReader final Integer subLevel = parseInteger(attributes, "subLevel"); final Integer fromSubLevel = parseInteger(attributes, "fromSubLevel", subLevel); final Integer toSubLevel = parseInteger(attributes, "toSubLevel", subLevel); - final Map> info = new HashMap<>(); + final Map> info = new HashMap<>(); for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) { if (!node.getNodeName().equals("#text")) @@ -471,7 +471,7 @@ public class SkillData implements IXmlReader return new NamedParamInfo(name, fromLevel, toLevel, fromSubLevel, toSubLevel, info); } - private void parseInfo(Node node, Map>> variableValues, Map> info) + private void parseInfo(Node node, Map>> variableValues, Map> info) { Map> values = parseValues(node); final Object generalValue = values.getOrDefault(-1, Collections.emptyMap()).get(-1); @@ -492,7 +492,7 @@ public class SkillData implements IXmlReader } } - values.forEach((level, subLevelMap) -> subLevelMap.forEach((subLevel, value) -> info.computeIfAbsent(level, k -> new HashMap<>()).computeIfAbsent(subLevel, k -> new StatsSet()).set(node.getNodeName(), value))); + values.forEach((level, subLevelMap) -> subLevelMap.forEach((subLevel, value) -> info.computeIfAbsent(level, k -> new HashMap<>()).computeIfAbsent(subLevel, k -> new StatSet()).set(node.getNodeName(), value))); } private Map> parseValues(Node node) @@ -535,7 +535,7 @@ public class SkillData implements IXmlReader variables.put("index", (i - fromLevel) + 1d); variables.put("subIndex", (j - fromSubLevel) + 1d); final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1); - if ((base != null) && !(base instanceof StatsSet)) + if ((base != null) && !(base instanceof StatSet)) { variables.put("base", Double.parseDouble(String.valueOf(base))); } @@ -555,13 +555,13 @@ public class SkillData implements IXmlReader Object parseValue(Node node, boolean blockValue, boolean parseAttributes, Map variables) { - StatsSet statsSet = null; + StatSet statSet = null; List list = null; Object text = null; if (parseAttributes && (!node.getNodeName().equals("value") || !blockValue) && (node.getAttributes().getLength() > 0)) { - statsSet = new StatsSet(); - parseAttributes(node.getAttributes(), "", statsSet, variables); + statSet = new StatSet(); + parseAttributes(node.getAttributes(), "", statSet, variables); } for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) { @@ -604,12 +604,12 @@ public class SkillData implements IXmlReader final Object value = parseValue(node, false, true, variables); if (value != null) { - if (statsSet == null) + if (statSet == null) { - statsSet = new StatsSet(); + statSet = new StatSet(); } - statsSet.set(nodeName, value); + statSet.set(nodeName, value); } } } @@ -620,9 +620,9 @@ public class SkillData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", list); + statSet.set(".", list); } else { @@ -635,30 +635,30 @@ public class SkillData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", text); + statSet.set(".", text); } else { return text; } } - return statsSet; + return statSet; } - private void parseAttributes(NamedNodeMap attributes, String prefix, StatsSet statsSet, Map variables) + private void parseAttributes(NamedNodeMap attributes, String prefix, StatSet statSet, Map variables) { for (int i = 0; i < attributes.getLength(); i++) { final Node attributeNode = attributes.item(i); - statsSet.set(prefix + "." + attributeNode.getNodeName(), parseNodeValue(attributeNode.getNodeValue(), variables)); + statSet.set(prefix + "." + attributeNode.getNodeName(), parseNodeValue(attributeNode.getNodeValue(), variables)); } } - private void parseAttributes(NamedNodeMap attributes, String prefix, StatsSet statsSet) + private void parseAttributes(NamedNodeMap attributes, String prefix, StatSet statSet) { - parseAttributes(attributes, prefix, statsSet, Collections.emptyMap()); + parseAttributes(attributes, prefix, statSet, Collections.emptyMap()); } private Object parseNodeValue(String value, Map variables) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java index f1fc07cea5..b85011b133 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.SubclassType; import org.l2jmobius.gameserver.model.SkillLearn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.base.ClassId; @@ -229,7 +229,7 @@ public class SkillTreesData implements IXmlReader { if ("skill".equalsIgnoreCase(c.getNodeName())) { - final StatsSet learnSkillSet = new StatsSet(); + final StatSet learnSkillSet = new StatSet(); attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java index 87915d89eb..78c22d1e7d 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java @@ -36,7 +36,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.ChanceLocation; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.MinionHolder; import org.l2jmobius.gameserver.model.interfaces.IParameterized; @@ -169,7 +169,7 @@ public class SpawnsData implements IXmlReader public void parseSpawn(Node spawnsNode, File file, Collection spawns) { - final SpawnTemplate spawnTemplate = new SpawnTemplate(new StatsSet(parseAttributes(spawnsNode)), file); + final SpawnTemplate spawnTemplate = new SpawnTemplate(new StatSet(parseAttributes(spawnsNode)), file); SpawnGroup defaultGroup = null; for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling()) { @@ -185,7 +185,7 @@ public class SpawnsData implements IXmlReader { if (defaultGroup == null) { - defaultGroup = new SpawnGroup(StatsSet.EMPTY_STATSET); + defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET); } parseNpc(innerNode, spawnTemplate, defaultGroup); } @@ -244,7 +244,7 @@ public class SpawnsData implements IXmlReader private void parseGroup(Node n, SpawnTemplate spawnTemplate) { - final SpawnGroup group = new SpawnGroup(new StatsSet(parseAttributes(n))); + final SpawnGroup group = new SpawnGroup(new StatSet(parseAttributes(n))); forEach(n, IXmlReader::isNode, npcNode -> { switch (npcNode.getNodeName()) @@ -271,7 +271,7 @@ public class SpawnsData implements IXmlReader */ private void parseNpc(Node n, SpawnTemplate spawnTemplate, SpawnGroup group) { - final NpcSpawnTemplate npcTemplate = new NpcSpawnTemplate(spawnTemplate, group, new StatsSet(parseAttributes(n))); + final NpcSpawnTemplate npcTemplate = new NpcSpawnTemplate(spawnTemplate, group, new StatSet(parseAttributes(n))); final NpcTemplate template = NpcData.getInstance().getTemplate(npcTemplate.getId()); if (template == null) { @@ -332,10 +332,10 @@ public class SpawnsData implements IXmlReader * @param n * @param npcTemplate */ - private void parseParameters(Node n, IParameterized npcTemplate) + private void parseParameters(Node n, IParameterized npcTemplate) { final Map params = parseParameters(n); - npcTemplate.setParameters(!params.isEmpty() ? new StatsSet(Collections.unmodifiableMap(params)) : StatsSet.EMPTY_STATSET); + npcTemplate.setParameters(!params.isEmpty() ? new StatSet(Collections.unmodifiableMap(params)) : StatSet.EMPTY_STATSET); } /** @@ -344,7 +344,7 @@ public class SpawnsData implements IXmlReader */ private void parseMinions(Node n, NpcSpawnTemplate npcTemplate) { - forEach(n, "minion", minionNode -> npcTemplate.addMinion(new MinionHolder(new StatsSet(parseAttributes(minionNode))))); + forEach(n, "minion", minionNode -> npcTemplate.addMinion(new MinionHolder(new StatSet(parseAttributes(minionNode))))); } /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java index 98d333446c..ef93935404 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; @@ -69,7 +69,7 @@ public class StaticObjectData implements IXmlReader if ("object".equalsIgnoreCase(d.getNodeName())) { final NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -86,9 +86,9 @@ public class StaticObjectData implements IXmlReader * Initialize an static object based on the stats set and add it to the map. * @param set the stats set to add. */ - private void addObject(StatsSet set) + private void addObject(StatSet set) { - final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatsSet()), set.getInt("id")); + final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatSet()), set.getInt("id")); obj.setType(set.getInt("type", 0)); obj.setName(set.getString("name")); obj.setMap(set.getString("texture", "none"), set.getInt("map_x", 0), set.getInt("map_y", 0)); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java index 7c8c9a538d..487bae9dea 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.TeleportType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.teleporter.TeleportHolder; /** @@ -74,7 +74,7 @@ public class TeleportersData implements IXmlReader final String name = parseString(nodeAttrs, "name", type.name()); // Parse locations final TeleportHolder holder = new TeleportHolder(name, type); - forEach(node, "location", location -> holder.registerLocation(new StatsSet(parseAttributes(location)))); + forEach(node, "location", location -> holder.registerLocation(new StatSet(parseAttributes(location)))); // Register holder if (teleList.putIfAbsent(name, holder) != null) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java index b6b3bf2e90..c2f5f94adb 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java @@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.transform.Transform; import org.l2jmobius.gameserver.model.actor.transform.TransformLevelData; import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate; @@ -70,7 +70,7 @@ public class TransformData implements IXmlReader if ("transform".equalsIgnoreCase(d.getNodeName())) { NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -192,7 +192,7 @@ public class TransformData implements IXmlReader transform.setTemplate(isMale, templateData); } - final StatsSet levelsSet = new StatsSet(); + final StatSet levelsSet = new StatSet(); for (Node s = z.getFirstChild(); s != null; s = s.getNextSibling()) { if ("level".equals(s.getNodeName())) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/engines/DocumentBase.java index ba3fc7f6b4..d178b10006 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/engines/DocumentBase.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/engines/DocumentBase.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.PlayerState; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionCategoryType; @@ -178,7 +178,7 @@ public abstract class DocumentBase protected abstract void parseDocument(Document doc); - protected abstract StatsSet getStatsSet(); + protected abstract StatSet getStatSet(); protected abstract String getTableValue(String name); @@ -1245,7 +1245,7 @@ public abstract class DocumentBase setTable(name, array.toArray(new String[array.size()])); } - protected void parseBeanSet(Node n, StatsSet set, Integer level) + protected void parseBeanSet(Node n, StatSet set, Integer level) { final String name = n.getAttributes().getNamedItem("name").getNodeValue().trim(); final String value = n.getAttributes().getNamedItem("val").getNodeValue().trim(); @@ -1260,7 +1260,7 @@ public abstract class DocumentBase } } - protected void setExtractableSkillData(StatsSet set, String value) + protected void setExtractableSkillData(StatSet set, String value) { set.set("capsuled_items_skill", value); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java index e8c77b206e..46f8f9be1f 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java @@ -21,7 +21,7 @@ import java.io.File; import org.w3c.dom.Document; import org.w3c.dom.Node; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; /** @@ -41,7 +41,7 @@ public class DocumentBaseGeneral extends DocumentBase } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return null; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java index 3ea7f41bb6..419552cf68 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.engines.DocumentBase; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -57,7 +57,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return _currentItem.set; } @@ -111,7 +111,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader _currentItem.id = itemId; _currentItem.name = itemName; _currentItem.type = className; - _currentItem.set = new StatsSet(); + _currentItem.set = new StatSet(); _currentItem.set.set("item_id", itemId); _currentItem.set.set("name", itemName); _currentItem.set.set("additionalName", additionalName); @@ -218,7 +218,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatsSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (Item) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java index 56e5b21a9f..967c1fc34d 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.engines.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; public class ItemDataHolder @@ -24,7 +24,7 @@ public class ItemDataHolder int id; String type; String name; - StatsSet set; + StatSet set; int currentLevel; Item item; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/handler/ConditionHandler.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/handler/ConditionHandler.java index 47f24d690d..b53f170fb3 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/handler/ConditionHandler.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/handler/ConditionHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.ICondition; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class ConditionHandler { - private final Map> _conditionHandlerFactories = new HashMap<>(); + private final Map> _conditionHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _conditionHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _conditionHandlerFactories.get(name); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/handler/EffectHandler.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/handler/EffectHandler.java index a58de8efb4..328265d9db 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/handler/EffectHandler.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/handler/EffectHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class EffectHandler { - private final Map> _effectHandlerFactories = new HashMap<>(); + private final Map> _effectHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _effectHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _effectHandlerFactories.get(name); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java index a6e2275d04..32438040e0 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class SkillConditionHandler { - private final Map> _skillConditionHandlerFactories = new HashMap<>(); + private final Map> _skillConditionHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _skillConditionHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _skillConditionHandlerFactories.get(name); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java index 6992dd5366..65a8c52d7e 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.model.AirShipTeleportList; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShipInstance; @@ -45,13 +45,13 @@ public class AirShipManager private static final String UPDATE_DB = "UPDATE airships SET fuel=? WHERE owner_id=?"; private CreatureTemplate _airShipTemplate = null; - private final Map _airShipsInfo = new HashMap<>(); + private final Map _airShipsInfo = new HashMap<>(); private final Map _airShips = new HashMap<>(); private final Map _teleports = new HashMap<>(); protected AirShipManager() { - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", 9); npcDat.set("level", 0); npcDat.set("jClass", "boat"); @@ -113,7 +113,7 @@ public class AirShipManager public AirShipInstance getNewAirShip(int x, int y, int z, int heading, int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return null; @@ -147,7 +147,7 @@ public class AirShipManager if (ship.getOwnerId() != 0) { storeInDb(ship.getOwnerId()); - final StatsSet info = _airShipsInfo.get(ship.getOwnerId()); + final StatSet info = _airShipsInfo.get(ship.getOwnerId()); if (info != null) { info.set("fuel", ship.getFuel()); @@ -164,7 +164,7 @@ public class AirShipManager { if (!_airShipsInfo.containsKey(ownerId)) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("fuel", 600); _airShipsInfo.put(ownerId, info); @@ -264,10 +264,10 @@ public class AirShipManager Statement s = con.createStatement(); ResultSet rs = s.executeQuery(LOAD_DB)) { - StatsSet info; + StatSet info; while (rs.next()) { - info = new StatsSet(); + info = new StatSet(); info.set("fuel", rs.getInt("fuel")); _airShipsInfo.put(rs.getInt("owner_id"), info); } @@ -285,7 +285,7 @@ public class AirShipManager private void storeInDb(int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java index 2db10dd045..e5c610b3f2 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.BoatInstance; @@ -57,7 +57,7 @@ public class BoatManager return null; } - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", boatId); npcDat.set("level", 0); npcDat.set("jClass", "boat"); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 99a9678ece..56f08422cd 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.enums.ManorMode; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; import org.l2jmobius.gameserver.model.SeedProduction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.entity.Castle; @@ -126,7 +126,7 @@ public class CastleManorManager implements IXmlReader, IStorable @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; NamedNodeMap attrs; Node att; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -142,7 +142,7 @@ public class CastleManorManager implements IXmlReader, IStorable { if ("crop".equalsIgnoreCase(c.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); set.set("castleId", castleId); attrs = c.getAttributes(); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java index 04c215a397..0fbd35091a 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java @@ -27,7 +27,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosState; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -181,7 +181,7 @@ public class CeremonyOfChaosManager extends AbstractEventManager _npcs = new ConcurrentHashMap<>(); protected final Map _spawns = new ConcurrentHashMap<>(); - protected final Map _storedInfo = new ConcurrentHashMap<>(); + protected final Map _storedInfo = new ConcurrentHashMap<>(); protected final Map> _schedules = new ConcurrentHashMap<>(); /** @@ -161,7 +161,7 @@ public class DBSpawnManager { npc.setDBStatus(RaidBossStatus.ALIVE); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getCurrentHp()); info.set("currentMP", npc.getCurrentMp()); info.set("respawnTime", 0); @@ -181,7 +181,7 @@ public class DBSpawnManager */ public void updateStatus(Npc npc, boolean isNpcDead) { - final StatsSet info = _storedInfo.get(npc.getId()); + final StatSet info = _storedInfo.get(npc.getId()); if (info == null) { return; @@ -254,7 +254,7 @@ public class DBSpawnManager _npcs.put(npcId, npc); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", currentHP); info.set("currentMP", currentMP); info.set("respawnTime", 0); @@ -316,7 +316,7 @@ public class DBSpawnManager } npc.setDBStatus(RaidBossStatus.ALIVE); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", 0); @@ -401,7 +401,7 @@ public class DBSpawnManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("UPDATE npc_respawns SET respawnTime = ?, currentHP = ?, currentMP = ? WHERE id = ?")) { - for (Entry entry : _storedInfo.entrySet()) + for (Entry entry : _storedInfo.entrySet()) { final Integer npcId = entry.getKey(); if (npcId == null) @@ -420,7 +420,7 @@ public class DBSpawnManager updateStatus(npc, false); } - final StatsSet info = entry.getValue(); + final StatSet info = entry.getValue(); if (info == null) { continue; @@ -529,7 +529,7 @@ public class DBSpawnManager */ public void notifySpawnNightNpc(Npc npc) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getCurrentHp()); info.set("currentMP", npc.getCurrentMp()); info.set("respawnTime", 0); @@ -572,7 +572,7 @@ public class DBSpawnManager * Gets the stored info. * @return the stored info */ - public Map getStoredInfo() + public Map getStoredInfo() { return _storedInfo; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index 3dd4e3f652..767bed6954 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.datatables.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.FakePlayerChatHolder; @@ -73,7 +73,7 @@ public class FakePlayerChatManager implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayerChat", fakePlayerChatNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerChatNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerChatNode)); MESSAGES.add(new FakePlayerChatHolder(set.getString("fpcName"), set.getString("searchMethod"), set.getString("searchText"), set.getString("answers"))); })); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java index 3bc57b3856..f91a16f65a 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java @@ -33,7 +33,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.tasks.GrandBossManagerStoreTask; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; import org.l2jmobius.gameserver.model.interfaces.IStorable; @@ -51,7 +51,7 @@ public class GrandBossManager implements IStorable protected static Map _bosses = new ConcurrentHashMap<>(); - protected static Map _storedInfo = new HashMap<>(); + protected static Map _storedInfo = new HashMap<>(); private final Map _bossStatus = new HashMap<>(); @@ -72,7 +72,7 @@ public class GrandBossManager implements IStorable final int bossId = rs.getInt("boss_id"); if (NpcData.getInstance().getTemplate(bossId) != null) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("loc_x", rs.getInt("loc_x")); info.set("loc_y", rs.getInt("loc_y")); info.set("loc_z", rs.getInt("loc_z")); @@ -136,12 +136,12 @@ public class GrandBossManager implements IStorable return _bosses.get(bossId); } - public StatsSet getStatsSet(int bossId) + public StatSet getStatSet(int bossId) { return _storedInfo.get(bossId); } - public void setStatsSet(int bossId, StatsSet info) + public void setStatSet(int bossId, StatSet info) { _storedInfo.put(bossId, info); updateDb(bossId, false); @@ -152,10 +152,10 @@ public class GrandBossManager implements IStorable { try (Connection con = DatabaseFactory.getConnection()) { - for (Entry e : _storedInfo.entrySet()) + for (Entry e : _storedInfo.entrySet()) { final GrandBossInstance boss = _bosses.get(e.getKey()); - final StatsSet info = e.getValue(); + final StatSet info = e.getValue(); if ((boss == null) || (info == null)) { try (PreparedStatement update = con.prepareStatement(UPDATE_GRAND_BOSS_DATA2)) @@ -205,7 +205,7 @@ public class GrandBossManager implements IStorable try (Connection con = DatabaseFactory.getConnection()) { final GrandBossInstance boss = _bosses.get(bossId); - final StatsSet info = _storedInfo.get(bossId); + final StatSet info = _storedInfo.get(bossId); if (statusOnly || (boss == null) || (info == null)) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index d77642378f..29e517b0cd 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.enums.InstanceReenterType; import org.l2jmobius.gameserver.enums.InstanceRemoveBuffType; import org.l2jmobius.gameserver.enums.InstanceTeleportType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.holders.InstanceReenterTimeHolder; @@ -151,7 +151,7 @@ public class InstanceManager implements IXmlReader return; } - final InstanceTemplate template = new InstanceTemplate(new StatsSet(parseAttributes(instanceNode))); + final InstanceTemplate template = new InstanceTemplate(new StatSet(parseAttributes(instanceNode))); // Update name if wasn't provided if (template.getName() == null) @@ -241,10 +241,10 @@ public class InstanceManager implements IXmlReader { if (doorNode.getNodeName().equals("door")) { - final StatsSet parsedSet = DoorData.getInstance().parseDoor(doorNode); - final StatsSet mergedSet = new StatsSet(); + final StatSet parsedSet = DoorData.getInstance().parseDoor(doorNode); + final StatSet mergedSet = new StatSet(); final int doorId = parsedSet.getInt("id"); - final StatsSet templateSet = DoorData.getInstance().getDoorTemplate(doorId); + final StatSet templateSet = DoorData.getInstance().getDoorTemplate(doorId); if (templateSet != null) { mergedSet.merge(templateSet); @@ -324,14 +324,14 @@ public class InstanceManager implements IXmlReader final boolean onlyLeader = parseBoolean(attrs, "onlyLeader", false); final boolean showMessageAndHtml = parseBoolean(attrs, "showMessageAndHtml", false); // Load parameters - StatsSet params = null; + StatSet params = null; for (Node f = conditionNode.getFirstChild(); f != null; f = f.getNextSibling()) { if (f.getNodeName().equals("param")) { if (params == null) { - params = new StatsSet(); + params = new StatSet(); } params.set(parseString(f.getAttributes(), "name"), parseString(f.getAttributes(), "value")); @@ -341,14 +341,14 @@ public class InstanceManager implements IXmlReader // If none parameters found then set empty StatSet if (params == null) { - params = StatsSet.EMPTY_STATSET; + params = StatSet.EMPTY_STATSET; } // Now when everything is loaded register condition to template try { final Class clazz = Class.forName("org.l2jmobius.gameserver.model.instancezone.conditions.Condition" + type); - final Constructor constructor = clazz.getConstructor(InstanceTemplate.class, StatsSet.class, boolean.class, boolean.class); + final Constructor constructor = clazz.getConstructor(InstanceTemplate.class, StatSet.class, boolean.class, boolean.class); conditions.add((Condition) constructor.newInstance(template, params, onlyLeader, showMessageAndHtml)); } catch (Exception ex) @@ -378,7 +378,7 @@ public class InstanceManager implements IXmlReader */ public Instance createInstance() { - return new Instance(getNewInstanceId(), new InstanceTemplate(StatsSet.EMPTY_STATSET), null); + return new Instance(getNewInstanceId(), new InstanceTemplate(StatSet.EMPTY_STATSET), null); } /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/AccessLevel.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/AccessLevel.java index 772c1fe77e..72b77905e1 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/AccessLevel.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/AccessLevel.java @@ -52,7 +52,7 @@ public class AccessLevel /** Flag to gain exp in party */ private boolean _gainExp = false; - public AccessLevel(StatsSet set) + public AccessLevel(StatSet set) { _accessLevel = set.getInt("level"); _name = set.getString("name"); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ActionDataHolder.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ActionDataHolder.java index 4887bedba8..ca6d9ee685 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ActionDataHolder.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ActionDataHolder.java @@ -25,7 +25,7 @@ public class ActionDataHolder private final String _handler; private final int _optionId; - public ActionDataHolder(StatsSet set) + public ActionDataHolder(StatSet set) { _id = set.getInt("id"); _handler = set.getString("handler"); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java index 656119098e..3f88e455d7 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java @@ -27,7 +27,7 @@ public class AdminCommandAccessRight private final int _accessLevel; private final boolean _requireConfirm; - public AdminCommandAccessRight(StatsSet set) + public AdminCommandAccessRight(StatSet set) { _adminCommand = set.getString("command"); _requireConfirm = set.getBoolean("confirmDlg", false); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index 5223b47ae9..cead2c2ce9 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -36,12 +36,12 @@ public class DailyMissionDataHolder private final List _rewardsItems; private final List _classRestriction; private final int _requiredCompletions; - private final StatsSet _params; + private final StatSet _params; private final boolean _dailyReset; private final boolean _isOneTime; private final AbstractDailyMissionHandler _handler; - public DailyMissionDataHolder(StatsSet set) + public DailyMissionDataHolder(StatSet set) { final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); @@ -50,7 +50,7 @@ public class DailyMissionDataHolder _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); - _params = set.getObject("params", StatsSet.class); + _params = set.getObject("params", StatSet.class); _dailyReset = set.getBoolean("dailyReset", true); _isOneTime = set.getBoolean("isOneTime", true); _handler = handler != null ? handler.apply(this) : null; @@ -81,7 +81,7 @@ public class DailyMissionDataHolder return _requiredCompletions; } - public StatsSet getParams() + public StatSet getParams() { return _params; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Location.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Location.java index 1c61740e4d..024c71075f 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Location.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Location.java @@ -49,7 +49,7 @@ public class Location implements IPositionable this(obj.getX(), obj.getY(), obj.getZ(), obj.getHeading()); } - public Location(StatsSet set) + public Location(StatSet set) { _x = set.getInt("x"); _y = set.getInt("y"); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/PetLevelData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/PetLevelData.java index e46b215b5f..7cad1a225a 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/PetLevelData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/PetLevelData.java @@ -46,7 +46,7 @@ public class PetLevelData private final double _slowFlySpeedOnRide; private final double _fastFlySpeedOnRide; - public PetLevelData(StatsSet set) + public PetLevelData(StatSet set) { _ownerExpTaken = set.getInt("get_exp_type"); _petMaxExp = set.getLong("exp"); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/RecipeList.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/RecipeList.java index 9e4a3b2387..a81bbb1802 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/RecipeList.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/RecipeList.java @@ -68,7 +68,7 @@ public class RecipeList * @param set * @param haveRare */ - public RecipeList(StatsSet set, boolean haveRare) + public RecipeList(StatSet set, boolean haveRare) { _recipes = new RecipeInstance[0]; _statUse = new RecipeStatInstance[0]; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Seed.java index 6d31ffc60f..54ef8acd9f 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Seed.java @@ -35,7 +35,7 @@ public class Seed private final int _seedReferencePrice; private final int _cropReferencePrice; - public Seed(StatsSet set) + public Seed(StatSet set) { _cropId = set.getInt("id"); _seedId = set.getInt("seedId"); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java index 78897cf4f1..4de77df228 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java @@ -27,7 +27,7 @@ public class SiegeScheduleDate private final int _hour; private final int _maxConcurrent; - public SiegeScheduleDate(StatsSet set) + public SiegeScheduleDate(StatSet set) { _day = set.getInt("day", Calendar.SUNDAY); _hour = set.getInt("hour", 16); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/SkillLearn.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/SkillLearn.java index e2ccdd6331..00f53c0cb9 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/SkillLearn.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/SkillLearn.java @@ -58,7 +58,7 @@ public class SkillLearn * Constructor for SkillLearn. * @param set the set with the SkillLearn data. */ - public SkillLearn(StatsSet set) + public SkillLearn(StatSet set) { _skillName = set.getString("skillName"); _skillId = set.getInt("skillId"); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/StatsSet.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/StatSet.java similarity index 95% rename from L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/StatsSet.java rename to L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/StatSet.java index 5ce013ebd2..3c824d9fa4 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/StatsSet.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/StatSet.java @@ -39,25 +39,25 @@ import org.l2jmobius.gameserver.util.Util; * They are stored as object but can be retrieved in any type wanted. As long as cast is available.
* @author mkizub */ -public class StatsSet implements IParserAdvUtils +public class StatSet implements IParserAdvUtils { - private static final Logger LOGGER = Logger.getLogger(StatsSet.class.getName()); + private static final Logger LOGGER = Logger.getLogger(StatSet.class.getName()); /** Static empty immutable map, used to avoid multiple null checks over the source. */ - public static final StatsSet EMPTY_STATSET = new StatsSet(Collections.emptyMap()); + public static final StatSet EMPTY_STATSET = new StatSet(Collections.emptyMap()); private final Map _set; - public StatsSet() + public StatSet() { this(ConcurrentHashMap::new); } - public StatsSet(Supplier> mapFactory) + public StatSet(Supplier> mapFactory) { this(mapFactory.get()); } - public StatsSet(Map map) + public StatSet(Map map) { _set = map; } @@ -73,9 +73,9 @@ public class StatsSet implements IParserAdvUtils /** * Add a set of couple values in the current set - * @param newSet : StatsSet pointing out the list of couples to add in the current set + * @param newSet : StatSet pointing out the list of couples to add in the current set */ - public void merge(StatsSet newSet) + public void merge(StatSet newSet) { _set.putAll(newSet.getSet()); } @@ -871,7 +871,7 @@ public class StatsSet implements IParserAdvUtils return (Map) obj; } - public StatsSet set(String name, Object value) + public StatSet set(String name, Object value) { if (value == null) { @@ -881,49 +881,49 @@ public class StatsSet implements IParserAdvUtils return this; } - public StatsSet set(String key, boolean value) + public StatSet set(String key, boolean value) { _set.put(key, value); return this; } - public StatsSet set(String key, byte value) + public StatSet set(String key, byte value) { _set.put(key, value); return this; } - public StatsSet set(String key, short value) + public StatSet set(String key, short value) { _set.put(key, value); return this; } - public StatsSet set(String key, int value) + public StatSet set(String key, int value) { _set.put(key, value); return this; } - public StatsSet set(String key, long value) + public StatSet set(String key, long value) { _set.put(key, value); return this; } - public StatsSet set(String key, float value) + public StatSet set(String key, float value) { _set.put(key, value); return this; } - public StatsSet set(String key, double value) + public StatSet set(String key, double value) { _set.put(key, value); return this; } - public StatsSet set(String key, String value) + public StatSet set(String key, String value) { if (value == null) { @@ -933,7 +933,7 @@ public class StatsSet implements IParserAdvUtils return this; } - public StatsSet set(String key, Enum value) + public StatSet set(String key, Enum value) { if (value == null) { @@ -943,9 +943,9 @@ public class StatsSet implements IParserAdvUtils return this; } - public static StatsSet valueOf(String key, Object value) + public static StatSet valueOf(String key, Object value) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.set(key, value); return set; } @@ -963,6 +963,6 @@ public class StatsSet implements IParserAdvUtils @Override public String toString() { - return "StatsSet{_set=" + _set + '}'; + return "StatSet{_set=" + _set + '}'; } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java index a1a7e98aba..2b90533cc5 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.MpRewardTask; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.FishermanInstance; @@ -148,7 +148,7 @@ public class Npc extends Creature private NpcStringId _titleString; private NpcStringId _nameString; - private StatsSet _params; + private StatSet _params; private RaidBossStatus _raidStatus; /** Contains information about local tax payments. */ @@ -1756,7 +1756,7 @@ public class Npc extends Creature /** * @return the parameters of the npc merged with the spawn parameters (if there are any) */ - public StatsSet getParameters() + public StatSet getParameters() { if (_params != null) { @@ -1768,10 +1768,10 @@ public class Npc extends Creature final NpcSpawnTemplate npcSpawnTemplate = _spawn.getNpcSpawnTemplate(); if ((npcSpawnTemplate != null) && (npcSpawnTemplate.getParameters() != null) && !npcSpawnTemplate.getParameters().isEmpty()) { - final StatsSet params = getTemplate().getParameters(); + final StatSet params = getTemplate().getParameters(); if ((params != null) && !params.getSet().isEmpty()) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.merge(params); set.merge(npcSpawnTemplate.getParameters()); _params = set; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 82f429bc18..4cb0835220 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -21,7 +21,7 @@ import java.util.EnumMap; import java.util.Map; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; @@ -49,12 +49,12 @@ public class CreatureTemplate extends ListenersContainer /** The creature's race. */ private Race _race; - public CreatureTemplate(StatsSet set) + public CreatureTemplate(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { // Base stats _baseValues.put(Stat.STAT_STR, set.getDouble("baseSTR", 0)); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java index 86441c678c..14f0e9cae8 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.CubicInstance; @@ -46,7 +46,7 @@ public class CubicTemplate implements ICubicConditionHolder private final List _conditions = new ArrayList<>(); public List _skills = new ArrayList<>(); - public CubicTemplate(StatsSet set) + public CubicTemplate(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java index c40883ac75..410040bc86 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.templates; import org.l2jmobius.gameserver.enums.DoorOpenType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -57,7 +57,7 @@ public class DoorTemplate extends CreatureTemplate implements IIdentifiable private final boolean _stealth; private final boolean _isInverted; - public DoorTemplate(StatsSet set) + public DoorTemplate(StatSet set) { super(set); _doorId = set.getInt("id"); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 767743de2e..8ab41c70e3 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.enums.MpRewardAffectType; import org.l2jmobius.gameserver.enums.MpRewardType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -63,7 +63,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private boolean _usingServerSideName; private String _title; private boolean _usingServerSideTitle; - private StatsSet _parameters; + private StatSet _parameters; private Sex _sex; private int _chestId; private int _rhandId; @@ -123,15 +123,15 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable /** * Constructor of Creature. - * @param set The StatsSet object to transfer data to the method + * @param set The StatSet object to transfer data to the method */ - public NpcTemplate(StatsSet set) + public NpcTemplate(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _id = set.getInt("id"); @@ -320,12 +320,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _usingServerSideTitle; } - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } - public void setParameters(StatsSet set) + public void setParameters(StatSet set) { _parameters = set; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 50292b8bc8..28458aa09e 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -50,7 +50,7 @@ public class PlayerTemplate extends CreatureTemplate private final List _creationPoints; private final Map _baseSlotDef; - public PlayerTemplate(StatsSet set, List creationPoints) + public PlayerTemplate(StatSet set, List creationPoints) { super(set); _classId = ClassId.getClassId(set.getInt("classId")); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index aa28a0f648..260da48365 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -23,7 +23,7 @@ import java.util.Objects; import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import org.l2jmobius.gameserver.enums.InventoryBlockType; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -57,7 +57,7 @@ public class Transform implements IIdentifiable private TransformTemplate _maleTemplate; private TransformTemplate _femaleTemplate; - public Transform(StatsSet set) + public Transform(StatSet set) { _id = set.getInt("id"); _displayId = set.getInt("displayId", _id); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java index 5660852a01..729998503f 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.actor.transform; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -31,7 +31,7 @@ public class TransformLevelData private final double _levelMod; private Map _stats; - public TransformLevelData(StatsSet set) + public TransformLevelData(StatSet set) { _level = set.getInt("val"); _levelMod = set.getDouble("levelMod"); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 4de84b8bdc..7aca059f91 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -23,7 +23,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -49,7 +49,7 @@ public class TransformTemplate private ExBasicActionList _list; private final Map _data = new LinkedHashMap<>(100); - public TransformTemplate(StatsSet set) + public TransformTemplate(StatSet set) { _collisionRadius = set.contains("radius") ? set.getDouble("radius") : null; _collisionHeight = set.contains("height") ? set.getDouble("height") : null; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java index d808a6b8bf..02550d2818 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -36,7 +36,7 @@ public class AlchemyCraftData private ItemHolder _productionSuccess; private ItemHolder _productionFailure; - public AlchemyCraftData(StatsSet set) + public AlchemyCraftData(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java index 0bd061d3c4..79dd6c0207 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.beautyshop; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -32,7 +32,7 @@ public class BeautyItem private final int _beautyShopTicket; private final Map _colors = new HashMap<>(); - public BeautyItem(StatsSet set) + public BeautyItem(StatSet set) { _id = set.getInt("id"); _adena = set.getInt("adena", 0); @@ -60,7 +60,7 @@ public class BeautyItem return _beautyShopTicket; } - public void addColor(StatsSet set) + public void addColor(StatSet set) { final BeautyItem color = new BeautyItem(set); _colors.put(set.getInt("id"), color); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index 689a61464d..8b32364c1a 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party.MessageType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.appearance.PlayerAppearance; @@ -244,7 +244,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent player.teleToLocation(_instance.getEnterLocations().get(index++), 0, _instance); } - getTimers().addTimer("match_start_countdown", StatsSet.valueOf("time", 60), 100, null, null); + getTimers().addTimer("match_start_countdown", StatSet.valueOf("time", 60), 100, null, null); getTimers().addTimer("teleport_message1", 10000, null, null); getTimers().addTimer("teleport_message2", 14000, null, null); @@ -400,7 +400,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent } } getTimers().cancelTimer("update", null, null); - getTimers().addTimer("match_end_countdown", StatsSet.valueOf("time", 30), 30 * 1000, null, null); + getTimers().addTimer("match_end_countdown", StatSet.valueOf("time", 30), 30 * 1000, null, null); EventDispatcher.getInstance().notifyEvent(new OnCeremonyOfChaosMatchResult(winners, members)); } @@ -493,7 +493,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java index 39f9196d93..371f8dc459 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.conditions.ICubicCondition; @@ -38,7 +38,7 @@ public class CubicSkill extends SkillHolder implements ICubicConditionHolder private final List _conditions = new ArrayList<>(); private final boolean _targetDebuff; - public CubicSkill(StatsSet set) + public CubicSkill(StatSet set) { super(set.getInt("id"), set.getInt("level")); _triggerRate = set.getInt("triggerRate", 100); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/ClanHall.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/ClanHall.java index 8da77477fd..22af370709 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/ClanHall.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/ClanHall.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -75,7 +75,7 @@ public class ClanHall extends AbstractResidence private static final String LOAD_CLANHALL = "SELECT * FROM clanhall WHERE id=?"; private static final String UPDATE_CLANHALL = "UPDATE clanhall SET ownerId=?,paidUntil=? WHERE id=?"; - public ClanHall(StatsSet params) + public ClanHall(StatSet params) { super(params.getInt("id")); // Set static parameters diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Hero.java index ef005ff325..aee8b019ee 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Hero.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Hero.java @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.data.xml.impl.ClassListData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -74,13 +74,13 @@ public class Hero // delete hero items private static final String DELETE_ITEMS = "DELETE FROM items WHERE item_id IN (30392, 30393, 30394, 30395, 30396, 30397, 30398, 30399, 30400, 30401, 30402, 30403, 30404, 30405, 30372, 30373, 6842, 6611, 6612, 6613, 6614, 6615, 6616, 6617, 6618, 6619, 6620, 6621, 9388, 9389, 9390) AND owner_id NOT IN (SELECT charId FROM characters WHERE accesslevel > 0)"; - private static final Map HEROES = new ConcurrentHashMap<>(); - private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); + private static final Map HEROES = new ConcurrentHashMap<>(); + private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); - private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); - private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); + private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); + private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); - private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); + private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); private static final Map HERO_MESSAGE = new ConcurrentHashMap<>(); public static final String COUNT = "count"; @@ -118,7 +118,7 @@ public class Hero { while (rset.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset.getInt(Olympiad.CLASS_ID)); @@ -137,7 +137,7 @@ public class Hero while (rset2.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset2.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset2.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset2.getInt(Olympiad.CLASS_ID)); @@ -159,7 +159,7 @@ public class Hero LOGGER.info("Hero System: Loaded " + COMPLETE_HEROS.size() + " all time Heroes."); } - private void processHeros(PreparedStatement ps, int charId, StatsSet hero) throws SQLException + private void processHeros(PreparedStatement ps, int charId, StatSet hero) throws SQLException { ps.setInt(1, charId); try (ResultSet rs = ps.executeQuery()) @@ -224,7 +224,7 @@ public class Hero public void loadDiary(int charId) { - final List diary = new ArrayList<>(); + final List diary = new ArrayList<>(); int diaryentries = 0; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement("SELECT * FROM heroes_diary WHERE charId=? ORDER BY time ASC")) @@ -234,7 +234,7 @@ public class Hero { while (rset.next()) { - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final long time = rset.getLong("time"); final int action = rset.getInt("action"); @@ -279,8 +279,8 @@ public class Hero public void loadFights(int charId) { - final List fights = new ArrayList<>(); - final StatsSet heroCountData = new StatsSet(); + final List fights = new ArrayList<>(); + final StatSet heroCountData = new StatSet(); final Calendar data = Calendar.getInstance(); data.set(Calendar.DAY_OF_MONTH, 1); data.set(Calendar.HOUR_OF_DAY, 0); @@ -326,7 +326,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charTwoClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -362,7 +362,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charOneClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -410,14 +410,14 @@ public class Hero } } - public Map getHeroes() + public Map getHeroes() { return HEROES; } public int getHeroByClass(int classid) { - for (Entry e : HEROES.entrySet()) + for (Entry e : HEROES.entrySet()) { if (e.getValue().getInt(Olympiad.CLASS_ID) == classid) { @@ -438,7 +438,7 @@ public class Hero public void showHeroDiary(PlayerInstance player, int heroclass, int charid, int page) { final int perpage = 10; - final List mainList = HERO_DIARY.get(charid); + final List mainList = HERO_DIARY.get(charid); if (mainList != null) { final NpcHtmlMessage diaryReply = new NpcHtmlMessage(); @@ -453,7 +453,7 @@ public class Hero if (!mainList.isEmpty()) { - final List list = new ArrayList<>(mainList); + final List list = new ArrayList<>(mainList); Collections.reverse(list); boolean color = true; @@ -463,7 +463,7 @@ public class Hero for (int i = (page - 1) * perpage; i < list.size(); i++) { breakat = i; - final StatsSet diaryEntry = list.get(i); + final StatSet diaryEntry = list.get(i); fList.append(""); if (color) { @@ -524,7 +524,7 @@ public class Hero int loss = 0; int draw = 0; - final List heroFights = HERO_FIGHTS.get(charid); + final List heroFights = HERO_FIGHTS.get(charid); if (heroFights != null) { final NpcHtmlMessage fightReply = new NpcHtmlMessage(); @@ -536,7 +536,7 @@ public class Hero if (!heroFights.isEmpty()) { - final StatsSet heroCount = HERO_COUNTS.get(charid); + final StatSet heroCount = HERO_COUNTS.get(charid); if (heroCount != null) { win = heroCount.getInt("victory"); @@ -551,7 +551,7 @@ public class Hero for (int i = (page - 1) * perpage; i < heroFights.size(); i++) { breakat = i; - final StatsSet fight = heroFights.get(i); + final StatSet fight = heroFights.get(i); fList.append(""); if (color) { @@ -609,7 +609,7 @@ public class Hero } } - public synchronized void computeNewHeroes(List newHeroes) + public synchronized void computeNewHeroes(List newHeroes) { updateHeroes(true); @@ -659,13 +659,13 @@ public class Hero return; } - for (StatsSet hero : newHeroes) + for (StatSet hero : newHeroes) { final int charId = hero.getInt(Olympiad.CHAR_ID); if (COMPLETE_HEROS.containsKey(charId)) { - final StatsSet oldHero = COMPLETE_HEROS.get(charId); + final StatSet oldHero = COMPLETE_HEROS.get(charId); final int count = oldHero.getInt(COUNT); oldHero.set(COUNT, count + 1); oldHero.set(PLAYED, 1); @@ -674,7 +674,7 @@ public class Hero } else { - final StatsSet newHero = new StatsSet(); + final StatSet newHero = new StatSet(); newHero.set(Olympiad.CHAR_NAME, hero.getString(Olympiad.CHAR_NAME)); newHero.set(Olympiad.CLASS_ID, hero.getInt(Olympiad.CLASS_ID)); newHero.set(COUNT, 1); @@ -700,9 +700,9 @@ public class Hero } else { - StatsSet hero; + StatSet hero; int heroId; - for (Entry entry : HEROES.entrySet()) + for (Entry entry : HEROES.entrySet()) { hero = entry.getValue(); heroId = entry.getKey(); @@ -787,13 +787,13 @@ public class Hero setDiaryData(charId, ACTION_RAID_KILLED, npcId); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (template == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -806,13 +806,13 @@ public class Hero setDiaryData(charId, ACTION_CASTLE_TAKEN, castleId); final Castle castle = CastleManager.getInstance().getCastleById(castleId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (castle == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -922,10 +922,10 @@ public class Hero */ public void claimHero(PlayerInstance player) { - StatsSet hero = HEROES.get(player.getObjectId()); + StatSet hero = HEROES.get(player.getObjectId()); if (hero == null) { - hero = new StatsSet(); + hero = new StatSet(); HEROES.put(player.getObjectId(), hero); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java index f1263e8d44..c52f487402 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java @@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.atomic.AtomicReference; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.eventengine.drop.IEventDrop; import org.l2jmobius.gameserver.model.events.AbstractScript; @@ -42,7 +42,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout public abstract class AbstractEventManager>extends AbstractScript { private String _name; - private StatsSet _variables = StatsSet.EMPTY_STATSET; + private StatSet _variables = StatSet.EMPTY_STATSET; private Set _schedulers = Collections.emptySet(); private Set _conditionalSchedulers = Collections.emptySet(); private Map _rewards = Collections.emptyMap(); @@ -67,14 +67,14 @@ public abstract class AbstractEventManager>extends Ab /* ********************** */ - public StatsSet getVariables() + public StatSet getVariables() { return _variables; } - public void setVariables(StatsSet variables) + public void setVariables(StatSet variables) { - _variables = new StatsSet(Collections.unmodifiableMap(variables.getSet())); + _variables = new StatSet(Collections.unmodifiableMap(variables.getSet())); } /* ********************** */ diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java index 59c64b812c..e41af41d1a 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.util.cron4j.PastPredictor; import org.l2jmobius.gameserver.util.cron4j.Predictor; @@ -45,7 +45,7 @@ public class EventScheduler private List _notifications; private ScheduledFuture _task; - public EventScheduler(AbstractEventManager manager, StatsSet set) + public EventScheduler(AbstractEventManager manager, StatSet set) { _eventManager = manager; _name = set.getString("name", ""); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 1189dc9aa4..ca9d08a337 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -51,7 +51,7 @@ import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -183,12 +183,12 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime onTimerCancel(holder.getEvent(), holder.getParams(), holder.getNpc(), holder.getPlayer()); } - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { LOGGER.warning("[" + getClass().getSimpleName() + "]: Timer event arrived at non overriden onTimerEvent method event: " + event + " npc: " + npc + " player: " + player); } - public void onTimerCancel(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerCancel(String event, StatSet params, Npc npc, PlayerInstance player) { } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java index 400fb64b6e..861c4a9b31 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java @@ -24,7 +24,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.timers.IEventTimerCancel; @@ -69,7 +69,7 @@ public class TimerExecutor * @param eventTimer * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - public boolean addTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) + public boolean addTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) { return addTimer(new TimerHolder<>(event, params, time, npc, player, false, eventTimer, _cancelListener, this)); } @@ -95,7 +95,7 @@ public class TimerExecutor * @param player * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - public boolean addTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player) + public boolean addTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player) { return addTimer(event, params, time, npc, player, _eventListener); } @@ -123,7 +123,7 @@ public class TimerExecutor * @param eventTimer * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - private boolean addRepeatingTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) + private boolean addRepeatingTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) { return addTimer(new TimerHolder<>(event, params, time, npc, player, true, eventTimer, _cancelListener, this)); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java index ab8fa150ca..0fcafba759 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java @@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.gameserver.instancemanager.TimersManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.TimerExecutor; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.events.TimerExecutor; public class TimerHolder implements Runnable { private final T _event; - private final StatsSet _params; + private final StatSet _params; private final long _time; private final Npc _npc; private final PlayerInstance _player; @@ -44,7 +44,7 @@ public class TimerHolder implements Runnable private final TimerExecutor _postExecutor; private final ScheduledFuture _task; - public TimerHolder(T event, StatsSet params, long time, Npc npc, PlayerInstance player, boolean isRepeating, IEventTimerEvent eventScript, IEventTimerCancel cancelScript, TimerExecutor postExecutor) + public TimerHolder(T event, StatSet params, long time, Npc npc, PlayerInstance player, boolean isRepeating, IEventTimerEvent eventScript, IEventTimerCancel cancelScript, TimerExecutor postExecutor) { Objects.requireNonNull(event, getClass().getSimpleName() + ": \"event\" cannot be null!"); Objects.requireNonNull(eventScript, getClass().getSimpleName() + ": \"script\" cannot be null!"); @@ -73,7 +73,7 @@ public class TimerHolder implements Runnable /** * @return the parameters of this timer */ - public StatsSet getParams() + public StatSet getParams() { return _params; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index 4ab0367aba..ab239da356 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; @@ -37,7 +37,7 @@ public class AppearanceHolder private final AppearanceTargetType _targetType; private final Integer _bodyPart; - public AppearanceHolder(StatsSet set) + public AppearanceHolder(StatSet set) { _visualId = set.getInt("id", 0); _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java index 29740873cd..0f9488448d 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Nik @@ -43,7 +43,7 @@ public class AttachSkillHolder extends SkillHolder return _requiredSkillLevel; } - public static AttachSkillHolder fromStatsSet(StatsSet set) + public static AttachSkillHolder fromStatSet(StatSet set) { return new AttachSkillHolder(set.getInt("skillId"), set.getInt("skillLevel", 1), set.getInt("requiredSkillId"), set.getInt("requiredSkillLevel", 1)); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java index cc41724532..57b6d47c40 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Set; import org.l2jmobius.gameserver.enums.SkillEnchantType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -36,7 +36,7 @@ public class EnchantSkillHolder private final Map _chance = new EnumMap<>(SkillEnchantType.class); private final Map> _requiredItems = new EnumMap<>(SkillEnchantType.class); - public EnchantSkillHolder(StatsSet set) + public EnchantSkillHolder(StatSet set) { _level = set.getInt("level"); _enchantFailLevel = set.getInt("enchantFailLevel"); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java index e6706c8467..33d14e4345 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Map; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -36,7 +36,7 @@ public class ExtendDropDataHolder private final List _conditions; private final Map _systemMessages; - public ExtendDropDataHolder(StatsSet set) + public ExtendDropDataHolder(StatSet set) { _id = set.getInt("id"); _items = set.getList("items", ExtendDropItemHolder.class); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java index 16454d764a..d63d4eb775 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -52,7 +52,7 @@ public class FakePlayerHolder private final int _clanId; private final int _pledgeStatus; - public FakePlayerHolder(StatsSet set) + public FakePlayerHolder(StatSet set) { _classId = set.getInt("classId", 182); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java index a9c72776cd..86af0c1405 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -29,7 +29,7 @@ public class ItemHolder implements IIdentifiable private final int _id; private final long _count; - public ItemHolder(StatsSet set) + public ItemHolder(StatSet set) { _id = set.getInt("id"); _count = set.getLong("count"); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java index 5b581c4cfe..a54dfa8300 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -25,7 +25,7 @@ public class ItemPointHolder extends ItemHolder { private final int _points; - public ItemPointHolder(StatsSet params) + public ItemPointHolder(StatSet params) { this(params.getInt("id"), params.getLong("count"), params.getInt("points")); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java index 22c6c327eb..0ba78224d3 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.holders; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -34,7 +34,7 @@ public class LuckyGameDataHolder private int _minModifyRewardGame; private int _maxModifyRewardGame; - public LuckyGameDataHolder(StatsSet params) + public LuckyGameDataHolder(StatSet params) { _index = params.getInt("index"); _turningPoints = params.getInt("turning_point"); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java index f77e380e8d..9fa8c99654 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.holders; import java.time.Duration; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -32,7 +32,7 @@ public class MinionHolder implements IIdentifiable private final long _respawnTime; private final int _weightPoint; - public MinionHolder(StatsSet set) + public MinionHolder(StatSet set) { _id = set.getInt("id"); _count = set.getInt("count", 1); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java index f4173594d1..36ac70176d 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -52,7 +52,7 @@ public class MultisellListHolder implements IIdentifiable } @SuppressWarnings("unchecked") - public MultisellListHolder(StatsSet set) + public MultisellListHolder(StatSet set) { _listId = set.getInt("listId"); _isChanceMultisell = set.getBoolean("isChanceMultisell", false); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index f1b98ee9ac..ecd1069283 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -45,7 +45,7 @@ import org.l2jmobius.gameserver.enums.InstanceReenterType; import org.l2jmobius.gameserver.enums.InstanceTeleportType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -87,7 +87,7 @@ public class Instance implements IIdentifiable, INamable private final Set _players = ConcurrentHashMap.newKeySet(); // Players inside instance private final Set _npcs = ConcurrentHashMap.newKeySet(); // Spawned NPCs inside instance private final Map _doors = new HashMap<>(); // Spawned doors inside instance - private final StatsSet _parameters = new StatsSet(); + private final StatSet _parameters = new StatSet(); // Timers private final Map> _ejectDeadTasks = new ConcurrentHashMap<>(); private ScheduledFuture _cleanUpTask = null; @@ -171,7 +171,7 @@ public class Instance implements IIdentifiable, INamable * Get instance world parameters. * @return instance parameters */ - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } @@ -1020,7 +1020,7 @@ public class Instance implements IIdentifiable, INamable * Get parameters from instance template.
* @return template parameters */ - public StatsSet getTemplateParameters() + public StatSet getTemplateParameters() { return _template.getParameters(); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 2a196f73ef..b53b0a819d 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.AbstractPlayerGroup; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -71,7 +71,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl private float _spRate = Config.RATE_INSTANCE_SP; private float _expPartyRate = Config.RATE_INSTANCE_PARTY_XP; private float _spPartyRate = Config.RATE_INSTANCE_PARTY_SP; - private StatsSet _parameters = StatsSet.EMPTY_STATSET; + private StatSet _parameters = StatSet.EMPTY_STATSET; private final Map _doors = new HashMap<>(); private final List _spawns = new ArrayList<>(); // Locations @@ -92,7 +92,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl /** * @param set */ - public InstanceTemplate(StatsSet set) + public InstanceTemplate(StatSet set) { _templateId = set.getInt("id", 0); _name = set.getString("name", null); @@ -178,7 +178,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (!set.isEmpty()) { - _parameters = new StatsSet(Collections.unmodifiableMap(set)); + _parameters = new StatSet(Collections.unmodifiableMap(set)); } } @@ -469,7 +469,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl * Get instance template parameters. * @return parameters of template */ - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java index 3b67ff72f4..3627959662 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; import java.util.function.BiConsumer; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public abstract class Condition { private final InstanceTemplate _template; - private final StatsSet _parameters; + private final StatSet _parameters; private final boolean _leaderOnly; private final boolean _showMessageAndHtml; private SystemMessageId _systemMsg = null; @@ -46,7 +46,7 @@ public abstract class Condition * @param onlyLeader flag which means if only leader should be affected (leader means player who wants to enter not group leader!) * @param showMessageAndHtml if {@code true} and HTML message is defined then both are send, otherwise only HTML or message is send */ - public Condition(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public Condition(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { _template = template; _parameters = parameters; @@ -58,7 +58,7 @@ public abstract class Condition * Gets parameters of condition. * @return set of parameters */ - protected final StatsSet getParameters() + protected final StatSet getParameters() { return _parameters; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java index e379741b59..c27d92d662 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionCommandChannel extends Condition { - public ConditionCommandChannel(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionCommandChannel(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_CANNOT_ENTER_BECAUSE_YOU_ARE_NOT_ASSOCIATED_WITH_THE_CURRENT_COMMAND_CHANNEL); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java index ed434e3524..a828dcceae 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.model.AbstractPlayerGroup; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionCommandChannelLeader extends Condition { - public ConditionCommandChannelLeader(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionCommandChannelLeader(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java index d2a60816d0..423a37a94e 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionDistance extends Condition { - public ConditionDistance(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionDistance(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); setSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED, (message, player) -> message.addString(player.getName())); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java index 3dc78a98c7..8aa68b7e08 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionGroupMax extends Condition { - public ConditionGroupMax(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionGroupMax(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_CANNOT_ENTER_DUE_TO_THE_PARTY_HAVING_EXCEEDED_THE_LIMIT); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java index f7930b1d8c..fde9d13439 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionGroupMin extends Condition { - public ConditionGroupMin(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionGroupMin(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_MUST_HAVE_A_MINIMUM_OF_S1_PEOPLE_TO_ENTER_THIS_INSTANCED_ZONE, (msg, player) -> msg.addInt(getLimit())); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 3088d8ae64..53fee609aa 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.enums.ResidenceType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; */ public class ConditionHasResidence extends Condition { - public ConditionHasResidence(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionHasResidence(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); } @@ -43,7 +43,7 @@ public class ConditionHasResidence extends Condition return false; } - final StatsSet params = getParameters(); + final StatSet params = getParameters(); final int id = params.getInt("id"); boolean test = false; switch (params.getEnum("type", ResidenceType.class)) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java index 4e1c407325..eed350db38 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -32,7 +32,7 @@ public class ConditionItem extends Condition private final long _count; private final boolean _take; - public ConditionItem(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionItem(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Load params diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java index 7d509a20c7..b38f8c0e2c 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -32,7 +32,7 @@ public class ConditionLevel extends Condition private final int _min; private final int _max; - public ConditionLevel(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionLevel(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Load params diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java index b91deeffdb..d71e6d0a39 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; */ public class ConditionNoParty extends Condition { - public ConditionNoParty(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionNoParty(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java index dd31bf3ca5..5bf768a03e 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionParty extends Condition { - public ConditionParty(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionParty(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java index 524a59675a..0363715536 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionPartyLeader extends Condition { - public ConditionPartyLeader(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionPartyLeader(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java index 481cb251ce..48d7fc7981 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.instancemanager.QuestManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionQuest extends Condition { - public ConditionQuest(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionQuest(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Set message diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 899b17aff9..a073129734 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionReenter extends Condition { - public ConditionReenter(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionReenter(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); setSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET, (message, player) -> message.addString(player.getName())); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java index ec255025c3..fafafe5604 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.itemauction; import java.util.Calendar; import java.util.concurrent.TimeUnit; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Forsaiken @@ -40,7 +40,7 @@ public class AuctionDateGenerator private int _hour_of_day; private int _minute_of_hour; - public AuctionDateGenerator(StatsSet config) + public AuctionDateGenerator(StatSet config) { _calendar = Calendar.getInstance(); _interval = config.getInt(FIELD_INTERVAL, -1); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 64bf0a6ff1..cb554e4dce 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.itemauction; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.idfactory.IdFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,9 +34,9 @@ public class AuctionItem private final int _itemId; private final long _itemCount; @SuppressWarnings("unused") - private final StatsSet _itemExtra; + private final StatSet _itemExtra; - public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatsSet itemExtra) + public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatSet itemExtra) { _auctionItemId = auctionItemId; _auctionLength = auctionLength; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 6dff6e3a4d..dc3a7f6f6b 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -44,7 +44,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -84,7 +84,7 @@ public class ItemAuctionInstance _items = new ArrayList<>(); final NamedNodeMap nanode = node.getAttributes(); - final StatsSet generatorConfig = new StatsSet(); + final StatSet generatorConfig = new StatSet(); for (int i = nanode.getLength(); i-- > 0;) { final Node n = nanode.item(i); @@ -115,7 +115,7 @@ public class ItemAuctionInstance throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } - final StatsSet itemExtra = new StatsSet(); + final StatSet itemExtra = new StatSet(); final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Armor.java index ac707b015b..c87f7ed45e 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Armor.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.type.ArmorType; /** @@ -28,15 +28,15 @@ public class Armor extends Item /** * Constructor for Armor. - * @param set the StatsSet designating the set of couples (key,value) characterizing the armor. + * @param set the StatSet designating the set of couples (key,value) characterizing the armor. */ - public Armor(StatsSet set) + public Armor(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/EtcItem.java index 86d7291595..a902860c0d 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/EtcItem.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -38,15 +38,15 @@ public class EtcItem extends Item /** * Constructor for EtcItem. - * @param set StatsSet designating the set of couples (key,value) for description of the Etc + * @param set StatSet designating the set of couples (key,value) for description of the Etc */ - public EtcItem(StatsSet set) + public EtcItem(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Henna.java index c669b86eec..c4c32e7cda 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -21,7 +21,7 @@ import java.util.EnumMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; @@ -45,7 +45,7 @@ public class Henna private final List _skills; private final List _wear_class; - public Henna(StatsSet set) + public Henna(StatSet set) { _dyeId = set.getInt("dyeId"); _dyeItemId = set.getInt("dyeItemId"); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Item.java index 4a5c714d97..7ed78ba385 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Item.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.enums.ItemGrade; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; @@ -175,14 +175,14 @@ public abstract class Item extends ListenersContainer implements IIdentifiable /** * Constructor of the Item that fill class variables.
*
- * @param set : StatsSet corresponding to a set of couples (key,value) for description of the item + * @param set : StatSet corresponding to a set of couples (key,value) for description of the item */ - protected Item(StatsSet set) + protected Item(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { _itemId = set.getInt("item_id"); _displayId = set.getInt("displayId", _itemId); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java index ab196007a8..3ca228cbe5 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -29,7 +29,7 @@ public class PlayerItemTemplate extends ItemHolder /** * @param set the set containing the values for this object */ - public PlayerItemTemplate(StatsSet set) + public PlayerItemTemplate(StatSet set) { super(set.getInt("id"), set.getInt("count")); _equipped = set.getBoolean("equipped", false); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Weapon.java index 16f0c47287..5f9f8507bd 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Weapon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.items; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ItemSkillType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -58,15 +58,15 @@ public class Weapon extends Item /** * Constructor for Weapon. - * @param set the StatsSet designating the set of couples (key,value) characterizing the weapon. + * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. */ - public Weapon(StatsSet set) + public Weapon(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java index 422054b245..aa1f33acce 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java @@ -23,7 +23,7 @@ import java.util.List; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -54,7 +54,7 @@ public class AppearanceStone private List _racesNot; private List _allVisualIds; - public AppearanceStone(StatsSet set) + public AppearanceStone(StatSet set) { _id = set.getInt("id"); _visualId = set.getInt("visualId", 0); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java index f3b53f1a67..a2897ba911 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.items.combination; import java.util.EnumMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -31,7 +31,7 @@ public class CombinationItem private final int _chance; private final Map _rewards = new EnumMap<>(CombinationItemType.class); - public CombinationItem(StatsSet set) + public CombinationItem(StatSet set) { _itemOne = set.getInt("one"); _itemTwo = set.getInt("two"); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java index 1cde38a6d6..a7f1326bd8 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.CrystalType; @@ -59,7 +59,7 @@ public abstract class AbstractEnchantItem private final int _maxEnchantLevel; private final double _bonusRate; - public AbstractEnchantItem(StatsSet set) + public AbstractEnchantItem(StatSet set) { _id = set.getInt("id"); if (getItem() == null) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java index 36ccf3a5a4..310a7643ec 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -40,7 +40,7 @@ public class EnchantScroll extends AbstractEnchantItem private final int _scrollGroupId; private Set _items; - public EnchantScroll(StatsSet set) + public EnchantScroll(StatSet set) { super(set); _scrollGroupId = set.getInt("scrollGroupId", 0); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java index c02095428b..978e38d533 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items.enchant; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.items.type.ItemType; @@ -30,7 +30,7 @@ public class EnchantSupportItem extends AbstractEnchantItem private final boolean _isGiant; private final ItemType type; - public EnchantSupportItem(StatsSet set) + public EnchantSupportItem(StatSet set) { super(set); type = getItem().getItemType(); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 714e3b3ac1..375bd2d16a 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.data.xml.impl.CategoryData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.entity.Hero; @@ -61,7 +61,7 @@ public class Olympiad extends ListenersContainer protected static final Logger LOGGER = Logger.getLogger(Olympiad.class.getName()); protected static final Logger LOGGER_OLYMPIAD = Logger.getLogger("olympiad"); - private static final Map NOBLES = new ConcurrentHashMap<>(); + private static final Map NOBLES = new ConcurrentHashMap<>(); private static final Map NOBLES_RANK = new HashMap<>(); public static final String OLYMPIAD_HTML_PATH = "data/html/olympiad/"; @@ -229,10 +229,10 @@ public class Olympiad extends ListenersContainer PreparedStatement statement = con.prepareStatement(OLYMPIAD_LOAD_NOBLES); ResultSet rset = statement.executeQuery()) { - StatsSet statData; + StatSet statData; while (rset.next()) { - statData = new StatsSet(); + statData = new StatSet(); statData.set(CLASS_ID, rset.getInt(CLASS_ID)); statData.set(CHAR_NAME, rset.getString(CHAR_NAME)); statData.set(POINTS, rset.getInt(POINTS)); @@ -461,7 +461,7 @@ public class Olympiad extends ListenersContainer saveNobleData(); _period = 1; - final List heroesToBe = sortHerosToBe(); + final List heroesToBe = sortHerosToBe(); Hero.getInstance().resetData(); Hero.getInstance().computeNewHeroes(heroesToBe); @@ -495,7 +495,7 @@ public class Olympiad extends ListenersContainer return NOBLES.size(); } - public static StatsSet getNobleStats(int playerId) + public static StatSet getNobleStats(int playerId) { return NOBLES.get(playerId); } @@ -814,7 +814,7 @@ public class Olympiad extends ListenersContainer } int currentPoints; - for (StatsSet nobleInfo : NOBLES.values()) + for (StatSet nobleInfo : NOBLES.values()) { currentPoints = nobleInfo.getInt(POINTS); currentPoints += WEEKLY_POINTS; @@ -832,7 +832,7 @@ public class Olympiad extends ListenersContainer return; } - for (StatsSet nobleInfo : NOBLES.values()) + for (StatSet nobleInfo : NOBLES.values()) { nobleInfo.set(COMP_DONE_WEEK, 0); nobleInfo.set(COMP_DONE_WEEK_CLASSED, 0); @@ -868,9 +868,9 @@ public class Olympiad extends ListenersContainer try (Connection con = DatabaseFactory.getConnection()) { - for (Entry entry : NOBLES.entrySet()) + for (Entry entry : NOBLES.entrySet()) { - final StatsSet nobleInfo = entry.getValue(); + final StatSet nobleInfo = entry.getValue(); if (nobleInfo == null) { @@ -992,7 +992,7 @@ public class Olympiad extends ListenersContainer } } - protected List sortHerosToBe() + protected List sortHerosToBe() { if (_period != 1) { @@ -1000,8 +1000,8 @@ public class Olympiad extends ListenersContainer } LOGGER_OLYMPIAD.info("Noble,charid,classid,compDone,points"); - StatsSet nobleInfo; - for (Entry entry : NOBLES.entrySet()) + StatSet nobleInfo; + for (Entry entry : NOBLES.entrySet()) { nobleInfo = entry.getValue(); if (nobleInfo == null) @@ -1018,12 +1018,12 @@ public class Olympiad extends ListenersContainer LOGGER_OLYMPIAD.info(charName + "," + charId + "," + classId + "," + compDone + "," + points); } - final List heroesToBe = new LinkedList<>(); + final List heroesToBe = new LinkedList<>(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(OLYMPIAD_GET_HEROS)) { - StatsSet hero; + StatSet hero; for (int element : HERO_IDS) { statement.setInt(1, element); @@ -1032,7 +1032,7 @@ public class Olympiad extends ListenersContainer { if (rset.next()) { - hero = new StatsSet(); + hero = new StatSet(); hero.set(CLASS_ID, element); hero.set(CHAR_ID, rset.getInt(CHAR_ID)); hero.set(CHAR_NAME, rset.getString(CHAR_NAME)); @@ -1086,7 +1086,7 @@ public class Olympiad extends ListenersContainer return 0; } - final StatsSet noble = NOBLES.get(objectId); + final StatSet noble = NOBLES.get(objectId); if ((noble == null) || (noble.getInt(POINTS) == 0)) { return 0; @@ -1136,7 +1136,7 @@ public class Olympiad extends ListenersContainer { if (!NOBLES.containsKey(player.getObjectId())) { - final StatsSet statDat = new StatsSet(); + final StatSet statDat = new StatSet(); statDat.set(CLASS_ID, player.getBaseClass()); statDat.set(CHAR_NAME, player.getName()); statDat.set(POINTS, DEFAULT_POINTS); @@ -1318,7 +1318,7 @@ public class Olympiad extends ListenersContainer * @param data the stats set data to add. * @return the old stats set if the noble is already present, null otherwise. */ - public static StatsSet addNobleStats(int charId, StatsSet data) + public static StatSet addNobleStats(int charId, StatSet data) { return NOBLES.put(charId, data); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Participant.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Participant.java index 670066ac32..b6d879b902 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Participant.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Participant.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.olympiad; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class Participant private final int baseClass; private boolean disconnected = false; private boolean defaulted = false; - private final StatsSet stats; + private final StatSet stats; public String clanName; public int clanId; @@ -125,7 +125,7 @@ public class Participant /** * @return the stats */ - public StatsSet getStats() + public StatSet getStats() { return stats; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java index 4d5231ca5d..c1fb0f88f6 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.primeshop; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -49,7 +49,7 @@ public class PrimeShopGroup private final int _availableCount; private final List _items; - public PrimeShopGroup(StatsSet set, List items) + public PrimeShopGroup(StatSet set, List items) { _brId = set.getInt("id"); _category = set.getInt("cat", 0); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java index d150ec98cd..88795e0721 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.residences; import java.time.Duration; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -33,7 +33,7 @@ public class ResidenceFunctionTemplate private final Duration _duration; private final double _value; - public ResidenceFunctionTemplate(StatsSet set) + public ResidenceFunctionTemplate(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java index 4f15efda0b..b19f8e59d5 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; /** @@ -34,7 +34,7 @@ public class ShuttleDataHolder private final List _stops = new ArrayList<>(2); private final List _routes = new ArrayList<>(2); - public ShuttleDataHolder(StatsSet set) + public ShuttleDataHolder(StatSet set) { _id = set.getInt("id"); _loc = new Location(set); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/Skill.java index c44b45a781..0e97466a3a 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.handler.IAffectScopeHandler; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.CubicInstance; @@ -210,7 +210,7 @@ public class Skill implements IIdentifiable private final SkillBuffType _buffType; private final boolean _displayInList; - public Skill(StatsSet set) + public Skill(StatSet set) { _id = set.getInt(".id"); _level = set.getInt(".level"); @@ -391,7 +391,7 @@ public class Skill implements IIdentifiable _toggleGroupId = set.getInt("toggleGroupId", -1); _attachToggleGroupId = set.getInt("attachToggleGroupId", -1); - _attachSkills = set.getList("attachSkillList", StatsSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatsSet).collect(Collectors.toList()); + _attachSkills = set.getList("attachSkillList", StatSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatSet).collect(Collectors.toList()); final String abnormalResist = set.getString("abnormalResists", null); if (abnormalResist != null) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java index bfc25bddde..39b738dbca 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.ChanceLocation; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory; /** * @author UnAfraid */ -public class NpcSpawnTemplate implements Cloneable, IParameterized +public class NpcSpawnTemplate implements Cloneable, IParameterized { private static final Logger LOGGER = Logger.getLogger(NpcSpawnTemplate.class.getName()); @@ -56,7 +56,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized private final Duration _respawnTimeRandom; private List _locations; private SpawnTerritory _zone; - private StatsSet _parameters; + private StatSet _parameters; private final boolean _spawnAnimation; private final boolean _saveInDB; private final String _dbName; @@ -82,7 +82,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized _minions = template._minions; } - public NpcSpawnTemplate(SpawnTemplate spawnTemplate, SpawnGroup group, StatsSet set) + public NpcSpawnTemplate(SpawnTemplate spawnTemplate, SpawnGroup group, StatSet set) { _spawnTemplate = spawnTemplate; _group = group; @@ -128,14 +128,14 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized mergeParameters(spawnTemplate, group); } - private StatsSet mergeParameters(SpawnTemplate spawnTemplate, SpawnGroup group) + private StatSet mergeParameters(SpawnTemplate spawnTemplate, SpawnGroup group) { if ((_parameters == null) && (spawnTemplate.getParameters() == null) && (group.getParameters() == null)) { return null; } - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); if (spawnTemplate.getParameters() != null) { set.merge(spawnTemplate.getParameters()); @@ -206,13 +206,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized } @Override - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } @Override - public void setParameters(StatsSet parameters) + public void setParameters(StatSet parameters) { if (_parameters == null) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java index 6723863c93..7ceb2d46af 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IParameterized; import org.l2jmobius.gameserver.model.interfaces.ITerritorized; @@ -31,16 +31,16 @@ import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory; /** * @author UnAfraid */ -public class SpawnGroup implements Cloneable, ITerritorized, IParameterized +public class SpawnGroup implements Cloneable, ITerritorized, IParameterized { private final String _name; private final boolean _spawnByDefault; private List _territories; private List _bannedTerritories; private final List _spawns = new ArrayList<>(); - private StatsSet _parameters; + private StatSet _parameters; - public SpawnGroup(StatsSet set) + public SpawnGroup(StatSet set) { this(set.getString("name", null), set.getBoolean("spawnByDefault", true)); } @@ -104,13 +104,13 @@ public class SpawnGroup implements Cloneable, ITerritorized, IParameterized +public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized { private final String _name; private final String _ai; @@ -45,9 +45,9 @@ public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized _territories; private List _bannedTerritories; private final List _groups = new ArrayList<>(); - private StatsSet _parameters; + private StatSet _parameters; - public SpawnTemplate(StatsSet set, File file) + public SpawnTemplate(StatSet set, File file) { this(set.getString("name", null), set.getString("ai", null), set.getBoolean("spawnByDefault", true), file); } @@ -128,13 +128,13 @@ public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized _castleId; - public TeleportLocation(int id, StatsSet set) + public TeleportLocation(int id, StatSet set) { super(set); _id = id; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java index 916ae0790c..33cf6ac3bc 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.variables; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.IRestorable; import org.l2jmobius.gameserver.model.interfaces.IStorable; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.interfaces.IStorable; /** * @author UnAfraid */ -public abstract class AbstractVariables extends StatsSet implements IRestorable, IStorable, IDeletable +public abstract class AbstractVariables extends StatSet implements IRestorable, IStorable, IDeletable { private final AtomicBoolean _hasChanges = new AtomicBoolean(false); @@ -41,42 +41,42 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, */ @Override - public StatsSet set(String name, boolean value) + public StatSet set(String name, boolean value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, double value) + public StatSet set(String name, double value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, Enum value) + public StatSet set(String name, Enum value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, int value) + public StatSet set(String name, int value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, long value) + public StatSet set(String name, long value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, String value) + public StatSet set(String name, String value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); @@ -89,7 +89,7 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, * @param markAsChanged * @return */ - public StatsSet set(String name, String value, boolean markAsChanged) + public StatSet set(String name, String value, boolean markAsChanged) { if (markAsChanged) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index 5c03122a62..4d97f0017a 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExHeroList implements IClientOutgoingPacket { - private final Map _heroList; + private final Map _heroList; public ExHeroList() { @@ -42,7 +42,7 @@ public class ExHeroList implements IClientOutgoingPacket OutgoingPackets.EX_HERO_LIST.writeId(packet); packet.writeD(_heroList.size()); - for (StatsSet hero : _heroList.values()) + for (StatSet hero : _heroList.values()) { packet.writeS(hero.getString(Olympiad.CHAR_NAME)); packet.writeD(hero.getInt(Olympiad.CLASS_ID)); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/BypassParser.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/BypassParser.java index 414125bdeb..a80323ba1f 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/BypassParser.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/BypassParser.java @@ -20,12 +20,12 @@ import java.util.LinkedHashMap; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid */ -public class BypassParser extends StatsSet +public class BypassParser extends StatSet { private static final String ALLOWED_CHARS = "a-zA-Z0-9-_`!@#%^&*()\\[\\]|\\\\/"; private static final Pattern PATTERN = Pattern.compile(String.format("([%s]*)=('([%s ]*)'|[%s]*)", ALLOWED_CHARS, ALLOWED_CHARS, ALLOWED_CHARS)); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java index 2ceebc156a..a3f07a6ad5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java @@ -18,7 +18,7 @@ package ai.areas.BeastFarm; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -133,7 +133,7 @@ public class ImprovedBabyPets extends AbstractNpcAI private boolean castBuff(Summon summon, int stepNumber, int buffNumber) { final PlayerInstance owner = summon.getOwner(); - final StatsSet parameters = summon.getTemplate().getParameters(); + final StatSet parameters = summon.getTemplate().getParameters(); final SkillHolder skill = parameters.getObject("step" + stepNumber + "_buff0" + buffNumber, SkillHolder.class); if ((skill != null) && (owner != null)) @@ -174,7 +174,7 @@ public class ImprovedBabyPets extends AbstractNpcAI { final boolean previousFollowStatus = summon.getFollowStatus(); final PlayerInstance owner = summon.getOwner(); - final StatsSet parameters = summon.getTemplate().getParameters(); + final StatSet parameters = summon.getTemplate().getParameters(); final SkillHolder skill = parameters.getObject("step" + stepNumber + "_heal0" + healNumber, SkillHolder.class); final int targetType = parameters.getInt("step" + stepNumber + "_heal_target0" + healNumber, 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java index efdbdd4460..9ff1875b62 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java @@ -18,7 +18,7 @@ package ai.areas.FairySettlement; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -50,11 +50,11 @@ public class Wisp extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("DELETE_NPC")) { - params = new StatsSet(); + params = new StatSet(); params.set("LOCATION_OBJECT", npc.getLocation()); getTimers().addTimer("RESPAWN_WISP_" + npc.getObjectId(), params, getRandom(RESPAWN_MIN, RESPAWN_MAX), null, null); npc.deleteMe(); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java index 5cd6622513..b52be69c96 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java @@ -19,7 +19,7 @@ package ai.areas.Parnassus.EntrancePortalToCrystalCaverns; import java.util.Calendar; import org.l2jmobius.gameserver.instancemanager.QuestManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -107,7 +107,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("LOOP_TIMER")) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfHellfire/Zofan.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfHellfire/Zofan.java index b6c122da75..03f451c9fd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfHellfire/Zofan.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfHellfire/Zofan.java @@ -16,7 +16,7 @@ */ package ai.areas.SeedOfHellfire; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -61,7 +61,7 @@ public class Zofan extends AbstractNpcAI { if ((npc.getInstanceWorld() == null) && (npc.getSpawn() != null)) { - final StatsSet params = npc.getParameters(); + final StatSet params = npc.getParameters(); if (params.getInt("i_childrengarden_guard", 0) == 0) { for (String param : MINION_PARAMS) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Allada.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Allada.java index 5ccca8c99a..4291aeb5ec 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Allada.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Allada.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -45,7 +45,7 @@ public class Allada extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Mei.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Mei.java index 015ee0bc9a..7ad9623ec2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Mei.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Mei.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -40,7 +40,7 @@ public class Mei extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SHOUT")) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Remons.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Remons.java index 41ec3c1bff..a1ea6ba90c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Remons.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Remons.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -43,7 +43,7 @@ public class Remons extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rinne.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rinne.java index 55ab4fc1a7..1d6eafa48a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rinne.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rinne.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -42,7 +42,7 @@ public class Rinne extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rotina.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rotina.java index 24ad1b6041..d0c8f2a81b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rotina.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rotina.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -45,7 +45,7 @@ public class Rotina extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Soros.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Soros.java index d7862030aa..632d1a78a8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Soros.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Soros.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -40,7 +40,7 @@ public class Soros extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java index cbe7cc9ac9..4a2aaf21c4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java @@ -17,7 +17,7 @@ package ai.areas.WallOfArgos.ElmoredenServantsGhost; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -58,7 +58,7 @@ public class ElmoredenServantsGhost extends AbstractNpcAI takeItems(player, USED_GRAVE_PASS, 1); final Location loc; - final StatsSet npcParameters = npc.getParameters(); + final StatSet npcParameters = npc.getParameters(); if (event.equals("teleport1")) { loc = new Location(npcParameters.getInt("TelPos_X1", 0), npcParameters.getInt("TelPos_Y1", 0), npcParameters.getInt("TelPos_Z1", 0)); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java index aca502d2cc..a46695ea27 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -341,7 +341,7 @@ public class Anakim extends AbstractNpcAI addSkillSeeId(ALL_MOBS); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANAKIM); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM); final int status = GrandBossManager.getInstance().getBossStatus(ANAKIM); if (status == DEAD) { @@ -613,9 +613,9 @@ public class Anakim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(ANAKIM, DEAD); final long respawnTime = getRespawnTime(); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANAKIM); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(ANAKIM, info); + GrandBossManager.getInstance().setStatSet(ANAKIM, info); startQuestTimer("unlock_anakim", respawnTime, null, null); startQuestTimer("end_anakim", 900000, null, null); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index b837d839d8..d12c29d422 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -138,7 +138,7 @@ public class Antharas extends AbstractNpcAI addAttackId(ANTHARAS, BOMBER, BEHEMOTH, TERASQUE); addKillId(ANTHARAS, TERASQUE, BEHEMOTH); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANTHARAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANTHARAS); final double curr_hp = info.getDouble("currentHP"); final double curr_mp = info.getDouble("currentMP"); final int loc_x = info.getInt("loc_x"); @@ -761,7 +761,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(PlayerInstance attacker, int damage) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Baium/Baium.java index ee6655da4d..bca22cc6a6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -112,7 +112,7 @@ public class Baium extends AbstractNpcAI addSeeCreatureId(BAIUM); addSpellFinishedId(BAIUM); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(BAIUM); + final StatSet info = GrandBossManager.getInstance().getStatSet(BAIUM); switch (getStatus()) { @@ -666,7 +666,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java index 768ebbc11d..ebf5e78a5a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -122,7 +122,7 @@ public class BalokWarzone extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (isInInstance(world)) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java index 9919e58ce5..e8a2e67509 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java @@ -17,7 +17,7 @@ package ai.bosses.Baylor; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -77,7 +77,7 @@ public class BaylorWarzone extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (isInInstance(world)) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java index 1e80c81840..e8e9fa8756 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; @@ -104,7 +104,7 @@ public class Beleth extends AbstractNpcAI addStartNpc(STONE_COFFIN); addTalkId(STONE_COFFIN); addFirstTalkId(ELF); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(REAL_BELETH); + final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH); if (status == DEAD) { @@ -750,9 +750,9 @@ public class Beleth extends AbstractNpcAI setBelethKiller(killer); GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD); final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(REAL_BELETH); + final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(REAL_BELETH, info); + GrandBossManager.getInstance().setStatSet(REAL_BELETH, info); startQuestTimer("BELETH_UNLOCK", respawnTime, null, null); deleteAll(); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Core/Core.java index bfa7212b8c..c1452bf9de 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; @@ -85,7 +85,7 @@ public class Core extends AbstractNpcAI registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR); _firstAttacked = false; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. @@ -205,9 +205,9 @@ public class Core extends AbstractNpcAI final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000; startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(CORE, info); + GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java index 6ef025304c..764df30625 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -175,7 +175,7 @@ public class IceQueensCastleBattle extends AbstractInstance final Instance world = npc.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); final Npc controller = params.getObject("controller", Npc.class); final Npc freya = params.getObject("freya", Npc.class); switch (event) @@ -734,7 +734,7 @@ public class IceQueensCastleBattle extends AbstractInstance final Instance world = npc.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); switch (npc.getId()) { case FREYA_THRONE: @@ -1069,7 +1069,7 @@ public class IceQueensCastleBattle extends AbstractInstance final Instance world = npc.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); final Npc controller = params.getObject("controller", Npc.class); switch (npc.getId()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/Helios.java index 7faa1d8823..0f70177f83 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/Helios.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/Helios.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.zone.type.NoSummonFriendZone; @@ -58,7 +58,7 @@ public class Helios extends AbstractNpcAI // Zone bossZone = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(HELIOS3); + final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3); final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3); if (status == DEAD) { @@ -136,9 +136,9 @@ public class Helios extends AbstractNpcAI bossZone.broadcastPacket(new ExShowScreenMessage(NpcStringId.HELIOS_DEFEATED_TAKES_FLIGHT_DEEP_IN_TO_THE_SUPERION_FORT_HIS_THRONE_IS_RENDERED_INACTIVE, ExShowScreenMessage.TOP_CENTER, 10000, true)); GrandBossManager.getInstance().setBossStatus(HELIOS3, DEAD); final long respawnTime = (Config.HELIOS_SPAWN_INTERVAL + getRandom(-Config.HELIOS_SPAWN_RANDOM, Config.HELIOS_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(HELIOS3); + final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(HELIOS3, info); + GrandBossManager.getInstance().setStatSet(HELIOS3, info); startQuestTimer("unlock_helios", respawnTime, null, null); break; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java index dc6e826093..b863874cd2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.AggroInfo; import org.l2jmobius.gameserver.model.DamageDoneInfo; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -153,13 +153,13 @@ public class IstinaCavern extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); - final StatsSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); switch (event) { case "DEATH_TIMER": @@ -391,7 +391,7 @@ public class IstinaCavern extends AbstractInstance } else { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); if (skillId == npcParams.getSkillHolder("Istina_Death_Skill01").getSkillId()) { @@ -440,7 +440,7 @@ public class IstinaCavern extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int stage = npcVars.getInt("ISTINA_STAGE", -1); if (npc.getId() == BALLISTA) @@ -657,7 +657,7 @@ public class IstinaCavern extends AbstractInstance private PlayerInstance setPlayerRewardInfo(Npc npc) { final Map rewards = new ConcurrentHashMap<>(); - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); PlayerInstance maxDealer = null; long maxDamage = 0; int totalDamage = 0; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index 61b663a0f3..7aebfa337d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -116,7 +116,7 @@ public class Kelbim extends AbstractNpcAI addKillId(KELBIM); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(KELBIM); + final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM); final int status = GrandBossManager.getInstance().getBossStatus(KELBIM); if (status == DEAD) { @@ -429,9 +429,9 @@ public class Kelbim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(KELBIM, DEAD); final long respawnTime = (Config.KELBIM_SPAWN_INTERVAL + getRandom(-Config.KELBIM_SPAWN_RANDOM, Config.KELBIM_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(KELBIM); + final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(KELBIM, info); + GrandBossManager.getInstance().setStatSet(KELBIM, info); startQuestTimer("unlock_kelbim", respawnTime, null, null); startQuestTimer("end_kelbim", 1800000, null, null); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java index 31be0ec32d..f023ad5f8e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java @@ -19,7 +19,7 @@ package ai.bosses.Kimerian; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -83,7 +83,7 @@ public class KimerianCommon extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) @@ -345,8 +345,8 @@ public class KimerianCommon extends AbstractInstance { final Creature creature = event.getSeen(); final Npc npc = (Npc) event.getSeer(); - final StatsSet npcParams = npc.getParameters(); - final StatsSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java index 9fbe2e6026..51ffd45923 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -367,7 +367,7 @@ public class Lilith extends AbstractNpcAI addSkillSeeId(ALL_MOBS); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LILITH); + final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH); final int status = GrandBossManager.getInstance().getBossStatus(LILITH); if (status == DEAD) { @@ -629,9 +629,9 @@ public class Lilith extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LILITH, DEAD); final long respawnTime = getRespawnTime(); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LILITH); + final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(LILITH, info); + GrandBossManager.getInstance().setStatSet(LILITH, info); startQuestTimer("unlock_lilith", respawnTime, null, null); startQuestTimer("end_lilith", 900000, null, null); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index 9ef473069d..cc00a33356 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -244,7 +244,7 @@ public class Lindvior extends AbstractNpcAI addSeeCreatureId(INVISIBLE); _zoneLair = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LINDVIOR_RAID); + final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID); final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID); if (status == DEAD) { @@ -821,9 +821,9 @@ public class Lindvior extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD); final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LINDVIOR_RAID); + final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(LINDVIOR_RAID, info); + GrandBossManager.getInstance().setStatSet(LINDVIOR_RAID, info); startQuestTimer("unlock_lindvior", respawnTime, null, null); } else if (npc.getId() == NPC_GENERATOR) @@ -867,7 +867,7 @@ public class Lindvior extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SHOUT") && (npc != null) && !npc.isDead()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/LionelHunter.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/LionelHunter.java index e02f478232..0677792823 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/LionelHunter.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/LionelHunter.java @@ -18,7 +18,7 @@ package ai.bosses.Lindvior; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.WalkingManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -43,7 +43,7 @@ public class LionelHunter extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SHOUT") && (npc != null)) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java index b9c19644c4..c5c62c8f2f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -152,13 +152,13 @@ public class OctavisWarzone extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (isInInstance(world)) { - final StatsSet npcVars = npc.getVariables(); - final StatsSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); switch (event) { @@ -378,7 +378,7 @@ public class OctavisWarzone extends AbstractInstance } else if (CommonUtil.contains(OCTAVIS_STAGE_2, npc.getId())) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); if (npcVars.getBoolean("START_TIMERS", true)) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index 38eebefc7b..5e525a6caa 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -92,7 +92,7 @@ public class Orfen extends AbstractNpcAI registerMobs(mobs); _IsTeleported = false; ZONE = ZoneManager.getInstance().getZoneById(12013); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); final int status = GrandBossManager.getInstance().getBossStatus(ORFEN); if (status == DEAD) { @@ -327,9 +327,9 @@ public class Orfen extends AbstractNpcAI respawnTime *= 3600000; startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(ORFEN, info); + GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); startQuestTimer("despawn_minions", 20000, null, null); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index c2564917c7..b9fdddaaf7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; @@ -91,7 +91,7 @@ public class QueenAnt extends AbstractNpcAI addFactionCallId(NURSE); _zone = ZoneManager.getInstance().getZoneById(12012); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); final int status = GrandBossManager.getInstance().getBossStatus(QUEEN); if (status == DEAD) { @@ -367,9 +367,9 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("action", npc, null); cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(QUEEN, info); + GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); _larva.deleteMe(); _larva = null; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java index 58d5b9d3a8..577a99ad9d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java @@ -19,7 +19,7 @@ package ai.bosses.Spezion.Cannon; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -170,7 +170,7 @@ public class Cannon extends AbstractNpcAI { if (skill.getId() == PRESENT_SKILL.getSkillId()) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); npc.broadcastPacket(new Earthquake(npc, 10, 5)); npc.broadcastPacket(new OnEventTrigger(npcParams.getInt("TRIGGER_ID"), true)); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java index 086615be42..4af559d521 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -105,13 +105,13 @@ public class TeredorWarzone extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); - final StatsSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); switch (event) { @@ -236,7 +236,7 @@ public class TeredorWarzone extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); switch (npc.getId()) { @@ -292,7 +292,7 @@ public class TeredorWarzone extends AbstractInstance if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); switch (npc.getId()) { @@ -472,7 +472,7 @@ public class TeredorWarzone extends AbstractInstance { case TEREDOR: { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int hpPer = npc.getCurrentHpPercent(); int teredorStatus = npcVars.getInt("TEREDOR_STATUS", 1); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java index 9d9a79d53a..1610356a26 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -322,7 +322,7 @@ public class Trasken extends AbstractNpcAI DoorData.getInstance().getDoor(DOOR).openMe(); } // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(TRASKEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN); final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN); if (status == DEAD) { @@ -603,9 +603,9 @@ public class Trasken extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD); final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(TRASKEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(TRASKEN, info); + GrandBossManager.getInstance().setStatSet(TRASKEN, info); startQuestTimer("unlock_trasken", respawnTime, null, null); break; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java index 9414859da4..7233381898 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; @@ -123,7 +123,7 @@ public class Valakas extends AbstractNpcAI registerMobs(VALAKAS); ZONE = ZoneManager.getInstance().getZoneById(12010); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(VALAKAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); final int status = GrandBossManager.getInstance().getBossStatus(VALAKAS); if (status == DEAD) @@ -446,9 +446,9 @@ public class Valakas extends AbstractNpcAI final long respawnTime = (Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM)) * 3600000; startQuestTimer("valakas_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(VALAKAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(VALAKAS, info); + GrandBossManager.getInstance().setStatSet(VALAKAS, info); return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java index c73ef9d83c..703e55428a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -189,8 +189,8 @@ public class CavernOfThePirateCaptain extends AbstractInstance final Instance world = npc.getInstanceWorld(); if (world != null) { - final StatsSet templParams = world.getTemplateParameters(); - final StatsSet params = world.getParameters(); + final StatSet templParams = world.getTemplateParameters(); + final StatSet params = world.getParameters(); switch (event) { case "BURN_BLUE": diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AreaSkillNpc.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AreaSkillNpc.java index f84b001cc5..80291ac3be 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AreaSkillNpc.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AreaSkillNpc.java @@ -17,7 +17,7 @@ package ai.others; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -124,7 +124,7 @@ public class AreaSkillNpc extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java index 01b37387a8..ef9e26a221 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -101,7 +101,7 @@ public class CastleTeleporter extends AbstractNpcAI if (st.hasMoreTokens()) { final int unknowInt = Integer.parseInt(st.nextToken()); - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); Location teleLoc = null; switch (unknowInt) { @@ -191,7 +191,7 @@ public class CastleTeleporter extends AbstractNpcAI return htmltext; } - private Location getTeleportLocation(StatsSet npcParams, String paramName1, String paramName2, String paramName3) + private Location getTeleportLocation(StatSet npcParams, String paramName1, String paramName2, String paramName3) { final Location loc; if (getRandom(100) < 33) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java index b1355fa9c5..c05c1b184b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java @@ -16,7 +16,7 @@ */ package ai.others.NpcBuffers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ class NpcBufferSkillData private final int _scaleToLevel; private final int _initialDelay; - NpcBufferSkillData(StatsSet set) + NpcBufferSkillData(StatSet set) { _skill = new SkillHolder(set.getInt("id"), set.getInt("level")); _scaleToLevel = set.getInt("scaleToLevel", -1); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java index dd7f4187be..ecae9d2861 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -54,7 +54,7 @@ class NpcBuffersData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node attr; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -75,7 +75,7 @@ class NpcBuffersData implements IXmlReader case "skill": { attrs = c.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { attr = attrs.item(i); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Servitors/ClanFlag.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Servitors/ClanFlag.java index 558d57b407..b09a5f38e9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Servitors/ClanFlag.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Servitors/ClanFlag.java @@ -17,7 +17,7 @@ package ai.others.Servitors; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -51,7 +51,7 @@ public class ClanFlag extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java index 55c9613eab..a50c042b7f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -68,7 +68,7 @@ public class GateOfUnlimitedSummoning extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java index f19f5dea69..c817501830 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java @@ -17,7 +17,7 @@ package ai.others.Servitors; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -52,7 +52,7 @@ public class TreeOfLife extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (player != null) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java index 3ee8063427..ee96be41d8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -91,7 +91,7 @@ public class TersisHerald extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("DESPAWN_NPCS")) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index 2e5331f903..55dc363405 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.zone.type.NoRestartZone; @@ -309,7 +309,7 @@ public class AdminGrandBoss implements IAdminCommandHandler } } - final StatsSet info = GrandBossManager.getInstance().getStatsSet(grandBossId); + final StatSet info = GrandBossManager.getInstance().getStatSet(grandBossId); final String bossRespawn = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(info.getLong("respawn_time")); final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java index 075d9d050c..71aeb82ddd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java @@ -19,7 +19,7 @@ package handlers.admincommandhandlers; import java.util.StringTokenizer; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -114,7 +114,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.getNobleLevel() > 0) { - final StatsSet statDat = getPlayerSet(player); + final StatSet statDat = getPlayerSet(player); final int oldpoints = Olympiad.getInstance().getNoblePoints(player); final int points = Math.max(oldpoints + val, 0); if (points > 1000) @@ -155,7 +155,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.getNobleLevel() > 0) { - final StatsSet playerStat = Olympiad.getNobleStats(player.getObjectId()); + final StatSet playerStat = Olympiad.getNobleStats(player.getObjectId()); if (playerStat == null) { BuilderUtil.sendSysMessage(activeChar, "This player hasn't played on Olympiad yet!"); @@ -197,7 +197,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.getNobleLevel() > 0) { - final StatsSet statDat = getPlayerSet(player); + final StatSet statDat = getPlayerSet(player); final int oldpoints = Olympiad.getInstance().getNoblePoints(player); final int points = oldpoints - val; if ((points < 1) && (points > 1000)) @@ -237,12 +237,12 @@ public class AdminOlympiad implements IAdminCommandHandler return Integer.decode(token); } - private StatsSet getPlayerSet(PlayerInstance player) + private StatSet getPlayerSet(PlayerInstance player) { - StatsSet statDat = Olympiad.getNobleStats(player.getObjectId()); + StatSet statDat = Olympiad.getNobleStats(player.getObjectId()); if (statDat == null) { - statDat = new StatsSet(); + statDat = new StatSet(); statDat.set(Olympiad.CLASS_ID, player.getBaseClass()); statDat.set(Olympiad.CHAR_NAME, player.getName()); statDat.set(Olympiad.POINTS, Olympiad.DEFAULT_POINTS); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java index d8a3d6e5ce..6382651e6c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java @@ -19,7 +19,7 @@ package handlers.conditions; import java.util.List; import org.l2jmobius.gameserver.enums.CategoryType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -31,7 +31,7 @@ public class CategoryTypeCondition implements ICondition { private final List _categoryTypes; - public CategoryTypeCondition(StatsSet params) + public CategoryTypeCondition(StatSet params) { _categoryTypes = params.getEnumList("category", CategoryType.class); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java index b24cfa0f14..9a14cb6fa2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java @@ -16,7 +16,7 @@ */ package handlers.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -29,7 +29,7 @@ public class NpcLevelCondition implements ICondition private final int _minLevel; private final int _maxLevel; - public NpcLevelCondition(StatsSet params) + public NpcLevelCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java index afffe7a0c5..9e3deaa8ce 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java @@ -16,7 +16,7 @@ */ package handlers.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -29,7 +29,7 @@ public class PlayerLevelCondition implements ICondition private final int _minLevel; private final int _maxLevel; - public PlayerLevelCondition(StatsSet params) + public PlayerLevelCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 09f609dc37..0e81066579 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -32,7 +32,7 @@ public class AbnormalShield extends AbstractEffect { private final int _times; - public AbnormalShield(StatsSet params) + public AbnormalShield(StatSet params) { _times = params.getInt("times", -1); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 0496c9068d..9c508c8c52 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Objects; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class AbnormalTimeChange extends AbstractEffect private final int _time; private final int _mode; - public AbnormalTimeChange(StatsSet params) + public AbnormalTimeChange(StatSet params) { final String abnormals = params.getString("slot", null); if ((abnormals != null) && !abnormals.isEmpty()) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 98f85c7b21..3f9132b8e3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -37,7 +37,7 @@ public class AbsorbDamage extends AbstractEffect private final double _damage; private static final Map _damageHolder = new ConcurrentHashMap<>(); - public AbsorbDamage(StatsSet params) + public AbsorbDamage(StatSet params) { _damage = params.getDouble("damage", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 26f51d5351..86fef7cf6d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; @@ -38,7 +38,7 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect private final int _hpPercent; private final Map _updates = new ConcurrentHashMap<>(); - protected AbstractConditionalHpEffect(StatsSet params, Stat stat) + protected AbstractConditionalHpEffect(StatSet params, Stat stat) { super(params, stat); _hpPercent = params.getInt("hpPercent", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java index 2e40124e39..f010f84271 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AbstractStatAddEffect extends AbstractEffect private final Stat _stat; protected final double _amount; - public AbstractStatAddEffect(StatsSet params, Stat stat) + public AbstractStatAddEffect(StatSet params, Stat stat) { _stat = stat; _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index da6a575c44..29e439684b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; @@ -42,12 +42,12 @@ public abstract class AbstractStatEffect extends AbstractEffect protected final StatModifierType _mode; protected final List _conditions = new ArrayList<>(); - public AbstractStatEffect(StatsSet params, Stat stat) + public AbstractStatEffect(StatSet params, Stat stat) { this(params, stat, stat); } - public AbstractStatEffect(StatsSet params, Stat mulStat, Stat addStat) + public AbstractStatEffect(StatSet params, Stat mulStat, Stat addStat) { _addStat = addStat; _mulStat = mulStat; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java index 9811f395aa..33d08bff36 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AbstractStatPercentEffect extends AbstractEffect private final Stat _stat; protected final double _amount; - public AbstractStatPercentEffect(StatsSet params, Stat stat) + public AbstractStatPercentEffect(StatSet params, Stat stat) { _stat = stat; _amount = params.getDouble("amount", 1); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java index 539814ef2a..79c022a23c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class Accuracy extends AbstractStatEffect { - public Accuracy(StatsSet params) + public Accuracy(StatSet params) { super(params, Stat.ACCURACY_COMBAT); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index 0c1fcbd92b..48d69968c5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddHate extends AbstractEffect private final double _power; private final boolean _affectSummoner; - public AddHate(StatsSet params) + public AddHate(StatSet params) { _power = params.getDouble("power", 0); _affectSummoner = params.getBoolean("affectSummoner", false); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java index e90d5cc7f3..324927947a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddSkillBySkill extends AbstractEffect private final int _existingSkillLevel; private final SkillHolder _addedSkill; - public AddSkillBySkill(StatsSet params) + public AddSkillBySkill(StatSet params) { _existingSkillId = params.getInt("existingSkillId"); _existingSkillLevel = params.getInt("existingSkillLevel"); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index bdd8314dd7..205bc82200 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddTeleportBookmarkSlot extends AbstractEffect { private final int _amount; - public AddTeleportBookmarkSlot(StatsSet params) + public AddTeleportBookmarkSlot(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java index c26ec5442f..658931ecb2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionCp extends AbstractStatAddEffect { - public AdditionalPotionCp(StatsSet params) + public AdditionalPotionCp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_CP); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java index 6b68e40f32..57d54c7d3b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionHp extends AbstractStatAddEffect { - public AdditionalPotionHp(StatsSet params) + public AdditionalPotionHp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_HP); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java index c9e1cc237e..007547ebe7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionMp extends AbstractStatAddEffect { - public AdditionalPotionMp(StatsSet params) + public AdditionalPotionMp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_MP); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index cbbd845e23..c01bdec653 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -22,7 +22,7 @@ import java.util.Map; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -78,7 +78,7 @@ public class AirBind extends AbstractEffect _chainedAirSkills.put(ClassId.AEORE_SHILLIEN_SAINT, 11999); // Heavy Hit } - public AirBind(StatsSet params) + public AirBind(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java index f5cbb63465..9255ba1877 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AreaDamage extends AbstractStatAddEffect { - public AreaDamage(StatsSet params) + public AreaDamage(StatSet params) { super(params, Stat.DAMAGE_ZONE_VULN); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java index 2ded14e7ae..a5d56477f5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AttackAttribute extends AbstractEffect private final AttributeType _attribute; private final double _amount; - public AttackAttribute(StatsSet params) + public AttackAttribute(StatSet params) { _amount = params.getDouble("amount", 0); _attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java index ff58d09cc7..795366850d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class AttackAttributeAdd extends AbstractEffect { private final double _amount; - public AttackAttributeAdd(StatsSet params) + public AttackAttributeAdd(StatSet params) { _amount = params.getDouble("amount", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java index 37bfbf341a..fcd2b48c99 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class AttackBehind extends AbstractEffect { - public AttackBehind(StatsSet params) + public AttackBehind(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index 062c325a55..4136f5d530 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class AttackTrait extends AbstractEffect { private final Map _attackTraits = new EnumMap<>(TraitType.class); - public AttackTrait(StatsSet params) + public AttackTrait(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 02d6a8d78c..8ac42d45c3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -37,7 +37,7 @@ public class Backstab extends AbstractEffect private final double _criticalChance; private final boolean _overHit; - public Backstab(StatsSet params) + public Backstab(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Betray.java index 32e3c65c55..79e8bd3360 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Betray extends AbstractEffect { - public Betray(StatsSet params) + public Betray(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Blink.java index ba1caed6ac..56d3f628fd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -52,7 +52,7 @@ public class Blink extends AbstractEffect private final int _flyDelay; private final int _animationSpeed; - public Blink(StatsSet params) + public Blink(StatSet params) { _flyCourse = params.getInt("angle", 0); _flyRadius = params.getInt("range", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 8677f72407..596d4b752f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; */ public class BlinkSwap extends AbstractEffect { - public BlinkSwap(StatsSet params) + public BlinkSwap(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 7bec602aef..cea12039d2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -20,7 +20,7 @@ import java.util.Arrays; import java.util.Set; import java.util.stream.Collectors; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class BlockAbnormalSlot extends AbstractEffect { private final Set _blockAbnormalSlots; - public BlockAbnormalSlot(StatsSet params) + public BlockAbnormalSlot(StatSet params) { _blockAbnormalSlots = Arrays.stream(params.getString("slot").split(";")).map(slot -> Enum.valueOf(AbnormalType.class, slot)).collect(Collectors.toSet()); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index b4839ab322..348881f970 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -21,7 +21,7 @@ import java.util.Set; import org.l2jmobius.gameserver.datatables.BotReportTable; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class BlockAction extends AbstractEffect { private final Set _blockedActions = new HashSet<>(); - public BlockAction(StatsSet params) + public BlockAction(StatSet params) { final String[] actions = params.getString("blockedActions").split(","); for (String action : actions) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index 68f6586e3e..635d2735f9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -22,7 +22,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class BlockActions extends AbstractEffect { private final Set _allowedSkills; - public BlockActions(StatsSet params) + public BlockActions(StatSet params) { final String[] allowedSkills = params.getString("allowedSkills", "").split(";"); _allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet()); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 99af987208..3502d140d0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockChat extends AbstractEffect { - public BlockChat(StatsSet params) + public BlockChat(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java index 6160114414..a2b084c918 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; */ public class BlockControl extends AbstractEffect { - public BlockControl(StatsSet params) + public BlockControl(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java index 3d96329b6d..69b390ae8f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BlockEscape extends AbstractEffect { - public BlockEscape(StatsSet params) + public BlockEscape(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index 8bbd7ac018..85d89180e7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockMove extends AbstractEffect { - public BlockMove(StatsSet params) + public BlockMove(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index 316f82f855..9e28fc403a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockParty extends AbstractEffect { - public BlockParty(StatsSet params) + public BlockParty(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java index ae2ac8b035..d3235fc34f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BlockResurrection extends AbstractEffect { - public BlockResurrection(StatsSet params) + public BlockResurrection(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index f7f119691f..f2cc65b782 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -35,7 +35,7 @@ public class BlockSkill extends AbstractEffect { private final int[] _magicTypes; - public BlockSkill(StatsSet params) + public BlockSkill(StatSet params) { _magicTypes = params.getIntArray("magicTypes", ";"); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index d9b3d3a34d..9f0b7143d2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockTarget extends AbstractEffect { - public BlockTarget(StatsSet params) + public BlockTarget(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index bc4cbd6320..bef60ad003 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class Bluff extends AbstractEffect { private final int _chance; - public Bluff(StatsSet params) + public Bluff(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java index 2ace40a596..69583d613b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusDropAmount extends AbstractStatPercentEffect { - public BonusDropAmount(StatsSet params) + public BonusDropAmount(StatSet params) { super(params, Stat.BONUS_DROP_AMOUNT); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java index b81560b040..e63c8f79f4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusDropRate extends AbstractStatPercentEffect { - public BonusDropRate(StatsSet params) + public BonusDropRate(StatSet params) { super(params, Stat.BONUS_DROP_RATE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java index b984404cb2..e0fb54b162 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusSpoilRate extends AbstractStatPercentEffect { - public BonusSpoilRate(StatsSet params) + public BonusSpoilRate(StatSet params) { super(params, Stat.BONUS_SPOIL_RATE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Breath.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Breath.java index 859f341f3c..4235319f22 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Breath.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Breath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class Breath extends AbstractStatEffect { - public Breath(StatsSet params) + public Breath(StatSet params) { super(params, Stat.BREATH); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java index a6d25f3c36..4102506e6c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BuffBlock extends AbstractEffect { - public BuffBlock(StatsSet params) + public BuffBlock(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index de7497f8bf..4f470b06c7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class CallLearnedSkill extends AbstractEffect { private final int _skillId; - public CallLearnedSkill(StatsSet params) + public CallLearnedSkill(StatSet params) { _skillId = params.getInt("skillId"); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index e6096be4be..b41daf073c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CallParty extends AbstractEffect { - public CallParty(StatsSet params) + public CallParty(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index 0760fb675e..eb4bdf2349 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class CallPc extends AbstractEffect private final int _itemId; private final int _itemCount; - public CallPc(StatsSet params) + public CallPc(StatSet params) { _itemId = params.getInt("itemId", 0); _itemCount = params.getInt("itemCount", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index d6d5cb721d..0da3802665 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -35,7 +35,7 @@ public class CallRandomSkill extends AbstractEffect { private final List _skills = new ArrayList<>(); - public CallRandomSkill(StatsSet params) + public CallRandomSkill(StatSet params) { final String skills = params.getString("skills", null); if (skills != null) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index 99c1494223..f8e4b226c4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -35,7 +35,7 @@ public class CallSkill extends AbstractEffect private final SkillHolder _skill; private final int _skillLevelScaleTo; - public CallSkill(StatsSet params) + public CallSkill(StatSet params) { _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0)); _skillLevelScaleTo = params.getInt("skillLevelScaleTo", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index b340de4ae1..ff98639c37 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.Collections; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ public class CallSkillOnActionTime extends AbstractEffect { private final SkillHolder _skill; - public CallSkillOnActionTime(StatsSet params) + public CallSkillOnActionTime(StatSet params) { _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0)); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index d48eb90fb3..32753a71a0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CallTargetParty extends AbstractEffect { - public CallTargetParty(StatsSet params) + public CallTargetParty(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index ef01f4a8ed..d4331bf5b7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ public class ChameleonRest extends AbstractEffect { private final double _power; - public ChameleonRest(StatsSet params) + public ChameleonRest(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index e3b846674d..37054f2fd0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; @@ -35,9 +35,9 @@ public class ChangeBody extends AbstractEffect { private final Set _transformations = new HashSet<>(); - public ChangeBody(StatsSet params) + public ChangeBody(StatSet params) { - for (StatsSet item : params.getList("templates", StatsSet.class)) + for (StatSet item : params.getList("templates", StatSet.class)) { _transformations.add(new TemplateChanceHolder(item.getInt(".templateId"), item.getInt(".minChance"), item.getInt(".maxChance"))); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 76c6e03aa6..6b6386909e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeFace extends AbstractEffect { private final int _value; - public ChangeFace(StatsSet params) + public ChangeFace(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java index cee3ac1a6f..304afa821c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; /** @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; */ public class ChangeFishingMastery extends AbstractEffect { - public ChangeFishingMastery(StatsSet params) + public ChangeFishingMastery(StatSet params) { } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index 0c583cbc13..64ac49f5d5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeHairColor extends AbstractEffect { private final int _value; - public ChangeHairColor(StatsSet params) + public ChangeHairColor(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index ad2efbe6a0..ae7d6c6da1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeHairStyle extends AbstractEffect { private final int _value; - public ChangeHairStyle(StatsSet params) + public ChangeHairStyle(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java index 2d536029fd..4d7c380c75 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class CheapShot extends AbstractEffect { - public CheapShot(StatsSet params) + public CheapShot(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index 207b7f0a3e..1a6a44fb31 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.SubclassInfoType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class ClassChange extends AbstractEffect private final int _index; private static final int IDENTITY_CRISIS_SKILL_ID = 1570; - public ClassChange(StatsSet params) + public ClassChange(StatSet params) { _index = params.getInt("index", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index ccf7598eff..e184022afc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.stats.Formulas; */ public class Compelling extends AbstractEffect { - public Compelling(StatsSet params) + public Compelling(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index b6aa30f604..f164ac6f3f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class Confuse extends AbstractEffect { private final int _chance; - public Confuse(StatsSet params) + public Confuse(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 25e29532eb..78293c1b0f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ConsumeBody extends AbstractEffect { - public ConsumeBody(StatsSet params) + public ConsumeBody(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index e915eb0391..6ddd0d72eb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class ConvertItem extends AbstractEffect { - public ConvertItem(StatsSet params) + public ConvertItem(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java index 9402fdb06d..857df659c0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CounterPhysicalSkill extends AbstractStatAddEffect { - public CounterPhysicalSkill(StatsSet params) + public CounterPhysicalSkill(StatSet params) { super(params, Stat.VENGEANCE_SKILL_PHYSICAL_DAMAGE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 67bca7fd1b..598682037b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Cp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Cp(StatsSet params) + public Cp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index e0cd52808e..37303b0e7a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class CpHeal extends AbstractEffect { private final double _power; - public CpHeal(StatsSet params) + public CpHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index e2e8ee3479..54de5adfc6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class CpHealOverTime extends AbstractEffect { private final double _power; - public CpHealOverTime(StatsSet params) + public CpHealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index 5665e937dc..b4a994d6df 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CpHealPercent extends AbstractEffect { private final double _power; - public CpHealPercent(StatsSet params) + public CpHealPercent(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java index 1cc851b2af..efb020bbd5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CpRegen extends AbstractStatEffect { - public CpRegen(StatsSet params) + public CpRegen(StatSet params) { super(params, Stat.REGENERATE_CP_RATE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CraftingCritical.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CraftingCritical.java index fb8ef495fb..cb3f2aace2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CraftingCritical.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CraftingCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CraftingCritical extends AbstractStatAddEffect { - public CraftingCritical(StatsSet params) + public CraftingCritical(StatSet params) { super(params, Stat.CRAFTING_CRITICAL); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java index 37231ac1af..00d3dfbaaa 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class CreateCommonItem extends AbstractEffect { private final int _recipeLevel; - public CreateCommonItem(StatsSet params) + public CreateCommonItem(StatSet params) { _recipeLevel = params.getInt("value"); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java index 99f31fecab..d01d510ba9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class CreateItem extends AbstractEffect { private final int _recipeLevel; - public CreateItem(StatsSet params) + public CreateItem(StatSet params) { _recipeLevel = params.getInt("value"); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java index 8983497026..0b93eef45e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CriticalDamage extends AbstractStatEffect { - public CriticalDamage(StatsSet params) + public CriticalDamage(StatSet params) { super(params, Stat.CRITICAL_DAMAGE, Stat.CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 7ef4f0ecb4..0630f087b7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.Position; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CriticalDamagePosition extends AbstractEffect private final double _amount; private final Position _position; - public CriticalDamagePosition(StatsSet params) + public CriticalDamagePosition(StatSet params) { _amount = params.getDouble("amount", 0); _position = params.getEnum("position", Position.class, Position.FRONT); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java index 01f49380eb..0d4bded60e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; public class CriticalRate extends AbstractConditionalHpEffect { - public CriticalRate(StatsSet params) + public CriticalRate(StatSet params) { super(params, Stat.CRITICAL_RATE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 863b385ca3..4d65fa84eb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.Position; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CriticalRatePositionBonus extends AbstractEffect private final double _amount; private final Position _position; - public CriticalRatePositionBonus(StatsSet params) + public CriticalRatePositionBonus(StatSet params) { _amount = params.getDouble("amount", 0); _position = params.getEnum("position", Position.class, Position.FRONT); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index 0d307a3240..33ccbd1de1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class CrystalGradeModify extends AbstractEffect { private final int _amount; - public CrystalGradeModify(StatsSet params) + public CrystalGradeModify(StatSet params) { _amount = params.getInt("_amount", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java index 5f86f9d343..bd48abf204 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ItemGrade; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class Crystallize extends AbstractEffect { private final ItemGrade _grade; - public Crystallize(StatsSet params) + public Crystallize(StatSet params) { _grade = params.getEnum("grade", ItemGrade.class); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java index 94ff8e64e2..79ee5b994e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CubicMastery extends AbstractStatAddEffect { - public CubicMastery(StatsSet params) + public CubicMastery(StatSet params) { super(params, Stat.MAX_CUBIC); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index 36abf0accf..e6bb53fdea 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class DamOverTime extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTime(StatsSet params) + public DamOverTime(StatSet params) { _canKill = params.getBoolean("canKill", false); _power = params.getDouble("power"); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 13e57099e0..b5f25db4d8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class DamOverTimePercent extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTimePercent(StatsSet params) + public DamOverTimePercent(StatSet params) { _canKill = params.getBoolean("canKill", false); _power = params.getDouble("power"); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java index dc7a45198f..c9567ea034 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ public class DamageBlock extends AbstractEffect private final boolean _blockHp; private final boolean _blockMp; - public DamageBlock(StatsSet params) + public DamageBlock(StatSet params) { final String type = params.getString("type", null); _blockHp = type.equalsIgnoreCase("BLOCK_HP"); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java index bfa716eacc..9eb0b4e233 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DamageByAttackType; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -38,7 +38,7 @@ public class DamageByAttack extends AbstractEffect private final double _value; private final DamageByAttackType _type; - public DamageByAttack(StatsSet params) + public DamageByAttack(StatSet params) { _value = params.getDouble("amount"); _type = params.getEnum("type", DamageByAttackType.class, DamageByAttackType.NONE); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java index 5a7629482a..e823a9824a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DamageShield extends AbstractStatAddEffect { - public DamageShield(StatsSet params) + public DamageShield(StatSet params) { super(params, Stat.REFLECT_DAMAGE_PERCENT); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java index db1abe264d..3029a3f0aa 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DamageShieldResist extends AbstractStatAddEffect { - public DamageShieldResist(StatsSet params) + public DamageShieldResist(StatSet params) { super(params, Stat.REFLECT_DAMAGE_PERCENT_DEFENSE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index 8561ff46b0..369bd5483d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class DeathLink extends AbstractEffect { private final double _power; - public DeathLink(StatsSet params) + public DeathLink(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java index b948fad1fc..54261c6229 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class DebuffBlock extends AbstractEffect { - public DebuffBlock(StatsSet params) + public DebuffBlock(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java index 217ef3dfaa..4bc08271fa 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class DefenceAttribute extends AbstractEffect private final AttributeType _attribute; private final double _amount; - public DefenceAttribute(StatsSet params) + public DefenceAttribute(StatSet params) { _amount = params.getDouble("amount", 0); _attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java index 0c0c2e8d6a..daff53d9e1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceCriticalDamage extends AbstractStatEffect { - public DefenceCriticalDamage(StatsSet params) + public DefenceCriticalDamage(StatSet params) { super(params, Stat.DEFENCE_CRITICAL_DAMAGE, Stat.DEFENCE_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java index 131eb500ea..74a729e38c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceCriticalRate extends AbstractStatEffect { - public DefenceCriticalRate(StatsSet params) + public DefenceCriticalRate(StatSet params) { super(params, Stat.DEFENCE_CRITICAL_RATE, Stat.DEFENCE_CRITICAL_RATE_ADD); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java index 1abee78e08..c664939977 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceMagicCriticalDamage extends AbstractStatEffect { - public DefenceMagicCriticalDamage(StatsSet params) + public DefenceMagicCriticalDamage(StatSet params) { super(params, Stat.DEFENCE_MAGIC_CRITICAL_DAMAGE, Stat.DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java index 2146b89551..6594dda2b3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceMagicCriticalRate extends AbstractStatEffect { - public DefenceMagicCriticalRate(StatsSet params) + public DefenceMagicCriticalRate(StatSet params) { super(params, Stat.DEFENCE_MAGIC_CRITICAL_RATE, Stat.DEFENCE_MAGIC_CRITICAL_RATE_ADD); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index bd80f690cd..134ed56979 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class DefenceTrait extends AbstractEffect { private final Map _defenceTraits = new EnumMap<>(TraitType.class); - public DefenceTrait(StatsSet params) + public DefenceTrait(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index bab5e1a762..7cee616006 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class DeleteHate extends AbstractEffect { private final int _chance; - public DeleteHate(StatsSet params) + public DeleteHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index 85985653b8..f10f189e68 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class DeleteHateOfMe extends AbstractEffect { private final int _chance; - public DeleteHateOfMe(StatsSet params) + public DeleteHateOfMe(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index d3664ad00f..82833ac79d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class DeleteTopAgro extends AbstractEffect { private final int _chance; - public DeleteTopAgro(StatsSet params) + public DeleteTopAgro(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index ae1f2a5942..ba6dad4698 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DoorOpenType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DetectHiddenObjects extends AbstractEffect { - public DetectHiddenObjects(StatsSet params) + public DetectHiddenObjects(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Detection.java index 078360ff35..a20cbcb348 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Detection extends AbstractEffect { - public Detection(StatsSet params) + public Detection(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java index d679c71919..5227885bb5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class DisableSkill extends AbstractEffect private final Set disableSkills; private Skill knownSKill; - public DisableSkill(StatsSet params) + public DisableSkill(StatSet params) { final String disable = params.getString("disable"); if ((disable != null) && !disable.isEmpty()) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 8567a94d12..32ee715df7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DisableTargeting extends AbstractEffect { - public DisableTargeting(StatsSet params) + public DisableTargeting(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index fa06ec7221..5a80971f51 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Disarm extends AbstractEffect { - public Disarm(StatsSet params) + public Disarm(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index 0133906661..8b06598d83 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class Disarmor extends AbstractEffect private final Map _unequippedItems; // PlayerObjId, ItemObjId private final int _slot; - public Disarmor(StatsSet params) + public Disarmor(StatSet params) { _unequippedItems = new ConcurrentHashMap<>(); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 95de0300bb..a652a023f5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DispelAll extends AbstractEffect { - public DispelAll(StatsSet params) + public DispelAll(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 88d979a0d9..040271d2a7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.List; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -38,7 +38,7 @@ public class DispelByCategory extends AbstractEffect private final int _rate; private final int _max; - public DispelByCategory(StatsSet params) + public DispelByCategory(StatSet params) { _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); _rate = params.getInt("rate", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index a6e4c7cd19..ab79e046b2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.EnumMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -37,7 +37,7 @@ public class DispelBySlot extends AbstractEffect private final String _dispel; private final Map _dispelAbnormals; - public DispelBySlot(StatsSet params) + public DispelBySlot(StatSet params) { _dispel = params.getString("dispel"); if ((_dispel != null) && !_dispel.isEmpty()) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 1ba6612e23..d1341d10b9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class DispelBySlotMyself extends AbstractEffect { private final Set _dispelAbnormals; - public DispelBySlotMyself(StatsSet params) + public DispelBySlotMyself(StatSet params) { final String dispel = params.getString("dispel"); if ((dispel != null) && !dispel.isEmpty()) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 845980e59d..b58723058e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -37,7 +37,7 @@ public class DispelBySlotProbability extends AbstractEffect private final Set _dispelAbnormals; private final int _rate; - public DispelBySlotProbability(StatsSet params) + public DispelBySlotProbability(StatSet params) { final String[] dispelEffects = params.getString("dispel").split(";"); _rate = params.getInt("rate", 100); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index 7acd9c4a6c..688d77a703 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -45,7 +45,7 @@ public class DoubleCast extends AbstractEffect private final Map> _addedToggles; - public DoubleCast(StatsSet params) + public DoubleCast(StatSet params) { _addedToggles = new HashMap<>(); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java index d7f067a2a0..d1e21edeb0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DuelistFury extends AbstractEffect { - public DuelistFury(StatsSet params) + public DuelistFury(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index 409fed6a23..de397bb5ff 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class EnableCloak extends AbstractEffect { - public EnableCloak(StatsSet params) + public EnableCloak(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index e855c4ba1a..2fe2bef99f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -43,7 +43,7 @@ public class EnergyAttack extends AbstractEffect private final boolean _overHit; private final double _pDefMod; - public EnergyAttack(StatsSet params) + public EnergyAttack(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getInt("criticalChance", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index a8f108573f..ae463ef2a4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class EnlargeAbnormalSlot extends AbstractEffect { private final int _slots; - public EnlargeAbnormalSlot(StatsSet params) + public EnlargeAbnormalSlot(StatSet params) { _slots = params.getInt("slots", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java index c43ea04413..c4073b1a47 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StorageType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class EnlargeSlot extends AbstractEffect private final StorageType _type; private final double _amount; - public EnlargeSlot(StatsSet params) + public EnlargeSlot(StatSet params) { _amount = params.getDouble("amount", 0); _type = params.getEnum("type", StorageType.class, StorageType.INVENTORY_NORMAL); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Escape.java index 936f82d8ce..f3a07c9d15 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class Escape extends AbstractEffect { private final TeleportWhereType _escapeType; - public Escape(StatsSet params) + public Escape(StatSet params) { _escapeType = params.getEnum("escapeType", TeleportWhereType.class, null); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java index 76dbc8171c..eb68d24af8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ExpModify extends AbstractStatAddEffect { - public ExpModify(StatsSet params) + public ExpModify(StatSet params) { super(params, Stat.BONUS_EXP); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java index bf11db6e4b..1100ca25be 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Faceoff extends AbstractEffect { - public Faceoff(StatsSet params) + public Faceoff(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index e256209e39..79f7b43503 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -34,7 +34,7 @@ public class FakeDeath extends AbstractEffect { private final double _power; - public FakeDeath(StatsSet params) + public FakeDeath(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index a94c75d310..780d5cefba 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -44,7 +44,7 @@ public class FatalBlow extends AbstractEffect private final double _abnormalPower; private final boolean _overHit; - public FatalBlow(StatsSet params) + public FatalBlow(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java index c8ff8f7acb..6e7597e63d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class FatalBlowRate extends AbstractEffect private final double _amount; private final StatModifierType _mode; - public FatalBlowRate(StatsSet params) + public FatalBlowRate(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 9731e75e5d..ec2659ea2c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DefenderInstance; import org.l2jmobius.gameserver.model.actor.instance.FortCommanderInstance; @@ -40,7 +40,7 @@ public class Fear extends AbstractEffect { private static final int FEAR_RANGE = 500; - public Fear(StatsSet params) + public Fear(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 5e04e46d60..94d9912bdf 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.MountType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ public class Feed extends AbstractEffect private final int _ride; private final int _wyvern; - public Feed(StatsSet params) + public Feed(StatSet params) { _normal = params.getInt("normal", 0); _ride = params.getInt("ride", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java index 0b22a4d4c9..146e3b73e6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class FishingExpSpBonus extends AbstractStatPercentEffect { - public FishingExpSpBonus(StatsSet params) + public FishingExpSpBonus(StatSet params) { super(params, Stat.FISHING_EXP_SP_BONUS); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Flag.java index c1469eab19..2442cbdb35 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Flag extends AbstractEffect { - public Flag(StatsSet params) + public Flag(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index 0243f0f543..74a9754a95 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.BlockInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class FlipBlock extends AbstractEffect { - public FlipBlock(StatsSet params) + public FlipBlock(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 7fc7da5fe6..3412e4d36d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class FlyAway extends AbstractEffect { private final int _radius; - public FlyAway(StatsSet params) + public FlyAway(StatSet params) { _radius = params.getInt("radius"); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java index fd3216286d..590fbbcd44 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class FocusEnergy extends AbstractStatAddEffect { - public FocusEnergy(StatsSet params) + public FocusEnergy(StatSet params) { super(params, Stat.MAX_MOMENTUM); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index efbd93f304..19f0163e42 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class FocusMaxMomentum extends AbstractEffect { - public FocusMaxMomentum(StatsSet params) + public FocusMaxMomentum(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index 284d19ee5f..e8c18e9682 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -36,7 +36,7 @@ public class FocusMomentum extends AbstractEffect private final int _amount; private final int _maxCharges; - public FocusMomentum(StatsSet params) + public FocusMomentum(StatSet params) { _amount = params.getInt("amount", 1); _maxCharges = params.getInt("maxCharges", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 18a9864bbc..debd491cfe 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class FocusSouls extends AbstractEffect { private final int _charge; - public FocusSouls(StatsSet params) + public FocusSouls(StatSet params) { _charge = params.getInt("charge", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 8540ccd49c..23328db910 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Set; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class GetAgro extends AbstractEffect { - public GetAgro(StatsSet params) + public GetAgro(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java index 1ca8722709..e91002d04b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class GetDamageLimit extends AbstractStatAddEffect { - public GetDamageLimit(StatsSet params) + public GetDamageLimit(StatSet params) { super(params, Stat.DAMAGE_LIMIT); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 2dfd3bf8c4..439f3e8e3a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class GetMomentum extends AbstractEffect { private static int _ticks; - public GetMomentum(StatsSet params) + public GetMomentum(StatSet params) { _ticks = params.getInt("ticks", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index 7c1c0f3fa2..2c842101ed 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class GiveClanReputation extends AbstractEffect { private final int _reputation; - public GiveClanReputation(StatsSet params) + public GiveClanReputation(StatSet params) { _reputation = params.getInt("reputation", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index fd4d61fa73..9052c63154 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class GiveExpAndSp extends AbstractEffect private final int _xp; private final int _sp; - public GiveExpAndSp(StatsSet params) + public GiveExpAndSp(StatSet params) { _xp = params.getInt("xp", 0); _sp = params.getInt("sp", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index 3448e09797..9d41a4395b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ public class GiveFame extends AbstractEffect { private final int _fame; - public GiveFame(StatsSet params) + public GiveFame(StatSet params) { _fame = params.getInt("fame", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index c948fa0948..617a8ef88a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class GiveRecommendation extends AbstractEffect { private final int _amount; - public GiveRecommendation(StatsSet params) + public GiveRecommendation(StatSet params) { _amount = params.getInt("amount", 0); if (_amount == 0) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index 5fe06566c7..75a16fe828 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class GiveSp extends AbstractEffect { private final int _sp; - public GiveSp(StatsSet params) + public GiveSp(StatSet params) { _sp = params.getInt("sp", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index e32735f4e9..7779c6f413 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class GiveXp extends AbstractEffect { private final long _xp; - public GiveXp(StatsSet params) + public GiveXp(StatSet params) { _xp = params.getLong("xp", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 17095c209a..5cf4994f32 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Grow extends AbstractEffect { - public Grow(StatsSet params) + public Grow(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index a2200e1a2f..350c8e659f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.UserInfoType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class HairAccessorySet extends AbstractEffect { - public HairAccessorySet(StatsSet params) + public HairAccessorySet(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index 04b0b8ac6f..8211e03c01 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Harvesting extends AbstractEffect { - public Harvesting(StatsSet params) + public Harvesting(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java index ac1c9f49d8..097db6604a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HateAttack extends AbstractStatPercentEffect { - public HateAttack(StatsSet params) + public HateAttack(StatSet params) { super(params, Stat.HATE_ATTACK); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index 00f569eb17..9963ff1336 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlagInstance; @@ -34,7 +34,7 @@ public class HeadquarterCreate extends AbstractEffect private static final int HQ_NPC_ID = 35062; private final boolean _isAdvanced; - public HeadquarterCreate(StatsSet params) + public HeadquarterCreate(StatSet params) { _isAdvanced = params.getBoolean("isAdvanced", false); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 6e611144f1..139972a272 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -40,7 +40,7 @@ public class Heal extends AbstractEffect { private final double _power; - public Heal(StatsSet params) + public Heal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java index 5a7457d3df..a9f75ab036 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HealEffect extends AbstractStatEffect { - public HealEffect(StatsSet params) + public HealEffect(StatSet params) { super(params, Stat.HEAL_EFFECT, Stat.HEAL_EFFECT_ADD); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 86e28dc8b4..da76f33058 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class HealOverTime extends AbstractEffect { private final double _power; - public HealOverTime(StatsSet params) + public HealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index 6c9c8986bb..8b1c821a0a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class HealPercent extends AbstractEffect { private final int _power; - public HealPercent(StatsSet params) + public HealPercent(StatSet params) { _power = params.getInt("power", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Hide.java index e431277964..d02898bac5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Hide extends AbstractEffect { - public Hide(StatsSet params) + public Hide(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index e7e5f3f91b..78fa1c9392 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.GameTimeController; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HitAtNight extends AbstractStatEffect { - public HitAtNight(StatsSet params) + public HitAtNight(StatSet params) { super(params, Stat.HIT_AT_NIGHT); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java index 1fd98e7aa9..f14b922308 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HitNumber extends AbstractStatEffect { - public HitNumber(StatsSet params) + public HitNumber(StatSet params) { super(params, Stat.ATTACK_COUNT_MAX); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 3611fd7d74..c2426f8d11 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Hp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Hp(StatsSet params) + public Hp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index 3d125565fe..6244c76428 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class HpByLevel extends AbstractEffect { private final double _power; - public HpByLevel(StatsSet params) + public HpByLevel(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 3cdb210bba..80b4af9b46 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -40,7 +40,7 @@ public class HpCpHeal extends AbstractEffect { private final double _power; - public HpCpHeal(StatsSet params) + public HpCpHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java index 0394dab996..6f96c2dcb3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class HpCpHealCritical extends AbstractEffect { - public HpCpHealCritical(StatsSet params) + public HpCpHealCritical(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 554b1cec79..7cf47c3a65 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class HpDrain extends AbstractEffect private final double _power; private final double _percentage; - public HpDrain(StatsSet params) + public HpDrain(StatSet params) { _power = params.getDouble("power", 0); _percentage = params.getDouble("percentage", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java index cb1d2bc3a7..b170bc62ba 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HpRegen extends AbstractStatEffect { - public HpRegen(StatsSet params) + public HpRegen(StatSet params) { super(params, Stat.REGENERATE_HP_RATE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 235e89a79b..f346fbaad8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class HpToOwner extends AbstractEffect private final double _power; private final int _stealAmount; - public HpToOwner(StatsSet params) + public HpToOwner(StatSet params) { _power = params.getDouble("power"); _stealAmount = params.getInt("stealAmount"); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java index 9829519da9..c659684ae8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class IgnoreDeath extends AbstractEffect { - public IgnoreDeath(StatsSet params) + public IgnoreDeath(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index f7c9baa155..44dceba10e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ImmobilePetBuff extends AbstractEffect { - public ImmobilePetBuff(StatsSet params) + public ImmobilePetBuff(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java index a60fc45d15..a03eff933a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ public class InstantKillResist extends AbstractEffect { private final int _amount; - public InstantKillResist(StatsSet params) + public InstantKillResist(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java index 7e1fc8abe4..265a9aab97 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class JewelSlot extends AbstractStatAddEffect { - public JewelSlot(StatsSet params) + public JewelSlot(StatSet params) { super(params, Stat.BROOCH_JEWELS); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 3d5ff2dda3..a34d7cc5b3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class KarmaCount extends AbstractEffect private final int _amount; private final int _mode; - public KarmaCount(StatsSet params) + public KarmaCount(StatSet params) { _amount = params.getInt("amount", 0); switch (params.getString("mode", "DIFF")) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index b6f5b03994..cffa4427c6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -94,7 +94,7 @@ public class KnockBack extends AbstractEffect _chainKnockSkills.put(ClassId.AEORE_SHILLIEN_SAINT, 12000); // Heavy Hit } - public KnockBack(StatsSet params) + public KnockBack(StatSet params) { _distance = params.getInt("distance", 50); _speed = params.getInt("speed", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index 7bfac989cf..1affb1b141 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -38,7 +38,7 @@ public class Lethal extends AbstractEffect private final double _fullLethal; private final double _halfLethal; - public Lethal(StatsSet params) + public Lethal(StatSet params) { _fullLethal = params.getDouble("fullLethal", 0); _halfLethal = params.getDouble("halfLethal", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java index aeb42458a6..43b17877ad 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitCp extends AbstractStatEffect { - public LimitCp(StatsSet params) + public LimitCp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_CP); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java index cf76ec482a..45d8f37355 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitHp extends AbstractStatEffect { - public LimitHp(StatsSet params) + public LimitHp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_HP); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java index f5eda36ba6..8d31633d0a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitMp extends AbstractStatEffect { - public LimitMp(StatsSet params) + public LimitMp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_MP); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Lucky.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Lucky.java index 3775d2361d..4ff5ea9a01 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Lucky.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Lucky.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Lucky extends AbstractEffect { - public Lucky(StatsSet params) + public Lucky(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MAtk.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MAtk.java index 5f9ad5f32b..38c2fc9067 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MAtk.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MAtk.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MAtk extends AbstractStatEffect { - public MAtk(StatsSet params) + public MAtk(StatSet params) { super(params, Stat.MAGIC_ATTACK); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java index 2b9ae2e9e6..393d0d2d30 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicAccuracy extends AbstractStatEffect { - public MagicAccuracy(StatsSet params) + public MagicAccuracy(StatSet params) { super(params, Stat.ACCURACY_MAGIC); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java index 123706eb55..b9a58b09f3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicCriticalDamage extends AbstractStatEffect { - public MagicCriticalDamage(StatsSet params) + public MagicCriticalDamage(StatSet params) { super(params, Stat.MAGIC_CRITICAL_DAMAGE, Stat.MAGIC_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java index 0c10014e50..c9fa9a4240 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicCriticalRate extends AbstractStatEffect { - public MagicCriticalRate(StatsSet params) + public MagicCriticalRate(StatSet params) { super(params, Stat.MAGIC_CRITICAL_RATE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index e8b6f5e8bf..5281bf8445 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class MagicMpCost extends AbstractEffect private final int _magicType; private final double _amount; - public MagicMpCost(StatsSet params) + public MagicMpCost(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index ed4a3fca8b..283a99176c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class MagicalAbnormalDispelAttack extends AbstractEffect private final double _power; private final AbnormalType _abnormalType; - public MagicalAbnormalDispelAttack(StatsSet params) + public MagicalAbnormalDispelAttack(StatSet params) { _power = params.getDouble("power", 0); _abnormalType = AbnormalType.getAbnormalType(params.getString("abnormalType", null)); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java index 8234db1c43..be6403077c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAbnormalResist extends AbstractStatAddEffect { - public MagicalAbnormalResist(StatsSet params) + public MagicalAbnormalResist(StatSet params) { super(params, Stat.ABNORMAL_RESIST_MAGICAL); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index 4e938809f1..25c7d25954 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -37,7 +37,7 @@ public class MagicalAttack extends AbstractEffect private final boolean _overHit; private final double _debuffModifier; - public MagicalAttack(StatsSet params) + public MagicalAttack(StatSet params) { _power = params.getDouble("power", 0); _overHit = params.getBoolean("overHit", false); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 424480b76c..11c387780e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class MagicalAttackByAbnormal extends AbstractEffect { private final double _power; - public MagicalAttackByAbnormal(StatsSet params) + public MagicalAttackByAbnormal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9c3e263a05..348e904025 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -40,7 +40,7 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect private final double _power; private final Set _abnormals; - public MagicalAttackByAbnormalSlot(StatsSet params) + public MagicalAttackByAbnormalSlot(StatSet params) { _power = params.getDouble("power", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 49dd351046..de55dd0fcd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -38,7 +38,7 @@ public class MagicalAttackMp extends AbstractEffect private final boolean _critical; private final double _criticalLimit; - public MagicalAttackMp(StatsSet params) + public MagicalAttackMp(StatSet params) { _power = params.getDouble("power"); _critical = params.getBoolean("critical"); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 4414b36fa7..93ac560169 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class MagicalAttackRange extends AbstractEffect private final double _power; private final double _shieldDefPercent; - public MagicalAttackRange(StatsSet params) + public MagicalAttackRange(StatSet params) { _power = params.getDouble("power"); _shieldDefPercent = params.getDouble("shieldDefPercent", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java index 2e304e5f8b..1cf39ed501 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAttackSpeed extends AbstractStatEffect { - public MagicalAttackSpeed(StatsSet params) + public MagicalAttackSpeed(StatSet params) { super(params, Stat.MAGIC_ATTACK_SPEED); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 9a3a776e32..880d71f0c5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class MagicalDamOverTime extends AbstractEffect private final double _power; private final boolean _canKill; - public MagicalDamOverTime(StatsSet params) + public MagicalDamOverTime(StatSet params) { _power = params.getDouble("power", 0); _canKill = params.getBoolean("canKill", false); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java index 80fdf87050..9b4e6061aa 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalDefence extends AbstractStatEffect { - public MagicalDefence(StatsSet params) + public MagicalDefence(StatSet params) { super(params, Stat.MAGICAL_DEFENCE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java index c3c7c404f3..4e83b80e8b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalEvasion extends AbstractStatEffect { - public MagicalEvasion(StatsSet params) + public MagicalEvasion(StatSet params) { super(params, Stat.MAGIC_EVASION_RATE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java index 6253af7373..bf419a19f7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalSkillPower extends AbstractStatEffect { - public MagicalSkillPower(StatsSet params) + public MagicalSkillPower(StatSet params) { super(params, Stat.MAGICAL_SKILL_POWER, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index d0047fedef..f4388dc16f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class MagicalSoulAttack extends AbstractEffect { private final double _power; - public MagicalSoulAttack(StatsSet params) + public MagicalSoulAttack(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java index fcc143cd4b..688243d9e1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ManaCharge extends AbstractStatAddEffect { - public ManaCharge(StatsSet params) + public ManaCharge(StatSet params) { super(params, Stat.MANA_CHARGE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index 0c84b4ab61..b889e6e824 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class ManaDamOverTime extends AbstractEffect { private final double _power; - public ManaDamOverTime(StatsSet params) + public ManaDamOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index f48011c9a2..94286df1c8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -34,7 +34,7 @@ public class ManaHeal extends AbstractEffect { private final double _power; - public ManaHeal(StatsSet params) + public ManaHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index bfdfa54380..61f15449a0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -35,7 +35,7 @@ public class ManaHealByLevel extends AbstractEffect { private final double _power; - public ManaHealByLevel(StatsSet params) + public ManaHealByLevel(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 46937a8dd0..e505c9e7a2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class ManaHealOverTime extends AbstractEffect { private final double _power; - public ManaHealOverTime(StatsSet params) + public ManaHealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 101961d1c4..71085da549 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class ManaHealPercent extends AbstractEffect { private final double _power; - public ManaHealPercent(StatsSet params) + public ManaHealPercent(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 7c9c63e3ad..07d15d826c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxCp extends AbstractStatEffect { private final boolean _heal; - public MaxCp(StatsSet params) + public MaxCp(StatSet params) { super(params, Stat.MAX_CP); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 6d2c3449bd..85867bca96 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxHp extends AbstractStatEffect { private final boolean _heal; - public MaxHp(StatsSet params) + public MaxHp(StatSet params) { super(params, Stat.MAX_HP); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index e554c63055..9ca46fda8d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxMp extends AbstractStatEffect { private final boolean _heal; - public MaxMp(StatsSet params) + public MaxMp(StatSet params) { super(params, Stat.MAX_MP); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 39cf62a95b..c27284e5f6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -43,7 +43,7 @@ public class ModifyVital extends AbstractEffect private final int _mp; private final int _cp; - public ModifyVital(StatsSet params) + public ModifyVital(StatSet params) { _type = params.getEnum("type", ModifyType.class); if (_type != ModifyType.SET) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 29ee88f805..095d130f7f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Mp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Mp(StatsSet params) + public Mp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index 76d858ad8e..b13d7824d0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class MpConsumePerLevel extends AbstractEffect { private final double _power; - public MpConsumePerLevel(StatsSet params) + public MpConsumePerLevel(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java index 2051009805..ae7bf0c48c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpRegen extends AbstractStatEffect { - public MpRegen(StatsSet params) + public MpRegen(StatSet params) { super(params, Stat.REGENERATE_MP_RATE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MpShield.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MpShield.java index 82e307a562..a4eb3e663f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MpShield.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MpShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpShield extends AbstractStatAddEffect { - public MpShield(StatsSet params) + public MpShield(StatSet params) { super(params, Stat.MANA_SHIELD_PERCENT); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java index af2ce119cc..366e96b18f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpVampiricAttack extends AbstractStatAddEffect { - public MpVampiricAttack(StatsSet params) + public MpVampiricAttack(StatSet params) { super(params, Stat.ABSORB_MANA_DAMAGE_PERCENT); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mute.java index a7f2f76e23..7e5b5a528f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Mute extends AbstractEffect { - public Mute(StatsSet params) + public Mute(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java index 3cc4cae96f..513dc46ec7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class NoblesseBless extends AbstractEffect { - public NoblesseBless(StatsSet params) + public NoblesseBless(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index bb0f02af5c..05f8c6a99b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpenChest extends AbstractEffect { - public OpenChest(StatsSet params) + public OpenChest(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 1b8f7ef59f..a4b09c13ec 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeBookItemList; */ public class OpenCommonRecipeBook extends AbstractEffect { - public OpenCommonRecipeBook(StatsSet params) + public OpenCommonRecipeBook(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 21dd337982..7b5effc6b4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class OpenDoor extends AbstractEffect private final int _chance; private final boolean _isItem; - public OpenDoor(StatsSet params) + public OpenDoor(StatSet params) { _chance = params.getInt("chance", 0); _isItem = params.getBoolean("isItem", false); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index ebd6c6a668..8842de2ea8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeBookItemList; */ public class OpenDwarfRecipeBook extends AbstractEffect { - public OpenDwarfRecipeBook(StatsSet params) + public OpenDwarfRecipeBook(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PAtk.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PAtk.java index c353d03a00..7f10b9dcc7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PAtk.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PAtk.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PAtk extends AbstractConditionalHpEffect { - public PAtk(StatsSet params) + public PAtk(StatSet params) { super(params, Stat.PHYSICAL_ATTACK); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Passive.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Passive.java index cef680ca21..27ce15bb60 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Passive.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Passive.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Passive extends AbstractEffect { - public Passive(StatsSet params) + public Passive(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java index 05f55c7dac..1a9f29424f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAbnormalResist extends AbstractStatAddEffect { - public PhysicalAbnormalResist(StatsSet params) + public PhysicalAbnormalResist(StatSet params) { super(params, Stat.ABNORMAL_RESIST_PHYSICAL); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 098770705b..7e5fb14465 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -52,7 +52,7 @@ public class PhysicalAttack extends AbstractEffect private final Set _abnormals; private final double _abnormalPowerMod; - public PhysicalAttack(StatsSet params) + public PhysicalAttack(StatSet params) { _power = params.getDouble("power", 0); _pAtkMod = params.getDouble("pAtkMod", 1.0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index d325c3d5ed..f191867614 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -38,7 +38,7 @@ public class PhysicalAttackHpLink extends AbstractEffect private final double _criticalChance; private final boolean _overHit; - public PhysicalAttackHpLink(StatsSet params) + public PhysicalAttackHpLink(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index dc575c2c75..fe087a1bcc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class PhysicalAttackMute extends AbstractEffect { - public PhysicalAttackMute(StatsSet params) + public PhysicalAttackMute(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java index 112b41eb36..2093d45264 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAttackRange extends AbstractStatEffect { - public PhysicalAttackRange(StatsSet params) + public PhysicalAttackRange(StatSet params) { super(params, Stat.PHYSICAL_ATTACK_RANGE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index d3c2dcfaf2..5d66bd4c87 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ public class PhysicalAttackSaveHp extends AbstractEffect private final boolean _overHit; private final double _saveHp; - public PhysicalAttackSaveHp(StatsSet params) + public PhysicalAttackSaveHp(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java index 167b859572..cdf34eb6f6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAttackSpeed extends AbstractStatEffect { - public PhysicalAttackSpeed(StatsSet params) + public PhysicalAttackSpeed(StatSet params) { super(params, Stat.PHYSICAL_ATTACK_SPEED); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 61bed5561b..a1a6818a00 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class PhysicalAttackWeaponBonus extends AbstractEffect private final Map _weaponBonus = new EnumMap<>(WeaponType.class); - public PhysicalAttackWeaponBonus(StatsSet params) + public PhysicalAttackWeaponBonus(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java index fa3925e725..078c3673b9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalDefence extends AbstractConditionalHpEffect { - public PhysicalDefence(StatsSet params) + public PhysicalDefence(StatSet params) { super(params, Stat.PHYSICAL_DEFENCE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java index 812c641ac8..9714220e1b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalEvasion extends AbstractConditionalHpEffect { - public PhysicalEvasion(StatsSet params) + public PhysicalEvasion(StatSet params) { super(params, Stat.EVASION_RATE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index b337fed6cb..fe7cf853c8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class PhysicalMute extends AbstractEffect { - public PhysicalMute(StatsSet params) + public PhysicalMute(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java index 0fd835f4e3..1b843dda3d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class PhysicalShieldAngleAll extends AbstractEffect { - public PhysicalShieldAngleAll(StatsSet params) + public PhysicalShieldAngleAll(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java index 9d3f051659..507eb57326 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalSkillPower extends AbstractStatEffect { - public PhysicalSkillPower(StatsSet params) + public PhysicalSkillPower(StatSet params) { super(params, Stat.PHYSICAL_SKILL_POWER, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index a958116ff7..9ceccea4cc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -42,7 +42,7 @@ public class PhysicalSoulAttack extends AbstractEffect private final boolean _ignoreShieldDefence; private final boolean _overHit; - public PhysicalSoulAttack(StatsSet params) + public PhysicalSoulAttack(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index e95e09ab90..fd2b23a2ae 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class PkCount extends AbstractEffect { private final int _amount; - public PkCount(StatsSet params) + public PkCount(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index 2a356bdbc9..18cecfb90e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class Plunder extends AbstractEffect { - public Plunder(StatsSet params) + public Plunder(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index fd61584af1..3e885274b3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PolearmSingleTarget extends AbstractEffect { - public PolearmSingleTarget(StatsSet params) + public PolearmSingleTarget(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java index 86f2e2cee8..b2fb920379 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class ProtectDeathPenalty extends AbstractEffect { - public ProtectDeathPenalty(StatsSet params) + public ProtectDeathPenalty(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java index 890b8980bd..6664b36bae 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ProtectionBlessing extends AbstractEffect { - public ProtectionBlessing(StatsSet params) + public ProtectionBlessing(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index 6de78c2c82..62c480716d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class PullBack extends AbstractEffect private final int _animationSpeed; private final FlyType _type; - public PullBack(StatsSet params) + public PullBack(StatSet params) { _speed = params.getInt("speed", 0); _delay = params.getInt("delay", _speed); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java index 1019c56778..84a72299f3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveMagicalSkillDamageBonus extends AbstractStatPercentEffect { - public PveMagicalSkillDamageBonus(StatsSet params) + public PveMagicalSkillDamageBonus(StatSet params) { super(params, Stat.PVE_MAGICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java index 8da698c746..70870aa45c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveMagicalSkillDefenceBonus(StatsSet params) + public PveMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java index c7a82d4ded..8f60ea025c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalAttackDamageBonus extends AbstractStatPercentEffect { - public PvePhysicalAttackDamageBonus(StatsSet params) + public PvePhysicalAttackDamageBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_ATTACK_DAMAGE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java index 0717fe525b..ea01a4e1d8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PvePhysicalAttackDefenceBonus(StatsSet params) + public PvePhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java index 878f942877..1e8b9e76c4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvePhysicalSkillDamageBonus(StatsSet params) + public PvePhysicalSkillDamageBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java index bdfa0dcc67..b1dbb0b217 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvePhysicalSkillDefenceBonus(StatsSet params) + public PvePhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java index 94fdc26015..fbe3119ba8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveRaidMagicalSkillDefenceBonus(StatsSet params) + public PveRaidMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java index f54d849752..83352e1b2f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidPhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PveRaidPhysicalAttackDefenceBonus(StatsSet params) + public PveRaidPhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java index 0a344f96de..be05bec159 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidPhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveRaidPhysicalSkillDefenceBonus(StatsSet params) + public PveRaidPhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java index 542c019420..2f0153189a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpMagicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvpMagicalSkillDamageBonus(StatsSet params) + public PvpMagicalSkillDamageBonus(StatSet params) { super(params, Stat.PVP_MAGICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java index bb006280fc..41ad3b7749 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvpMagicalSkillDefenceBonus(StatsSet params) + public PvpMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVP_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java index 483d7b02e4..23488ea000 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalAttackDamageBonus extends AbstractStatPercentEffect { - public PvpPhysicalAttackDamageBonus(StatsSet params) + public PvpPhysicalAttackDamageBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_ATTACK_DAMAGE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java index 40c3a22ea2..ff942b3d4d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PvpPhysicalAttackDefenceBonus(StatsSet params) + public PvpPhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java index 225c7c1e39..19a7c96003 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvpPhysicalSkillDamageBonus(StatsSet params) + public PvpPhysicalSkillDamageBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java index ea2d1fa126..211d14c5e3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvpPhysicalSkillDefenceBonus(StatsSet params) + public PvpPhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 8a01583374..e500b487af 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -36,7 +36,7 @@ public class RandomizeHate extends AbstractEffect { private final int _chance; - public RandomizeHate(StatsSet params) + public RandomizeHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index 8b2801ee6c..18b07bd2d7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class RealDamage extends AbstractEffect { private final double _power; - public RealDamage(StatsSet params) + public RealDamage(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java index 4372c15bcf..86738fae0f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class RearDamage extends AbstractStatPercentEffect { - public RearDamage(StatsSet params) + public RearDamage(StatSet params) { super(params, Stat.REAR_DAMAGE_RATE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 31c7a4e4b3..82ed18faa1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RebalanceHP extends AbstractEffect { - public RebalanceHP(StatsSet params) + public RebalanceHP(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index 09d307be02..979809b533 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RebalanceHPSummon extends AbstractEffect { - public RebalanceHPSummon(StatsSet params) + public RebalanceHPSummon(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 7599b691ac..e76328929a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class RecoverVitalityInPeaceZone extends AbstractEffect private final double _amount; private final int _ticks; - public RecoverVitalityInPeaceZone(StatsSet params) + public RecoverVitalityInPeaceZone(StatSet params) { _amount = params.getDouble("amount", 0); _ticks = params.getInt("ticks", 10); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Recovery.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Recovery.java index 35c5cf3af1..30296eec4d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Recovery.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Recovery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Recovery extends AbstractEffect { - public Recovery(StatsSet params) + public Recovery(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java index 824044ae21..e52b5abafb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ReduceCancel extends AbstractStatEffect { - public ReduceCancel(StatsSet params) + public ReduceCancel(StatSet params) { super(params, Stat.ATTACK_CANCEL); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index ecc7a10d31..be9188f3b0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -33,7 +33,7 @@ public class ReduceDamage extends AbstractEffect { private final double _amount; - public ReduceDamage(StatsSet params) + public ReduceDamage(StatSet params) { _amount = params.getDouble("amount"); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java index 8534a94fc6..7b8862f608 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ReduceDropType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -32,7 +32,7 @@ public class ReduceDropPenalty extends AbstractEffect private final double _deathPenalty; private final ReduceDropType _type; - public ReduceDropPenalty(StatsSet params) + public ReduceDropPenalty(StatSet params) { _exp = params.getDouble("exp", 0); _deathPenalty = params.getDouble("deathPenalty", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java index c15f7301b9..6436b488e0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ReflectMagic extends AbstractStatAddEffect { - public ReflectMagic(StatsSet params) + public ReflectMagic(StatSet params) { super(params, Stat.VENGEANCE_SKILL_MAGIC_DAMAGE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java index bf1d555351..583191fd4c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.BasicProperty; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ReflectSkill extends AbstractEffect private final Stat _stat; private final double _amount; - public ReflectSkill(StatsSet params) + public ReflectSkill(StatSet params) { _stat = params.getEnum("type", BasicProperty.class, BasicProperty.PHYSICAL) == BasicProperty.PHYSICAL ? Stat.REFLECT_SKILL_PHYSIC : Stat.REFLECT_SKILL_MAGIC; _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index e850ea6be9..77b96e4205 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class RefuelAirship extends AbstractEffect { private final int _value; - public RefuelAirship(StatsSet params) + public RefuelAirship(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Relax.java index c8c61fe47e..e2ba4420db 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ public class Relax extends AbstractEffect { private final double _power; - public Relax(StatsSet params) + public Relax(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java index 0a44550fbf..1600e28444 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class RemoveEquipPenalty extends AbstractEffect { private final CrystalType _grade; - public RemoveEquipPenalty(StatsSet params) + public RemoveEquipPenalty(StatSet params) { _grade = params.getEnum("grade", CrystalType.class); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 9678dc1174..0613c17234 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class ResetInstanceEntry extends AbstractEffect { private final Set _instanceId; - public ResetInstanceEntry(StatsSet params) + public ResetInstanceEntry(StatSet params) { final String instanceIds = params.getString("instanceId", null); if ((instanceIds != null) && !instanceIds.isEmpty()) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java index 940c731208..f15ff56189 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ResistAbnormalByCategory extends AbstractEffect private final DispelSlotType _slot; private final double _amount; - public ResistAbnormalByCategory(StatsSet params) + public ResistAbnormalByCategory(StatSet params) { _amount = params.getDouble("amount", 0); _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.DEBUFF); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java index dae38e5246..2e29b5cc8e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ResistDDMagic extends AbstractStatPercentEffect { - public ResistDDMagic(StatsSet params) + public ResistDDMagic(StatSet params) { super(params, Stat.MAGIC_SUCCESS_RES); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java index af2b203aad..d08fcb262a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ResistDispelByCategory extends AbstractEffect private final DispelSlotType _slot; private final double _amount; - public ResistDispelByCategory(StatsSet params) + public ResistDispelByCategory(StatSet params) { _amount = params.getDouble("amount", 0); _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index af1e40bea8..cd03f1a74a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -34,7 +34,7 @@ public class ResistSkill extends AbstractEffect { private final List _skills = new ArrayList<>(); - public ResistSkill(StatsSet params) + public ResistSkill(StatSet params) { for (int i = 1;; i++) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index feb5885fb0..6f887a07cf 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class Restoration extends AbstractEffect private final int _itemCount; private final int _itemEnchantmentLevel; - public Restoration(StatsSet params) + public Restoration(StatSet params) { _itemId = params.getInt("itemId", 0); _itemCount = params.getInt("itemCount", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 37cd974643..0baf0aaae6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -25,7 +25,7 @@ import java.util.Map.Entry; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.ExtractableProductItem; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,12 +47,12 @@ public class RestorationRandom extends AbstractEffect { private final List _products = new ArrayList<>(); - public RestorationRandom(StatsSet params) + public RestorationRandom(StatSet params) { - for (StatsSet group : params.getList("items", StatsSet.class)) + for (StatSet group : params.getList("items", StatSet.class)) { final List items = new ArrayList<>(); - for (StatsSet item : group.getList(".", StatsSet.class)) + for (StatSet item : group.getList(".", StatSet.class)) { items.add(new RestorationItemHolder(item.getInt(".id"), item.getInt(".count"), item.getInt(".minEnchant", 0), item.getInt(".maxEnchant", 0))); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index f9c10b7ff2..9b287dd419 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class Resurrection extends AbstractEffect { private final int _power; - public Resurrection(StatsSet params) + public Resurrection(StatSet params) { _power = params.getInt("power", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 18d8bdb0bd..6ef063ce91 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -39,7 +39,7 @@ public class ResurrectionSpecial extends AbstractEffect private final int _power; private final Set _instanceId; - public ResurrectionSpecial(StatsSet params) + public ResurrectionSpecial(StatSet params) { _power = params.getInt("power", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index e4d66b43d3..0e7391681b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class Reuse extends AbstractEffect private final int _magicType; private final double _amount; - public Reuse(StatsSet params) + public Reuse(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index 3716fc1922..e17cd7cc25 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ReuseSkillById extends AbstractEffect { private final int _skillId; - public ReuseSkillById(StatsSet params) + public ReuseSkillById(StatSet params) { _skillId = params.getInt("skillId", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Root.java index 1ca3492949..b6876e8e13 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Root extends AbstractEffect { - public Root(StatsSet params) + public Root(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index 66fc8d82c8..4c7ee53239 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class SacrificeSummon extends AbstractEffect { - public SacrificeSummon(StatsSet params) + public SacrificeSummon(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java index d00856c9bd..683f45bb55 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SafeFallHeight extends AbstractStatEffect { - public SafeFallHeight(StatsSet params) + public SafeFallHeight(StatSet params) { super(params, Stat.FALL); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 7f6bf69ee3..797aa95263 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -33,7 +33,7 @@ public class SendSystemMessageToClan extends AbstractEffect { private final SystemMessage _message; - public SendSystemMessageToClan(StatsSet params) + public SendSystemMessageToClan(StatSet params) { final int id = params.getInt("id", 0); _message = new SystemMessage(id); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java index 7acbf846df..a0508d73b1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class ServitorShare extends AbstractEffect { private final Map _sharedStats = new EnumMap<>(Stat.class); - public ServitorShare(StatsSet params) + public ServitorShare(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 01dfd87c71..6e8187feae 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SetHp extends AbstractEffect private final double _amount; private final StatModifierType _mode; - public SetHp(StatsSet params) + public SetHp(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index 805d18160b..fae21baa51 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SetSkill extends AbstractEffect private final int _skillId; private final int _skillLvl; - public SetSkill(StatsSet params) + public SetSkill(StatSet params) { _skillId = params.getInt("skillId", 0); _skillLvl = params.getInt("skillLvl", 1); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java index a93bb5f253..354cb42b55 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ShieldDefence extends AbstractStatEffect { - public ShieldDefence(StatsSet params) + public ShieldDefence(StatSet params) { super(params, Stat.SHIELD_DEFENCE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java index f28d0e4ad2..1fdee75f69 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ShieldDefenceRate extends AbstractStatEffect { - public ShieldDefenceRate(StatsSet params) + public ShieldDefenceRate(StatSet params) { super(params, Stat.SHIELD_DEFENCE_RATE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java index 1d649082dc..533b631f10 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class SilentMove extends AbstractEffect { - public SilentMove(StatsSet params) + public SilentMove(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java index 89dad85514..7c929a7fe8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class SkillCritical extends AbstractEffect { private final BaseStat _stat; - public SkillCritical(StatsSet params) + public SkillCritical(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java index 369bef11f5..8f054f973b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillCriticalDamage extends AbstractStatEffect { - public SkillCriticalDamage(StatsSet params) + public SkillCriticalDamage(StatSet params) { super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java index c91f2d6b49..88ecf69e77 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillCriticalProbability extends AbstractStatPercentEffect { - public SkillCriticalProbability(StatsSet params) + public SkillCriticalProbability(StatSet params) { super(params, Stat.SKILL_CRITICAL_PROBABILITY); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 7b98a9e180..1664ea1827 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class SkillEvasion extends AbstractEffect private final int _magicType; private final double _amount; - public SkillEvasion(StatsSet params) + public SkillEvasion(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java index 9cc62532b4..2880d0ccef 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillPowerAdd extends AbstractStatAddEffect { - public SkillPowerAdd(StatsSet params) + public SkillPowerAdd(StatSet params) { super(params, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 9578c88f91..7156fff2df 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SkillTurning extends AbstractEffect private final int _chance; private final boolean _staticChance; - public SkillTurning(StatsSet params) + public SkillTurning(StatSet params) { _chance = params.getInt("chance", 100); _staticChance = params.getBoolean("staticChance", false); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 45b02206a4..04691304ed 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SkillTurningOverTime extends AbstractEffect private final int _chance; private final boolean _staticChance; - public SkillTurningOverTime(StatsSet params) + public SkillTurningOverTime(StatSet params) { _chance = params.getInt("chance", 100); _staticChance = params.getBoolean("staticChance", false); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index c1dd92cedb..b919c7acac 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -36,7 +36,7 @@ public class SoulBlow extends AbstractEffect private final double _chanceBoost; private final boolean _overHit; - public SoulBlow(StatsSet params) + public SoulBlow(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 8471aa236c..4f63a84081 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; @@ -40,7 +40,7 @@ public class SoulEating extends AbstractEffect private final int _expNeeded; private final int _maxSouls; - public SoulEating(StatsSet params) + public SoulEating(StatSet params) { _expNeeded = params.getInt("expNeeded"); _maxSouls = params.getInt("maxSouls"); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a7d5c2628a..ad261845eb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Seed; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Sow extends AbstractEffect { - public Sow(StatsSet params) + public Sow(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SpModify.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SpModify.java index 24d124ecce..c3bc6193e9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SpModify.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SpModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SpModify extends AbstractStatAddEffect { - public SpModify(StatsSet params) + public SpModify(StatSet params) { super(params, Stat.BONUS_SP); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 0718408ca2..890438d65f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.enums.SpeedType; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -36,7 +36,7 @@ public class Speed extends AbstractEffect private final StatModifierType _mode; private List _speedType; - public Speed(StatsSet params) + public Speed(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index 91b91ad05e..db247775f3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SphericBarrier extends AbstractStatAddEffect { - public SphericBarrier(StatsSet params) + public SphericBarrier(StatSet params) { super(params, Stat.SPHERIC_BARRIER_RANGE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index d13eaf1c2e..385240377f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class Spoil extends AbstractEffect { - public Spoil(StatsSet params) + public Spoil(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index b63c24dc20..22c4132b63 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -36,7 +36,7 @@ public class StatBonusSkillCritical extends AbstractEffect private final BaseStat _stat; private final Condition _armorTypeCondition; - public StatBonusSkillCritical(StatsSet params) + public StatBonusSkillCritical(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.DEX); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index 41a20bfafe..49280eb774 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -36,7 +36,7 @@ public class StatBonusSpeed extends AbstractEffect private final BaseStat _stat; private final Condition _armorTypeCondition; - public StatBonusSpeed(StatsSet params) + public StatBonusSpeed(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.DEX); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index a007b118b2..bcf691e360 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class StatByMoveType extends AbstractEffect private final MoveType _type; private final double _value; - public StatByMoveType(StatsSet params) + public StatByMoveType(StatSet params) { _stat = params.getEnum("stat", Stat.class); _type = params.getEnum("type", MoveType.class); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StatUp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StatUp.java index a22710ca7a..29d72bb4de 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StatUp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StatUp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class StatUp extends AbstractEffect private final BaseStat _stat; private final double _amount; - public StatUp(StatsSet params) + public StatUp(StatSet params) { _amount = params.getDouble("amount", 0); _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index 0720057c19..23239887a7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.List; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -39,7 +39,7 @@ public class StealAbnormal extends AbstractEffect private final int _rate; private final int _max; - public StealAbnormal(StatsSet params) + public StealAbnormal(StatSet params) { _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); _rate = params.getInt("rate", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Summon.java index 0f95637961..7ef79d4c39 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.ServitorInstance; @@ -43,7 +43,7 @@ public class Summon extends AbstractEffect private final int _lifeTime; private final int _consumeItemInterval; - public Summon(StatsSet params) + public Summon(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index 8929e1f2b0..50c025e572 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class SummonAgathion extends AbstractEffect { private final int _npcId; - public SummonAgathion(StatsSet params) + public SummonAgathion(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index 7716d58f16..49b816f272 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.CubicData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; @@ -42,7 +42,7 @@ public class SummonCubic extends AbstractEffect private final int _cubicId; private final int _cubicLvl; - public SummonCubic(StatsSet params) + public SummonCubic(StatSet params) { _cubicId = params.getInt("cubicId", -1); _cubicLvl = params.getInt("cubicLvl", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index d0a2a82738..13d5a2eac7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoppelgangerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ public class SummonHallucination extends AbstractEffect private final int _npcId; private final int _npcCount; - public SummonHallucination(StatsSet params) + public SummonHallucination(StatSet params) { _despawnDelay = params.getInt("despawnDelay", 20000); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index bcd050e084..d61a6e5c02 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.ServitorInstance; @@ -43,7 +43,7 @@ public class SummonMulti extends AbstractEffect private final int _consumeItemInterval; private final int _summonPoints; - public SummonMulti(StatsSet params) + public SummonMulti(StatSet params) { _npcId = params.getInt("npcId"); _expMultiplier = params.getFloat("expMultiplier", 1); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index 6f4090eef0..eaff214b7c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DecoyInstance; @@ -48,7 +48,7 @@ public class SummonNpc extends AbstractEffect private final boolean _isSummonSpawn; private final boolean _singleInstance; // Only one instance of this NPC is allowed. - public SummonNpc(StatsSet params) + public SummonNpc(StatSet params) { _despawnDelay = params.getInt("despawnDelay", 20000); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 5ef621819e..534a41ee16 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.data.xml.impl.PetDataTable; import org.l2jmobius.gameserver.model.PetData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PetItemList; */ public class SummonPet extends AbstractEffect { - public SummonPet(StatsSet params) + public SummonPet(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java index 7dd690587c..b1d5ec38cb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SummonPoints extends AbstractStatAddEffect { - public SummonPoints(StatsSet params) + public SummonPoints(StatSet params) { super(params, Stat.MAX_SUMMON_POINTS); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index d8a47b670f..ac1ddaa16a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; @@ -35,7 +35,7 @@ public class SummonTrap extends AbstractEffect private final int _despawnTime; private final int _npcId; - public SummonTrap(StatsSet params) + public SummonTrap(StatSet params) { _despawnTime = params.getInt("despawnTime", 0); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 84f6d070a8..3196bb949d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Collection; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Sweeper extends AbstractEffect { - public Sweeper(StatsSet params) + public Sweeper(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 1594a8a23b..77dc9b4af7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ public class Synergy extends AbstractEffect private final int _skillLevelScaleTo; private final int _minSlot; - public Synergy(StatsSet params) + public Synergy(StatSet params) { final String requiredSlots = params.getString("requiredSlots", null); if ((requiredSlots != null) && !requiredSlots.isEmpty()) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index e35516fef5..39ed981bbf 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Castle; @@ -33,7 +33,7 @@ public class TakeCastle extends AbstractEffect { private final CastleSide _side; - public TakeCastle(StatsSet params) + public TakeCastle(StatSet params) { _side = params.getEnum("side", CastleSide.class); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 77fd9ec103..3be2bf5593 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Castle; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TakeCastleStart extends AbstractEffect { - public TakeCastleStart(StatsSet params) + public TakeCastleStart(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 70842191a7..18749c1aef 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Fort; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TakeFort extends AbstractEffect { - public TakeFort(StatsSet params) + public TakeFort(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 0eb23f6733..77355f9683 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TakeFortStart extends AbstractEffect { - public TakeFortStart(StatsSet params) + public TakeFortStart(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index cec32755ed..dd8e09278f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class TalismanSlot extends AbstractEffect { private final int _slots; - public TalismanSlot(StatsSet params) + public TalismanSlot(StatSet params) { _slots = params.getInt("slots", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 281b5322fd..32a126f499 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class TargetCancel extends AbstractEffect { private final int _chance; - public TargetCancel(StatsSet params) + public TargetCancel(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index b4463de391..86ff70c9ca 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMe extends AbstractEffect { - public TargetMe(StatsSet params) + public TargetMe(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index 11e581113e..e68a1e1faf 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class TargetMeProbability extends AbstractEffect { private final int _chance; - public TargetMeProbability(StatsSet params) + public TargetMeProbability(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 6c30519678..9ca01faf50 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -32,7 +32,7 @@ public class Teleport extends AbstractEffect { private final Location _loc; - public Teleport(StatsSet params) + public Teleport(StatSet params) { _loc = new Location(params.getInt("x", 0), params.getInt("y", 0), params.getInt("z", 0)); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index e0e715818c..bdc53208d5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -38,7 +38,7 @@ public class TeleportToNpc extends AbstractEffect private final int _npcId; private final boolean _party; - public TeleportToNpc(StatsSet params) + public TeleportToNpc(StatSet params) { _npcId = params.getInt("npcId"); _party = params.getBoolean("party", false); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index c84c559322..4f4275fd41 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TeleportToPlayer extends AbstractEffect { - public TeleportToPlayer(StatsSet params) + public TeleportToPlayer(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index 1c9af0f535..b2d6b663de 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class TeleportToSummon extends AbstractEffect { private final double _maxDistance; - public TeleportToSummon(StatsSet params) + public TeleportToSummon(StatSet params) { _maxDistance = params.getDouble("distance", -1); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index e550302b02..c4bf787a10 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class TeleportToTarget extends AbstractEffect { - public TeleportToTarget(StatsSet params) + public TeleportToTarget(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index ba1c55c615..ff63eea817 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class TransferDamageToPlayer extends AbstractStatAddEffect { - public TransferDamageToPlayer(StatsSet params) + public TransferDamageToPlayer(StatSet params) { super(params, Stat.TRANSFER_DAMAGE_TO_PLAYER); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java index b084bfc1cb..c87d5f0554 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class TransferDamageToSummon extends AbstractStatAddEffect { - public TransferDamageToSummon(StatsSet params) + public TransferDamageToSummon(StatSet params) { super(params, Stat.TRANSFER_DAMAGE_SUMMON_PERCENT); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index e9f0292113..48bc5e3a1c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -34,7 +34,7 @@ public class TransferHate extends AbstractEffect { private final int _chance; - public TransferHate(StatsSet params) + public TransferHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 2ddf95a4db..bf593eaed8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Transformation extends AbstractEffect { private final List _id; - public Transformation(StatsSet params) + public Transformation(StatSet params) { final String ids = params.getString("transformationId", null); if ((ids != null) && !ids.isEmpty()) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 103ccdf8ce..2b4af0a1d3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class TrapDetect extends AbstractEffect { private final int _power; - public TrapDetect(StatsSet params) + public TrapDetect(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index eb7b073b36..c4a6c6aed9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.TrapAction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class TrapRemove extends AbstractEffect { private final int _power; - public TrapRemove(StatsSet params) + public TrapRemove(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 6df3874ab1..8fb87050b1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -59,7 +59,7 @@ public class TriggerSkillByAttack extends AbstractEffect * @param params */ - public TriggerSkillByAttack(StatsSet params) + public TriggerSkillByAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index ae6a3bc89f..78366b8047 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillByAvoid extends AbstractEffect /** * @param params */ - public TriggerSkillByAvoid(StatsSet params) + public TriggerSkillByAvoid(StatSet params) { _chance = params.getInt("chance", 100); _skill = new SkillHolder(params.getInt("skillId", 0), params.getInt("skillLevel", 0)); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index c24fb95246..9fe53c0622 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -48,7 +48,7 @@ public class TriggerSkillByDamage extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillByDamage(StatsSet params) + public TriggerSkillByDamage(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c086507336..8b84350293 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillByDeathBlow extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillByDeathBlow(StatsSet params) + public TriggerSkillByDeathBlow(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index a9bfcc320c..11802645f2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -37,7 +37,7 @@ public class TriggerSkillByKill extends AbstractEffect private final int _chance; private final SkillHolder _skill; - public TriggerSkillByKill(StatsSet params) + public TriggerSkillByKill(StatSet params) { _chance = params.getInt("chance", 100); _skill = new SkillHolder(params.getInt("skillId", 0), params.getInt("skillLevel", 0)); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 2893d46f33..7f2d3f9fa7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -52,7 +52,7 @@ public class TriggerSkillByMagicType extends AbstractEffect * @param params */ - public TriggerSkillByMagicType(StatsSet params) + public TriggerSkillByMagicType(StatSet params) { _chance = params.getInt("chance", 100); _magicTypes = params.getIntArray("magicTypes", ";"); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 1524e3d4f4..b77da803f5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillBySkill extends AbstractEffect private final int _skillLevelScaleTo; private final TargetType _targetType; - public TriggerSkillBySkill(StatsSet params) + public TriggerSkillBySkill(StatSet params) { _castSkillId = params.getInt("castSkillId"); _chance = params.getInt("chance", 100); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index ec2124c44e..7bb68baec9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -53,7 +53,7 @@ public class TriggerSkillBySkillAttack extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillBySkillAttack(StatsSet params) + public TriggerSkillBySkillAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 3f58619f0a..c209decfb3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -69,7 +69,7 @@ public class TwoHandedBluntBonus extends AbstractEffect private final double _speedAmount; private final StatModifierType _speedMode; - public TwoHandedBluntBonus(StatsSet params) + public TwoHandedBluntBonus(StatSet params) { _pAtkAmount = params.getDouble("pAtkAmount", 0); _pAtkMode = params.getEnum("pAtkMode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index b2c50c4b88..344456a925 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -69,7 +69,7 @@ public class TwoHandedSwordBonus extends AbstractEffect private final double _speedAmount; private final StatModifierType _speedMode; - public TwoHandedSwordBonus(StatsSet params) + public TwoHandedSwordBonus(StatSet params) { _pAtkAmount = params.getDouble("pAtkAmount", 0); _pAtkMode = params.getEnum("pAtkMode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 01ae8122ec..20b418c29b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ public class Unsummon extends AbstractEffect { private final int _chance; - public Unsummon(StatsSet params) + public Unsummon(StatSet params) { _chance = params.getInt("chance", -1); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 57eb89196d..f73f0f57f0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; */ public class UnsummonAgathion extends AbstractEffect { - public UnsummonAgathion(StatsSet params) + public UnsummonAgathion(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index a4fdc2c0aa..0779d018cc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class UnsummonServitors extends AbstractEffect { - public UnsummonServitors(StatsSet params) + public UnsummonServitors(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index dbb0c700b5..ac33fcba0d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Untargetable extends AbstractEffect { - public Untargetable(StatsSet params) + public Untargetable(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java index ac6cae3d05..1c85196fe0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class VampiricAttack extends AbstractEffect private final double _amount; private final double _sum; - public VampiricAttack(StatsSet params) + public VampiricAttack(StatSet params) { _amount = params.getDouble("amount"); _sum = _amount * params.getDouble("chance"); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java index ab724714e1..571ca55bbe 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ public class VampiricDefence extends AbstractEffect { private final int _amount; - public VampiricDefence(StatsSet params) + public VampiricDefence(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java index f8b9d76f3a..caaa8d02b4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class VitalityExpRate extends AbstractStatPercentEffect { - public VitalityExpRate(StatsSet params) + public VitalityExpRate(StatSet params) { super(params, Stat.VITALITY_EXP_RATE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index cba2b14c35..385595e03d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class VitalityPointUp extends AbstractEffect { private final int _value; - public VitalityPointUp(StatsSet params) + public VitalityPointUp(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java index 86612955dd..72f78ec177 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class VitalityPointsRate extends AbstractStatPercentEffect { - public VitalityPointsRate(StatsSet params) + public VitalityPointsRate(StatSet params) { super(params, Stat.VITALITY_CONSUME_RATE); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java index 09500b3823..bf20bd5018 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WeightLimit extends AbstractStatEffect { - public WeightLimit(StatsSet params) + public WeightLimit(StatSet params) { super(params, Stat.WEIGHT_LIMIT); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java index f9be68f493..6020399f85 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WeightPenalty extends AbstractStatAddEffect { - public WeightPenalty(StatsSet params) + public WeightPenalty(StatSet params) { super(params, Stat.WEIGHT_PENALTY); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java index bdf9aca48d..81eb9a9688 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WorldChatPoints extends AbstractStatEffect { - public WorldChatPoints(StatsSet params) + public WorldChatPoints(StatSet params) { super(params, Stat.WORLD_CHAT_POINTS); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java index 5a3842921d..127dadf9d2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class BuildAdvanceBaseSkillCondition implements ISkillCondition { - public BuildAdvanceBaseSkillCondition(StatsSet params) + public BuildAdvanceBaseSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java index a9dd2b9eba..ffb7d13539 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class BuildCampSkillCondition implements ISkillCondition { - public BuildCampSkillCondition(StatsSet params) + public BuildCampSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java index c1220c828a..aca51bafbf 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanAddMaxEntranceInzoneSkillCondition implements ISkillCondition { - public CanAddMaxEntranceInzoneSkillCondition(StatsSet params) + public CanAddMaxEntranceInzoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java index eddd45771c..6ac3c2e199 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ public class CanBookmarkAddSlotSkillCondition implements ISkillCondition { private final int _teleportBookmarkSlots; - public CanBookmarkAddSlotSkillCondition(StatsSet params) + public CanBookmarkAddSlotSkillCondition(StatSet params) { _teleportBookmarkSlots = params.getInt("teleportBookmarkSlots"); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java index 30fdb7f36f..ee1bf96e69 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanChangeVitalItemCountSkillCondition implements ISkillCondition { - public CanChangeVitalItemCountSkillCondition(StatsSet params) + public CanChangeVitalItemCountSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java index da553a6d9f..48e28e7af7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanEnchantAttributeSkillCondition implements ISkillCondition { - public CanEnchantAttributeSkillCondition(StatsSet params) + public CanEnchantAttributeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java index c14f1ffe64..2908994776 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanMountForEventSkillCondition implements ISkillCondition { - public CanMountForEventSkillCondition(StatsSet params) + public CanMountForEventSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java index d07aa9a622..9dc5f99592 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShipInstance; @@ -31,7 +31,7 @@ public class CanRefuelAirshipSkillCondition implements ISkillCondition { private final int _amount; - public CanRefuelAirshipSkillCondition(StatsSet params) + public CanRefuelAirshipSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java index d451f3c997..67206b47bd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanRestoreVitalPointSkillCondition implements ISkillCondition { - public CanRestoreVitalPointSkillCondition(StatsSet params) + public CanRestoreVitalPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java index 7e519025b0..49232af88f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CanSummonCubicSkillCondition implements ISkillCondition { - public CanSummonCubicSkillCondition(StatsSet params) + public CanSummonCubicSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java index 23cca508c1..6610f322f1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class CanSummonMultiSkillCondition implements ISkillCondition { private final int _summonPoints; - public CanSummonMultiSkillCondition(StatsSet params) + public CanSummonMultiSkillCondition(StatSet params) { _summonPoints = params.getInt("summonPoints"); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java index 85419e1e5e..c38566dbdd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.CharSummonTable; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; */ public class CanSummonPetSkillCondition implements ISkillCondition { - public CanSummonPetSkillCondition(StatsSet params) + public CanSummonPetSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java index ea41a2e22e..3655e158cb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanSummonSiegeGolemSkillCondition implements ISkillCondition { - public CanSummonSiegeGolemSkillCondition(StatsSet params) + public CanSummonSiegeGolemSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java index 6248c5131f..4d59811c7b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanSummonSkillCondition implements ISkillCondition { - public CanSummonSkillCondition(StatsSet params) + public CanSummonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java index 309da529c9..bd8838d02f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanTransformInDominionSkillCondition implements ISkillCondition { - public CanTransformInDominionSkillCondition(StatsSet params) + public CanTransformInDominionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java index 81297944f1..2f4d780cab 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class CanTransformSkillCondition implements ISkillCondition // TODO: What to do with this? // private final int _transformId; - public CanTransformSkillCondition(StatsSet params) + public CanTransformSkillCondition(StatSet params) { // _transformId = params.getInt("transformId"); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java index 800d0375be..771873a553 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanUntransformSkillCondition implements ISkillCondition { - public CanUntransformSkillCondition(StatsSet params) + public CanUntransformSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java index e651b3b1d5..ffe2e4a026 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class CanUseInBattlefieldSkillCondition implements ISkillCondition { - public CanUseInBattlefieldSkillCondition(StatsSet params) + public CanUseInBattlefieldSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java index 5ff751abce..ba030b97a4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanUseInDragonLairSkillCondition implements ISkillCondition { - public CanUseInDragonLairSkillCondition(StatsSet params) + public CanUseInDragonLairSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java index 4d914c28fe..8a0cb18ac7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class CanUseSwoopCannonSkillCondition implements ISkillCondition { - public CanUseSwoopCannonSkillCondition(StatsSet params) + public CanUseSwoopCannonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java index 6a2d832a4c..e9996580fc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanUseVitalityConsumeItemSkillCondition implements ISkillCondition { - public CanUseVitalityConsumeItemSkillCondition(StatsSet params) + public CanUseVitalityConsumeItemSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java index f694956e7e..48dafb46c3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class CannotUseInTransformSkillCondition implements ISkillCondition { private final int _transformId; - public CannotUseInTransformSkillCondition(StatsSet params) + public CannotUseInTransformSkillCondition(StatSet params) { _transformId = params.getInt("transformId", -1); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java index 141c69322f..6591233504 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -32,7 +32,7 @@ public class CheckLevelSkillCondition implements ISkillCondition private final int _maxLevel; private final SkillConditionAffectType _affectType; - public CheckLevelSkillCondition(StatsSet params) + public CheckLevelSkillCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java index 15163a3373..d72f463c4e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class CheckSexSkillCondition implements ISkillCondition { private final boolean _isFemale; - public CheckSexSkillCondition(StatsSet params) + public CheckSexSkillCondition(StatSet params) { _isFemale = params.getBoolean("isFemale"); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java index 8dee11ef9c..12e49c23a7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConsumeBodySkillCondition implements ISkillCondition { - public ConsumeBodySkillCondition(StatsSet params) + public ConsumeBodySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java index c24da9ebcd..ba1b1cdd5f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class EnergySavedSkillCondition implements ISkillCondition { private final int _amount; - public EnergySavedSkillCondition(StatsSet params) + public EnergySavedSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 192f3487e2..cbaf72bb00 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -35,7 +35,7 @@ public class EquipArmorSkillCondition implements ISkillCondition { private int _armorTypesMask = 0; - public EquipArmorSkillCondition(StatsSet params) + public EquipArmorSkillCondition(StatSet params) { final List armorTypes = params.getEnumList("armorType", ArmorType.class); if (armorTypes != null) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index e5f22008fa..708b4dd1d4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class EquipShieldSkillCondition implements ISkillCondition { - public EquipShieldSkillCondition(StatsSet params) + public EquipShieldSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 4561945254..f733f81f62 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -33,7 +33,7 @@ public class EquipWeaponSkillCondition implements ISkillCondition { private int _weaponTypesMask = 0; - public EquipWeaponSkillCondition(StatsSet params) + public EquipWeaponSkillCondition(StatSet params) { final List weaponTypes = params.getEnumList("weaponType", WeaponType.class); if (weaponTypes != null) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java index 5f77215218..e36c06fa11 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class NotFearedSkillCondition implements ISkillCondition { - public NotFearedSkillCondition(StatsSet params) + public NotFearedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java index b9096cc1a9..b6e7bcd826 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class NotInUnderwaterSkillCondition implements ISkillCondition { - public NotInUnderwaterSkillCondition(StatsSet params) + public NotInUnderwaterSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index eee6ec73e9..18d8dc8a11 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -35,7 +35,7 @@ public class Op2hWeaponSkillCondition implements ISkillCondition { private final List _weaponTypes = new ArrayList<>(); - public Op2hWeaponSkillCondition(StatsSet params) + public Op2hWeaponSkillCondition(StatSet params) { final List weaponTypes = params.getList("weaponType", String.class); if (weaponTypes != null) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 3b91f36fe4..6223172dbc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; - public OpAffectedBySkillSkillCondition(StatsSet params) + public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java index 2eb561291e..3818df4736 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAgathionEnergySkillCondition implements ISkillCondition { - public OpAgathionEnergySkillCondition(StatsSet params) + public OpAgathionEnergySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java index 76a7ebc5a8..ee2b415021 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.enums.SkillConditionAlignment; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -32,7 +32,7 @@ public class OpAlignmentSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final SkillConditionAlignment _alignment; - public OpAlignmentSkillCondition(StatsSet params) + public OpAlignmentSkillCondition(StatSet params) { _affectType = params.getEnum("affectType", SkillConditionAffectType.class); _alignment = params.getEnum("alignment", SkillConditionAlignment.class); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index 1c83d18f4e..bcc6715bb2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -33,7 +33,7 @@ public class OpBlinkSkillCondition implements ISkillCondition private final int _angle; private final int _range; - public OpBlinkSkillCondition(StatsSet params) + public OpBlinkSkillCondition(StatSet params) { switch (params.getEnum("direction", Position.class)) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java index 5215f86ae6..fde0c7f0f8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpCallPcSkillCondition implements ISkillCondition { - public OpCallPcSkillCondition(StatsSet params) + public OpCallPcSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java index dddafec6f0..1de2a32550 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCanEscapeSkillCondition implements ISkillCondition { - public OpCanEscapeSkillCondition(StatsSet params) + public OpCanEscapeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java index 3f1685a1e0..a87fd8adb6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCanNotUseAirshipSkillCondition implements ISkillCondition { - public OpCanNotUseAirshipSkillCondition(StatsSet params) + public OpCanNotUseAirshipSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java index 8eec19a568..ac7a81c015 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCannotUseTargetWithPrivateStoreSkillCondition implements ISkillCondition { - public OpCannotUseTargetWithPrivateStoreSkillCondition(StatsSet params) + public OpCannotUseTargetWithPrivateStoreSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 91de0adc8c..4030b79d00 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Weapon; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpChangeWeaponSkillCondition implements ISkillCondition { - public OpChangeWeaponSkillCondition(StatsSet params) + public OpChangeWeaponSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java index c2de03de1e..3e304e7d9d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.AbnormalType; @@ -34,7 +34,7 @@ public class OpCheckAbnormalSkillCondition implements ISkillCondition private final boolean _hasAbnormal; private final SkillConditionAffectType _affectType; - public OpCheckAbnormalSkillCondition(StatsSet params) + public OpCheckAbnormalSkillCondition(StatSet params) { _type = params.getEnum("type", AbnormalType.class); _level = params.getInt("level"); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java index 65084182b1..c70b58dc50 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCheckAccountTypeSkillCondition implements ISkillCondition { - public OpCheckAccountTypeSkillCondition(StatsSet params) + public OpCheckAccountTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java index 3d4f0a58a0..11eb804274 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpCheckCastRangeSkillCondition implements ISkillCondition { private final int _distance; - public OpCheckCastRangeSkillCondition(StatsSet params) + public OpCheckCastRangeSkillCondition(StatSet params) { _distance = params.getInt("distance"); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java index 7e2e391595..03af1ac63d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.ClassId; @@ -35,7 +35,7 @@ public class OpCheckClassListSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final boolean _isWithin; - public OpCheckClassListSkillCondition(StatsSet params) + public OpCheckClassListSkillCondition(StatSet params) { _classIds = params.getEnumList("classIds", ClassId.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java index 9f779f937a..9702804304 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.ClassId; @@ -33,7 +33,7 @@ public class OpCheckClassSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final boolean _isWithin; - public OpCheckClassSkillCondition(StatsSet params) + public OpCheckClassSkillCondition(StatSet params) { _classId = params.getEnum("classId", ClassId.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java index 3bf6b65dc8..ad997dced7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckCrtEffectSkillCondition implements ISkillCondition { - public OpCheckCrtEffectSkillCondition(StatsSet params) + public OpCheckCrtEffectSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java index 61c3aa66a4..c0bb54afe0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class OpCheckFlagSkillCondition implements ISkillCondition { - public OpCheckFlagSkillCondition(StatsSet params) + public OpCheckFlagSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java index 75af2ab89a..2e0c07d040 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckOnGoingEventCampaignSkillCondition implements ISkillCondition { - public OpCheckOnGoingEventCampaignSkillCondition(StatsSet params) + public OpCheckOnGoingEventCampaignSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java index c64f7c6722..f11569f43c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckPcbangPointSkillCondition implements ISkillCondition { - public OpCheckPcbangPointSkillCondition(StatsSet params) + public OpCheckPcbangPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java index 252519f7ff..997a4d0fec 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.data.xml.impl.ClanHallData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -35,7 +35,7 @@ public class OpCheckResidenceSkillCondition implements ISkillCondition private final List _residencesId; private final boolean _isWithin; - public OpCheckResidenceSkillCondition(StatsSet params) + public OpCheckResidenceSkillCondition(StatSet params) { _residencesId = params.getList("residencesId", Integer.class); _isWithin = params.getBoolean("isWithin"); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java index 6abeed7d35..3a1bcf424c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -34,7 +34,7 @@ public class OpCheckSkillListSkillCondition implements ISkillCondition private final List _skillIds; private final SkillConditionAffectType _affectType; - public OpCheckSkillListSkillCondition(StatsSet params) + public OpCheckSkillListSkillCondition(StatSet params) { _skillIds = params.getList("skillIds", Integer.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java index 984338b2c0..af563d983f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpCheckSkillSkillCondition implements ISkillCondition private final int _skillId; private final SkillConditionAffectType _affectType; - public OpCheckSkillSkillCondition(StatsSet params) + public OpCheckSkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java index ea882c3635..5d85a2dbdb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionCompanionType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpCompanionSkillCondition implements ISkillCondition { private final SkillConditionCompanionType _type; - public OpCompanionSkillCondition(StatsSet params) + public OpCompanionSkillCondition(StatSet params) { _type = params.getEnum("type", SkillConditionCompanionType.class); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java index 069b9d1759..464853c00c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpEnchantRangeSkillCondition implements ISkillCondition { - public OpEnchantRangeSkillCondition(StatsSet params) + public OpEnchantRangeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java index 99f22bb16a..e12f3ae007 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class OpEncumberedSkillCondition implements ISkillCondition private final int _slotsPercent; private final int _weightPercent; - public OpEncumberedSkillCondition(StatsSet params) + public OpEncumberedSkillCondition(StatSet params) { _slotsPercent = params.getInt("slotsPercent"); _weightPercent = params.getInt("weightPercent"); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java index 187dfba744..49cf8e2cb8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpEnergyMaxSkillCondition implements ISkillCondition { private final int _amount; - public OpEnergyMaxSkillCondition(StatsSet params) + public OpEnergyMaxSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 75bdf465e0..82eb70b770 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class OpEquipItemSkillCondition implements ISkillCondition private final int _itemId; private final SkillConditionAffectType _affectType; - public OpEquipItemSkillCondition(StatsSet params) + public OpEquipItemSkillCondition(StatSet params) { _itemId = params.getInt("itemId"); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java index 2c4576c2fa..fa6e82082b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ public class OpExistNpcSkillCondition implements ISkillCondition private final int _range; private final boolean _isAround; - public OpExistNpcSkillCondition(StatsSet params) + public OpExistNpcSkillCondition(StatSet params) { _npcIds = params.getList("npcIds", Integer.class); _range = params.getInt("range"); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java index 27cc3e90a9..8299b40047 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingCastSkillCondition implements ISkillCondition { - public OpFishingCastSkillCondition(StatsSet params) + public OpFishingCastSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java index 84cc031a24..4b43eb834e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingPumpingSkillCondition implements ISkillCondition { - public OpFishingPumpingSkillCondition(StatsSet params) + public OpFishingPumpingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java index 86aa667bee..a6a400f96f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingReelingSkillCondition implements ISkillCondition { - public OpFishingReelingSkillCondition(StatsSet params) + public OpFishingReelingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java index d22733df7e..50e6dafb82 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpHaveSummonSkillCondition implements ISkillCondition { - public OpHaveSummonSkillCondition(StatsSet params) + public OpHaveSummonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 2e854ca2b8..cceb4e937b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { private final int _npcId; - public OpHaveSummonedNpcSkillCondition(StatsSet params) + public OpHaveSummonedNpcSkillCondition(StatSet params) { _npcId = params.getInt("npcId"); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java index 16932ce531..374a75bfab 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.impl.ClanHallData; import org.l2jmobius.gameserver.enums.ResidenceType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -34,7 +34,7 @@ public class OpHomeSkillCondition implements ISkillCondition { private final ResidenceType _type; - public OpHomeSkillCondition(StatsSet params) + public OpHomeSkillCondition(StatSet params) { _type = params.getEnum("type", ResidenceType.class); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java index 9482a0bf55..62ad48bdcc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpInSiegeTimeSkillCondition implements ISkillCondition { - public OpInSiegeTimeSkillCondition(StatsSet params) + public OpInSiegeTimeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java index 1bffdacd6c..f2fb298398 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -30,7 +30,7 @@ public class OpInstantzoneSkillCondition implements ISkillCondition { private final int _instanceId; - public OpInstantzoneSkillCondition(StatsSet params) + public OpInstantzoneSkillCondition(StatSet params) { _instanceId = params.getInt("instanceId"); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java index 76703cc53b..7418ef9b64 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpMainjobSkillCondition implements ISkillCondition { - public OpMainjobSkillCondition(StatsSet params) + public OpMainjobSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java index d4c9f1f331..3c81369bbb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNeedAgathionSkillCondition implements ISkillCondition { - public OpNeedAgathionSkillCondition(StatsSet params) + public OpNeedAgathionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java index 96f6774f25..e7a477b0ee 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; @@ -34,7 +34,7 @@ public class OpNeedSummonOrPetSkillCondition implements ISkillCondition { private final List _npcIds = new ArrayList<>(); - public OpNeedSummonOrPetSkillCondition(StatsSet params) + public OpNeedSummonOrPetSkillCondition(StatSet params) { final List npcIds = params.getList("npcIds", String.class); if (npcIds != null) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java index 9701002065..ae1edfd719 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotCursedSkillCondition implements ISkillCondition { - public OpNotCursedSkillCondition(StatsSet params) + public OpNotCursedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInCeremonyOfChaosSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInCeremonyOfChaosSkillCondition.java index 9549fdc2ac..b5cefc61cc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInCeremonyOfChaosSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInCeremonyOfChaosSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotInCeremonyOfChaosSkillCondition implements ISkillCondition { - public OpNotInCeremonyOfChaosSkillCondition(StatsSet params) + public OpNotInCeremonyOfChaosSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java index bf909425d8..1de79f388a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpNotInPeacezoneSkillCondition implements ISkillCondition { - public OpNotInPeacezoneSkillCondition(StatsSet params) + public OpNotInPeacezoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java index 0752ba4a6a..0d3e4cb4dd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotInstantzoneSkillCondition implements ISkillCondition { - public OpNotInstantzoneSkillCondition(StatsSet params) + public OpNotInstantzoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java index 45891cd0ac..7ea02159ba 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotOlympiadSkillCondition implements ISkillCondition { - public OpNotOlympiadSkillCondition(StatsSet params) + public OpNotOlympiadSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java index 5c5d293ae8..2397a68e99 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpNotTerritorySkillCondition implements ISkillCondition { - public OpNotTerritorySkillCondition(StatsSet params) + public OpNotTerritorySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java index 874872bb2e..d9f8c1fa3b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpPeacezoneSkillCondition implements ISkillCondition { - public OpPeacezoneSkillCondition(StatsSet params) + public OpPeacezoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java index c20c4665bb..08d6bb095a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpPkcountSkillCondition implements ISkillCondition { private final SkillConditionAffectType _affectType; - public OpPkcountSkillCondition(StatsSet params) + public OpPkcountSkillCondition(StatSet params) { _affectType = params.getEnum("affectType", SkillConditionAffectType.class); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java index 879fc88c4c..d393c5ddc3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -30,7 +30,7 @@ public class OpPledgeSkillCondition implements ISkillCondition { private final int _level; - public OpPledgeSkillCondition(StatsSet params) + public OpPledgeSkillCondition(StatSet params) { _level = params.getInt("level"); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java index 9adc89b98d..adf16f8feb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpRestartPointSkillCondition implements ISkillCondition { - public OpRestartPointSkillCondition(StatsSet params) + public OpRestartPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java index bbd1d9d7d1..6874091ba2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class OpResurrectionSkillCondition implements ISkillCondition { - public OpResurrectionSkillCondition(StatsSet params) + public OpResurrectionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java index 8bbf796ad2..566f935a50 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpSiegeHammerSkillCondition implements ISkillCondition { - public OpSiegeHammerSkillCondition(StatsSet params) + public OpSiegeHammerSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java index be3ad18e05..cbfc1a25b2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition private final int _skillId; private final boolean _hasLearned; - public OpSkillAcquireSkillCondition(StatsSet params) + public OpSkillAcquireSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _hasLearned = params.getBoolean("hasLearned"); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java index c8789d28e4..a8382b83b3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpSkillSkillCondition implements ISkillCondition private final int _skillLevel; private final boolean _hasLearned; - public OpSkillSkillCondition(StatsSet params) + public OpSkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _skillLevel = params.getInt("skillLevel"); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java index 5127071683..a3d188f3eb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpSocialClassSkillCondition implements ISkillCondition { private final int _socialClass; - public OpSocialClassSkillCondition(StatsSet params) + public OpSocialClassSkillCondition(StatSet params) { _socialClass = params.getInt("socialClass"); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java index b9d37d18c0..c86984a218 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class OpSoulMaxSkillCondition implements ISkillCondition { - public OpSoulMaxSkillCondition(StatsSet params) + public OpSoulMaxSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java index 4780c13a58..0faa676bbe 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpSubjobSkillCondition implements ISkillCondition { - public OpSubjobSkillCondition(StatsSet params) + public OpSubjobSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java index 17a9a1a9e3..a14192847a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.concurrent.atomic.AtomicBoolean; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpSweeperSkillCondition implements ISkillCondition { - public OpSweeperSkillCondition(StatsSet params) + public OpSweeperSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java index b36585bf00..c4b3923e92 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTargetAllItemTypeSkillCondition implements ISkillCondition { - public OpTargetAllItemTypeSkillCondition(StatsSet params) + public OpTargetAllItemTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 6b85389d62..5492e96e1a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTargetArmorTypeSkillCondition implements ISkillCondition { - public OpTargetArmorTypeSkillCondition(StatsSet params) + public OpTargetArmorTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java index 0c0090fbc4..97e07a1822 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpTargetDoorSkillCondition implements ISkillCondition { private final List _doorIds; - public OpTargetDoorSkillCondition(StatsSet params) + public OpTargetDoorSkillCondition(StatSet params) { _doorIds = params.getList("doorIds", Integer.class); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java index 6fbc3cda10..eaabf4a73d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpTargetMyPledgeAcademySkillCondition implements ISkillCondition { - public OpTargetMyPledgeAcademySkillCondition(StatsSet params) + public OpTargetMyPledgeAcademySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java index d5820600dd..14a744613d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpTargetNpcSkillCondition implements ISkillCondition { private final List _npcId; - public OpTargetNpcSkillCondition(StatsSet params) + public OpTargetNpcSkillCondition(StatSet params) { _npcId = params.getList("npcIds", Integer.class); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java index 854225a75a..b0c5e50ae3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpTargetPcSkillCondition implements ISkillCondition { - public OpTargetPcSkillCondition(StatsSet params) + public OpTargetPcSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index 7faecb2ffd..62fd4b365f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Weapon; @@ -34,7 +34,7 @@ public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition { private final List _weaponTypes = new ArrayList<>(); - public OpTargetWeaponAttackTypeSkillCondition(StatsSet params) + public OpTargetWeaponAttackTypeSkillCondition(StatSet params) { final List weaponTypes = params.getList("weaponType", String.class); if (weaponTypes != null) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java index 8451365885..e114c03412 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTerritorySkillCondition implements ISkillCondition { - public OpTerritorySkillCondition(StatsSet params) + public OpTerritorySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java index 13f287687e..fde1293086 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpUnlockSkillCondition implements ISkillCondition { - public OpUnlockSkillCondition(StatsSet params) + public OpUnlockSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java index 8cc76a34bb..46dea5bbcb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpUseFirecrackerSkillCondition implements ISkillCondition { - public OpUseFirecrackerSkillCondition(StatsSet params) + public OpUseFirecrackerSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java index f3b54bbad7..651dade274 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpUsePraseedSkillCondition implements ISkillCondition { - public OpUsePraseedSkillCondition(StatsSet params) + public OpUsePraseedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java index 890b0fcd5f..dd57df0e13 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.MountType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpWyvernSkillCondition implements ISkillCondition { - public OpWyvernSkillCondition(StatsSet params) + public OpWyvernSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java index 8a4c974840..5ac80d3e62 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class PossessHolythingSkillCondition implements ISkillCondition { - public PossessHolythingSkillCondition(StatsSet params) + public PossessHolythingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java index 8b0fb55554..38b5644fb1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class RemainCpPerSkillCondition implements ISkillCondition private final int _amount; private final SkillConditionPercentType _percentType; - public RemainCpPerSkillCondition(StatsSet params) + public RemainCpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java index 612367a233..1ad96100ad 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -33,7 +33,7 @@ public class RemainHpPerSkillCondition implements ISkillCondition private final SkillConditionPercentType _percentType; private final SkillConditionAffectType _affectType; - public RemainHpPerSkillCondition(StatsSet params) + public RemainHpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java index 5455c1587a..39085349d9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class RemainMpPerSkillCondition implements ISkillCondition private final int _amount; private final SkillConditionPercentType _percentType; - public RemainMpPerSkillCondition(StatsSet params) + public RemainMpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java index 7de47f103f..6e9e5ad821 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class SoulSavedSkillCondition implements ISkillCondition { private final int _amount; - public SoulSavedSkillCondition(StatsSet params) + public SoulSavedSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java index 0b75a5a623..f4bdbaaecb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class TargetItemCrystalTypeSkillCondition implements ISkillCondition { - public TargetItemCrystalTypeSkillCondition(StatsSet params) + public TargetItemCrystalTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java index 51502ff209..604a41f904 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.MentorManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMyMenteeSkillCondition implements ISkillCondition { - public TargetMyMenteeSkillCondition(StatsSet params) + public TargetMyMenteeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java index fc621365a9..4bfb496634 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class TargetMyPartySkillCondition implements ISkillCondition { private final boolean _includeMe; - public TargetMyPartySkillCondition(StatsSet params) + public TargetMyPartySkillCondition(StatSet params) { _includeMe = params.getBoolean("includeMe"); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java index 9ebec0e691..d44a1bc8a9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMyPledgeSkillCondition implements ISkillCondition { - public TargetMyPledgeSkillCondition(StatsSet params) + public TargetMyPledgeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java index f4da8d6079..5045aa3848 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class TargetRaceSkillCondition implements ISkillCondition { private final Race _race; - public TargetRaceSkillCondition(StatsSet params) + public TargetRaceSkillCondition(StatSet params) { _race = params.getEnum("race", Race.class); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java index 55734b03bb..d1aac35879 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -350,7 +350,7 @@ public class ChamberOfDelusion extends AbstractInstance protected void changeRoom(Instance world) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); final List locations = world.getEnterLocations(); int newRoom = params.getInt("currentRoom", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java index 95a96bb16e..bef23aa88c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java @@ -19,7 +19,7 @@ package instances.CrystalCaverns; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -64,12 +64,12 @@ public class CrystalCavernsCoralGarden extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (event) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java index d977f82481..5d6a8dda61 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java @@ -17,7 +17,7 @@ package instances.CrystalCaverns; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -90,13 +90,13 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); - final StatsSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); final int baseId = npcParams.getInt("base_id", -1); switch (event) @@ -156,7 +156,7 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (npc.getId()) { @@ -205,7 +205,7 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); final int baseId = npcParams.getInt("base_id", -1); switch (npc.getId()) @@ -365,7 +365,7 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance { case WATER_CANNON: { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); final int baseId = npcParams.getInt("base_id", -1); if (baseId != 1) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java index b9662a5d06..7624504082 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java @@ -19,7 +19,7 @@ package instances.CrystalCaverns; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -83,12 +83,12 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (event) { @@ -180,7 +180,7 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); switch (npc.getId()) { @@ -224,7 +224,7 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance final Instance instance = receiver.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = receiver.getParameters(); + final StatSet npcParams = receiver.getParameters(); if (eventName.equals(String.valueOf(24220005 + npcParams.getInt("Terri_ID", 0)))) { @@ -265,7 +265,7 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); final int killTarget = instance.getParameters().getInt("KILL_TARGET", 5); int currentKillCount = instance.getParameters().getInt("KILL_COUNT", 0); @@ -377,7 +377,7 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance if (isInInstance(instance) && creature.isPlayer()) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); switch (npc.getId()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java index 0d9724e766..1245a89ed0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -404,7 +404,7 @@ public class DarkCloudMansion extends AbstractInstance { if (CommonUtil.contains(BELETH_SAMPLE, npc.getId())) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); if (!params.getBoolean("blocked", false)) { if (npc.isScriptValue(1)) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java index 85c7a898db..3e913de57d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java @@ -18,7 +18,7 @@ package instances.FaeronTrainingGrounds1; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -273,7 +273,7 @@ public class FaeronTrainingGrounds1 extends AbstractInstance final Instance world = player.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); for (int i = 0; i < MOB_SPAWNS.length; i++) { if (params.getObject("Mob" + i, Npc.class) == null) @@ -295,7 +295,7 @@ public class FaeronTrainingGrounds1 extends AbstractInstance final Instance world = player.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); for (int i = 0; i < MOB_SPAWNS.length; i++) { final Npc mob = params.getObject("Mob" + i, Npc.class); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java index 9a8123b6cf..b038186d7f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java @@ -18,7 +18,7 @@ package instances.FaeronTrainingGrounds2; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -270,7 +270,7 @@ public class FaeronTrainingGrounds2 extends AbstractInstance final Instance world = player.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); for (int i = 0; i < MOB_SPAWNS.length; i++) { if (params.getObject("Mob" + i, Npc.class) == null) @@ -292,7 +292,7 @@ public class FaeronTrainingGrounds2 extends AbstractInstance final Instance world = player.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); for (int i = 0; i < MOB_SPAWNS.length; i++) { final Npc mob = params.getObject("Mob" + i, Npc.class); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java index 20046a664b..54b93c8ccb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -566,7 +566,7 @@ public class HarnakUndergroundRuins extends AbstractInstance } case 2: { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); final int waveNpc = params.getInt("waveNpcId"); if (world.getAliveNpcs(waveNpc).isEmpty()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaBoss.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaBoss.java index 181f892fbe..3ef76e5f72 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaBoss.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaBoss.java @@ -17,7 +17,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureAttacked; @@ -70,7 +70,7 @@ public class KartiaBoss extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SAY") && npc.isTargetable()) { @@ -107,7 +107,7 @@ public class KartiaBoss extends AbstractNpcAI public void spawnMinions(Npc npc) { - final StatsSet param = npc.getParameters(); + final StatSet param = npc.getParameters(); final int kartiaLevel = param.getInt("cartia_level", 0); final boolean isParty = param.getInt("party_type", 0) == 1; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java index bd312c7fe6..721a32deb0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -97,12 +97,12 @@ public class KartiaHelperAdolph extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if ((instance != null) && event.equals("CHECK_ACTION")) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final PlayerInstance plr = npcVars.getObject("PLAYER_OBJECT", PlayerInstance.class); if (plr != null) { @@ -159,7 +159,7 @@ public class KartiaHelperAdolph extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder skill_01 = instParams.getSkillHolder("adolphHate"); final SkillHolder skill_02 = instParams.getSkillHolder("adolphPunish"); final SkillHolder skill_03 = instParams.getSkillHolder("adolphShield"); @@ -256,7 +256,7 @@ public class KartiaHelperAdolph extends AbstractNpcAI { npc.setTarget(event.getAttacker()); addAttackDesire(npc, (Creature) npc.getTarget()); - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder hateSkill = instParams.getSkillHolder("adolphHate"); if ((hateSkill != null) && SkillCaster.checkUseConditions(npc, hateSkill.getSkill())) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java index e9aada8d07..c87c49ae5b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java @@ -19,7 +19,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -92,7 +92,7 @@ public class KartiaHelperBarton extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if ((instance != null) && event.equals("CHECK_ACTION")) @@ -170,7 +170,7 @@ public class KartiaHelperBarton extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder skill01 = instParams.getSkillHolder("bartonInfinity"); final SkillHolder skill02 = instParams.getSkillHolder("bartonBerserker"); final SkillHolder skill03 = instParams.getSkillHolder("bartonHurricane"); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java index e383a62d49..01edde0bd4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java @@ -26,7 +26,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -115,12 +115,12 @@ public class KartiaHelperElise extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if ((instance != null) && event.equals("CHECK_ACTION")) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final FriendlyNpcInstance adolph = npcVars.getObject("ADOLPH_OBJECT", FriendlyNpcInstance.class); if (!npc.isCastingNow()) { @@ -153,8 +153,8 @@ public class KartiaHelperElise extends AbstractNpcAI final Instance instance = npc.getInstanceWorld(); if (instance != null) { - final StatsSet npcVars = npc.getVariables(); - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet npcVars = npc.getVariables(); + final StatSet instParams = instance.getTemplateParameters(); if (!npc.isCastingNow()) { final PlayerInstance plr = npcVars.getObject("PLAYER_OBJECT", PlayerInstance.class); @@ -248,7 +248,7 @@ public class KartiaHelperElise extends AbstractNpcAI { if (creature.isPlayer() || (creature instanceof FriendlyNpcInstance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); if (creature.isPlayer()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperEliyah.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperEliyah.java index 244110429c..cb3013c46c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperEliyah.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperEliyah.java @@ -18,7 +18,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance; @@ -87,7 +87,7 @@ public class KartiaHelperEliyah extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if ((instance != null) && event.equals("CHECK_ACTION")) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java index 07fe730289..123414862a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java @@ -18,7 +18,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -96,7 +96,7 @@ public class KartiaHelperGuardian extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (instance == null) @@ -183,7 +183,7 @@ public class KartiaHelperGuardian extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder skill01 = instParams.getSkillHolder("guardianSpiritsBlow"); final SkillHolder skill02 = instParams.getSkillHolder("guardianSpiritsWrath"); final int numberOfActiveSkills = 2; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java index 1541261bac..45fdfece27 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java @@ -19,7 +19,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -93,7 +93,7 @@ public class KartiaHelperHayuk extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (instance == null) @@ -176,7 +176,7 @@ public class KartiaHelperHayuk extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder skill01 = instParams.getSkillHolder("hayukPinpointShot"); final SkillHolder skill02 = instParams.getSkillHolder("hayukRecoilShot"); final SkillHolder skill03 = instParams.getSkillHolder("hayukMultipleArrow"); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaSupportTroop.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaSupportTroop.java index bfdc9b4cd3..d17653b8e3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaSupportTroop.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaSupportTroop.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -49,7 +49,7 @@ public class KartiaSupportTroop extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SAY") && !npc.isDead()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java index 0bf65e9c9b..01d0a1ab7a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -273,7 +273,7 @@ public class KartiasLabyrinth extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = (npc != null) ? npc.getInstanceWorld() : player.getInstanceWorld(); if (instance != null) @@ -363,7 +363,7 @@ public class KartiasLabyrinth extends AbstractInstance if (instance != null) { - final StatsSet param = instance.getParameters(); + final StatSet param = instance.getParameters(); if (param.getBoolean("BOSS_KILL_OPEN_DOOR", false) && CommonUtil.contains(MINI_BOSSES, npc.getId())) { instance.setParameter("BOSS_KILL_OPEN_DOOR", true); @@ -562,7 +562,7 @@ public class KartiasLabyrinth extends AbstractInstance private void manageProgressInInstance(Instance instance) { - final StatsSet param = instance.getParameters(); + final StatSet param = instance.getParameters(); final int room = param.getInt("ROOM", 1); final int stage = param.getInt("STAGE", 1); final int wave = param.getInt("WAVE", 1); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java index 5b0129dc4b..e3ab6bdbed 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -451,7 +451,7 @@ public class LabyrinthOfBelis extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (world != null) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java index f9c6c2b1af..7cd9254745 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -445,7 +445,7 @@ public class MemoryOfDisaster extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java index c5ebb7aa47..f1981550e1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java @@ -19,7 +19,7 @@ package instances.MuseumDungeon; import java.util.List; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -161,7 +161,7 @@ public class MuseumDungeon extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); final Attackable toyron = (Attackable) instance.getNpc(TOYRON); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Nursery/Nursery.java index 4e85e49c12..ff1ff2587e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Nursery/Nursery.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Nursery/Nursery.java @@ -19,7 +19,7 @@ package instances.Nursery; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -80,12 +80,12 @@ public class Nursery extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int gameStage = npcVars.getInt("GAME_STAGE", 0); switch (event) @@ -142,7 +142,7 @@ public class Nursery extends AbstractInstance if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int gameStage = npcVars.getInt("GAME_STAGE", 0); switch (gameStage) @@ -200,7 +200,7 @@ public class Nursery extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int gameStage = npcVars.getInt("GAME_STAGE", 0); switch (event) @@ -281,7 +281,7 @@ public class Nursery extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int maguenStatus = npcVars.getInt("MAGUEN_STATUS", 0); switch (maguenStatus) @@ -407,8 +407,8 @@ public class Nursery extends AbstractInstance final Npc gameManager = instance.getNpc(TIE); if (gameManager != null) { - final StatsSet managerVars = gameManager.getVariables(); - final StatsSet npcVars = npc.getVariables(); + final StatSet managerVars = gameManager.getVariables(); + final StatSet npcVars = npc.getVariables(); final int gamePoints = managerVars.getInt("GAME_POINTS", 0); if (gamePoints > 0) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java index 501ea07ad2..1d546871e9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java @@ -19,7 +19,7 @@ package instances.PailakaInjuredDragon; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -172,7 +172,7 @@ public class PailakaInjuredDragon extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (isInInstance(world)) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java index 8de90bca71..cd31666b75 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java @@ -19,7 +19,7 @@ package instances.PrisonOfDarkness; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -122,12 +122,12 @@ public class PrisonOfDarkness extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (event) { @@ -187,7 +187,7 @@ public class PrisonOfDarkness extends AbstractInstance if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (event) { @@ -327,7 +327,7 @@ public class PrisonOfDarkness extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (npc.getId()) { @@ -360,7 +360,7 @@ public class PrisonOfDarkness extends AbstractInstance if (isInInstance(instance) && (npc.getId() == EXIT_PORTAL)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (npcVars.getInt("PORTAL_STATE", 0)) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java index 415395c724..7d06cdeb54 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java @@ -18,7 +18,7 @@ package instances.TaintedDimension; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -97,7 +97,7 @@ public class TaintedDimension extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java index c8eda180d5..cfb333a649 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java @@ -18,7 +18,7 @@ package quests.Q10771_VolatilePower; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.quest.Quest; @@ -177,7 +177,7 @@ public class Q10771_VolatilePower extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java index 252229c5ba..7e7db63238 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java @@ -19,7 +19,7 @@ package quests.Q10772_ReportsFromCrumaTowerPart1; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -157,7 +157,7 @@ public class Q10772_ReportsFromCrumaTowerPart1 extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("DESPAWN_OWL") && (npc != null) && (npc.getId() == MAGIC_OWL)) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java index 9626997734..6268b612e8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java @@ -19,7 +19,7 @@ package quests.Q10776_TheWrathOfTheGiants; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.quest.Quest; @@ -236,7 +236,7 @@ public class Q10776_TheWrathOfTheGiants extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java index 7a47d95edc..1cf356e671 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java @@ -19,7 +19,7 @@ package quests.Q10777_ReportsFromCrumaTowerPart2; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -159,7 +159,7 @@ public class Q10777_ReportsFromCrumaTowerPart2 extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if ((npc != null) && (npc.getId() == MAGIC_OWL) && event.equals("DESPAWN_OWL")) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java index 8322b9ae14..4e1b7e0133 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java @@ -17,7 +17,7 @@ package quests.Q10787_ASpyMission; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -154,7 +154,7 @@ public class Q10787_ASpyMission extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if ((npc != null) && (npc.getId() == SUSPICIOUS_BOX) && event.equals("DESPAWN")) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java index b1d0ec8553..7e9236b634 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.ActionDataHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -57,7 +57,7 @@ public class ActionData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "action", actionNode -> { - final ActionDataHolder holder = new ActionDataHolder(new StatsSet(parseAttributes(actionNode))); + final ActionDataHolder holder = new ActionDataHolder(new StatSet(parseAttributes(actionNode))); _actionData.put(holder.getId(), holder); })); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java index 36002572b0..f7762ab07b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java @@ -32,7 +32,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.AdminCommandAccessRight; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -72,7 +72,7 @@ public class AdminData implements IXmlReader { NamedNodeMap attrs; Node attr; - StatsSet set; + StatSet set; AccessLevel level; AdminCommandAccessRight command; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -83,7 +83,7 @@ public class AdminData implements IXmlReader { if ("access".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -99,7 +99,7 @@ public class AdminData implements IXmlReader } else if ("admin".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java index b425296a19..6a14a867fc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java @@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.alchemy.AlchemyCraftData; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -55,7 +55,7 @@ public class AlchemyData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node att; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -67,7 +67,7 @@ public class AlchemyData implements IXmlReader if ("skill".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index 6d25769eab..817f0cabde 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; @@ -83,7 +83,7 @@ public class AppearanceItemData implements IXmlReader { if ("appearance_stone".equalsIgnoreCase(d.getNodeName())) { - final AppearanceStone stone = new AppearanceStone(new StatsSet(parseAttributes(d))); + final AppearanceStone stone = new AppearanceStone(new StatSet(parseAttributes(d))); for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) { switch (c.getNodeName()) @@ -120,7 +120,7 @@ public class AppearanceItemData implements IXmlReader } case "visual": { - stone.addVisualId(new AppearanceHolder(new StatsSet(parseAttributes(c)))); + stone.addVisualId(new AppearanceHolder(new StatSet(parseAttributes(c)))); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java index 6c96d3874a..6eac3240e7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -64,7 +64,7 @@ public class AttendanceRewardData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "item", rewardNode -> { - final StatsSet set = new StatsSet(parseAttributes(rewardNode)); + final StatSet set = new StatSet(parseAttributes(rewardNode)); final int itemId = set.getInt("id"); final int itemCount = set.getInt("count"); if (ItemTable.getInstance().getTemplate(itemId) == null) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java index 891d19fcf2..3054b0e7ef 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.beautyshop.BeautyData; import org.l2jmobius.gameserver.model.beautyshop.BeautyItem; @@ -56,7 +56,7 @@ public class BeautyShopData implements IXmlReader public void parseDocument(Document doc, File f) { NamedNodeMap attrs; - StatsSet set; + StatSet set; Node att; Race race = null; Sex sex = null; @@ -92,7 +92,7 @@ public class BeautyShopData implements IXmlReader if ("hair".equalsIgnoreCase(a.getNodeName())) { attrs = a.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -105,7 +105,7 @@ public class BeautyShopData implements IXmlReader if ("color".equalsIgnoreCase(g.getNodeName())) { attrs = g.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -119,7 +119,7 @@ public class BeautyShopData implements IXmlReader else if ("face".equalsIgnoreCase(a.getNodeName())) { attrs = a.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java index 37e977c51e..530a5d975a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java @@ -34,7 +34,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.entity.ClanHall; @@ -66,7 +66,7 @@ public class ClanHallData implements IXmlReader final List doors = new ArrayList<>(); final List npcs = new ArrayList<>(); final List teleports = new ArrayList<>(); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); for (Node listNode = doc.getFirstChild(); listNode != null; listNode = listNode.getNextSibling()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java index ae608cefb6..f1a23734e0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.combination.CombinationItem; import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; @@ -57,7 +57,7 @@ public class CombinationItemsData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "item", itemNode -> { - final CombinationItem item = new CombinationItem(new StatsSet(parseAttributes(itemNode))); + final CombinationItem item = new CombinationItem(new StatSet(parseAttributes(itemNode))); forEach(itemNode, "reward", rewardNode -> { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java index 038738b138..4af039b48d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.CubicSkill; import org.l2jmobius.gameserver.model.cubic.ICubicConditionHolder; @@ -61,7 +61,7 @@ public class CubicData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - forEach(doc, "list", listNode -> forEach(listNode, "cubic", cubicNode -> parseTemplate(cubicNode, new CubicTemplate(new StatsSet(parseAttributes(cubicNode)))))); + forEach(doc, "list", listNode -> forEach(listNode, "cubic", cubicNode -> parseTemplate(cubicNode, new CubicTemplate(new StatSet(parseAttributes(cubicNode)))))); } /** @@ -137,7 +137,7 @@ public class CubicData implements IXmlReader { forEach(cubicNode, "skill", skillNode -> { - final CubicSkill skill = new CubicSkill(new StatsSet(parseAttributes(skillNode))); + final CubicSkill skill = new CubicSkill(new StatSet(parseAttributes(skillNode))); forEach(cubicNode, "conditions", conditionNode -> parseConditions(cubicNode, template, skill)); template.getSkills().add(skill); }); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java index 3d19bee079..ede9b72202 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -62,7 +62,7 @@ public class DailyMissionData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "reward", rewardNode -> { - final StatsSet set = new StatsSet(parseAttributes(rewardNode)); + final StatSet set = new StatSet(parseAttributes(rewardNode)); final List items = new ArrayList<>(1); forEach(rewardNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> @@ -80,14 +80,14 @@ public class DailyMissionData implements IXmlReader // Initial values in case handler doesn't exists set.set("handler", ""); - set.set("params", StatsSet.EMPTY_STATSET); + set.set("params", StatSet.EMPTY_STATSET); // Parse handler and parameters forEach(rewardNode, "handler", handlerNode -> { set.set("handler", parseString(handlerNode.getAttributes(), "name")); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); set.set("params", params); forEach(handlerNode, "param", paramNode -> params.set(parseString(paramNode.getAttributes(), "name"), paramNode.getTextContent())); }); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java index 835eab4fe9..53248de524 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java @@ -35,7 +35,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -51,7 +51,7 @@ public class DoorData implements IXmlReader // Info holders private final Map> _groups = new HashMap<>(); private final Map _doors = new HashMap<>(); - private final Map _templates = new HashMap<>(); + private final Map _templates = new HashMap<>(); private final Map> _regions = new HashMap<>(); protected DoorData() @@ -75,9 +75,9 @@ public class DoorData implements IXmlReader LOGGER.info(getClass().getSimpleName() + ": Loaded " + _doors.size() + " Door Templates for " + _regions.size() + " regions."); } - public StatsSet parseDoor(Node doorNode) + public StatSet parseDoor(Node doorNode) { - final StatsSet params = new StatsSet(parseAttributes(doorNode)); + final StatSet params = new StatSet(parseAttributes(doorNode)); params.set("baseHpMax", 1); // Avoid doors without HP value created dead due to default value 0 in CreatureTemplate forEach(doorNode, IXmlReader::isNode, innerDoorNode -> @@ -115,7 +115,7 @@ public class DoorData implements IXmlReader /** * @param set */ - private void applyCollisions(StatsSet set) + private void applyCollisions(StatSet set) { // Insert Collision data if (set.contains("nodeX_0") && set.contains("nodeY_0") && set.contains("nodeX_1") && set.contains("nodeY_1")) @@ -142,7 +142,7 @@ public class DoorData implements IXmlReader * @param set * @return */ - public DoorInstance spawnDoor(StatsSet set) + public DoorInstance spawnDoor(StatSet set) { // Create door template + door instance final DoorTemplate template = new DoorTemplate(set); @@ -183,7 +183,7 @@ public class DoorData implements IXmlReader return door; } - public StatsSet getDoorTemplate(int doorId) + public StatSet getDoorTemplate(int doorId) { return _templates.get(doorId); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java index eca42a9a34..637ef1e953 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -64,7 +64,7 @@ public class EnchantItemData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node att; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -76,7 +76,7 @@ public class EnchantItemData implements IXmlReader if ("enchant".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -107,7 +107,7 @@ public class EnchantItemData implements IXmlReader else if ("support".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java index 46701fd777..bb1e8026b7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.SkillEnchantType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.EnchantSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -69,10 +69,10 @@ public class EnchantSkillGroupsData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "enchant", enchantNode -> { - final EnchantSkillHolder enchantSkillHolder = new EnchantSkillHolder(new StatsSet(parseAttributes(enchantNode))); + final EnchantSkillHolder enchantSkillHolder = new EnchantSkillHolder(new StatSet(parseAttributes(enchantNode))); forEach(enchantNode, "sps", spsNode -> forEach(spsNode, "sp", spNode -> enchantSkillHolder.addSp(parseEnum(spNode.getAttributes(), SkillEnchantType.class, "type"), parseInteger(spNode.getAttributes(), "amount")))); forEach(enchantNode, "chances", chancesNode -> forEach(chancesNode, "chance", chanceNode -> enchantSkillHolder.addChance(parseEnum(chanceNode.getAttributes(), SkillEnchantType.class, "type"), parseInteger(chanceNode.getAttributes(), "value")))); - forEach(enchantNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> enchantSkillHolder.addRequiredItem(parseEnum(itemNode.getAttributes(), SkillEnchantType.class, "type"), new ItemHolder(new StatsSet(parseAttributes(itemNode)))))); + forEach(enchantNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> enchantSkillHolder.addRequiredItem(parseEnum(itemNode.getAttributes(), SkillEnchantType.class, "type"), new ItemHolder(new StatSet(parseAttributes(itemNode)))))); _enchantSkillHolders.put(parseInteger(enchantNode.getAttributes(), "level"), enchantSkillHolder); })); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java index a8bb0397ac..037af7e1ae 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java @@ -34,7 +34,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.eventengine.AbstractEventManager; import org.l2jmobius.gameserver.model.eventengine.EventMethodNotification; import org.l2jmobius.gameserver.model.eventengine.EventScheduler; @@ -156,7 +156,7 @@ public class EventEngineData implements IXmlReader */ private void parseVariables(AbstractEventManager eventManager, Node innerNode) { - final StatsSet variables = new StatsSet(LinkedHashMap::new); + final StatSet variables = new StatSet(LinkedHashMap::new); for (Node variableNode = innerNode.getFirstChild(); variableNode != null; variableNode = variableNode.getNextSibling()) { if ("variable".equals(variableNode.getNodeName())) @@ -188,7 +188,7 @@ public class EventEngineData implements IXmlReader { if ("schedule".equals(scheduleNode.getNodeName())) { - final StatsSet params = new StatsSet(LinkedHashMap::new); + final StatSet params = new StatSet(LinkedHashMap::new); final NamedNodeMap attrs = scheduleNode.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -235,7 +235,7 @@ public class EventEngineData implements IXmlReader } else if ("conditionalSchedule".equals(scheduleNode.getNodeName())) { - final StatsSet params = new StatsSet(LinkedHashMap::new); + final StatSet params = new StatSet(LinkedHashMap::new); final NamedNodeMap attrs = scheduleNode.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -346,7 +346,7 @@ public class EventEngineData implements IXmlReader * @param variableNode */ @SuppressWarnings("unchecked") - private void parseListVariables(AbstractEventManager eventManager, StatsSet variables, Node variableNode) + private void parseListVariables(AbstractEventManager eventManager, StatSet variables, Node variableNode) { final String name = parseString(variableNode.getAttributes(), "name"); final String type = parseString(variableNode.getAttributes(), "type"); @@ -419,7 +419,7 @@ public class EventEngineData implements IXmlReader * @param variableNode */ @SuppressWarnings("unchecked") - private void parseMapVariables(AbstractEventManager eventManager, StatsSet variables, Node variableNode) + private void parseMapVariables(AbstractEventManager eventManager, StatSet variables, Node variableNode) { final String name = parseString(variableNode.getAttributes(), "name"); final String keyType = parseString(variableNode.getAttributes(), "keyType"); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java index db19c5fdff..0724877d9d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.ConditionHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.ICondition; import org.l2jmobius.gameserver.model.holders.ExtendDropDataHolder; import org.l2jmobius.gameserver.model.holders.ExtendDropItemHolder; @@ -62,7 +62,7 @@ public class ExtendDropData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "drop", dropNode -> { - final StatsSet set = new StatsSet(parseAttributes(dropNode)); + final StatSet set = new StatSet(parseAttributes(dropNode)); final List items = new ArrayList<>(1); forEach(dropNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> @@ -80,8 +80,8 @@ public class ExtendDropData implements IXmlReader forEach(dropNode, "conditions", conditionsNode -> forEach(conditionsNode, "condition", conditionNode -> { final String conditionName = parseString(conditionNode.getAttributes(), "name"); - final StatsSet params = (StatsSet) parseValue(conditionNode); - final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); + final StatSet params = (StatSet) parseValue(conditionNode); + final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); if (conditionFunction != null) { conditions.add(conditionFunction.apply(params)); @@ -109,7 +109,7 @@ public class ExtendDropData implements IXmlReader private Object parseValue(Node node) { - StatsSet statsSet = null; + StatSet statSet = null; List list = null; Object text = null; for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) @@ -145,12 +145,12 @@ public class ExtendDropData implements IXmlReader final Object value = parseValue(node); if (value != null) { - if (statsSet == null) + if (statSet == null) { - statsSet = new StatsSet(); + statSet = new StatSet(); } - statsSet.set(nodeName, value); + statSet.set(nodeName, value); } } } @@ -161,9 +161,9 @@ public class ExtendDropData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", list); + statSet.set(".", list); } else { @@ -176,16 +176,16 @@ public class ExtendDropData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", text); + statSet.set(".", text); } else { return text; } } - return statsSet; + return statSet; } public ExtendDropDataHolder getExtendDropById(int id) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java index 57a16d6390..608f4702b8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.FakePlayerHolder; @@ -72,7 +72,7 @@ public class FakePlayerData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayer", fakePlayerNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerNode)); final int npcId = set.getInt("npcId"); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); final String name = template.getName(); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java index 18cc499b71..a5ade27c03 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.FenceState; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldRegion; import org.l2jmobius.gameserver.model.actor.instance.FenceInstance; @@ -79,7 +79,7 @@ public class FenceData implements IXmlReader private void spawnFence(Node fenceNode) { - final StatsSet set = new StatsSet(parseAttributes(fenceNode)); + final StatSet set = new StatSet(parseAttributes(fenceNode)); spawnFence(set.getInt("x"), set.getInt("y"), set.getInt("z"), set.getString("name"), set.getInt("width"), set.getInt("length"), set.getInt("height"), 0, set.getEnum("state", FenceState.class, FenceState.CLOSED)); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java index 67dd4e396b..02efb756f2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.Henna; import org.l2jmobius.gameserver.model.skills.Skill; @@ -86,7 +86,7 @@ public class HennaData implements IXmlReader */ private void parseHenna(Node d) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final List wearClassIds = new ArrayList<>(); final List skills = new ArrayList<>(); NamedNodeMap attrs = d.getAttributes(); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java index 03ad8ab79e..d81e85948d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; @@ -93,7 +93,7 @@ public class InitialEquipmentData implements IXmlReader { if ("item".equalsIgnoreCase(c.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java index 72080aa4ac..54b1909d60 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemPointHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; @@ -55,17 +55,17 @@ public class LuckyGameData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "luckygame", rewardNode -> { - final LuckyGameDataHolder holder = new LuckyGameDataHolder(new StatsSet(parseAttributes(rewardNode))); + final LuckyGameDataHolder holder = new LuckyGameDataHolder(new StatSet(parseAttributes(rewardNode))); forEach(rewardNode, "common_reward", commonRewardNode -> forEach(commonRewardNode, "item", itemNode -> { - final StatsSet stats = new StatsSet(parseAttributes(itemNode)); + final StatSet stats = new StatSet(parseAttributes(itemNode)); holder.addCommonReward(new ItemChanceHolder(stats.getInt("id"), stats.getDouble("chance"), stats.getLong("count"))); })); forEach(rewardNode, "unique_reward", uniqueRewardNode -> forEach(uniqueRewardNode, "item", itemNode -> { - holder.addUniqueReward(new ItemPointHolder(new StatsSet(parseAttributes(itemNode)))); + holder.addUniqueReward(new ItemPointHolder(new StatSet(parseAttributes(itemNode)))); })); forEach(rewardNode, "modify_reward", uniqueRewardNode -> @@ -74,7 +74,7 @@ public class LuckyGameData implements IXmlReader holder.setMaxModifyRewardGame(parseInteger(uniqueRewardNode.getAttributes(), "max_game")); forEach(uniqueRewardNode, "item", itemNode -> { - final StatsSet stats = new StatsSet(parseAttributes(itemNode)); + final StatSet stats = new StatSet(parseAttributes(itemNode)); holder.addModifyReward(new ItemChanceHolder(stats.getInt("id"), stats.getDouble("chance"), stats.getLong("count"))); }); }); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java index 75bb48ed37..190653cdec 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java @@ -35,7 +35,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.SpecialItemType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; @@ -90,7 +90,7 @@ public class MultisellData implements IXmlReader { forEach(doc, "list", listNode -> { - final StatsSet set = new StatsSet(parseAttributes(listNode)); + final StatSet set = new StatSet(parseAttributes(listNode)); final int listId = Integer.parseInt(f.getName().substring(0, f.getName().length() - 4)); final List entries = new ArrayList<>(listNode.getChildNodes().getLength()); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java index 12ad0f9f0e..de0567af09 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.enums.AISkillScope; import org.l2jmobius.gameserver.enums.DropType; import org.l2jmobius.gameserver.enums.MpRewardAffectType; import org.l2jmobius.gameserver.enums.MpRewardType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.DropHolder; @@ -95,7 +95,7 @@ public class NpcData implements IXmlReader if ("npc".equalsIgnoreCase(listNode.getNodeName())) { NamedNodeMap attrs = listNode.getAttributes(); - final StatsSet set = new StatsSet(new HashMap<>()); + final StatSet set = new StatSet(new HashMap<>()); final int npcId = parseInteger(attrs, "id"); Map parameters = null; Map skills = null; @@ -511,11 +511,11 @@ public class NpcData implements IXmlReader if (parameters != null) { // Using unmodifiable map parameters of template are not meant to be changed at runtime. - template.setParameters(new StatsSet(Collections.unmodifiableMap(parameters))); + template.setParameters(new StatSet(Collections.unmodifiableMap(parameters))); } else { - template.setParameters(StatsSet.EMPTY_STATSET); + template.setParameters(StatSet.EMPTY_STATSET); } if (skills != null) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java index 3712cca6af..373f87ecfc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -79,7 +79,7 @@ public class NpcNameLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); NPC_NAME_LOCALISATIONS.get(_lang).put(set.getInt("id"), new String[] { set.getString("name"), diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 55dcd539aa..36c5897ecd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.EffectHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; @@ -71,7 +71,7 @@ public class OptionData implements IXmlReader forEach(innerNode, "effect", effectNode -> { final String name = parseString(effectNode.getAttributes(), "name"); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); forEach(effectNode, IXmlReader::isNode, paramNode -> params.set(paramNode.getNodeName(), SkillData.getInstance().parseValue(paramNode, true, false, Collections.emptyMap()))); option.addEffect(EffectHandler.getInstance().getHandlerFactory(name).apply(params)); }); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java index b1bb74baf6..c893725bc3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.PetLevelData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * This class parse and hold all pet parameters.
@@ -116,7 +116,7 @@ public class PetDataTable implements IXmlReader if (s.getNodeName().equals("stat")) { final int level = Integer.parseInt(s.getAttributes().getNamedItem("level").getNodeValue()); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (Node bean = s.getFirstChild(); bean != null; bean = bean.getNextSibling()) { if (bean.getNodeName().equals("set")) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java index ab1cb3b257..b646782547 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.base.ClassId; @@ -83,7 +83,7 @@ public class PlayerTemplateData implements IXmlReader } else if ("staticData".equalsIgnoreCase(d.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.set("classId", classId); final List creationPoints = new ArrayList<>(); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java index 34a04edd9b..35b879e73f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; @@ -83,7 +83,7 @@ public class PrimeShopData implements IXmlReader { NamedNodeMap attrs = d.getAttributes(); Node att; - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java index 0158b153c6..9aa87a1f9f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java @@ -31,7 +31,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.StatusUpdateType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.RecipeHolder; @@ -61,7 +61,7 @@ public class RecipeData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node att; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -73,7 +73,7 @@ public class RecipeData implements IXmlReader if ("recipe".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java index 796f5ae085..9a8397e085 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java @@ -29,7 +29,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate; /** @@ -60,7 +60,7 @@ public class ResidenceFunctionsData implements IXmlReader forEach(doc, "list", list -> forEach(list, "function", func -> { final NamedNodeMap attrs = func.getAttributes(); - final StatsSet set = new StatsSet(HashMap::new); + final StatSet set = new StatSet(HashMap::new); for (int i = 0; i < attrs.getLength(); i++) { final Node node = attrs.item(i); @@ -69,7 +69,7 @@ public class ResidenceFunctionsData implements IXmlReader forEach(func, "function", levelNode -> { final NamedNodeMap levelAttrs = levelNode.getAttributes(); - final StatsSet levelSet = new StatsSet(HashMap::new); + final StatSet levelSet = new StatSet(HashMap::new); levelSet.merge(set); for (int i = 0; i < levelAttrs.getLength(); i++) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java index 053d9089ce..d6b28a5962 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; /** @@ -82,7 +82,7 @@ public class SendMessageLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); SEND_MESSAGE_LOCALISATIONS.get(_lang).put(set.getString("message").split(SPLIT_STRING), set.getString("translation").split(SPLIT_STRING)); })); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java index e473030c56..c3eda1f3b8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.actor.instance.ShuttleInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; @@ -72,7 +72,7 @@ public class ShuttleData implements IXmlReader public void parseDocument(Document doc, File f) { NamedNodeMap attrs; - StatsSet set; + StatSet set; Node att; ShuttleDataHolder data; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -84,7 +84,7 @@ public class ShuttleData implements IXmlReader if ("shuttle".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -164,7 +164,7 @@ public class ShuttleData implements IXmlReader { for (ShuttleDataHolder data : _shuttles.values()) { - final ShuttleInstance shuttle = new ShuttleInstance(new CreatureTemplate(new StatsSet())); + final ShuttleInstance shuttle = new ShuttleInstance(new CreatureTemplate(new StatSet())); shuttle.setData(data); shuttle.setHeading(data.getLocation().getHeading()); shuttle.setLocationInvisible(data.getLocation()); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java index 9db0b5f64b..ba000649f2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.SiegeScheduleDate; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.util.Util; /** @@ -54,7 +54,7 @@ public class SiegeScheduleData implements IXmlReader LOGGER.info(getClass().getSimpleName() + ": Loaded " + _scheduleData.size() + " siege schedulers."); if (_scheduleData.isEmpty()) { - _scheduleData.add(new SiegeScheduleDate(new StatsSet())); + _scheduleData.add(new SiegeScheduleDate(new StatSet())); LOGGER.info(getClass().getSimpleName() + ": Emergency loaded " + _scheduleData.size() + " default siege schedulers."); } } @@ -72,7 +72,7 @@ public class SiegeScheduleData implements IXmlReader { case "schedule": { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final NamedNodeMap attrs = cd.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java index cc019c4dbb..2592b3ed97 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java @@ -40,7 +40,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.EffectHandler; import org.l2jmobius.gameserver.handler.SkillConditionHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.EffectScope; @@ -67,9 +67,9 @@ public class SkillData implements IXmlReader private final Integer _toLevel; private final Integer _fromSubLevel; private final Integer _toSubLevel; - private final Map> _info; + private final Map> _info; - public NamedParamInfo(String name, Integer fromLevel, Integer toLevel, Integer fromSubLevel, Integer toSubLevel, Map> info) + public NamedParamInfo(String name, Integer fromLevel, Integer toLevel, Integer fromSubLevel, Integer toSubLevel, Map> info) { _name = name; _fromLevel = fromLevel; @@ -104,7 +104,7 @@ public class SkillData implements IXmlReader return _toSubLevel; } - public Map> getInfo() + public Map> getInfo() { return _info; } @@ -241,8 +241,8 @@ public class SkillData implements IXmlReader { NamedNodeMap attributes = listNode.getAttributes(); final Map> levels = new HashMap<>(); - final Map> skillInfo = new HashMap<>(); - final StatsSet generalSkillInfo = skillInfo.computeIfAbsent(-1, k -> new HashMap<>()).computeIfAbsent(-1, k -> new StatsSet()); + final Map> skillInfo = new HashMap<>(); + final StatSet generalSkillInfo = skillInfo.computeIfAbsent(-1, k -> new HashMap<>()).computeIfAbsent(-1, k -> new StatSet()); parseAttributes(attributes, "", generalSkillInfo); @@ -321,7 +321,7 @@ public class SkillData implements IXmlReader { return; } - subLevelMap.forEach((subLevel, statsSet) -> + subLevelMap.forEach((subLevel, statSet) -> { if (subLevel == -1) { @@ -339,7 +339,7 @@ public class SkillData implements IXmlReader { return; } - subLevelMap.forEach((subLevel, statsSet) -> + subLevelMap.forEach((subLevel, statSet) -> { if (subLevel == -1) { @@ -371,31 +371,31 @@ public class SkillData implements IXmlReader levels.forEach((level, subLevels) -> subLevels.forEach(subLevel -> { - final StatsSet statsSet = Optional.ofNullable(skillInfo.getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatsSet::new); - skillInfo.getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(statsSet.getSet()::putIfAbsent); - skillInfo.getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(statsSet.getSet()::putIfAbsent); - statsSet.set(".level", level); - statsSet.set(".subLevel", subLevel); - final Skill skill = new Skill(statsSet); + final StatSet statSet = Optional.ofNullable(skillInfo.getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatSet::new); + skillInfo.getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(statSet.getSet()::putIfAbsent); + skillInfo.getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(statSet.getSet()::putIfAbsent); + statSet.set(".level", level); + statSet.set(".subLevel", subLevel); + final Skill skill = new Skill(statSet); forEachNamedParamInfoParam(effectParamInfo, level, subLevel, ((effectScope, params) -> { final String effectName = params.getString(".name"); params.remove(".name"); try { - final Function effectFunction = EffectHandler.getInstance().getHandlerFactory(effectName); + final Function effectFunction = EffectHandler.getInstance().getHandlerFactory(effectName); if (effectFunction != null) { skill.addEffect(effectScope, effectFunction.apply(params)); } else { - LOGGER.warning(getClass().getSimpleName() + ": Missing effect for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]"); + LOGGER.warning(getClass().getSimpleName() + ": Missing effect for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]"); } } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading effect for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading effect for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]", e); } })); @@ -405,19 +405,19 @@ public class SkillData implements IXmlReader params.remove(".name"); try { - final Function conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName); + final Function conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName); if (conditionFunction != null) { skill.addCondition(skillConditionScope, conditionFunction.apply(params)); } else { - LOGGER.warning(getClass().getSimpleName() + ": Missing condition for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + skillConditionScope + "] Effect Name[" + conditionName + "]"); + LOGGER.warning(getClass().getSimpleName() + ": Missing condition for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + skillConditionScope + "] Effect Name[" + conditionName + "]"); } } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading condition for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Condition Scope[" + skillConditionScope + "] Condition Name[" + conditionName + "]", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading condition for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Condition Scope[" + skillConditionScope + "] Condition Name[" + conditionName + "]", e); } })); @@ -434,16 +434,16 @@ public class SkillData implements IXmlReader } } - private void forEachNamedParamInfoParam(Map> paramInfo, int level, int subLevel, BiConsumer consumer) + private void forEachNamedParamInfoParam(Map> paramInfo, int level, int subLevel, BiConsumer consumer) { paramInfo.forEach((scope, namedParamInfos) -> namedParamInfos.forEach(namedParamInfo -> { if ((((namedParamInfo.getFromLevel() == null) && (namedParamInfo.getToLevel() == null)) || ((namedParamInfo.getFromLevel() <= level) && (namedParamInfo.getToLevel() >= level))) // && (((namedParamInfo.getFromSubLevel() == null) && (namedParamInfo.getToSubLevel() == null)) || ((namedParamInfo.getFromSubLevel() <= subLevel) && (namedParamInfo.getToSubLevel() >= subLevel)))) { - final StatsSet params = Optional.ofNullable(namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatsSet::new); - namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); - namedParamInfo.getInfo().getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); + final StatSet params = Optional.ofNullable(namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatSet::new); + namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); + namedParamInfo.getInfo().getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); params.set(".name", namedParamInfo.getName()); consumer.accept(scope, params); } @@ -460,7 +460,7 @@ public class SkillData implements IXmlReader final Integer subLevel = parseInteger(attributes, "subLevel"); final Integer fromSubLevel = parseInteger(attributes, "fromSubLevel", subLevel); final Integer toSubLevel = parseInteger(attributes, "toSubLevel", subLevel); - final Map> info = new HashMap<>(); + final Map> info = new HashMap<>(); for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) { if (!node.getNodeName().equals("#text")) @@ -471,7 +471,7 @@ public class SkillData implements IXmlReader return new NamedParamInfo(name, fromLevel, toLevel, fromSubLevel, toSubLevel, info); } - private void parseInfo(Node node, Map>> variableValues, Map> info) + private void parseInfo(Node node, Map>> variableValues, Map> info) { Map> values = parseValues(node); final Object generalValue = values.getOrDefault(-1, Collections.emptyMap()).get(-1); @@ -492,7 +492,7 @@ public class SkillData implements IXmlReader } } - values.forEach((level, subLevelMap) -> subLevelMap.forEach((subLevel, value) -> info.computeIfAbsent(level, k -> new HashMap<>()).computeIfAbsent(subLevel, k -> new StatsSet()).set(node.getNodeName(), value))); + values.forEach((level, subLevelMap) -> subLevelMap.forEach((subLevel, value) -> info.computeIfAbsent(level, k -> new HashMap<>()).computeIfAbsent(subLevel, k -> new StatSet()).set(node.getNodeName(), value))); } private Map> parseValues(Node node) @@ -535,7 +535,7 @@ public class SkillData implements IXmlReader variables.put("index", (i - fromLevel) + 1d); variables.put("subIndex", (j - fromSubLevel) + 1d); final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1); - if ((base != null) && !(base instanceof StatsSet)) + if ((base != null) && !(base instanceof StatSet)) { variables.put("base", Double.parseDouble(String.valueOf(base))); } @@ -555,13 +555,13 @@ public class SkillData implements IXmlReader Object parseValue(Node node, boolean blockValue, boolean parseAttributes, Map variables) { - StatsSet statsSet = null; + StatSet statSet = null; List list = null; Object text = null; if (parseAttributes && (!node.getNodeName().equals("value") || !blockValue) && (node.getAttributes().getLength() > 0)) { - statsSet = new StatsSet(); - parseAttributes(node.getAttributes(), "", statsSet, variables); + statSet = new StatSet(); + parseAttributes(node.getAttributes(), "", statSet, variables); } for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) { @@ -604,12 +604,12 @@ public class SkillData implements IXmlReader final Object value = parseValue(node, false, true, variables); if (value != null) { - if (statsSet == null) + if (statSet == null) { - statsSet = new StatsSet(); + statSet = new StatSet(); } - statsSet.set(nodeName, value); + statSet.set(nodeName, value); } } } @@ -620,9 +620,9 @@ public class SkillData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", list); + statSet.set(".", list); } else { @@ -635,30 +635,30 @@ public class SkillData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", text); + statSet.set(".", text); } else { return text; } } - return statsSet; + return statSet; } - private void parseAttributes(NamedNodeMap attributes, String prefix, StatsSet statsSet, Map variables) + private void parseAttributes(NamedNodeMap attributes, String prefix, StatSet statSet, Map variables) { for (int i = 0; i < attributes.getLength(); i++) { final Node attributeNode = attributes.item(i); - statsSet.set(prefix + "." + attributeNode.getNodeName(), parseNodeValue(attributeNode.getNodeValue(), variables)); + statSet.set(prefix + "." + attributeNode.getNodeName(), parseNodeValue(attributeNode.getNodeValue(), variables)); } } - private void parseAttributes(NamedNodeMap attributes, String prefix, StatsSet statsSet) + private void parseAttributes(NamedNodeMap attributes, String prefix, StatSet statSet) { - parseAttributes(attributes, prefix, statsSet, Collections.emptyMap()); + parseAttributes(attributes, prefix, statSet, Collections.emptyMap()); } private Object parseNodeValue(String value, Map variables) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java index f1fc07cea5..b85011b133 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.SubclassType; import org.l2jmobius.gameserver.model.SkillLearn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.base.ClassId; @@ -229,7 +229,7 @@ public class SkillTreesData implements IXmlReader { if ("skill".equalsIgnoreCase(c.getNodeName())) { - final StatsSet learnSkillSet = new StatsSet(); + final StatSet learnSkillSet = new StatSet(); attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java index 87915d89eb..78c22d1e7d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java @@ -36,7 +36,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.ChanceLocation; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.MinionHolder; import org.l2jmobius.gameserver.model.interfaces.IParameterized; @@ -169,7 +169,7 @@ public class SpawnsData implements IXmlReader public void parseSpawn(Node spawnsNode, File file, Collection spawns) { - final SpawnTemplate spawnTemplate = new SpawnTemplate(new StatsSet(parseAttributes(spawnsNode)), file); + final SpawnTemplate spawnTemplate = new SpawnTemplate(new StatSet(parseAttributes(spawnsNode)), file); SpawnGroup defaultGroup = null; for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling()) { @@ -185,7 +185,7 @@ public class SpawnsData implements IXmlReader { if (defaultGroup == null) { - defaultGroup = new SpawnGroup(StatsSet.EMPTY_STATSET); + defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET); } parseNpc(innerNode, spawnTemplate, defaultGroup); } @@ -244,7 +244,7 @@ public class SpawnsData implements IXmlReader private void parseGroup(Node n, SpawnTemplate spawnTemplate) { - final SpawnGroup group = new SpawnGroup(new StatsSet(parseAttributes(n))); + final SpawnGroup group = new SpawnGroup(new StatSet(parseAttributes(n))); forEach(n, IXmlReader::isNode, npcNode -> { switch (npcNode.getNodeName()) @@ -271,7 +271,7 @@ public class SpawnsData implements IXmlReader */ private void parseNpc(Node n, SpawnTemplate spawnTemplate, SpawnGroup group) { - final NpcSpawnTemplate npcTemplate = new NpcSpawnTemplate(spawnTemplate, group, new StatsSet(parseAttributes(n))); + final NpcSpawnTemplate npcTemplate = new NpcSpawnTemplate(spawnTemplate, group, new StatSet(parseAttributes(n))); final NpcTemplate template = NpcData.getInstance().getTemplate(npcTemplate.getId()); if (template == null) { @@ -332,10 +332,10 @@ public class SpawnsData implements IXmlReader * @param n * @param npcTemplate */ - private void parseParameters(Node n, IParameterized npcTemplate) + private void parseParameters(Node n, IParameterized npcTemplate) { final Map params = parseParameters(n); - npcTemplate.setParameters(!params.isEmpty() ? new StatsSet(Collections.unmodifiableMap(params)) : StatsSet.EMPTY_STATSET); + npcTemplate.setParameters(!params.isEmpty() ? new StatSet(Collections.unmodifiableMap(params)) : StatSet.EMPTY_STATSET); } /** @@ -344,7 +344,7 @@ public class SpawnsData implements IXmlReader */ private void parseMinions(Node n, NpcSpawnTemplate npcTemplate) { - forEach(n, "minion", minionNode -> npcTemplate.addMinion(new MinionHolder(new StatsSet(parseAttributes(minionNode))))); + forEach(n, "minion", minionNode -> npcTemplate.addMinion(new MinionHolder(new StatSet(parseAttributes(minionNode))))); } /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java index 98d333446c..ef93935404 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; @@ -69,7 +69,7 @@ public class StaticObjectData implements IXmlReader if ("object".equalsIgnoreCase(d.getNodeName())) { final NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -86,9 +86,9 @@ public class StaticObjectData implements IXmlReader * Initialize an static object based on the stats set and add it to the map. * @param set the stats set to add. */ - private void addObject(StatsSet set) + private void addObject(StatSet set) { - final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatsSet()), set.getInt("id")); + final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatSet()), set.getInt("id")); obj.setType(set.getInt("type", 0)); obj.setName(set.getString("name")); obj.setMap(set.getString("texture", "none"), set.getInt("map_x", 0), set.getInt("map_y", 0)); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java index 7c8c9a538d..487bae9dea 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.TeleportType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.teleporter.TeleportHolder; /** @@ -74,7 +74,7 @@ public class TeleportersData implements IXmlReader final String name = parseString(nodeAttrs, "name", type.name()); // Parse locations final TeleportHolder holder = new TeleportHolder(name, type); - forEach(node, "location", location -> holder.registerLocation(new StatsSet(parseAttributes(location)))); + forEach(node, "location", location -> holder.registerLocation(new StatSet(parseAttributes(location)))); // Register holder if (teleList.putIfAbsent(name, holder) != null) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java index b6b3bf2e90..c2f5f94adb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java @@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.transform.Transform; import org.l2jmobius.gameserver.model.actor.transform.TransformLevelData; import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate; @@ -70,7 +70,7 @@ public class TransformData implements IXmlReader if ("transform".equalsIgnoreCase(d.getNodeName())) { NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -192,7 +192,7 @@ public class TransformData implements IXmlReader transform.setTemplate(isMale, templateData); } - final StatsSet levelsSet = new StatsSet(); + final StatSet levelsSet = new StatSet(); for (Node s = z.getFirstChild(); s != null; s = s.getNextSibling()) { if ("level".equals(s.getNodeName())) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/engines/DocumentBase.java index 376aeccaa5..126f472492 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/engines/DocumentBase.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/engines/DocumentBase.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.PlayerState; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionCategoryType; @@ -177,7 +177,7 @@ public abstract class DocumentBase protected abstract void parseDocument(Document doc); - protected abstract StatsSet getStatsSet(); + protected abstract StatSet getStatSet(); protected abstract String getTableValue(String name); @@ -1238,7 +1238,7 @@ public abstract class DocumentBase setTable(name, array.toArray(new String[array.size()])); } - protected void parseBeanSet(Node n, StatsSet set, Integer level) + protected void parseBeanSet(Node n, StatSet set, Integer level) { final String name = n.getAttributes().getNamedItem("name").getNodeValue().trim(); final String value = n.getAttributes().getNamedItem("val").getNodeValue().trim(); @@ -1253,7 +1253,7 @@ public abstract class DocumentBase } } - protected void setExtractableSkillData(StatsSet set, String value) + protected void setExtractableSkillData(StatSet set, String value) { set.set("capsuled_items_skill", value); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java index e8c77b206e..46f8f9be1f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java @@ -21,7 +21,7 @@ import java.io.File; import org.w3c.dom.Document; import org.w3c.dom.Node; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; /** @@ -41,7 +41,7 @@ public class DocumentBaseGeneral extends DocumentBase } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return null; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java index 3ea7f41bb6..419552cf68 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.engines.DocumentBase; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -57,7 +57,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return _currentItem.set; } @@ -111,7 +111,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader _currentItem.id = itemId; _currentItem.name = itemName; _currentItem.type = className; - _currentItem.set = new StatsSet(); + _currentItem.set = new StatSet(); _currentItem.set.set("item_id", itemId); _currentItem.set.set("name", itemName); _currentItem.set.set("additionalName", additionalName); @@ -218,7 +218,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatsSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (Item) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java index 56e5b21a9f..967c1fc34d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.engines.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; public class ItemDataHolder @@ -24,7 +24,7 @@ public class ItemDataHolder int id; String type; String name; - StatsSet set; + StatSet set; int currentLevel; Item item; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/ConditionHandler.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/ConditionHandler.java index 47f24d690d..b53f170fb3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/ConditionHandler.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/ConditionHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.ICondition; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class ConditionHandler { - private final Map> _conditionHandlerFactories = new HashMap<>(); + private final Map> _conditionHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _conditionHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _conditionHandlerFactories.get(name); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/EffectHandler.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/EffectHandler.java index a58de8efb4..328265d9db 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/EffectHandler.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/EffectHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class EffectHandler { - private final Map> _effectHandlerFactories = new HashMap<>(); + private final Map> _effectHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _effectHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _effectHandlerFactories.get(name); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java index a6e2275d04..32438040e0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class SkillConditionHandler { - private final Map> _skillConditionHandlerFactories = new HashMap<>(); + private final Map> _skillConditionHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _skillConditionHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _skillConditionHandlerFactories.get(name); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java index 6992dd5366..65a8c52d7e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.model.AirShipTeleportList; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShipInstance; @@ -45,13 +45,13 @@ public class AirShipManager private static final String UPDATE_DB = "UPDATE airships SET fuel=? WHERE owner_id=?"; private CreatureTemplate _airShipTemplate = null; - private final Map _airShipsInfo = new HashMap<>(); + private final Map _airShipsInfo = new HashMap<>(); private final Map _airShips = new HashMap<>(); private final Map _teleports = new HashMap<>(); protected AirShipManager() { - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", 9); npcDat.set("level", 0); npcDat.set("jClass", "boat"); @@ -113,7 +113,7 @@ public class AirShipManager public AirShipInstance getNewAirShip(int x, int y, int z, int heading, int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return null; @@ -147,7 +147,7 @@ public class AirShipManager if (ship.getOwnerId() != 0) { storeInDb(ship.getOwnerId()); - final StatsSet info = _airShipsInfo.get(ship.getOwnerId()); + final StatSet info = _airShipsInfo.get(ship.getOwnerId()); if (info != null) { info.set("fuel", ship.getFuel()); @@ -164,7 +164,7 @@ public class AirShipManager { if (!_airShipsInfo.containsKey(ownerId)) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("fuel", 600); _airShipsInfo.put(ownerId, info); @@ -264,10 +264,10 @@ public class AirShipManager Statement s = con.createStatement(); ResultSet rs = s.executeQuery(LOAD_DB)) { - StatsSet info; + StatSet info; while (rs.next()) { - info = new StatsSet(); + info = new StatSet(); info.set("fuel", rs.getInt("fuel")); _airShipsInfo.put(rs.getInt("owner_id"), info); } @@ -285,7 +285,7 @@ public class AirShipManager private void storeInDb(int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java index 2db10dd045..e5c610b3f2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.BoatInstance; @@ -57,7 +57,7 @@ public class BoatManager return null; } - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", boatId); npcDat.set("level", 0); npcDat.set("jClass", "boat"); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 99a9678ece..56f08422cd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.enums.ManorMode; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; import org.l2jmobius.gameserver.model.SeedProduction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.entity.Castle; @@ -126,7 +126,7 @@ public class CastleManorManager implements IXmlReader, IStorable @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; NamedNodeMap attrs; Node att; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -142,7 +142,7 @@ public class CastleManorManager implements IXmlReader, IStorable { if ("crop".equalsIgnoreCase(c.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); set.set("castleId", castleId); attrs = c.getAttributes(); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java index 04c215a397..0fbd35091a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java @@ -27,7 +27,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosState; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -181,7 +181,7 @@ public class CeremonyOfChaosManager extends AbstractEventManager _npcs = new ConcurrentHashMap<>(); protected final Map _spawns = new ConcurrentHashMap<>(); - protected final Map _storedInfo = new ConcurrentHashMap<>(); + protected final Map _storedInfo = new ConcurrentHashMap<>(); protected final Map> _schedules = new ConcurrentHashMap<>(); /** @@ -161,7 +161,7 @@ public class DBSpawnManager { npc.setDBStatus(RaidBossStatus.ALIVE); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getCurrentHp()); info.set("currentMP", npc.getCurrentMp()); info.set("respawnTime", 0); @@ -181,7 +181,7 @@ public class DBSpawnManager */ public void updateStatus(Npc npc, boolean isNpcDead) { - final StatsSet info = _storedInfo.get(npc.getId()); + final StatSet info = _storedInfo.get(npc.getId()); if (info == null) { return; @@ -254,7 +254,7 @@ public class DBSpawnManager _npcs.put(npcId, npc); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", currentHP); info.set("currentMP", currentMP); info.set("respawnTime", 0); @@ -316,7 +316,7 @@ public class DBSpawnManager } npc.setDBStatus(RaidBossStatus.ALIVE); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", 0); @@ -401,7 +401,7 @@ public class DBSpawnManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("UPDATE npc_respawns SET respawnTime = ?, currentHP = ?, currentMP = ? WHERE id = ?")) { - for (Entry entry : _storedInfo.entrySet()) + for (Entry entry : _storedInfo.entrySet()) { final Integer npcId = entry.getKey(); if (npcId == null) @@ -420,7 +420,7 @@ public class DBSpawnManager updateStatus(npc, false); } - final StatsSet info = entry.getValue(); + final StatSet info = entry.getValue(); if (info == null) { continue; @@ -529,7 +529,7 @@ public class DBSpawnManager */ public void notifySpawnNightNpc(Npc npc) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getCurrentHp()); info.set("currentMP", npc.getCurrentMp()); info.set("respawnTime", 0); @@ -572,7 +572,7 @@ public class DBSpawnManager * Gets the stored info. * @return the stored info */ - public Map getStoredInfo() + public Map getStoredInfo() { return _storedInfo; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index 3dd4e3f652..767bed6954 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.datatables.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.FakePlayerChatHolder; @@ -73,7 +73,7 @@ public class FakePlayerChatManager implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayerChat", fakePlayerChatNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerChatNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerChatNode)); MESSAGES.add(new FakePlayerChatHolder(set.getString("fpcName"), set.getString("searchMethod"), set.getString("searchText"), set.getString("answers"))); })); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java index 07c111065e..52bab09349 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java @@ -33,7 +33,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.tasks.GrandBossManagerStoreTask; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; import org.l2jmobius.gameserver.model.interfaces.IStorable; @@ -51,7 +51,7 @@ public class GrandBossManager implements IStorable protected static Map _bosses = new ConcurrentHashMap<>(); - protected static Map _storedInfo = new HashMap<>(); + protected static Map _storedInfo = new HashMap<>(); private final Map _bossStatus = new HashMap<>(); @@ -72,7 +72,7 @@ public class GrandBossManager implements IStorable final int bossId = rs.getInt("boss_id"); if (NpcData.getInstance().getTemplate(bossId) != null) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("loc_x", rs.getInt("loc_x")); info.set("loc_y", rs.getInt("loc_y")); info.set("loc_z", rs.getInt("loc_z")); @@ -140,12 +140,12 @@ public class GrandBossManager implements IStorable return _bosses.get(bossId); } - public StatsSet getStatsSet(int bossId) + public StatSet getStatSet(int bossId) { return _storedInfo.get(bossId); } - public void setStatsSet(int bossId, StatsSet info) + public void setStatSet(int bossId, StatSet info) { _storedInfo.put(bossId, info); updateDb(bossId, false); @@ -156,10 +156,10 @@ public class GrandBossManager implements IStorable { try (Connection con = DatabaseFactory.getConnection()) { - for (Entry e : _storedInfo.entrySet()) + for (Entry e : _storedInfo.entrySet()) { final GrandBossInstance boss = _bosses.get(e.getKey()); - final StatsSet info = e.getValue(); + final StatSet info = e.getValue(); if ((boss == null) || (info == null)) { try (PreparedStatement update = con.prepareStatement(UPDATE_GRAND_BOSS_DATA2)) @@ -209,7 +209,7 @@ public class GrandBossManager implements IStorable try (Connection con = DatabaseFactory.getConnection()) { final GrandBossInstance boss = _bosses.get(bossId); - final StatsSet info = _storedInfo.get(bossId); + final StatSet info = _storedInfo.get(bossId); if (statusOnly || (boss == null) || (info == null)) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index d77642378f..29e517b0cd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.enums.InstanceReenterType; import org.l2jmobius.gameserver.enums.InstanceRemoveBuffType; import org.l2jmobius.gameserver.enums.InstanceTeleportType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.holders.InstanceReenterTimeHolder; @@ -151,7 +151,7 @@ public class InstanceManager implements IXmlReader return; } - final InstanceTemplate template = new InstanceTemplate(new StatsSet(parseAttributes(instanceNode))); + final InstanceTemplate template = new InstanceTemplate(new StatSet(parseAttributes(instanceNode))); // Update name if wasn't provided if (template.getName() == null) @@ -241,10 +241,10 @@ public class InstanceManager implements IXmlReader { if (doorNode.getNodeName().equals("door")) { - final StatsSet parsedSet = DoorData.getInstance().parseDoor(doorNode); - final StatsSet mergedSet = new StatsSet(); + final StatSet parsedSet = DoorData.getInstance().parseDoor(doorNode); + final StatSet mergedSet = new StatSet(); final int doorId = parsedSet.getInt("id"); - final StatsSet templateSet = DoorData.getInstance().getDoorTemplate(doorId); + final StatSet templateSet = DoorData.getInstance().getDoorTemplate(doorId); if (templateSet != null) { mergedSet.merge(templateSet); @@ -324,14 +324,14 @@ public class InstanceManager implements IXmlReader final boolean onlyLeader = parseBoolean(attrs, "onlyLeader", false); final boolean showMessageAndHtml = parseBoolean(attrs, "showMessageAndHtml", false); // Load parameters - StatsSet params = null; + StatSet params = null; for (Node f = conditionNode.getFirstChild(); f != null; f = f.getNextSibling()) { if (f.getNodeName().equals("param")) { if (params == null) { - params = new StatsSet(); + params = new StatSet(); } params.set(parseString(f.getAttributes(), "name"), parseString(f.getAttributes(), "value")); @@ -341,14 +341,14 @@ public class InstanceManager implements IXmlReader // If none parameters found then set empty StatSet if (params == null) { - params = StatsSet.EMPTY_STATSET; + params = StatSet.EMPTY_STATSET; } // Now when everything is loaded register condition to template try { final Class clazz = Class.forName("org.l2jmobius.gameserver.model.instancezone.conditions.Condition" + type); - final Constructor constructor = clazz.getConstructor(InstanceTemplate.class, StatsSet.class, boolean.class, boolean.class); + final Constructor constructor = clazz.getConstructor(InstanceTemplate.class, StatSet.class, boolean.class, boolean.class); conditions.add((Condition) constructor.newInstance(template, params, onlyLeader, showMessageAndHtml)); } catch (Exception ex) @@ -378,7 +378,7 @@ public class InstanceManager implements IXmlReader */ public Instance createInstance() { - return new Instance(getNewInstanceId(), new InstanceTemplate(StatsSet.EMPTY_STATSET), null); + return new Instance(getNewInstanceId(), new InstanceTemplate(StatSet.EMPTY_STATSET), null); } /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/AccessLevel.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/AccessLevel.java index 772c1fe77e..72b77905e1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/AccessLevel.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/AccessLevel.java @@ -52,7 +52,7 @@ public class AccessLevel /** Flag to gain exp in party */ private boolean _gainExp = false; - public AccessLevel(StatsSet set) + public AccessLevel(StatSet set) { _accessLevel = set.getInt("level"); _name = set.getString("name"); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ActionDataHolder.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ActionDataHolder.java index 4887bedba8..ca6d9ee685 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ActionDataHolder.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ActionDataHolder.java @@ -25,7 +25,7 @@ public class ActionDataHolder private final String _handler; private final int _optionId; - public ActionDataHolder(StatsSet set) + public ActionDataHolder(StatSet set) { _id = set.getInt("id"); _handler = set.getString("handler"); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java index 656119098e..3f88e455d7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java @@ -27,7 +27,7 @@ public class AdminCommandAccessRight private final int _accessLevel; private final boolean _requireConfirm; - public AdminCommandAccessRight(StatsSet set) + public AdminCommandAccessRight(StatSet set) { _adminCommand = set.getString("command"); _requireConfirm = set.getBoolean("confirmDlg", false); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index 9d5306eb90..bdddab5dc6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -36,7 +36,7 @@ public class DailyMissionDataHolder private final List _rewardsItems; private final List _classRestriction; private final int _requiredCompletions; - private final StatsSet _params; + private final StatSet _params; private final boolean _dailyReset; private final boolean _isOneTime; private final boolean _isMainClassOnly; @@ -44,7 +44,7 @@ public class DailyMissionDataHolder private final boolean _isDisplayedWhenNotAvailable; private final AbstractDailyMissionHandler _handler; - public DailyMissionDataHolder(StatsSet set) + public DailyMissionDataHolder(StatSet set) { final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); @@ -53,7 +53,7 @@ public class DailyMissionDataHolder _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); - _params = set.getObject("params", StatsSet.class); + _params = set.getObject("params", StatSet.class); _dailyReset = set.getBoolean("dailyReset", true); _isOneTime = set.getBoolean("isOneTime", true); _isMainClassOnly = set.getBoolean("isMainClassOnly", true); @@ -87,7 +87,7 @@ public class DailyMissionDataHolder return _requiredCompletions; } - public StatsSet getParams() + public StatSet getParams() { return _params; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Location.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Location.java index 1c61740e4d..024c71075f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Location.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Location.java @@ -49,7 +49,7 @@ public class Location implements IPositionable this(obj.getX(), obj.getY(), obj.getZ(), obj.getHeading()); } - public Location(StatsSet set) + public Location(StatSet set) { _x = set.getInt("x"); _y = set.getInt("y"); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/PetLevelData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/PetLevelData.java index e46b215b5f..7cad1a225a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/PetLevelData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/PetLevelData.java @@ -46,7 +46,7 @@ public class PetLevelData private final double _slowFlySpeedOnRide; private final double _fastFlySpeedOnRide; - public PetLevelData(StatsSet set) + public PetLevelData(StatSet set) { _ownerExpTaken = set.getInt("get_exp_type"); _petMaxExp = set.getLong("exp"); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Seed.java index 4307849cf5..dd756c82e2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Seed.java @@ -35,7 +35,7 @@ public class Seed private final long _seedReferencePrice; private final long _cropReferencePrice; - public Seed(StatsSet set) + public Seed(StatSet set) { _cropId = set.getInt("id"); _seedId = set.getInt("seedId"); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java index 78897cf4f1..4de77df228 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java @@ -27,7 +27,7 @@ public class SiegeScheduleDate private final int _hour; private final int _maxConcurrent; - public SiegeScheduleDate(StatsSet set) + public SiegeScheduleDate(StatSet set) { _day = set.getInt("day", Calendar.SUNDAY); _hour = set.getInt("hour", 16); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/SkillLearn.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/SkillLearn.java index e2ccdd6331..00f53c0cb9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/SkillLearn.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/SkillLearn.java @@ -58,7 +58,7 @@ public class SkillLearn * Constructor for SkillLearn. * @param set the set with the SkillLearn data. */ - public SkillLearn(StatsSet set) + public SkillLearn(StatSet set) { _skillName = set.getString("skillName"); _skillId = set.getInt("skillId"); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/StatsSet.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/StatSet.java similarity index 95% rename from L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/StatsSet.java rename to L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/StatSet.java index 5ce013ebd2..3c824d9fa4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/StatsSet.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/StatSet.java @@ -39,25 +39,25 @@ import org.l2jmobius.gameserver.util.Util; * They are stored as object but can be retrieved in any type wanted. As long as cast is available.
* @author mkizub */ -public class StatsSet implements IParserAdvUtils +public class StatSet implements IParserAdvUtils { - private static final Logger LOGGER = Logger.getLogger(StatsSet.class.getName()); + private static final Logger LOGGER = Logger.getLogger(StatSet.class.getName()); /** Static empty immutable map, used to avoid multiple null checks over the source. */ - public static final StatsSet EMPTY_STATSET = new StatsSet(Collections.emptyMap()); + public static final StatSet EMPTY_STATSET = new StatSet(Collections.emptyMap()); private final Map _set; - public StatsSet() + public StatSet() { this(ConcurrentHashMap::new); } - public StatsSet(Supplier> mapFactory) + public StatSet(Supplier> mapFactory) { this(mapFactory.get()); } - public StatsSet(Map map) + public StatSet(Map map) { _set = map; } @@ -73,9 +73,9 @@ public class StatsSet implements IParserAdvUtils /** * Add a set of couple values in the current set - * @param newSet : StatsSet pointing out the list of couples to add in the current set + * @param newSet : StatSet pointing out the list of couples to add in the current set */ - public void merge(StatsSet newSet) + public void merge(StatSet newSet) { _set.putAll(newSet.getSet()); } @@ -871,7 +871,7 @@ public class StatsSet implements IParserAdvUtils return (Map) obj; } - public StatsSet set(String name, Object value) + public StatSet set(String name, Object value) { if (value == null) { @@ -881,49 +881,49 @@ public class StatsSet implements IParserAdvUtils return this; } - public StatsSet set(String key, boolean value) + public StatSet set(String key, boolean value) { _set.put(key, value); return this; } - public StatsSet set(String key, byte value) + public StatSet set(String key, byte value) { _set.put(key, value); return this; } - public StatsSet set(String key, short value) + public StatSet set(String key, short value) { _set.put(key, value); return this; } - public StatsSet set(String key, int value) + public StatSet set(String key, int value) { _set.put(key, value); return this; } - public StatsSet set(String key, long value) + public StatSet set(String key, long value) { _set.put(key, value); return this; } - public StatsSet set(String key, float value) + public StatSet set(String key, float value) { _set.put(key, value); return this; } - public StatsSet set(String key, double value) + public StatSet set(String key, double value) { _set.put(key, value); return this; } - public StatsSet set(String key, String value) + public StatSet set(String key, String value) { if (value == null) { @@ -933,7 +933,7 @@ public class StatsSet implements IParserAdvUtils return this; } - public StatsSet set(String key, Enum value) + public StatSet set(String key, Enum value) { if (value == null) { @@ -943,9 +943,9 @@ public class StatsSet implements IParserAdvUtils return this; } - public static StatsSet valueOf(String key, Object value) + public static StatSet valueOf(String key, Object value) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.set(key, value); return set; } @@ -963,6 +963,6 @@ public class StatsSet implements IParserAdvUtils @Override public String toString() { - return "StatsSet{_set=" + _set + '}'; + return "StatSet{_set=" + _set + '}'; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Npc.java index a1a7e98aba..2b90533cc5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.MpRewardTask; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.FishermanInstance; @@ -148,7 +148,7 @@ public class Npc extends Creature private NpcStringId _titleString; private NpcStringId _nameString; - private StatsSet _params; + private StatSet _params; private RaidBossStatus _raidStatus; /** Contains information about local tax payments. */ @@ -1756,7 +1756,7 @@ public class Npc extends Creature /** * @return the parameters of the npc merged with the spawn parameters (if there are any) */ - public StatsSet getParameters() + public StatSet getParameters() { if (_params != null) { @@ -1768,10 +1768,10 @@ public class Npc extends Creature final NpcSpawnTemplate npcSpawnTemplate = _spawn.getNpcSpawnTemplate(); if ((npcSpawnTemplate != null) && (npcSpawnTemplate.getParameters() != null) && !npcSpawnTemplate.getParameters().isEmpty()) { - final StatsSet params = getTemplate().getParameters(); + final StatSet params = getTemplate().getParameters(); if ((params != null) && !params.getSet().isEmpty()) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.merge(params); set.merge(npcSpawnTemplate.getParameters()); _params = set; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 82f429bc18..4cb0835220 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -21,7 +21,7 @@ import java.util.EnumMap; import java.util.Map; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; @@ -49,12 +49,12 @@ public class CreatureTemplate extends ListenersContainer /** The creature's race. */ private Race _race; - public CreatureTemplate(StatsSet set) + public CreatureTemplate(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { // Base stats _baseValues.put(Stat.STAT_STR, set.getDouble("baseSTR", 0)); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java index 86441c678c..14f0e9cae8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.CubicInstance; @@ -46,7 +46,7 @@ public class CubicTemplate implements ICubicConditionHolder private final List _conditions = new ArrayList<>(); public List _skills = new ArrayList<>(); - public CubicTemplate(StatsSet set) + public CubicTemplate(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java index c40883ac75..410040bc86 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.templates; import org.l2jmobius.gameserver.enums.DoorOpenType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -57,7 +57,7 @@ public class DoorTemplate extends CreatureTemplate implements IIdentifiable private final boolean _stealth; private final boolean _isInverted; - public DoorTemplate(StatsSet set) + public DoorTemplate(StatSet set) { super(set); _doorId = set.getInt("id"); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 767743de2e..8ab41c70e3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.enums.MpRewardAffectType; import org.l2jmobius.gameserver.enums.MpRewardType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -63,7 +63,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private boolean _usingServerSideName; private String _title; private boolean _usingServerSideTitle; - private StatsSet _parameters; + private StatSet _parameters; private Sex _sex; private int _chestId; private int _rhandId; @@ -123,15 +123,15 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable /** * Constructor of Creature. - * @param set The StatsSet object to transfer data to the method + * @param set The StatSet object to transfer data to the method */ - public NpcTemplate(StatsSet set) + public NpcTemplate(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _id = set.getInt("id"); @@ -320,12 +320,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _usingServerSideTitle; } - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } - public void setParameters(StatsSet set) + public void setParameters(StatSet set) { _parameters = set; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 50292b8bc8..28458aa09e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -50,7 +50,7 @@ public class PlayerTemplate extends CreatureTemplate private final List _creationPoints; private final Map _baseSlotDef; - public PlayerTemplate(StatsSet set, List creationPoints) + public PlayerTemplate(StatSet set, List creationPoints) { super(set); _classId = ClassId.getClassId(set.getInt("classId")); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index aa28a0f648..260da48365 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -23,7 +23,7 @@ import java.util.Objects; import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import org.l2jmobius.gameserver.enums.InventoryBlockType; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -57,7 +57,7 @@ public class Transform implements IIdentifiable private TransformTemplate _maleTemplate; private TransformTemplate _femaleTemplate; - public Transform(StatsSet set) + public Transform(StatSet set) { _id = set.getInt("id"); _displayId = set.getInt("displayId", _id); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java index 5660852a01..729998503f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.actor.transform; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -31,7 +31,7 @@ public class TransformLevelData private final double _levelMod; private Map _stats; - public TransformLevelData(StatsSet set) + public TransformLevelData(StatSet set) { _level = set.getInt("val"); _levelMod = set.getDouble("levelMod"); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 4de84b8bdc..7aca059f91 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -23,7 +23,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -49,7 +49,7 @@ public class TransformTemplate private ExBasicActionList _list; private final Map _data = new LinkedHashMap<>(100); - public TransformTemplate(StatsSet set) + public TransformTemplate(StatSet set) { _collisionRadius = set.contains("radius") ? set.getDouble("radius") : null; _collisionHeight = set.contains("height") ? set.getDouble("height") : null; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java index d808a6b8bf..02550d2818 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -36,7 +36,7 @@ public class AlchemyCraftData private ItemHolder _productionSuccess; private ItemHolder _productionFailure; - public AlchemyCraftData(StatsSet set) + public AlchemyCraftData(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java index 0bd061d3c4..79dd6c0207 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.beautyshop; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -32,7 +32,7 @@ public class BeautyItem private final int _beautyShopTicket; private final Map _colors = new HashMap<>(); - public BeautyItem(StatsSet set) + public BeautyItem(StatSet set) { _id = set.getInt("id"); _adena = set.getInt("adena", 0); @@ -60,7 +60,7 @@ public class BeautyItem return _beautyShopTicket; } - public void addColor(StatsSet set) + public void addColor(StatSet set) { final BeautyItem color = new BeautyItem(set); _colors.put(set.getInt("id"), color); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index 689a61464d..8b32364c1a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party.MessageType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.appearance.PlayerAppearance; @@ -244,7 +244,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent player.teleToLocation(_instance.getEnterLocations().get(index++), 0, _instance); } - getTimers().addTimer("match_start_countdown", StatsSet.valueOf("time", 60), 100, null, null); + getTimers().addTimer("match_start_countdown", StatSet.valueOf("time", 60), 100, null, null); getTimers().addTimer("teleport_message1", 10000, null, null); getTimers().addTimer("teleport_message2", 14000, null, null); @@ -400,7 +400,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent } } getTimers().cancelTimer("update", null, null); - getTimers().addTimer("match_end_countdown", StatsSet.valueOf("time", 30), 30 * 1000, null, null); + getTimers().addTimer("match_end_countdown", StatSet.valueOf("time", 30), 30 * 1000, null, null); EventDispatcher.getInstance().notifyEvent(new OnCeremonyOfChaosMatchResult(winners, members)); } @@ -493,7 +493,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java index 39f9196d93..371f8dc459 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.conditions.ICubicCondition; @@ -38,7 +38,7 @@ public class CubicSkill extends SkillHolder implements ICubicConditionHolder private final List _conditions = new ArrayList<>(); private final boolean _targetDebuff; - public CubicSkill(StatsSet set) + public CubicSkill(StatSet set) { super(set.getInt("id"), set.getInt("level")); _triggerRate = set.getInt("triggerRate", 100); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/ClanHall.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/ClanHall.java index 8da77477fd..22af370709 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/ClanHall.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/ClanHall.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -75,7 +75,7 @@ public class ClanHall extends AbstractResidence private static final String LOAD_CLANHALL = "SELECT * FROM clanhall WHERE id=?"; private static final String UPDATE_CLANHALL = "UPDATE clanhall SET ownerId=?,paidUntil=? WHERE id=?"; - public ClanHall(StatsSet params) + public ClanHall(StatSet params) { super(params.getInt("id")); // Set static parameters diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Hero.java index ef005ff325..aee8b019ee 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Hero.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Hero.java @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.data.xml.impl.ClassListData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -74,13 +74,13 @@ public class Hero // delete hero items private static final String DELETE_ITEMS = "DELETE FROM items WHERE item_id IN (30392, 30393, 30394, 30395, 30396, 30397, 30398, 30399, 30400, 30401, 30402, 30403, 30404, 30405, 30372, 30373, 6842, 6611, 6612, 6613, 6614, 6615, 6616, 6617, 6618, 6619, 6620, 6621, 9388, 9389, 9390) AND owner_id NOT IN (SELECT charId FROM characters WHERE accesslevel > 0)"; - private static final Map HEROES = new ConcurrentHashMap<>(); - private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); + private static final Map HEROES = new ConcurrentHashMap<>(); + private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); - private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); - private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); + private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); + private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); - private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); + private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); private static final Map HERO_MESSAGE = new ConcurrentHashMap<>(); public static final String COUNT = "count"; @@ -118,7 +118,7 @@ public class Hero { while (rset.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset.getInt(Olympiad.CLASS_ID)); @@ -137,7 +137,7 @@ public class Hero while (rset2.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset2.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset2.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset2.getInt(Olympiad.CLASS_ID)); @@ -159,7 +159,7 @@ public class Hero LOGGER.info("Hero System: Loaded " + COMPLETE_HEROS.size() + " all time Heroes."); } - private void processHeros(PreparedStatement ps, int charId, StatsSet hero) throws SQLException + private void processHeros(PreparedStatement ps, int charId, StatSet hero) throws SQLException { ps.setInt(1, charId); try (ResultSet rs = ps.executeQuery()) @@ -224,7 +224,7 @@ public class Hero public void loadDiary(int charId) { - final List diary = new ArrayList<>(); + final List diary = new ArrayList<>(); int diaryentries = 0; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement("SELECT * FROM heroes_diary WHERE charId=? ORDER BY time ASC")) @@ -234,7 +234,7 @@ public class Hero { while (rset.next()) { - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final long time = rset.getLong("time"); final int action = rset.getInt("action"); @@ -279,8 +279,8 @@ public class Hero public void loadFights(int charId) { - final List fights = new ArrayList<>(); - final StatsSet heroCountData = new StatsSet(); + final List fights = new ArrayList<>(); + final StatSet heroCountData = new StatSet(); final Calendar data = Calendar.getInstance(); data.set(Calendar.DAY_OF_MONTH, 1); data.set(Calendar.HOUR_OF_DAY, 0); @@ -326,7 +326,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charTwoClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -362,7 +362,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charOneClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -410,14 +410,14 @@ public class Hero } } - public Map getHeroes() + public Map getHeroes() { return HEROES; } public int getHeroByClass(int classid) { - for (Entry e : HEROES.entrySet()) + for (Entry e : HEROES.entrySet()) { if (e.getValue().getInt(Olympiad.CLASS_ID) == classid) { @@ -438,7 +438,7 @@ public class Hero public void showHeroDiary(PlayerInstance player, int heroclass, int charid, int page) { final int perpage = 10; - final List mainList = HERO_DIARY.get(charid); + final List mainList = HERO_DIARY.get(charid); if (mainList != null) { final NpcHtmlMessage diaryReply = new NpcHtmlMessage(); @@ -453,7 +453,7 @@ public class Hero if (!mainList.isEmpty()) { - final List list = new ArrayList<>(mainList); + final List list = new ArrayList<>(mainList); Collections.reverse(list); boolean color = true; @@ -463,7 +463,7 @@ public class Hero for (int i = (page - 1) * perpage; i < list.size(); i++) { breakat = i; - final StatsSet diaryEntry = list.get(i); + final StatSet diaryEntry = list.get(i); fList.append(""); if (color) { @@ -524,7 +524,7 @@ public class Hero int loss = 0; int draw = 0; - final List heroFights = HERO_FIGHTS.get(charid); + final List heroFights = HERO_FIGHTS.get(charid); if (heroFights != null) { final NpcHtmlMessage fightReply = new NpcHtmlMessage(); @@ -536,7 +536,7 @@ public class Hero if (!heroFights.isEmpty()) { - final StatsSet heroCount = HERO_COUNTS.get(charid); + final StatSet heroCount = HERO_COUNTS.get(charid); if (heroCount != null) { win = heroCount.getInt("victory"); @@ -551,7 +551,7 @@ public class Hero for (int i = (page - 1) * perpage; i < heroFights.size(); i++) { breakat = i; - final StatsSet fight = heroFights.get(i); + final StatSet fight = heroFights.get(i); fList.append(""); if (color) { @@ -609,7 +609,7 @@ public class Hero } } - public synchronized void computeNewHeroes(List newHeroes) + public synchronized void computeNewHeroes(List newHeroes) { updateHeroes(true); @@ -659,13 +659,13 @@ public class Hero return; } - for (StatsSet hero : newHeroes) + for (StatSet hero : newHeroes) { final int charId = hero.getInt(Olympiad.CHAR_ID); if (COMPLETE_HEROS.containsKey(charId)) { - final StatsSet oldHero = COMPLETE_HEROS.get(charId); + final StatSet oldHero = COMPLETE_HEROS.get(charId); final int count = oldHero.getInt(COUNT); oldHero.set(COUNT, count + 1); oldHero.set(PLAYED, 1); @@ -674,7 +674,7 @@ public class Hero } else { - final StatsSet newHero = new StatsSet(); + final StatSet newHero = new StatSet(); newHero.set(Olympiad.CHAR_NAME, hero.getString(Olympiad.CHAR_NAME)); newHero.set(Olympiad.CLASS_ID, hero.getInt(Olympiad.CLASS_ID)); newHero.set(COUNT, 1); @@ -700,9 +700,9 @@ public class Hero } else { - StatsSet hero; + StatSet hero; int heroId; - for (Entry entry : HEROES.entrySet()) + for (Entry entry : HEROES.entrySet()) { hero = entry.getValue(); heroId = entry.getKey(); @@ -787,13 +787,13 @@ public class Hero setDiaryData(charId, ACTION_RAID_KILLED, npcId); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (template == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -806,13 +806,13 @@ public class Hero setDiaryData(charId, ACTION_CASTLE_TAKEN, castleId); final Castle castle = CastleManager.getInstance().getCastleById(castleId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (castle == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -922,10 +922,10 @@ public class Hero */ public void claimHero(PlayerInstance player) { - StatsSet hero = HEROES.get(player.getObjectId()); + StatSet hero = HEROES.get(player.getObjectId()); if (hero == null) { - hero = new StatsSet(); + hero = new StatSet(); HEROES.put(player.getObjectId(), hero); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java index f1263e8d44..c52f487402 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java @@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.atomic.AtomicReference; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.eventengine.drop.IEventDrop; import org.l2jmobius.gameserver.model.events.AbstractScript; @@ -42,7 +42,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout public abstract class AbstractEventManager>extends AbstractScript { private String _name; - private StatsSet _variables = StatsSet.EMPTY_STATSET; + private StatSet _variables = StatSet.EMPTY_STATSET; private Set _schedulers = Collections.emptySet(); private Set _conditionalSchedulers = Collections.emptySet(); private Map _rewards = Collections.emptyMap(); @@ -67,14 +67,14 @@ public abstract class AbstractEventManager>extends Ab /* ********************** */ - public StatsSet getVariables() + public StatSet getVariables() { return _variables; } - public void setVariables(StatsSet variables) + public void setVariables(StatSet variables) { - _variables = new StatsSet(Collections.unmodifiableMap(variables.getSet())); + _variables = new StatSet(Collections.unmodifiableMap(variables.getSet())); } /* ********************** */ diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java index 59c64b812c..e41af41d1a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.util.cron4j.PastPredictor; import org.l2jmobius.gameserver.util.cron4j.Predictor; @@ -45,7 +45,7 @@ public class EventScheduler private List _notifications; private ScheduledFuture _task; - public EventScheduler(AbstractEventManager manager, StatsSet set) + public EventScheduler(AbstractEventManager manager, StatSet set) { _eventManager = manager; _name = set.getString("name", ""); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 1189dc9aa4..ca9d08a337 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -51,7 +51,7 @@ import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -183,12 +183,12 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime onTimerCancel(holder.getEvent(), holder.getParams(), holder.getNpc(), holder.getPlayer()); } - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { LOGGER.warning("[" + getClass().getSimpleName() + "]: Timer event arrived at non overriden onTimerEvent method event: " + event + " npc: " + npc + " player: " + player); } - public void onTimerCancel(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerCancel(String event, StatSet params, Npc npc, PlayerInstance player) { } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java index 400fb64b6e..861c4a9b31 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java @@ -24,7 +24,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.timers.IEventTimerCancel; @@ -69,7 +69,7 @@ public class TimerExecutor * @param eventTimer * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - public boolean addTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) + public boolean addTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) { return addTimer(new TimerHolder<>(event, params, time, npc, player, false, eventTimer, _cancelListener, this)); } @@ -95,7 +95,7 @@ public class TimerExecutor * @param player * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - public boolean addTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player) + public boolean addTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player) { return addTimer(event, params, time, npc, player, _eventListener); } @@ -123,7 +123,7 @@ public class TimerExecutor * @param eventTimer * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - private boolean addRepeatingTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) + private boolean addRepeatingTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) { return addTimer(new TimerHolder<>(event, params, time, npc, player, true, eventTimer, _cancelListener, this)); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java index ab8fa150ca..0fcafba759 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java @@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.gameserver.instancemanager.TimersManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.TimerExecutor; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.events.TimerExecutor; public class TimerHolder implements Runnable { private final T _event; - private final StatsSet _params; + private final StatSet _params; private final long _time; private final Npc _npc; private final PlayerInstance _player; @@ -44,7 +44,7 @@ public class TimerHolder implements Runnable private final TimerExecutor _postExecutor; private final ScheduledFuture _task; - public TimerHolder(T event, StatsSet params, long time, Npc npc, PlayerInstance player, boolean isRepeating, IEventTimerEvent eventScript, IEventTimerCancel cancelScript, TimerExecutor postExecutor) + public TimerHolder(T event, StatSet params, long time, Npc npc, PlayerInstance player, boolean isRepeating, IEventTimerEvent eventScript, IEventTimerCancel cancelScript, TimerExecutor postExecutor) { Objects.requireNonNull(event, getClass().getSimpleName() + ": \"event\" cannot be null!"); Objects.requireNonNull(eventScript, getClass().getSimpleName() + ": \"script\" cannot be null!"); @@ -73,7 +73,7 @@ public class TimerHolder implements Runnable /** * @return the parameters of this timer */ - public StatsSet getParams() + public StatSet getParams() { return _params; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index 4ab0367aba..ab239da356 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; @@ -37,7 +37,7 @@ public class AppearanceHolder private final AppearanceTargetType _targetType; private final Integer _bodyPart; - public AppearanceHolder(StatsSet set) + public AppearanceHolder(StatSet set) { _visualId = set.getInt("id", 0); _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java index 29740873cd..0f9488448d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Nik @@ -43,7 +43,7 @@ public class AttachSkillHolder extends SkillHolder return _requiredSkillLevel; } - public static AttachSkillHolder fromStatsSet(StatsSet set) + public static AttachSkillHolder fromStatSet(StatSet set) { return new AttachSkillHolder(set.getInt("skillId"), set.getInt("skillLevel", 1), set.getInt("requiredSkillId"), set.getInt("requiredSkillLevel", 1)); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java index cc41724532..57b6d47c40 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Set; import org.l2jmobius.gameserver.enums.SkillEnchantType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -36,7 +36,7 @@ public class EnchantSkillHolder private final Map _chance = new EnumMap<>(SkillEnchantType.class); private final Map> _requiredItems = new EnumMap<>(SkillEnchantType.class); - public EnchantSkillHolder(StatsSet set) + public EnchantSkillHolder(StatSet set) { _level = set.getInt("level"); _enchantFailLevel = set.getInt("enchantFailLevel"); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java index e6706c8467..33d14e4345 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Map; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -36,7 +36,7 @@ public class ExtendDropDataHolder private final List _conditions; private final Map _systemMessages; - public ExtendDropDataHolder(StatsSet set) + public ExtendDropDataHolder(StatSet set) { _id = set.getInt("id"); _items = set.getList("items", ExtendDropItemHolder.class); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java index 16454d764a..d63d4eb775 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -52,7 +52,7 @@ public class FakePlayerHolder private final int _clanId; private final int _pledgeStatus; - public FakePlayerHolder(StatsSet set) + public FakePlayerHolder(StatSet set) { _classId = set.getInt("classId", 182); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java index a9c72776cd..86af0c1405 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -29,7 +29,7 @@ public class ItemHolder implements IIdentifiable private final int _id; private final long _count; - public ItemHolder(StatsSet set) + public ItemHolder(StatSet set) { _id = set.getInt("id"); _count = set.getLong("count"); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java index 5f7bb2008b..1c6f7b506b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -25,7 +25,7 @@ public class ItemPointHolder extends ItemHolder { private final int _points; - public ItemPointHolder(StatsSet params) + public ItemPointHolder(StatSet params) { this(params.getInt("id"), params.getLong("count"), params.getInt("points")); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java index 71d4f56eea..1b65c8912f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.holders; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -34,7 +34,7 @@ public class LuckyGameDataHolder private int _minModifyRewardGame; private int _maxModifyRewardGame; - public LuckyGameDataHolder(StatsSet params) + public LuckyGameDataHolder(StatSet params) { _index = params.getInt("index"); _turningPoints = params.getInt("turning_point"); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java index f77e380e8d..9fa8c99654 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.holders; import java.time.Duration; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -32,7 +32,7 @@ public class MinionHolder implements IIdentifiable private final long _respawnTime; private final int _weightPoint; - public MinionHolder(StatsSet set) + public MinionHolder(StatSet set) { _id = set.getInt("id"); _count = set.getInt("count", 1); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java index f4173594d1..36ac70176d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -52,7 +52,7 @@ public class MultisellListHolder implements IIdentifiable } @SuppressWarnings("unchecked") - public MultisellListHolder(StatsSet set) + public MultisellListHolder(StatSet set) { _listId = set.getInt("listId"); _isChanceMultisell = set.getBoolean("isChanceMultisell", false); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java index cef1e13e8f..5e9c55ea74 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.StatusUpdateType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -56,7 +56,7 @@ public class RecipeHolder implements IIdentifiable private final double _maxOfferingBonus; private final long _maxOffering; - public RecipeHolder(StatsSet set, List ingredients, List productGroup, List npcFee, Map statUse) + public RecipeHolder(StatSet set, List ingredients, List productGroup, List npcFee, Map statUse) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index f1b98ee9ac..ecd1069283 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -45,7 +45,7 @@ import org.l2jmobius.gameserver.enums.InstanceReenterType; import org.l2jmobius.gameserver.enums.InstanceTeleportType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -87,7 +87,7 @@ public class Instance implements IIdentifiable, INamable private final Set _players = ConcurrentHashMap.newKeySet(); // Players inside instance private final Set _npcs = ConcurrentHashMap.newKeySet(); // Spawned NPCs inside instance private final Map _doors = new HashMap<>(); // Spawned doors inside instance - private final StatsSet _parameters = new StatsSet(); + private final StatSet _parameters = new StatSet(); // Timers private final Map> _ejectDeadTasks = new ConcurrentHashMap<>(); private ScheduledFuture _cleanUpTask = null; @@ -171,7 +171,7 @@ public class Instance implements IIdentifiable, INamable * Get instance world parameters. * @return instance parameters */ - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } @@ -1020,7 +1020,7 @@ public class Instance implements IIdentifiable, INamable * Get parameters from instance template.
* @return template parameters */ - public StatsSet getTemplateParameters() + public StatSet getTemplateParameters() { return _template.getParameters(); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 2a196f73ef..b53b0a819d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.AbstractPlayerGroup; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -71,7 +71,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl private float _spRate = Config.RATE_INSTANCE_SP; private float _expPartyRate = Config.RATE_INSTANCE_PARTY_XP; private float _spPartyRate = Config.RATE_INSTANCE_PARTY_SP; - private StatsSet _parameters = StatsSet.EMPTY_STATSET; + private StatSet _parameters = StatSet.EMPTY_STATSET; private final Map _doors = new HashMap<>(); private final List _spawns = new ArrayList<>(); // Locations @@ -92,7 +92,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl /** * @param set */ - public InstanceTemplate(StatsSet set) + public InstanceTemplate(StatSet set) { _templateId = set.getInt("id", 0); _name = set.getString("name", null); @@ -178,7 +178,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (!set.isEmpty()) { - _parameters = new StatsSet(Collections.unmodifiableMap(set)); + _parameters = new StatSet(Collections.unmodifiableMap(set)); } } @@ -469,7 +469,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl * Get instance template parameters. * @return parameters of template */ - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java index 3b67ff72f4..3627959662 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; import java.util.function.BiConsumer; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public abstract class Condition { private final InstanceTemplate _template; - private final StatsSet _parameters; + private final StatSet _parameters; private final boolean _leaderOnly; private final boolean _showMessageAndHtml; private SystemMessageId _systemMsg = null; @@ -46,7 +46,7 @@ public abstract class Condition * @param onlyLeader flag which means if only leader should be affected (leader means player who wants to enter not group leader!) * @param showMessageAndHtml if {@code true} and HTML message is defined then both are send, otherwise only HTML or message is send */ - public Condition(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public Condition(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { _template = template; _parameters = parameters; @@ -58,7 +58,7 @@ public abstract class Condition * Gets parameters of condition. * @return set of parameters */ - protected final StatsSet getParameters() + protected final StatSet getParameters() { return _parameters; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java index e379741b59..c27d92d662 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionCommandChannel extends Condition { - public ConditionCommandChannel(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionCommandChannel(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_CANNOT_ENTER_BECAUSE_YOU_ARE_NOT_ASSOCIATED_WITH_THE_CURRENT_COMMAND_CHANNEL); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java index ed434e3524..a828dcceae 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.model.AbstractPlayerGroup; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionCommandChannelLeader extends Condition { - public ConditionCommandChannelLeader(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionCommandChannelLeader(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java index d2a60816d0..423a37a94e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionDistance extends Condition { - public ConditionDistance(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionDistance(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); setSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED, (message, player) -> message.addString(player.getName())); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java index 3dc78a98c7..8aa68b7e08 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionGroupMax extends Condition { - public ConditionGroupMax(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionGroupMax(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_CANNOT_ENTER_DUE_TO_THE_PARTY_HAVING_EXCEEDED_THE_LIMIT); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java index f7930b1d8c..fde9d13439 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionGroupMin extends Condition { - public ConditionGroupMin(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionGroupMin(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_MUST_HAVE_A_MINIMUM_OF_S1_PEOPLE_TO_ENTER_THIS_INSTANCED_ZONE, (msg, player) -> msg.addInt(getLimit())); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 3088d8ae64..53fee609aa 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.enums.ResidenceType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; */ public class ConditionHasResidence extends Condition { - public ConditionHasResidence(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionHasResidence(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); } @@ -43,7 +43,7 @@ public class ConditionHasResidence extends Condition return false; } - final StatsSet params = getParameters(); + final StatSet params = getParameters(); final int id = params.getInt("id"); boolean test = false; switch (params.getEnum("type", ResidenceType.class)) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java index 4e1c407325..eed350db38 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -32,7 +32,7 @@ public class ConditionItem extends Condition private final long _count; private final boolean _take; - public ConditionItem(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionItem(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Load params diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java index 7d509a20c7..b38f8c0e2c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -32,7 +32,7 @@ public class ConditionLevel extends Condition private final int _min; private final int _max; - public ConditionLevel(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionLevel(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Load params diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java index b91deeffdb..d71e6d0a39 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; */ public class ConditionNoParty extends Condition { - public ConditionNoParty(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionNoParty(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java index dd31bf3ca5..5bf768a03e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionParty extends Condition { - public ConditionParty(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionParty(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java index 524a59675a..0363715536 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionPartyLeader extends Condition { - public ConditionPartyLeader(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionPartyLeader(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java index 481cb251ce..48d7fc7981 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.instancemanager.QuestManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionQuest extends Condition { - public ConditionQuest(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionQuest(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Set message diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 899b17aff9..a073129734 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionReenter extends Condition { - public ConditionReenter(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionReenter(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); setSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET, (message, player) -> message.addString(player.getName())); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java index ec255025c3..fafafe5604 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.itemauction; import java.util.Calendar; import java.util.concurrent.TimeUnit; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Forsaiken @@ -40,7 +40,7 @@ public class AuctionDateGenerator private int _hour_of_day; private int _minute_of_hour; - public AuctionDateGenerator(StatsSet config) + public AuctionDateGenerator(StatSet config) { _calendar = Calendar.getInstance(); _interval = config.getInt(FIELD_INTERVAL, -1); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 64bf0a6ff1..cb554e4dce 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.itemauction; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.idfactory.IdFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,9 +34,9 @@ public class AuctionItem private final int _itemId; private final long _itemCount; @SuppressWarnings("unused") - private final StatsSet _itemExtra; + private final StatSet _itemExtra; - public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatsSet itemExtra) + public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatSet itemExtra) { _auctionItemId = auctionItemId; _auctionLength = auctionLength; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 6dff6e3a4d..dc3a7f6f6b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -44,7 +44,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -84,7 +84,7 @@ public class ItemAuctionInstance _items = new ArrayList<>(); final NamedNodeMap nanode = node.getAttributes(); - final StatsSet generatorConfig = new StatsSet(); + final StatSet generatorConfig = new StatSet(); for (int i = nanode.getLength(); i-- > 0;) { final Node n = nanode.item(i); @@ -115,7 +115,7 @@ public class ItemAuctionInstance throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } - final StatsSet itemExtra = new StatsSet(); + final StatSet itemExtra = new StatSet(); final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Armor.java index ac707b015b..c87f7ed45e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Armor.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.type.ArmorType; /** @@ -28,15 +28,15 @@ public class Armor extends Item /** * Constructor for Armor. - * @param set the StatsSet designating the set of couples (key,value) characterizing the armor. + * @param set the StatSet designating the set of couples (key,value) characterizing the armor. */ - public Armor(StatsSet set) + public Armor(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/EtcItem.java index 86d7291595..a902860c0d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/EtcItem.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -38,15 +38,15 @@ public class EtcItem extends Item /** * Constructor for EtcItem. - * @param set StatsSet designating the set of couples (key,value) for description of the Etc + * @param set StatSet designating the set of couples (key,value) for description of the Etc */ - public EtcItem(StatsSet set) + public EtcItem(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Henna.java index c669b86eec..c4c32e7cda 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -21,7 +21,7 @@ import java.util.EnumMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; @@ -45,7 +45,7 @@ public class Henna private final List _skills; private final List _wear_class; - public Henna(StatsSet set) + public Henna(StatSet set) { _dyeId = set.getInt("dyeId"); _dyeItemId = set.getInt("dyeItemId"); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Item.java index 49dbf04394..913b622479 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Item.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.enums.ItemGrade; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; @@ -175,14 +175,14 @@ public abstract class Item extends ListenersContainer implements IIdentifiable /** * Constructor of the Item that fill class variables.
*
- * @param set : StatsSet corresponding to a set of couples (key,value) for description of the item + * @param set : StatSet corresponding to a set of couples (key,value) for description of the item */ - protected Item(StatsSet set) + protected Item(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { _itemId = set.getInt("item_id"); _displayId = set.getInt("displayId", _itemId); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java index ab196007a8..3ca228cbe5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -29,7 +29,7 @@ public class PlayerItemTemplate extends ItemHolder /** * @param set the set containing the values for this object */ - public PlayerItemTemplate(StatsSet set) + public PlayerItemTemplate(StatSet set) { super(set.getInt("id"), set.getInt("count")); _equipped = set.getBoolean("equipped", false); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Weapon.java index 16f0c47287..5f9f8507bd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Weapon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.items; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ItemSkillType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -58,15 +58,15 @@ public class Weapon extends Item /** * Constructor for Weapon. - * @param set the StatsSet designating the set of couples (key,value) characterizing the weapon. + * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. */ - public Weapon(StatsSet set) + public Weapon(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java index 422054b245..aa1f33acce 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java @@ -23,7 +23,7 @@ import java.util.List; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -54,7 +54,7 @@ public class AppearanceStone private List _racesNot; private List _allVisualIds; - public AppearanceStone(StatsSet set) + public AppearanceStone(StatSet set) { _id = set.getInt("id"); _visualId = set.getInt("visualId", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java index f3b53f1a67..a2897ba911 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.items.combination; import java.util.EnumMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -31,7 +31,7 @@ public class CombinationItem private final int _chance; private final Map _rewards = new EnumMap<>(CombinationItemType.class); - public CombinationItem(StatsSet set) + public CombinationItem(StatSet set) { _itemOne = set.getInt("one"); _itemTwo = set.getInt("two"); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java index 1cde38a6d6..a7f1326bd8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.CrystalType; @@ -59,7 +59,7 @@ public abstract class AbstractEnchantItem private final int _maxEnchantLevel; private final double _bonusRate; - public AbstractEnchantItem(StatsSet set) + public AbstractEnchantItem(StatSet set) { _id = set.getInt("id"); if (getItem() == null) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java index 36ccf3a5a4..310a7643ec 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -40,7 +40,7 @@ public class EnchantScroll extends AbstractEnchantItem private final int _scrollGroupId; private Set _items; - public EnchantScroll(StatsSet set) + public EnchantScroll(StatSet set) { super(set); _scrollGroupId = set.getInt("scrollGroupId", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java index c02095428b..978e38d533 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items.enchant; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.items.type.ItemType; @@ -30,7 +30,7 @@ public class EnchantSupportItem extends AbstractEnchantItem private final boolean _isGiant; private final ItemType type; - public EnchantSupportItem(StatsSet set) + public EnchantSupportItem(StatSet set) { super(set); type = getItem().getItemType(); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index ab872cdea9..dabb2325f6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.data.xml.impl.CategoryData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.entity.Hero; @@ -61,7 +61,7 @@ public class Olympiad extends ListenersContainer protected static final Logger LOGGER = Logger.getLogger(Olympiad.class.getName()); protected static final Logger LOGGER_OLYMPIAD = Logger.getLogger("olympiad"); - private static final Map NOBLES = new ConcurrentHashMap<>(); + private static final Map NOBLES = new ConcurrentHashMap<>(); private static final Map NOBLES_RANK = new HashMap<>(); public static final String OLYMPIAD_HTML_PATH = "data/html/olympiad/"; @@ -226,10 +226,10 @@ public class Olympiad extends ListenersContainer PreparedStatement statement = con.prepareStatement(OLYMPIAD_LOAD_NOBLES); ResultSet rset = statement.executeQuery()) { - StatsSet statData; + StatSet statData; while (rset.next()) { - statData = new StatsSet(); + statData = new StatSet(); statData.set(CLASS_ID, rset.getInt(CLASS_ID)); statData.set(CHAR_NAME, rset.getString(CHAR_NAME)); statData.set(POINTS, rset.getInt(POINTS)); @@ -452,7 +452,7 @@ public class Olympiad extends ListenersContainer saveNobleData(); _period = 1; - final List heroesToBe = sortHerosToBe(); + final List heroesToBe = sortHerosToBe(); Hero.getInstance().resetData(); Hero.getInstance().computeNewHeroes(heroesToBe); @@ -486,7 +486,7 @@ public class Olympiad extends ListenersContainer return NOBLES.size(); } - public static StatsSet getNobleStats(int playerId) + public static StatSet getNobleStats(int playerId) { return NOBLES.get(playerId); } @@ -785,7 +785,7 @@ public class Olympiad extends ListenersContainer } int currentPoints; - for (StatsSet nobleInfo : NOBLES.values()) + for (StatSet nobleInfo : NOBLES.values()) { currentPoints = nobleInfo.getInt(POINTS); currentPoints += WEEKLY_POINTS; @@ -803,7 +803,7 @@ public class Olympiad extends ListenersContainer return; } - for (StatsSet nobleInfo : NOBLES.values()) + for (StatSet nobleInfo : NOBLES.values()) { nobleInfo.set(COMP_DONE_WEEK, 0); } @@ -836,9 +836,9 @@ public class Olympiad extends ListenersContainer try (Connection con = DatabaseFactory.getConnection()) { - for (Entry entry : NOBLES.entrySet()) + for (Entry entry : NOBLES.entrySet()) { - final StatsSet nobleInfo = entry.getValue(); + final StatSet nobleInfo = entry.getValue(); if (nobleInfo == null) { @@ -951,7 +951,7 @@ public class Olympiad extends ListenersContainer } } - protected List sortHerosToBe() + protected List sortHerosToBe() { if (_period != 1) { @@ -959,8 +959,8 @@ public class Olympiad extends ListenersContainer } LOGGER_OLYMPIAD.info("Noble,charid,classid,compDone,points"); - StatsSet nobleInfo; - for (Entry entry : NOBLES.entrySet()) + StatSet nobleInfo; + for (Entry entry : NOBLES.entrySet()) { nobleInfo = entry.getValue(); if (nobleInfo == null) @@ -977,12 +977,12 @@ public class Olympiad extends ListenersContainer LOGGER_OLYMPIAD.info(charName + "," + charId + "," + classId + "," + compDone + "," + points); } - final List heroesToBe = new LinkedList<>(); + final List heroesToBe = new LinkedList<>(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(OLYMPIAD_GET_HEROS)) { - StatsSet hero; + StatSet hero; for (int element : HERO_IDS) { statement.setInt(1, element); @@ -991,7 +991,7 @@ public class Olympiad extends ListenersContainer { if (rset.next()) { - hero = new StatsSet(); + hero = new StatSet(); hero.set(CLASS_ID, element); hero.set(CHAR_ID, rset.getInt(CHAR_ID)); hero.set(CHAR_NAME, rset.getString(CHAR_NAME)); @@ -1045,7 +1045,7 @@ public class Olympiad extends ListenersContainer return 0; } - final StatsSet noble = NOBLES.get(objectId); + final StatSet noble = NOBLES.get(objectId); if ((noble == null) || (noble.getInt(POINTS) == 0)) { return 0; @@ -1095,7 +1095,7 @@ public class Olympiad extends ListenersContainer { if (!NOBLES.containsKey(player.getObjectId())) { - final StatsSet statDat = new StatsSet(); + final StatSet statDat = new StatSet(); statDat.set(CLASS_ID, player.getBaseClass()); statDat.set(CHAR_NAME, player.getName()); statDat.set(POINTS, DEFAULT_POINTS); @@ -1202,7 +1202,7 @@ public class Olympiad extends ListenersContainer * @param data the stats set data to add. * @return the old stats set if the noble is already present, null otherwise. */ - public static StatsSet addNobleStats(int charId, StatsSet data) + public static StatSet addNobleStats(int charId, StatSet data) { return NOBLES.put(charId, data); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Participant.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Participant.java index 670066ac32..b6d879b902 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Participant.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Participant.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.olympiad; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class Participant private final int baseClass; private boolean disconnected = false; private boolean defaulted = false; - private final StatsSet stats; + private final StatSet stats; public String clanName; public int clanId; @@ -125,7 +125,7 @@ public class Participant /** * @return the stats */ - public StatsSet getStats() + public StatSet getStats() { return stats; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java index 4d5231ca5d..c1fb0f88f6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.primeshop; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -49,7 +49,7 @@ public class PrimeShopGroup private final int _availableCount; private final List _items; - public PrimeShopGroup(StatsSet set, List items) + public PrimeShopGroup(StatSet set, List items) { _brId = set.getInt("id"); _category = set.getInt("cat", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java index d150ec98cd..88795e0721 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.residences; import java.time.Duration; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -33,7 +33,7 @@ public class ResidenceFunctionTemplate private final Duration _duration; private final double _value; - public ResidenceFunctionTemplate(StatsSet set) + public ResidenceFunctionTemplate(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java index 4f15efda0b..b19f8e59d5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; /** @@ -34,7 +34,7 @@ public class ShuttleDataHolder private final List _stops = new ArrayList<>(2); private final List _routes = new ArrayList<>(2); - public ShuttleDataHolder(StatsSet set) + public ShuttleDataHolder(StatSet set) { _id = set.getInt("id"); _loc = new Location(set); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/Skill.java index c44b45a781..0e97466a3a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.handler.IAffectScopeHandler; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.CubicInstance; @@ -210,7 +210,7 @@ public class Skill implements IIdentifiable private final SkillBuffType _buffType; private final boolean _displayInList; - public Skill(StatsSet set) + public Skill(StatSet set) { _id = set.getInt(".id"); _level = set.getInt(".level"); @@ -391,7 +391,7 @@ public class Skill implements IIdentifiable _toggleGroupId = set.getInt("toggleGroupId", -1); _attachToggleGroupId = set.getInt("attachToggleGroupId", -1); - _attachSkills = set.getList("attachSkillList", StatsSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatsSet).collect(Collectors.toList()); + _attachSkills = set.getList("attachSkillList", StatSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatSet).collect(Collectors.toList()); final String abnormalResist = set.getString("abnormalResists", null); if (abnormalResist != null) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java index bfc25bddde..39b738dbca 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.ChanceLocation; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory; /** * @author UnAfraid */ -public class NpcSpawnTemplate implements Cloneable, IParameterized +public class NpcSpawnTemplate implements Cloneable, IParameterized { private static final Logger LOGGER = Logger.getLogger(NpcSpawnTemplate.class.getName()); @@ -56,7 +56,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized private final Duration _respawnTimeRandom; private List _locations; private SpawnTerritory _zone; - private StatsSet _parameters; + private StatSet _parameters; private final boolean _spawnAnimation; private final boolean _saveInDB; private final String _dbName; @@ -82,7 +82,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized _minions = template._minions; } - public NpcSpawnTemplate(SpawnTemplate spawnTemplate, SpawnGroup group, StatsSet set) + public NpcSpawnTemplate(SpawnTemplate spawnTemplate, SpawnGroup group, StatSet set) { _spawnTemplate = spawnTemplate; _group = group; @@ -128,14 +128,14 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized mergeParameters(spawnTemplate, group); } - private StatsSet mergeParameters(SpawnTemplate spawnTemplate, SpawnGroup group) + private StatSet mergeParameters(SpawnTemplate spawnTemplate, SpawnGroup group) { if ((_parameters == null) && (spawnTemplate.getParameters() == null) && (group.getParameters() == null)) { return null; } - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); if (spawnTemplate.getParameters() != null) { set.merge(spawnTemplate.getParameters()); @@ -206,13 +206,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized } @Override - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } @Override - public void setParameters(StatsSet parameters) + public void setParameters(StatSet parameters) { if (_parameters == null) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java index 6723863c93..7ceb2d46af 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IParameterized; import org.l2jmobius.gameserver.model.interfaces.ITerritorized; @@ -31,16 +31,16 @@ import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory; /** * @author UnAfraid */ -public class SpawnGroup implements Cloneable, ITerritorized, IParameterized +public class SpawnGroup implements Cloneable, ITerritorized, IParameterized { private final String _name; private final boolean _spawnByDefault; private List _territories; private List _bannedTerritories; private final List _spawns = new ArrayList<>(); - private StatsSet _parameters; + private StatSet _parameters; - public SpawnGroup(StatsSet set) + public SpawnGroup(StatSet set) { this(set.getString("name", null), set.getBoolean("spawnByDefault", true)); } @@ -104,13 +104,13 @@ public class SpawnGroup implements Cloneable, ITerritorized, IParameterized +public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized { private final String _name; private final String _ai; @@ -45,9 +45,9 @@ public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized _territories; private List _bannedTerritories; private final List _groups = new ArrayList<>(); - private StatsSet _parameters; + private StatSet _parameters; - public SpawnTemplate(StatsSet set, File file) + public SpawnTemplate(StatSet set, File file) { this(set.getString("name", null), set.getString("ai", null), set.getBoolean("spawnByDefault", true), file); } @@ -128,13 +128,13 @@ public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized _castleId; - public TeleportLocation(int id, StatsSet set) + public TeleportLocation(int id, StatSet set) { super(set); _id = id; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java index 916ae0790c..33cf6ac3bc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.variables; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.IRestorable; import org.l2jmobius.gameserver.model.interfaces.IStorable; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.interfaces.IStorable; /** * @author UnAfraid */ -public abstract class AbstractVariables extends StatsSet implements IRestorable, IStorable, IDeletable +public abstract class AbstractVariables extends StatSet implements IRestorable, IStorable, IDeletable { private final AtomicBoolean _hasChanges = new AtomicBoolean(false); @@ -41,42 +41,42 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, */ @Override - public StatsSet set(String name, boolean value) + public StatSet set(String name, boolean value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, double value) + public StatSet set(String name, double value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, Enum value) + public StatSet set(String name, Enum value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, int value) + public StatSet set(String name, int value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, long value) + public StatSet set(String name, long value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, String value) + public StatSet set(String name, String value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); @@ -89,7 +89,7 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, * @param markAsChanged * @return */ - public StatsSet set(String name, String value, boolean markAsChanged) + public StatSet set(String name, String value, boolean markAsChanged) { if (markAsChanged) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index 5c03122a62..4d97f0017a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExHeroList implements IClientOutgoingPacket { - private final Map _heroList; + private final Map _heroList; public ExHeroList() { @@ -42,7 +42,7 @@ public class ExHeroList implements IClientOutgoingPacket OutgoingPackets.EX_HERO_LIST.writeId(packet); packet.writeD(_heroList.size()); - for (StatsSet hero : _heroList.values()) + for (StatSet hero : _heroList.values()) { packet.writeS(hero.getString(Olympiad.CHAR_NAME)); packet.writeD(hero.getInt(Olympiad.CLASS_ID)); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/BypassParser.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/BypassParser.java index 414125bdeb..a80323ba1f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/BypassParser.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/BypassParser.java @@ -20,12 +20,12 @@ import java.util.LinkedHashMap; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid */ -public class BypassParser extends StatsSet +public class BypassParser extends StatSet { private static final String ALLOWED_CHARS = "a-zA-Z0-9-_`!@#%^&*()\\[\\]|\\\\/"; private static final Pattern PATTERN = Pattern.compile(String.format("([%s]*)=('([%s ]*)'|[%s]*)", ALLOWED_CHARS, ALLOWED_CHARS, ALLOWED_CHARS)); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java index 2ceebc156a..a3f07a6ad5 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java @@ -18,7 +18,7 @@ package ai.areas.BeastFarm; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -133,7 +133,7 @@ public class ImprovedBabyPets extends AbstractNpcAI private boolean castBuff(Summon summon, int stepNumber, int buffNumber) { final PlayerInstance owner = summon.getOwner(); - final StatsSet parameters = summon.getTemplate().getParameters(); + final StatSet parameters = summon.getTemplate().getParameters(); final SkillHolder skill = parameters.getObject("step" + stepNumber + "_buff0" + buffNumber, SkillHolder.class); if ((skill != null) && (owner != null)) @@ -174,7 +174,7 @@ public class ImprovedBabyPets extends AbstractNpcAI { final boolean previousFollowStatus = summon.getFollowStatus(); final PlayerInstance owner = summon.getOwner(); - final StatsSet parameters = summon.getTemplate().getParameters(); + final StatSet parameters = summon.getTemplate().getParameters(); final SkillHolder skill = parameters.getObject("step" + stepNumber + "_heal0" + healNumber, SkillHolder.class); final int targetType = parameters.getInt("step" + stepNumber + "_heal_target0" + healNumber, 0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java index efdbdd4460..9ff1875b62 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java @@ -18,7 +18,7 @@ package ai.areas.FairySettlement; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -50,11 +50,11 @@ public class Wisp extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("DELETE_NPC")) { - params = new StatsSet(); + params = new StatSet(); params.set("LOCATION_OBJECT", npc.getLocation()); getTimers().addTimer("RESPAWN_WISP_" + npc.getObjectId(), params, getRandom(RESPAWN_MIN, RESPAWN_MAX), null, null); npc.deleteMe(); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java index 5cd6622513..b52be69c96 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java @@ -19,7 +19,7 @@ package ai.areas.Parnassus.EntrancePortalToCrystalCaverns; import java.util.Calendar; import org.l2jmobius.gameserver.instancemanager.QuestManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -107,7 +107,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("LOOP_TIMER")) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/SeedOfHellfire/Zofan.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/SeedOfHellfire/Zofan.java index b6c122da75..03f451c9fd 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/SeedOfHellfire/Zofan.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/SeedOfHellfire/Zofan.java @@ -16,7 +16,7 @@ */ package ai.areas.SeedOfHellfire; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -61,7 +61,7 @@ public class Zofan extends AbstractNpcAI { if ((npc.getInstanceWorld() == null) && (npc.getSpawn() != null)) { - final StatsSet params = npc.getParameters(); + final StatSet params = npc.getParameters(); if (params.getInt("i_childrengarden_guard", 0) == 0) { for (String param : MINION_PARAMS) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Allada.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Allada.java index 5ccca8c99a..4291aeb5ec 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Allada.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Allada.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -45,7 +45,7 @@ public class Allada extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Mei.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Mei.java index 015ee0bc9a..7ad9623ec2 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Mei.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Mei.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -40,7 +40,7 @@ public class Mei extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SHOUT")) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Remons.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Remons.java index 41ec3c1bff..a1ea6ba90c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Remons.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Remons.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -43,7 +43,7 @@ public class Remons extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rinne.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rinne.java index 55ab4fc1a7..1d6eafa48a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rinne.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rinne.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -42,7 +42,7 @@ public class Rinne extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rotina.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rotina.java index 24ad1b6041..d0c8f2a81b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rotina.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rotina.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -45,7 +45,7 @@ public class Rotina extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Soros.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Soros.java index d7862030aa..632d1a78a8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Soros.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Soros.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -40,7 +40,7 @@ public class Soros extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java index cbe7cc9ac9..4a2aaf21c4 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java @@ -17,7 +17,7 @@ package ai.areas.WallOfArgos.ElmoredenServantsGhost; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -58,7 +58,7 @@ public class ElmoredenServantsGhost extends AbstractNpcAI takeItems(player, USED_GRAVE_PASS, 1); final Location loc; - final StatsSet npcParameters = npc.getParameters(); + final StatSet npcParameters = npc.getParameters(); if (event.equals("teleport1")) { loc = new Location(npcParameters.getInt("TelPos_X1", 0), npcParameters.getInt("TelPos_Y1", 0), npcParameters.getInt("TelPos_Z1", 0)); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java index aca502d2cc..a46695ea27 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -341,7 +341,7 @@ public class Anakim extends AbstractNpcAI addSkillSeeId(ALL_MOBS); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANAKIM); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM); final int status = GrandBossManager.getInstance().getBossStatus(ANAKIM); if (status == DEAD) { @@ -613,9 +613,9 @@ public class Anakim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(ANAKIM, DEAD); final long respawnTime = getRespawnTime(); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANAKIM); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(ANAKIM, info); + GrandBossManager.getInstance().setStatSet(ANAKIM, info); startQuestTimer("unlock_anakim", respawnTime, null, null); startQuestTimer("end_anakim", 900000, null, null); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index b837d839d8..d12c29d422 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -138,7 +138,7 @@ public class Antharas extends AbstractNpcAI addAttackId(ANTHARAS, BOMBER, BEHEMOTH, TERASQUE); addKillId(ANTHARAS, TERASQUE, BEHEMOTH); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANTHARAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANTHARAS); final double curr_hp = info.getDouble("currentHP"); final double curr_mp = info.getDouble("currentMP"); final int loc_x = info.getInt("loc_x"); @@ -761,7 +761,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(PlayerInstance attacker, int damage) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Baium/Baium.java index ee6655da4d..bca22cc6a6 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -112,7 +112,7 @@ public class Baium extends AbstractNpcAI addSeeCreatureId(BAIUM); addSpellFinishedId(BAIUM); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(BAIUM); + final StatSet info = GrandBossManager.getInstance().getStatSet(BAIUM); switch (getStatus()) { @@ -666,7 +666,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java index 413e2e5d59..91a5445402 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -122,7 +122,7 @@ public class BalokWarzone extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (isInInstance(world)) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java index 9919e58ce5..e8a2e67509 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java @@ -17,7 +17,7 @@ package ai.bosses.Baylor; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -77,7 +77,7 @@ public class BaylorWarzone extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (isInInstance(world)) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java index 1e80c81840..e8e9fa8756 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; @@ -104,7 +104,7 @@ public class Beleth extends AbstractNpcAI addStartNpc(STONE_COFFIN); addTalkId(STONE_COFFIN); addFirstTalkId(ELF); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(REAL_BELETH); + final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH); if (status == DEAD) { @@ -750,9 +750,9 @@ public class Beleth extends AbstractNpcAI setBelethKiller(killer); GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD); final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(REAL_BELETH); + final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(REAL_BELETH, info); + GrandBossManager.getInstance().setStatSet(REAL_BELETH, info); startQuestTimer("BELETH_UNLOCK", respawnTime, null, null); deleteAll(); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Core/Core.java index bfa7212b8c..c1452bf9de 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; @@ -85,7 +85,7 @@ public class Core extends AbstractNpcAI registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR); _firstAttacked = false; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. @@ -205,9 +205,9 @@ public class Core extends AbstractNpcAI final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000; startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(CORE, info); + GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java index 6ef025304c..764df30625 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -175,7 +175,7 @@ public class IceQueensCastleBattle extends AbstractInstance final Instance world = npc.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); final Npc controller = params.getObject("controller", Npc.class); final Npc freya = params.getObject("freya", Npc.class); switch (event) @@ -734,7 +734,7 @@ public class IceQueensCastleBattle extends AbstractInstance final Instance world = npc.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); switch (npc.getId()) { case FREYA_THRONE: @@ -1069,7 +1069,7 @@ public class IceQueensCastleBattle extends AbstractInstance final Instance world = npc.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); final Npc controller = params.getObject("controller", Npc.class); switch (npc.getId()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Helios/Helios.java index 7faa1d8823..0f70177f83 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Helios/Helios.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Helios/Helios.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.zone.type.NoSummonFriendZone; @@ -58,7 +58,7 @@ public class Helios extends AbstractNpcAI // Zone bossZone = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(HELIOS3); + final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3); final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3); if (status == DEAD) { @@ -136,9 +136,9 @@ public class Helios extends AbstractNpcAI bossZone.broadcastPacket(new ExShowScreenMessage(NpcStringId.HELIOS_DEFEATED_TAKES_FLIGHT_DEEP_IN_TO_THE_SUPERION_FORT_HIS_THRONE_IS_RENDERED_INACTIVE, ExShowScreenMessage.TOP_CENTER, 10000, true)); GrandBossManager.getInstance().setBossStatus(HELIOS3, DEAD); final long respawnTime = (Config.HELIOS_SPAWN_INTERVAL + getRandom(-Config.HELIOS_SPAWN_RANDOM, Config.HELIOS_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(HELIOS3); + final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(HELIOS3, info); + GrandBossManager.getInstance().setStatSet(HELIOS3, info); startQuestTimer("unlock_helios", respawnTime, null, null); break; } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java index dc6e826093..b863874cd2 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.AggroInfo; import org.l2jmobius.gameserver.model.DamageDoneInfo; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -153,13 +153,13 @@ public class IstinaCavern extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); - final StatsSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); switch (event) { case "DEATH_TIMER": @@ -391,7 +391,7 @@ public class IstinaCavern extends AbstractInstance } else { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); if (skillId == npcParams.getSkillHolder("Istina_Death_Skill01").getSkillId()) { @@ -440,7 +440,7 @@ public class IstinaCavern extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int stage = npcVars.getInt("ISTINA_STAGE", -1); if (npc.getId() == BALLISTA) @@ -657,7 +657,7 @@ public class IstinaCavern extends AbstractInstance private PlayerInstance setPlayerRewardInfo(Npc npc) { final Map rewards = new ConcurrentHashMap<>(); - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); PlayerInstance maxDealer = null; long maxDamage = 0; int totalDamage = 0; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index 61b663a0f3..7aebfa337d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -116,7 +116,7 @@ public class Kelbim extends AbstractNpcAI addKillId(KELBIM); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(KELBIM); + final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM); final int status = GrandBossManager.getInstance().getBossStatus(KELBIM); if (status == DEAD) { @@ -429,9 +429,9 @@ public class Kelbim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(KELBIM, DEAD); final long respawnTime = (Config.KELBIM_SPAWN_INTERVAL + getRandom(-Config.KELBIM_SPAWN_RANDOM, Config.KELBIM_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(KELBIM); + final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(KELBIM, info); + GrandBossManager.getInstance().setStatSet(KELBIM, info); startQuestTimer("unlock_kelbim", respawnTime, null, null); startQuestTimer("end_kelbim", 1800000, null, null); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java index 31be0ec32d..f023ad5f8e 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java @@ -19,7 +19,7 @@ package ai.bosses.Kimerian; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -83,7 +83,7 @@ public class KimerianCommon extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) @@ -345,8 +345,8 @@ public class KimerianCommon extends AbstractInstance { final Creature creature = event.getSeen(); final Npc npc = (Npc) event.getSeer(); - final StatsSet npcParams = npc.getParameters(); - final StatsSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java index 9fbe2e6026..51ffd45923 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -367,7 +367,7 @@ public class Lilith extends AbstractNpcAI addSkillSeeId(ALL_MOBS); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LILITH); + final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH); final int status = GrandBossManager.getInstance().getBossStatus(LILITH); if (status == DEAD) { @@ -629,9 +629,9 @@ public class Lilith extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LILITH, DEAD); final long respawnTime = getRespawnTime(); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LILITH); + final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(LILITH, info); + GrandBossManager.getInstance().setStatSet(LILITH, info); startQuestTimer("unlock_lilith", respawnTime, null, null); startQuestTimer("end_lilith", 900000, null, null); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index 9ef473069d..cc00a33356 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -244,7 +244,7 @@ public class Lindvior extends AbstractNpcAI addSeeCreatureId(INVISIBLE); _zoneLair = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LINDVIOR_RAID); + final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID); final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID); if (status == DEAD) { @@ -821,9 +821,9 @@ public class Lindvior extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD); final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LINDVIOR_RAID); + final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(LINDVIOR_RAID, info); + GrandBossManager.getInstance().setStatSet(LINDVIOR_RAID, info); startQuestTimer("unlock_lindvior", respawnTime, null, null); } else if (npc.getId() == NPC_GENERATOR) @@ -867,7 +867,7 @@ public class Lindvior extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SHOUT") && (npc != null) && !npc.isDead()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/LionelHunter.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/LionelHunter.java index e02f478232..0677792823 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/LionelHunter.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/LionelHunter.java @@ -18,7 +18,7 @@ package ai.bosses.Lindvior; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.WalkingManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -43,7 +43,7 @@ public class LionelHunter extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SHOUT") && (npc != null)) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java index b9c19644c4..c5c62c8f2f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -152,13 +152,13 @@ public class OctavisWarzone extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (isInInstance(world)) { - final StatsSet npcVars = npc.getVariables(); - final StatsSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); switch (event) { @@ -378,7 +378,7 @@ public class OctavisWarzone extends AbstractInstance } else if (CommonUtil.contains(OCTAVIS_STAGE_2, npc.getId())) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); if (npcVars.getBoolean("START_TIMERS", true)) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index 38eebefc7b..5e525a6caa 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -92,7 +92,7 @@ public class Orfen extends AbstractNpcAI registerMobs(mobs); _IsTeleported = false; ZONE = ZoneManager.getInstance().getZoneById(12013); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); final int status = GrandBossManager.getInstance().getBossStatus(ORFEN); if (status == DEAD) { @@ -327,9 +327,9 @@ public class Orfen extends AbstractNpcAI respawnTime *= 3600000; startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(ORFEN, info); + GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); startQuestTimer("despawn_minions", 20000, null, null); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index c2564917c7..b9fdddaaf7 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; @@ -91,7 +91,7 @@ public class QueenAnt extends AbstractNpcAI addFactionCallId(NURSE); _zone = ZoneManager.getInstance().getZoneById(12012); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); final int status = GrandBossManager.getInstance().getBossStatus(QUEEN); if (status == DEAD) { @@ -367,9 +367,9 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("action", npc, null); cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(QUEEN, info); + GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); _larva.deleteMe(); _larva = null; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java index 58d5b9d3a8..577a99ad9d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java @@ -19,7 +19,7 @@ package ai.bosses.Spezion.Cannon; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -170,7 +170,7 @@ public class Cannon extends AbstractNpcAI { if (skill.getId() == PRESENT_SKILL.getSkillId()) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); npc.broadcastPacket(new Earthquake(npc, 10, 5)); npc.broadcastPacket(new OnEventTrigger(npcParams.getInt("TRIGGER_ID"), true)); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java index 086615be42..4af559d521 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -105,13 +105,13 @@ public class TeredorWarzone extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); - final StatsSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); switch (event) { @@ -236,7 +236,7 @@ public class TeredorWarzone extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); switch (npc.getId()) { @@ -292,7 +292,7 @@ public class TeredorWarzone extends AbstractInstance if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); switch (npc.getId()) { @@ -472,7 +472,7 @@ public class TeredorWarzone extends AbstractInstance { case TEREDOR: { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int hpPer = npc.getCurrentHpPercent(); int teredorStatus = npcVars.getInt("TEREDOR_STATUS", 1); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java index 9d9a79d53a..1610356a26 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -322,7 +322,7 @@ public class Trasken extends AbstractNpcAI DoorData.getInstance().getDoor(DOOR).openMe(); } // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(TRASKEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN); final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN); if (status == DEAD) { @@ -603,9 +603,9 @@ public class Trasken extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD); final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(TRASKEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(TRASKEN, info); + GrandBossManager.getInstance().setStatSet(TRASKEN, info); startQuestTimer("unlock_trasken", respawnTime, null, null); break; } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java index 9414859da4..7233381898 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; @@ -123,7 +123,7 @@ public class Valakas extends AbstractNpcAI registerMobs(VALAKAS); ZONE = ZoneManager.getInstance().getZoneById(12010); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(VALAKAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); final int status = GrandBossManager.getInstance().getBossStatus(VALAKAS); if (status == DEAD) @@ -446,9 +446,9 @@ public class Valakas extends AbstractNpcAI final long respawnTime = (Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM)) * 3600000; startQuestTimer("valakas_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(VALAKAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(VALAKAS, info); + GrandBossManager.getInstance().setStatSet(VALAKAS, info); return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java index c73ef9d83c..703e55428a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -189,8 +189,8 @@ public class CavernOfThePirateCaptain extends AbstractInstance final Instance world = npc.getInstanceWorld(); if (world != null) { - final StatsSet templParams = world.getTemplateParameters(); - final StatsSet params = world.getParameters(); + final StatSet templParams = world.getTemplateParameters(); + final StatSet params = world.getParameters(); switch (event) { case "BURN_BLUE": diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/AreaSkillNpc.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/AreaSkillNpc.java index f84b001cc5..80291ac3be 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/AreaSkillNpc.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/AreaSkillNpc.java @@ -17,7 +17,7 @@ package ai.others; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -124,7 +124,7 @@ public class AreaSkillNpc extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java index 01b37387a8..ef9e26a221 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -101,7 +101,7 @@ public class CastleTeleporter extends AbstractNpcAI if (st.hasMoreTokens()) { final int unknowInt = Integer.parseInt(st.nextToken()); - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); Location teleLoc = null; switch (unknowInt) { @@ -191,7 +191,7 @@ public class CastleTeleporter extends AbstractNpcAI return htmltext; } - private Location getTeleportLocation(StatsSet npcParams, String paramName1, String paramName2, String paramName3) + private Location getTeleportLocation(StatSet npcParams, String paramName1, String paramName2, String paramName3) { final Location loc; if (getRandom(100) < 33) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java index b1355fa9c5..c05c1b184b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java @@ -16,7 +16,7 @@ */ package ai.others.NpcBuffers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ class NpcBufferSkillData private final int _scaleToLevel; private final int _initialDelay; - NpcBufferSkillData(StatsSet set) + NpcBufferSkillData(StatSet set) { _skill = new SkillHolder(set.getInt("id"), set.getInt("level")); _scaleToLevel = set.getInt("scaleToLevel", -1); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java index dd7f4187be..ecae9d2861 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -54,7 +54,7 @@ class NpcBuffersData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node attr; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -75,7 +75,7 @@ class NpcBuffersData implements IXmlReader case "skill": { attrs = c.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { attr = attrs.item(i); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/Servitors/ClanFlag.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/Servitors/ClanFlag.java index 558d57b407..b09a5f38e9 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/Servitors/ClanFlag.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/Servitors/ClanFlag.java @@ -17,7 +17,7 @@ package ai.others.Servitors; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -51,7 +51,7 @@ public class ClanFlag extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java index 55c9613eab..a50c042b7f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -68,7 +68,7 @@ public class GateOfUnlimitedSummoning extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java index f19f5dea69..c817501830 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java @@ -17,7 +17,7 @@ package ai.others.Servitors; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -52,7 +52,7 @@ public class TreeOfLife extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (player != null) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java index 3ee8063427..ee96be41d8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -91,7 +91,7 @@ public class TersisHerald extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("DESPAWN_NPCS")) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index 2e5331f903..55dc363405 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.zone.type.NoRestartZone; @@ -309,7 +309,7 @@ public class AdminGrandBoss implements IAdminCommandHandler } } - final StatsSet info = GrandBossManager.getInstance().getStatsSet(grandBossId); + final StatSet info = GrandBossManager.getInstance().getStatSet(grandBossId); final String bossRespawn = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(info.getLong("respawn_time")); final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java index 075d9d050c..71aeb82ddd 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java @@ -19,7 +19,7 @@ package handlers.admincommandhandlers; import java.util.StringTokenizer; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -114,7 +114,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.getNobleLevel() > 0) { - final StatsSet statDat = getPlayerSet(player); + final StatSet statDat = getPlayerSet(player); final int oldpoints = Olympiad.getInstance().getNoblePoints(player); final int points = Math.max(oldpoints + val, 0); if (points > 1000) @@ -155,7 +155,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.getNobleLevel() > 0) { - final StatsSet playerStat = Olympiad.getNobleStats(player.getObjectId()); + final StatSet playerStat = Olympiad.getNobleStats(player.getObjectId()); if (playerStat == null) { BuilderUtil.sendSysMessage(activeChar, "This player hasn't played on Olympiad yet!"); @@ -197,7 +197,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.getNobleLevel() > 0) { - final StatsSet statDat = getPlayerSet(player); + final StatSet statDat = getPlayerSet(player); final int oldpoints = Olympiad.getInstance().getNoblePoints(player); final int points = oldpoints - val; if ((points < 1) && (points > 1000)) @@ -237,12 +237,12 @@ public class AdminOlympiad implements IAdminCommandHandler return Integer.decode(token); } - private StatsSet getPlayerSet(PlayerInstance player) + private StatSet getPlayerSet(PlayerInstance player) { - StatsSet statDat = Olympiad.getNobleStats(player.getObjectId()); + StatSet statDat = Olympiad.getNobleStats(player.getObjectId()); if (statDat == null) { - statDat = new StatsSet(); + statDat = new StatSet(); statDat.set(Olympiad.CLASS_ID, player.getBaseClass()); statDat.set(Olympiad.CHAR_NAME, player.getName()); statDat.set(Olympiad.POINTS, Olympiad.DEFAULT_POINTS); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java index d8a3d6e5ce..6382651e6c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java @@ -19,7 +19,7 @@ package handlers.conditions; import java.util.List; import org.l2jmobius.gameserver.enums.CategoryType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -31,7 +31,7 @@ public class CategoryTypeCondition implements ICondition { private final List _categoryTypes; - public CategoryTypeCondition(StatsSet params) + public CategoryTypeCondition(StatSet params) { _categoryTypes = params.getEnumList("category", CategoryType.class); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java index b24cfa0f14..9a14cb6fa2 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java @@ -16,7 +16,7 @@ */ package handlers.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -29,7 +29,7 @@ public class NpcLevelCondition implements ICondition private final int _minLevel; private final int _maxLevel; - public NpcLevelCondition(StatsSet params) + public NpcLevelCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java index afffe7a0c5..9e3deaa8ce 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java @@ -16,7 +16,7 @@ */ package handlers.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -29,7 +29,7 @@ public class PlayerLevelCondition implements ICondition private final int _minLevel; private final int _maxLevel; - public PlayerLevelCondition(StatsSet params) + public PlayerLevelCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 09f609dc37..0e81066579 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -32,7 +32,7 @@ public class AbnormalShield extends AbstractEffect { private final int _times; - public AbnormalShield(StatsSet params) + public AbnormalShield(StatSet params) { _times = params.getInt("times", -1); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 0496c9068d..9c508c8c52 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Objects; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class AbnormalTimeChange extends AbstractEffect private final int _time; private final int _mode; - public AbnormalTimeChange(StatsSet params) + public AbnormalTimeChange(StatSet params) { final String abnormals = params.getString("slot", null); if ((abnormals != null) && !abnormals.isEmpty()) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 98f85c7b21..3f9132b8e3 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -37,7 +37,7 @@ public class AbsorbDamage extends AbstractEffect private final double _damage; private static final Map _damageHolder = new ConcurrentHashMap<>(); - public AbsorbDamage(StatsSet params) + public AbsorbDamage(StatSet params) { _damage = params.getDouble("damage", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 26f51d5351..86fef7cf6d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; @@ -38,7 +38,7 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect private final int _hpPercent; private final Map _updates = new ConcurrentHashMap<>(); - protected AbstractConditionalHpEffect(StatsSet params, Stat stat) + protected AbstractConditionalHpEffect(StatSet params, Stat stat) { super(params, stat); _hpPercent = params.getInt("hpPercent", 0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java index 2e40124e39..f010f84271 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AbstractStatAddEffect extends AbstractEffect private final Stat _stat; protected final double _amount; - public AbstractStatAddEffect(StatsSet params, Stat stat) + public AbstractStatAddEffect(StatSet params, Stat stat) { _stat = stat; _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index da6a575c44..29e439684b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; @@ -42,12 +42,12 @@ public abstract class AbstractStatEffect extends AbstractEffect protected final StatModifierType _mode; protected final List _conditions = new ArrayList<>(); - public AbstractStatEffect(StatsSet params, Stat stat) + public AbstractStatEffect(StatSet params, Stat stat) { this(params, stat, stat); } - public AbstractStatEffect(StatsSet params, Stat mulStat, Stat addStat) + public AbstractStatEffect(StatSet params, Stat mulStat, Stat addStat) { _addStat = addStat; _mulStat = mulStat; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java index 9811f395aa..33d08bff36 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AbstractStatPercentEffect extends AbstractEffect private final Stat _stat; protected final double _amount; - public AbstractStatPercentEffect(StatsSet params, Stat stat) + public AbstractStatPercentEffect(StatSet params, Stat stat) { _stat = stat; _amount = params.getDouble("amount", 1); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java index 539814ef2a..79c022a23c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class Accuracy extends AbstractStatEffect { - public Accuracy(StatsSet params) + public Accuracy(StatSet params) { super(params, Stat.ACCURACY_COMBAT); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index 0c1fcbd92b..48d69968c5 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddHate extends AbstractEffect private final double _power; private final boolean _affectSummoner; - public AddHate(StatsSet params) + public AddHate(StatSet params) { _power = params.getDouble("power", 0); _affectSummoner = params.getBoolean("affectSummoner", false); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java index e90d5cc7f3..324927947a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddSkillBySkill extends AbstractEffect private final int _existingSkillLevel; private final SkillHolder _addedSkill; - public AddSkillBySkill(StatsSet params) + public AddSkillBySkill(StatSet params) { _existingSkillId = params.getInt("existingSkillId"); _existingSkillLevel = params.getInt("existingSkillLevel"); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index bdd8314dd7..205bc82200 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddTeleportBookmarkSlot extends AbstractEffect { private final int _amount; - public AddTeleportBookmarkSlot(StatsSet params) + public AddTeleportBookmarkSlot(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java index c26ec5442f..658931ecb2 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionCp extends AbstractStatAddEffect { - public AdditionalPotionCp(StatsSet params) + public AdditionalPotionCp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_CP); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java index 6b68e40f32..57d54c7d3b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionHp extends AbstractStatAddEffect { - public AdditionalPotionHp(StatsSet params) + public AdditionalPotionHp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_HP); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java index c9e1cc237e..007547ebe7 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionMp extends AbstractStatAddEffect { - public AdditionalPotionMp(StatsSet params) + public AdditionalPotionMp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_MP); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AgathionSlot.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AgathionSlot.java index 2d2a3cf6df..b8a91b683f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AgathionSlot.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AgathionSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AgathionSlot extends AbstractStatAddEffect { - public AgathionSlot(StatsSet params) + public AgathionSlot(StatSet params) { super(params, Stat.AGATHION_SLOTS); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index cbbd845e23..c01bdec653 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -22,7 +22,7 @@ import java.util.Map; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -78,7 +78,7 @@ public class AirBind extends AbstractEffect _chainedAirSkills.put(ClassId.AEORE_SHILLIEN_SAINT, 11999); // Heavy Hit } - public AirBind(StatsSet params) + public AirBind(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java index f5cbb63465..9255ba1877 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AreaDamage extends AbstractStatAddEffect { - public AreaDamage(StatsSet params) + public AreaDamage(StatSet params) { super(params, Stat.DAMAGE_ZONE_VULN); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java index 2ded14e7ae..a5d56477f5 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AttackAttribute extends AbstractEffect private final AttributeType _attribute; private final double _amount; - public AttackAttribute(StatsSet params) + public AttackAttribute(StatSet params) { _amount = params.getDouble("amount", 0); _attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java index ff58d09cc7..795366850d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class AttackAttributeAdd extends AbstractEffect { private final double _amount; - public AttackAttributeAdd(StatsSet params) + public AttackAttributeAdd(StatSet params) { _amount = params.getDouble("amount", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java index 37bfbf341a..fcd2b48c99 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class AttackBehind extends AbstractEffect { - public AttackBehind(StatsSet params) + public AttackBehind(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index 062c325a55..4136f5d530 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class AttackTrait extends AbstractEffect { private final Map _attackTraits = new EnumMap<>(TraitType.class); - public AttackTrait(StatsSet params) + public AttackTrait(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 02d6a8d78c..8ac42d45c3 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -37,7 +37,7 @@ public class Backstab extends AbstractEffect private final double _criticalChance; private final boolean _overHit; - public Backstab(StatsSet params) + public Backstab(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Betray.java index 32e3c65c55..79e8bd3360 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Betray extends AbstractEffect { - public Betray(StatsSet params) + public Betray(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Blink.java index ba1caed6ac..56d3f628fd 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -52,7 +52,7 @@ public class Blink extends AbstractEffect private final int _flyDelay; private final int _animationSpeed; - public Blink(StatsSet params) + public Blink(StatSet params) { _flyCourse = params.getInt("angle", 0); _flyRadius = params.getInt("range", 0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 8677f72407..596d4b752f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; */ public class BlinkSwap extends AbstractEffect { - public BlinkSwap(StatsSet params) + public BlinkSwap(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 7bec602aef..cea12039d2 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -20,7 +20,7 @@ import java.util.Arrays; import java.util.Set; import java.util.stream.Collectors; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class BlockAbnormalSlot extends AbstractEffect { private final Set _blockAbnormalSlots; - public BlockAbnormalSlot(StatsSet params) + public BlockAbnormalSlot(StatSet params) { _blockAbnormalSlots = Arrays.stream(params.getString("slot").split(";")).map(slot -> Enum.valueOf(AbnormalType.class, slot)).collect(Collectors.toSet()); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index b4839ab322..348881f970 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -21,7 +21,7 @@ import java.util.Set; import org.l2jmobius.gameserver.datatables.BotReportTable; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class BlockAction extends AbstractEffect { private final Set _blockedActions = new HashSet<>(); - public BlockAction(StatsSet params) + public BlockAction(StatSet params) { final String[] actions = params.getString("blockedActions").split(","); for (String action : actions) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index 68f6586e3e..635d2735f9 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -22,7 +22,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class BlockActions extends AbstractEffect { private final Set _allowedSkills; - public BlockActions(StatsSet params) + public BlockActions(StatSet params) { final String[] allowedSkills = params.getString("allowedSkills", "").split(";"); _allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet()); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 99af987208..3502d140d0 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockChat extends AbstractEffect { - public BlockChat(StatsSet params) + public BlockChat(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java index 6160114414..a2b084c918 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; */ public class BlockControl extends AbstractEffect { - public BlockControl(StatsSet params) + public BlockControl(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java index 3d96329b6d..69b390ae8f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BlockEscape extends AbstractEffect { - public BlockEscape(StatsSet params) + public BlockEscape(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index 8bbd7ac018..85d89180e7 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockMove extends AbstractEffect { - public BlockMove(StatsSet params) + public BlockMove(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index 316f82f855..9e28fc403a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockParty extends AbstractEffect { - public BlockParty(StatsSet params) + public BlockParty(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java index ae2ac8b035..d3235fc34f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BlockResurrection extends AbstractEffect { - public BlockResurrection(StatsSet params) + public BlockResurrection(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index f7f119691f..f2cc65b782 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -35,7 +35,7 @@ public class BlockSkill extends AbstractEffect { private final int[] _magicTypes; - public BlockSkill(StatsSet params) + public BlockSkill(StatSet params) { _magicTypes = params.getIntArray("magicTypes", ";"); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index d9b3d3a34d..9f0b7143d2 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockTarget extends AbstractEffect { - public BlockTarget(StatsSet params) + public BlockTarget(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index bc4cbd6320..bef60ad003 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class Bluff extends AbstractEffect { private final int _chance; - public Bluff(StatsSet params) + public Bluff(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java index 2ace40a596..69583d613b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusDropAmount extends AbstractStatPercentEffect { - public BonusDropAmount(StatsSet params) + public BonusDropAmount(StatSet params) { super(params, Stat.BONUS_DROP_AMOUNT); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java index b81560b040..e63c8f79f4 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusDropRate extends AbstractStatPercentEffect { - public BonusDropRate(StatsSet params) + public BonusDropRate(StatSet params) { super(params, Stat.BONUS_DROP_RATE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java index b984404cb2..e0fb54b162 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusSpoilRate extends AbstractStatPercentEffect { - public BonusSpoilRate(StatsSet params) + public BonusSpoilRate(StatSet params) { super(params, Stat.BONUS_SPOIL_RATE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Breath.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Breath.java index 859f341f3c..4235319f22 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Breath.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Breath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class Breath extends AbstractStatEffect { - public Breath(StatsSet params) + public Breath(StatSet params) { super(params, Stat.BREATH); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java index a6d25f3c36..4102506e6c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BuffBlock extends AbstractEffect { - public BuffBlock(StatsSet params) + public BuffBlock(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index de7497f8bf..4f470b06c7 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class CallLearnedSkill extends AbstractEffect { private final int _skillId; - public CallLearnedSkill(StatsSet params) + public CallLearnedSkill(StatSet params) { _skillId = params.getInt("skillId"); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index e6096be4be..b41daf073c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CallParty extends AbstractEffect { - public CallParty(StatsSet params) + public CallParty(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index 0760fb675e..eb4bdf2349 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class CallPc extends AbstractEffect private final int _itemId; private final int _itemCount; - public CallPc(StatsSet params) + public CallPc(StatSet params) { _itemId = params.getInt("itemId", 0); _itemCount = params.getInt("itemCount", 0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index d6d5cb721d..0da3802665 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -35,7 +35,7 @@ public class CallRandomSkill extends AbstractEffect { private final List _skills = new ArrayList<>(); - public CallRandomSkill(StatsSet params) + public CallRandomSkill(StatSet params) { final String skills = params.getString("skills", null); if (skills != null) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index 99c1494223..f8e4b226c4 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -35,7 +35,7 @@ public class CallSkill extends AbstractEffect private final SkillHolder _skill; private final int _skillLevelScaleTo; - public CallSkill(StatsSet params) + public CallSkill(StatSet params) { _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0)); _skillLevelScaleTo = params.getInt("skillLevelScaleTo", 0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index b340de4ae1..ff98639c37 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.Collections; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ public class CallSkillOnActionTime extends AbstractEffect { private final SkillHolder _skill; - public CallSkillOnActionTime(StatsSet params) + public CallSkillOnActionTime(StatSet params) { _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0)); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index d48eb90fb3..32753a71a0 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CallTargetParty extends AbstractEffect { - public CallTargetParty(StatsSet params) + public CallTargetParty(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index ef01f4a8ed..d4331bf5b7 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ public class ChameleonRest extends AbstractEffect { private final double _power; - public ChameleonRest(StatsSet params) + public ChameleonRest(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index e3b846674d..37054f2fd0 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; @@ -35,9 +35,9 @@ public class ChangeBody extends AbstractEffect { private final Set _transformations = new HashSet<>(); - public ChangeBody(StatsSet params) + public ChangeBody(StatSet params) { - for (StatsSet item : params.getList("templates", StatsSet.class)) + for (StatSet item : params.getList("templates", StatSet.class)) { _transformations.add(new TemplateChanceHolder(item.getInt(".templateId"), item.getInt(".minChance"), item.getInt(".maxChance"))); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 76c6e03aa6..6b6386909e 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeFace extends AbstractEffect { private final int _value; - public ChangeFace(StatsSet params) + public ChangeFace(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java index cee3ac1a6f..304afa821c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; /** @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; */ public class ChangeFishingMastery extends AbstractEffect { - public ChangeFishingMastery(StatsSet params) + public ChangeFishingMastery(StatSet params) { } } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index 0c583cbc13..64ac49f5d5 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeHairColor extends AbstractEffect { private final int _value; - public ChangeHairColor(StatsSet params) + public ChangeHairColor(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index ad2efbe6a0..ae7d6c6da1 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeHairStyle extends AbstractEffect { private final int _value; - public ChangeHairStyle(StatsSet params) + public ChangeHairStyle(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java index 2d536029fd..4d7c380c75 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class CheapShot extends AbstractEffect { - public CheapShot(StatsSet params) + public CheapShot(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index 207b7f0a3e..1a6a44fb31 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.SubclassInfoType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class ClassChange extends AbstractEffect private final int _index; private static final int IDENTITY_CRISIS_SKILL_ID = 1570; - public ClassChange(StatsSet params) + public ClassChange(StatSet params) { _index = params.getInt("index", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index ccf7598eff..e184022afc 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.stats.Formulas; */ public class Compelling extends AbstractEffect { - public Compelling(StatsSet params) + public Compelling(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index b6aa30f604..f164ac6f3f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class Confuse extends AbstractEffect { private final int _chance; - public Confuse(StatsSet params) + public Confuse(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 25e29532eb..78293c1b0f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ConsumeBody extends AbstractEffect { - public ConsumeBody(StatsSet params) + public ConsumeBody(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 6bca38d232..3185c28746 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class ConvertItem extends AbstractEffect { - public ConvertItem(StatsSet params) + public ConvertItem(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java index 9402fdb06d..857df659c0 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CounterPhysicalSkill extends AbstractStatAddEffect { - public CounterPhysicalSkill(StatsSet params) + public CounterPhysicalSkill(StatSet params) { super(params, Stat.VENGEANCE_SKILL_PHYSICAL_DAMAGE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 67bca7fd1b..598682037b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Cp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Cp(StatsSet params) + public Cp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index e0cd52808e..37303b0e7a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class CpHeal extends AbstractEffect { private final double _power; - public CpHeal(StatsSet params) + public CpHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index e2e8ee3479..54de5adfc6 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class CpHealOverTime extends AbstractEffect { private final double _power; - public CpHealOverTime(StatsSet params) + public CpHealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index 5665e937dc..b4a994d6df 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CpHealPercent extends AbstractEffect { private final double _power; - public CpHealPercent(StatsSet params) + public CpHealPercent(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java index 1cc851b2af..efb020bbd5 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CpRegen extends AbstractStatEffect { - public CpRegen(StatsSet params) + public CpRegen(StatSet params) { super(params, Stat.REGENERATE_CP_RATE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CraftingCritical.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CraftingCritical.java index fb8ef495fb..cb3f2aace2 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CraftingCritical.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CraftingCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CraftingCritical extends AbstractStatAddEffect { - public CraftingCritical(StatsSet params) + public CraftingCritical(StatSet params) { super(params, Stat.CRAFTING_CRITICAL); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java index 37231ac1af..00d3dfbaaa 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class CreateCommonItem extends AbstractEffect { private final int _recipeLevel; - public CreateCommonItem(StatsSet params) + public CreateCommonItem(StatSet params) { _recipeLevel = params.getInt("value"); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java index 99f31fecab..d01d510ba9 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class CreateItem extends AbstractEffect { private final int _recipeLevel; - public CreateItem(StatsSet params) + public CreateItem(StatSet params) { _recipeLevel = params.getInt("value"); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java index 8983497026..0b93eef45e 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CriticalDamage extends AbstractStatEffect { - public CriticalDamage(StatsSet params) + public CriticalDamage(StatSet params) { super(params, Stat.CRITICAL_DAMAGE, Stat.CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 7ef4f0ecb4..0630f087b7 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.Position; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CriticalDamagePosition extends AbstractEffect private final double _amount; private final Position _position; - public CriticalDamagePosition(StatsSet params) + public CriticalDamagePosition(StatSet params) { _amount = params.getDouble("amount", 0); _position = params.getEnum("position", Position.class, Position.FRONT); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java index 01f49380eb..0d4bded60e 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; public class CriticalRate extends AbstractConditionalHpEffect { - public CriticalRate(StatsSet params) + public CriticalRate(StatSet params) { super(params, Stat.CRITICAL_RATE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 863b385ca3..4d65fa84eb 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.Position; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CriticalRatePositionBonus extends AbstractEffect private final double _amount; private final Position _position; - public CriticalRatePositionBonus(StatsSet params) + public CriticalRatePositionBonus(StatSet params) { _amount = params.getDouble("amount", 0); _position = params.getEnum("position", Position.class, Position.FRONT); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index 0d307a3240..33ccbd1de1 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class CrystalGradeModify extends AbstractEffect { private final int _amount; - public CrystalGradeModify(StatsSet params) + public CrystalGradeModify(StatSet params) { _amount = params.getInt("_amount", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java index 5f86f9d343..bd48abf204 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ItemGrade; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class Crystallize extends AbstractEffect { private final ItemGrade _grade; - public Crystallize(StatsSet params) + public Crystallize(StatSet params) { _grade = params.getEnum("grade", ItemGrade.class); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java index 94ff8e64e2..79ee5b994e 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CubicMastery extends AbstractStatAddEffect { - public CubicMastery(StatsSet params) + public CubicMastery(StatSet params) { super(params, Stat.MAX_CUBIC); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index 36abf0accf..e6bb53fdea 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class DamOverTime extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTime(StatsSet params) + public DamOverTime(StatSet params) { _canKill = params.getBoolean("canKill", false); _power = params.getDouble("power"); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 13e57099e0..b5f25db4d8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class DamOverTimePercent extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTimePercent(StatsSet params) + public DamOverTimePercent(StatSet params) { _canKill = params.getBoolean("canKill", false); _power = params.getDouble("power"); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java index dc7a45198f..c9567ea034 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ public class DamageBlock extends AbstractEffect private final boolean _blockHp; private final boolean _blockMp; - public DamageBlock(StatsSet params) + public DamageBlock(StatSet params) { final String type = params.getString("type", null); _blockHp = type.equalsIgnoreCase("BLOCK_HP"); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java index 5bc9b5fff8..3d8985d1d8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DamageByAttackType; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -38,7 +38,7 @@ public class DamageByAttack extends AbstractEffect private final double _value; private final DamageByAttackType _type; - public DamageByAttack(StatsSet params) + public DamageByAttack(StatSet params) { _value = params.getDouble("amount"); _type = params.getEnum("type", DamageByAttackType.class, DamageByAttackType.NONE); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java index 5a7629482a..e823a9824a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DamageShield extends AbstractStatAddEffect { - public DamageShield(StatsSet params) + public DamageShield(StatSet params) { super(params, Stat.REFLECT_DAMAGE_PERCENT); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java index db1abe264d..3029a3f0aa 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DamageShieldResist extends AbstractStatAddEffect { - public DamageShieldResist(StatsSet params) + public DamageShieldResist(StatSet params) { super(params, Stat.REFLECT_DAMAGE_PERCENT_DEFENSE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index 8561ff46b0..369bd5483d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class DeathLink extends AbstractEffect { private final double _power; - public DeathLink(StatsSet params) + public DeathLink(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java index b948fad1fc..54261c6229 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class DebuffBlock extends AbstractEffect { - public DebuffBlock(StatsSet params) + public DebuffBlock(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java index 217ef3dfaa..4bc08271fa 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class DefenceAttribute extends AbstractEffect private final AttributeType _attribute; private final double _amount; - public DefenceAttribute(StatsSet params) + public DefenceAttribute(StatSet params) { _amount = params.getDouble("amount", 0); _attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java index 0c0c2e8d6a..daff53d9e1 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceCriticalDamage extends AbstractStatEffect { - public DefenceCriticalDamage(StatsSet params) + public DefenceCriticalDamage(StatSet params) { super(params, Stat.DEFENCE_CRITICAL_DAMAGE, Stat.DEFENCE_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java index 131eb500ea..74a729e38c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceCriticalRate extends AbstractStatEffect { - public DefenceCriticalRate(StatsSet params) + public DefenceCriticalRate(StatSet params) { super(params, Stat.DEFENCE_CRITICAL_RATE, Stat.DEFENCE_CRITICAL_RATE_ADD); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java index 1abee78e08..c664939977 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceMagicCriticalDamage extends AbstractStatEffect { - public DefenceMagicCriticalDamage(StatsSet params) + public DefenceMagicCriticalDamage(StatSet params) { super(params, Stat.DEFENCE_MAGIC_CRITICAL_DAMAGE, Stat.DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java index 2146b89551..6594dda2b3 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceMagicCriticalRate extends AbstractStatEffect { - public DefenceMagicCriticalRate(StatsSet params) + public DefenceMagicCriticalRate(StatSet params) { super(params, Stat.DEFENCE_MAGIC_CRITICAL_RATE, Stat.DEFENCE_MAGIC_CRITICAL_RATE_ADD); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index bd80f690cd..134ed56979 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class DefenceTrait extends AbstractEffect { private final Map _defenceTraits = new EnumMap<>(TraitType.class); - public DefenceTrait(StatsSet params) + public DefenceTrait(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index bab5e1a762..7cee616006 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class DeleteHate extends AbstractEffect { private final int _chance; - public DeleteHate(StatsSet params) + public DeleteHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index 85985653b8..f10f189e68 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class DeleteHateOfMe extends AbstractEffect { private final int _chance; - public DeleteHateOfMe(StatsSet params) + public DeleteHateOfMe(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index d3664ad00f..82833ac79d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class DeleteTopAgro extends AbstractEffect { private final int _chance; - public DeleteTopAgro(StatsSet params) + public DeleteTopAgro(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index ae1f2a5942..ba6dad4698 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DoorOpenType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DetectHiddenObjects extends AbstractEffect { - public DetectHiddenObjects(StatsSet params) + public DetectHiddenObjects(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Detection.java index 078360ff35..a20cbcb348 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Detection extends AbstractEffect { - public Detection(StatsSet params) + public Detection(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java index d679c71919..5227885bb5 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class DisableSkill extends AbstractEffect private final Set disableSkills; private Skill knownSKill; - public DisableSkill(StatsSet params) + public DisableSkill(StatSet params) { final String disable = params.getString("disable"); if ((disable != null) && !disable.isEmpty()) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 8567a94d12..32ee715df7 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DisableTargeting extends AbstractEffect { - public DisableTargeting(StatsSet params) + public DisableTargeting(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index fa06ec7221..5a80971f51 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Disarm extends AbstractEffect { - public Disarm(StatsSet params) + public Disarm(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index 48e357d1f2..eb8d99e41f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class Disarmor extends AbstractEffect private final Map _unequippedItems; // PlayerObjId, ItemObjId private final long _slot; - public Disarmor(StatsSet params) + public Disarmor(StatSet params) { _unequippedItems = new ConcurrentHashMap<>(); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 95de0300bb..a652a023f5 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DispelAll extends AbstractEffect { - public DispelAll(StatsSet params) + public DispelAll(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 88d979a0d9..040271d2a7 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.List; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -38,7 +38,7 @@ public class DispelByCategory extends AbstractEffect private final int _rate; private final int _max; - public DispelByCategory(StatsSet params) + public DispelByCategory(StatSet params) { _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); _rate = params.getInt("rate", 0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index a6e4c7cd19..ab79e046b2 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.EnumMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -37,7 +37,7 @@ public class DispelBySlot extends AbstractEffect private final String _dispel; private final Map _dispelAbnormals; - public DispelBySlot(StatsSet params) + public DispelBySlot(StatSet params) { _dispel = params.getString("dispel"); if ((_dispel != null) && !_dispel.isEmpty()) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 1ba6612e23..d1341d10b9 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class DispelBySlotMyself extends AbstractEffect { private final Set _dispelAbnormals; - public DispelBySlotMyself(StatsSet params) + public DispelBySlotMyself(StatSet params) { final String dispel = params.getString("dispel"); if ((dispel != null) && !dispel.isEmpty()) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 845980e59d..b58723058e 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -37,7 +37,7 @@ public class DispelBySlotProbability extends AbstractEffect private final Set _dispelAbnormals; private final int _rate; - public DispelBySlotProbability(StatsSet params) + public DispelBySlotProbability(StatSet params) { final String[] dispelEffects = params.getString("dispel").split(";"); _rate = params.getInt("rate", 100); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java index e52cabffb1..c0c5b040c9 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class DispelCaster extends AbstractEffect { private final Set _dispelAbnormals; - public DispelCaster(StatsSet params) + public DispelCaster(StatSet params) { final String dispel = params.getString("dispel"); if ((dispel != null) && !dispel.isEmpty()) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index 7acd9c4a6c..688d77a703 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -45,7 +45,7 @@ public class DoubleCast extends AbstractEffect private final Map> _addedToggles; - public DoubleCast(StatsSet params) + public DoubleCast(StatSet params) { _addedToggles = new HashMap<>(); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java index d7f067a2a0..d1e21edeb0 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DuelistFury extends AbstractEffect { - public DuelistFury(StatsSet params) + public DuelistFury(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index 409fed6a23..de397bb5ff 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class EnableCloak extends AbstractEffect { - public EnableCloak(StatsSet params) + public EnableCloak(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index e855c4ba1a..2fe2bef99f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -43,7 +43,7 @@ public class EnergyAttack extends AbstractEffect private final boolean _overHit; private final double _pDefMod; - public EnergyAttack(StatsSet params) + public EnergyAttack(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getInt("criticalChance", 0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index a8f108573f..ae463ef2a4 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class EnlargeAbnormalSlot extends AbstractEffect { private final int _slots; - public EnlargeAbnormalSlot(StatsSet params) + public EnlargeAbnormalSlot(StatSet params) { _slots = params.getInt("slots", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java index c43ea04413..c4073b1a47 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StorageType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class EnlargeSlot extends AbstractEffect private final StorageType _type; private final double _amount; - public EnlargeSlot(StatsSet params) + public EnlargeSlot(StatSet params) { _amount = params.getDouble("amount", 0); _type = params.getEnum("type", StorageType.class, StorageType.INVENTORY_NORMAL); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Escape.java index 936f82d8ce..f3a07c9d15 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class Escape extends AbstractEffect { private final TeleportWhereType _escapeType; - public Escape(StatsSet params) + public Escape(StatSet params) { _escapeType = params.getEnum("escapeType", TeleportWhereType.class, null); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java index 76dbc8171c..eb68d24af8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ExpModify extends AbstractStatAddEffect { - public ExpModify(StatsSet params) + public ExpModify(StatSet params) { super(params, Stat.BONUS_EXP); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java index bf11db6e4b..1100ca25be 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Faceoff extends AbstractEffect { - public Faceoff(StatsSet params) + public Faceoff(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index e256209e39..79f7b43503 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -34,7 +34,7 @@ public class FakeDeath extends AbstractEffect { private final double _power; - public FakeDeath(StatsSet params) + public FakeDeath(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index a94c75d310..780d5cefba 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -44,7 +44,7 @@ public class FatalBlow extends AbstractEffect private final double _abnormalPower; private final boolean _overHit; - public FatalBlow(StatsSet params) + public FatalBlow(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java index c8ff8f7acb..6e7597e63d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class FatalBlowRate extends AbstractEffect private final double _amount; private final StatModifierType _mode; - public FatalBlowRate(StatsSet params) + public FatalBlowRate(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 9731e75e5d..ec2659ea2c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DefenderInstance; import org.l2jmobius.gameserver.model.actor.instance.FortCommanderInstance; @@ -40,7 +40,7 @@ public class Fear extends AbstractEffect { private static final int FEAR_RANGE = 500; - public Fear(StatsSet params) + public Fear(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 5e04e46d60..94d9912bdf 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.MountType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ public class Feed extends AbstractEffect private final int _ride; private final int _wyvern; - public Feed(StatsSet params) + public Feed(StatSet params) { _normal = params.getInt("normal", 0); _ride = params.getInt("ride", 0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java index 0b22a4d4c9..146e3b73e6 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class FishingExpSpBonus extends AbstractStatPercentEffect { - public FishingExpSpBonus(StatsSet params) + public FishingExpSpBonus(StatSet params) { super(params, Stat.FISHING_EXP_SP_BONUS); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Flag.java index c1469eab19..2442cbdb35 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Flag extends AbstractEffect { - public Flag(StatsSet params) + public Flag(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index 0243f0f543..74a9754a95 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.BlockInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class FlipBlock extends AbstractEffect { - public FlipBlock(StatsSet params) + public FlipBlock(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 7fc7da5fe6..3412e4d36d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class FlyAway extends AbstractEffect { private final int _radius; - public FlyAway(StatsSet params) + public FlyAway(StatSet params) { _radius = params.getInt("radius"); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java index fd3216286d..590fbbcd44 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class FocusEnergy extends AbstractStatAddEffect { - public FocusEnergy(StatsSet params) + public FocusEnergy(StatSet params) { super(params, Stat.MAX_MOMENTUM); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index efbd93f304..19f0163e42 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class FocusMaxMomentum extends AbstractEffect { - public FocusMaxMomentum(StatsSet params) + public FocusMaxMomentum(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index 284d19ee5f..e8c18e9682 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -36,7 +36,7 @@ public class FocusMomentum extends AbstractEffect private final int _amount; private final int _maxCharges; - public FocusMomentum(StatsSet params) + public FocusMomentum(StatSet params) { _amount = params.getInt("amount", 1); _maxCharges = params.getInt("maxCharges", 0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 18a9864bbc..debd491cfe 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class FocusSouls extends AbstractEffect { private final int _charge; - public FocusSouls(StatsSet params) + public FocusSouls(StatSet params) { _charge = params.getInt("charge", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 8540ccd49c..23328db910 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Set; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class GetAgro extends AbstractEffect { - public GetAgro(StatsSet params) + public GetAgro(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java index 1ca8722709..e91002d04b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class GetDamageLimit extends AbstractStatAddEffect { - public GetDamageLimit(StatsSet params) + public GetDamageLimit(StatSet params) { super(params, Stat.DAMAGE_LIMIT); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 2dfd3bf8c4..439f3e8e3a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class GetMomentum extends AbstractEffect { private static int _ticks; - public GetMomentum(StatsSet params) + public GetMomentum(StatSet params) { _ticks = params.getInt("ticks", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index 7c1c0f3fa2..2c842101ed 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class GiveClanReputation extends AbstractEffect { private final int _reputation; - public GiveClanReputation(StatsSet params) + public GiveClanReputation(StatSet params) { _reputation = params.getInt("reputation", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index fd4d61fa73..9052c63154 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class GiveExpAndSp extends AbstractEffect private final int _xp; private final int _sp; - public GiveExpAndSp(StatsSet params) + public GiveExpAndSp(StatSet params) { _xp = params.getInt("xp", 0); _sp = params.getInt("sp", 0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index 3448e09797..9d41a4395b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ public class GiveFame extends AbstractEffect { private final int _fame; - public GiveFame(StatsSet params) + public GiveFame(StatSet params) { _fame = params.getInt("fame", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index c948fa0948..617a8ef88a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class GiveRecommendation extends AbstractEffect { private final int _amount; - public GiveRecommendation(StatsSet params) + public GiveRecommendation(StatSet params) { _amount = params.getInt("amount", 0); if (_amount == 0) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index 5fe06566c7..75a16fe828 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class GiveSp extends AbstractEffect { private final int _sp; - public GiveSp(StatsSet params) + public GiveSp(StatSet params) { _sp = params.getInt("sp", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index e32735f4e9..7779c6f413 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class GiveXp extends AbstractEffect { private final long _xp; - public GiveXp(StatsSet params) + public GiveXp(StatSet params) { _xp = params.getLong("xp", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 17095c209a..5cf4994f32 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Grow extends AbstractEffect { - public Grow(StatsSet params) + public Grow(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index a2200e1a2f..350c8e659f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.UserInfoType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class HairAccessorySet extends AbstractEffect { - public HairAccessorySet(StatsSet params) + public HairAccessorySet(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index 04b0b8ac6f..8211e03c01 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Harvesting extends AbstractEffect { - public Harvesting(StatsSet params) + public Harvesting(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java index ac1c9f49d8..097db6604a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HateAttack extends AbstractStatPercentEffect { - public HateAttack(StatsSet params) + public HateAttack(StatSet params) { super(params, Stat.HATE_ATTACK); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index 00f569eb17..9963ff1336 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlagInstance; @@ -34,7 +34,7 @@ public class HeadquarterCreate extends AbstractEffect private static final int HQ_NPC_ID = 35062; private final boolean _isAdvanced; - public HeadquarterCreate(StatsSet params) + public HeadquarterCreate(StatSet params) { _isAdvanced = params.getBoolean("isAdvanced", false); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 6e611144f1..139972a272 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -40,7 +40,7 @@ public class Heal extends AbstractEffect { private final double _power; - public Heal(StatsSet params) + public Heal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java index 5a7457d3df..a9f75ab036 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HealEffect extends AbstractStatEffect { - public HealEffect(StatsSet params) + public HealEffect(StatSet params) { super(params, Stat.HEAL_EFFECT, Stat.HEAL_EFFECT_ADD); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 86e28dc8b4..da76f33058 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class HealOverTime extends AbstractEffect { private final double _power; - public HealOverTime(StatsSet params) + public HealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index 6c9c8986bb..8b1c821a0a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class HealPercent extends AbstractEffect { private final int _power; - public HealPercent(StatsSet params) + public HealPercent(StatSet params) { _power = params.getInt("power", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Hide.java index e431277964..d02898bac5 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Hide extends AbstractEffect { - public Hide(StatsSet params) + public Hide(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index e7e5f3f91b..78fa1c9392 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.GameTimeController; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HitAtNight extends AbstractStatEffect { - public HitAtNight(StatsSet params) + public HitAtNight(StatSet params) { super(params, Stat.HIT_AT_NIGHT); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java index 1fd98e7aa9..f14b922308 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HitNumber extends AbstractStatEffect { - public HitNumber(StatsSet params) + public HitNumber(StatSet params) { super(params, Stat.ATTACK_COUNT_MAX); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 3611fd7d74..c2426f8d11 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Hp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Hp(StatsSet params) + public Hp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index 3d125565fe..6244c76428 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class HpByLevel extends AbstractEffect { private final double _power; - public HpByLevel(StatsSet params) + public HpByLevel(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 3cdb210bba..80b4af9b46 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -40,7 +40,7 @@ public class HpCpHeal extends AbstractEffect { private final double _power; - public HpCpHeal(StatsSet params) + public HpCpHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java index 0394dab996..6f96c2dcb3 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class HpCpHealCritical extends AbstractEffect { - public HpCpHealCritical(StatsSet params) + public HpCpHealCritical(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 554b1cec79..7cf47c3a65 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class HpDrain extends AbstractEffect private final double _power; private final double _percentage; - public HpDrain(StatsSet params) + public HpDrain(StatSet params) { _power = params.getDouble("power", 0); _percentage = params.getDouble("percentage", 0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java index cb1d2bc3a7..b170bc62ba 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HpRegen extends AbstractStatEffect { - public HpRegen(StatsSet params) + public HpRegen(StatSet params) { super(params, Stat.REGENERATE_HP_RATE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 235e89a79b..f346fbaad8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class HpToOwner extends AbstractEffect private final double _power; private final int _stealAmount; - public HpToOwner(StatsSet params) + public HpToOwner(StatSet params) { _power = params.getDouble("power"); _stealAmount = params.getInt("stealAmount"); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java index 9829519da9..c659684ae8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class IgnoreDeath extends AbstractEffect { - public IgnoreDeath(StatsSet params) + public IgnoreDeath(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index f7c9baa155..44dceba10e 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ImmobilePetBuff extends AbstractEffect { - public ImmobilePetBuff(StatsSet params) + public ImmobilePetBuff(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java index a60fc45d15..a03eff933a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ public class InstantKillResist extends AbstractEffect { private final int _amount; - public InstantKillResist(StatsSet params) + public InstantKillResist(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java index 7e1fc8abe4..265a9aab97 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class JewelSlot extends AbstractStatAddEffect { - public JewelSlot(StatsSet params) + public JewelSlot(StatSet params) { super(params, Stat.BROOCH_JEWELS); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 3d5ff2dda3..a34d7cc5b3 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class KarmaCount extends AbstractEffect private final int _amount; private final int _mode; - public KarmaCount(StatsSet params) + public KarmaCount(StatSet params) { _amount = params.getInt("amount", 0); switch (params.getString("mode", "DIFF")) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index b6f5b03994..cffa4427c6 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -94,7 +94,7 @@ public class KnockBack extends AbstractEffect _chainKnockSkills.put(ClassId.AEORE_SHILLIEN_SAINT, 12000); // Heavy Hit } - public KnockBack(StatsSet params) + public KnockBack(StatSet params) { _distance = params.getInt("distance", 50); _speed = params.getInt("speed", 0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index 7bfac989cf..1affb1b141 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -38,7 +38,7 @@ public class Lethal extends AbstractEffect private final double _fullLethal; private final double _halfLethal; - public Lethal(StatsSet params) + public Lethal(StatSet params) { _fullLethal = params.getDouble("fullLethal", 0); _halfLethal = params.getDouble("halfLethal", 0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java index aeb42458a6..43b17877ad 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitCp extends AbstractStatEffect { - public LimitCp(StatsSet params) + public LimitCp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_CP); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java index cf76ec482a..45d8f37355 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitHp extends AbstractStatEffect { - public LimitHp(StatsSet params) + public LimitHp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_HP); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java index f5eda36ba6..8d31633d0a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitMp extends AbstractStatEffect { - public LimitMp(StatsSet params) + public LimitMp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_MP); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java index e7832ef5af..e502ad06f3 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class LimitSkill extends AbstractEffect private static final int CELESTIAL_PROTECTION = 11758; private static final int CELESTIAL_PARTY_PROTECTION = 11759; - public LimitSkill(StatsSet params) + public LimitSkill(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Lucky.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Lucky.java index 3775d2361d..4ff5ea9a01 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Lucky.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Lucky.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Lucky extends AbstractEffect { - public Lucky(StatsSet params) + public Lucky(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MAtk.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MAtk.java index 5f9ad5f32b..38c2fc9067 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MAtk.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MAtk.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MAtk extends AbstractStatEffect { - public MAtk(StatsSet params) + public MAtk(StatSet params) { super(params, Stat.MAGIC_ATTACK); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java index 2b9ae2e9e6..393d0d2d30 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicAccuracy extends AbstractStatEffect { - public MagicAccuracy(StatsSet params) + public MagicAccuracy(StatSet params) { super(params, Stat.ACCURACY_MAGIC); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java index 123706eb55..b9a58b09f3 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicCriticalDamage extends AbstractStatEffect { - public MagicCriticalDamage(StatsSet params) + public MagicCriticalDamage(StatSet params) { super(params, Stat.MAGIC_CRITICAL_DAMAGE, Stat.MAGIC_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java index 0c10014e50..c9fa9a4240 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicCriticalRate extends AbstractStatEffect { - public MagicCriticalRate(StatsSet params) + public MagicCriticalRate(StatSet params) { super(params, Stat.MAGIC_CRITICAL_RATE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index e8b6f5e8bf..5281bf8445 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class MagicMpCost extends AbstractEffect private final int _magicType; private final double _amount; - public MagicMpCost(StatsSet params) + public MagicMpCost(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index ed4a3fca8b..283a99176c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class MagicalAbnormalDispelAttack extends AbstractEffect private final double _power; private final AbnormalType _abnormalType; - public MagicalAbnormalDispelAttack(StatsSet params) + public MagicalAbnormalDispelAttack(StatSet params) { _power = params.getDouble("power", 0); _abnormalType = AbnormalType.getAbnormalType(params.getString("abnormalType", null)); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java index 8234db1c43..be6403077c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAbnormalResist extends AbstractStatAddEffect { - public MagicalAbnormalResist(StatsSet params) + public MagicalAbnormalResist(StatSet params) { super(params, Stat.ABNORMAL_RESIST_MAGICAL); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index 4e938809f1..25c7d25954 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -37,7 +37,7 @@ public class MagicalAttack extends AbstractEffect private final boolean _overHit; private final double _debuffModifier; - public MagicalAttack(StatsSet params) + public MagicalAttack(StatSet params) { _power = params.getDouble("power", 0); _overHit = params.getBoolean("overHit", false); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 424480b76c..11c387780e 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class MagicalAttackByAbnormal extends AbstractEffect { private final double _power; - public MagicalAttackByAbnormal(StatsSet params) + public MagicalAttackByAbnormal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9c3e263a05..348e904025 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -40,7 +40,7 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect private final double _power; private final Set _abnormals; - public MagicalAttackByAbnormalSlot(StatsSet params) + public MagicalAttackByAbnormalSlot(StatSet params) { _power = params.getDouble("power", 0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 49dd351046..de55dd0fcd 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -38,7 +38,7 @@ public class MagicalAttackMp extends AbstractEffect private final boolean _critical; private final double _criticalLimit; - public MagicalAttackMp(StatsSet params) + public MagicalAttackMp(StatSet params) { _power = params.getDouble("power"); _critical = params.getBoolean("critical"); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 4414b36fa7..93ac560169 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class MagicalAttackRange extends AbstractEffect private final double _power; private final double _shieldDefPercent; - public MagicalAttackRange(StatsSet params) + public MagicalAttackRange(StatSet params) { _power = params.getDouble("power"); _shieldDefPercent = params.getDouble("shieldDefPercent", 0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java index 2e304e5f8b..1cf39ed501 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAttackSpeed extends AbstractStatEffect { - public MagicalAttackSpeed(StatsSet params) + public MagicalAttackSpeed(StatSet params) { super(params, Stat.MAGIC_ATTACK_SPEED); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 9a3a776e32..880d71f0c5 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class MagicalDamOverTime extends AbstractEffect private final double _power; private final boolean _canKill; - public MagicalDamOverTime(StatsSet params) + public MagicalDamOverTime(StatSet params) { _power = params.getDouble("power", 0); _canKill = params.getBoolean("canKill", false); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java index 80fdf87050..9b4e6061aa 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalDefence extends AbstractStatEffect { - public MagicalDefence(StatsSet params) + public MagicalDefence(StatSet params) { super(params, Stat.MAGICAL_DEFENCE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java index c3c7c404f3..4e83b80e8b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalEvasion extends AbstractStatEffect { - public MagicalEvasion(StatsSet params) + public MagicalEvasion(StatSet params) { super(params, Stat.MAGIC_EVASION_RATE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java index 6253af7373..bf419a19f7 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalSkillPower extends AbstractStatEffect { - public MagicalSkillPower(StatsSet params) + public MagicalSkillPower(StatSet params) { super(params, Stat.MAGICAL_SKILL_POWER, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index d0047fedef..f4388dc16f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class MagicalSoulAttack extends AbstractEffect { private final double _power; - public MagicalSoulAttack(StatsSet params) + public MagicalSoulAttack(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java index fcc143cd4b..688243d9e1 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ManaCharge extends AbstractStatAddEffect { - public ManaCharge(StatsSet params) + public ManaCharge(StatSet params) { super(params, Stat.MANA_CHARGE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index 0c84b4ab61..b889e6e824 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class ManaDamOverTime extends AbstractEffect { private final double _power; - public ManaDamOverTime(StatsSet params) + public ManaDamOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index f48011c9a2..94286df1c8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -34,7 +34,7 @@ public class ManaHeal extends AbstractEffect { private final double _power; - public ManaHeal(StatsSet params) + public ManaHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index bfdfa54380..61f15449a0 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -35,7 +35,7 @@ public class ManaHealByLevel extends AbstractEffect { private final double _power; - public ManaHealByLevel(StatsSet params) + public ManaHealByLevel(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 46937a8dd0..e505c9e7a2 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class ManaHealOverTime extends AbstractEffect { private final double _power; - public ManaHealOverTime(StatsSet params) + public ManaHealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 101961d1c4..71085da549 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class ManaHealPercent extends AbstractEffect { private final double _power; - public ManaHealPercent(StatsSet params) + public ManaHealPercent(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 7c9c63e3ad..07d15d826c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxCp extends AbstractStatEffect { private final boolean _heal; - public MaxCp(StatsSet params) + public MaxCp(StatSet params) { super(params, Stat.MAX_CP); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 6d2c3449bd..85867bca96 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxHp extends AbstractStatEffect { private final boolean _heal; - public MaxHp(StatsSet params) + public MaxHp(StatSet params) { super(params, Stat.MAX_HP); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index e554c63055..9ca46fda8d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxMp extends AbstractStatEffect { private final boolean _heal; - public MaxMp(StatsSet params) + public MaxMp(StatSet params) { super(params, Stat.MAX_MP); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 39cf62a95b..c27284e5f6 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -43,7 +43,7 @@ public class ModifyVital extends AbstractEffect private final int _mp; private final int _cp; - public ModifyVital(StatsSet params) + public ModifyVital(StatSet params) { _type = params.getEnum("type", ModifyType.class); if (_type != ModifyType.SET) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 29ee88f805..095d130f7f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Mp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Mp(StatsSet params) + public Mp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index 76d858ad8e..b13d7824d0 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class MpConsumePerLevel extends AbstractEffect { private final double _power; - public MpConsumePerLevel(StatsSet params) + public MpConsumePerLevel(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java index 2051009805..ae7bf0c48c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpRegen extends AbstractStatEffect { - public MpRegen(StatsSet params) + public MpRegen(StatSet params) { super(params, Stat.REGENERATE_MP_RATE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MpShield.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MpShield.java index 82e307a562..a4eb3e663f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MpShield.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MpShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpShield extends AbstractStatAddEffect { - public MpShield(StatsSet params) + public MpShield(StatSet params) { super(params, Stat.MANA_SHIELD_PERCENT); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java index af2ce119cc..366e96b18f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpVampiricAttack extends AbstractStatAddEffect { - public MpVampiricAttack(StatsSet params) + public MpVampiricAttack(StatSet params) { super(params, Stat.ABSORB_MANA_DAMAGE_PERCENT); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Mute.java index a7f2f76e23..7e5b5a528f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Mute extends AbstractEffect { - public Mute(StatsSet params) + public Mute(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java index 3cc4cae96f..513dc46ec7 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class NoblesseBless extends AbstractEffect { - public NoblesseBless(StatsSet params) + public NoblesseBless(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index bb0f02af5c..05f8c6a99b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpenChest extends AbstractEffect { - public OpenChest(StatsSet params) + public OpenChest(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 1b8f7ef59f..a4b09c13ec 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeBookItemList; */ public class OpenCommonRecipeBook extends AbstractEffect { - public OpenCommonRecipeBook(StatsSet params) + public OpenCommonRecipeBook(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 21dd337982..7b5effc6b4 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class OpenDoor extends AbstractEffect private final int _chance; private final boolean _isItem; - public OpenDoor(StatsSet params) + public OpenDoor(StatSet params) { _chance = params.getInt("chance", 0); _isItem = params.getBoolean("isItem", false); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index ebd6c6a668..8842de2ea8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeBookItemList; */ public class OpenDwarfRecipeBook extends AbstractEffect { - public OpenDwarfRecipeBook(StatsSet params) + public OpenDwarfRecipeBook(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PAtk.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PAtk.java index c353d03a00..7f10b9dcc7 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PAtk.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PAtk.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PAtk extends AbstractConditionalHpEffect { - public PAtk(StatsSet params) + public PAtk(StatSet params) { super(params, Stat.PHYSICAL_ATTACK); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Passive.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Passive.java index cef680ca21..27ce15bb60 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Passive.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Passive.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Passive extends AbstractEffect { - public Passive(StatsSet params) + public Passive(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java index 05f55c7dac..1a9f29424f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAbnormalResist extends AbstractStatAddEffect { - public PhysicalAbnormalResist(StatsSet params) + public PhysicalAbnormalResist(StatSet params) { super(params, Stat.ABNORMAL_RESIST_PHYSICAL); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 098770705b..7e5fb14465 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -52,7 +52,7 @@ public class PhysicalAttack extends AbstractEffect private final Set _abnormals; private final double _abnormalPowerMod; - public PhysicalAttack(StatsSet params) + public PhysicalAttack(StatSet params) { _power = params.getDouble("power", 0); _pAtkMod = params.getDouble("pAtkMod", 1.0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index d325c3d5ed..f191867614 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -38,7 +38,7 @@ public class PhysicalAttackHpLink extends AbstractEffect private final double _criticalChance; private final boolean _overHit; - public PhysicalAttackHpLink(StatsSet params) + public PhysicalAttackHpLink(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index dc575c2c75..fe087a1bcc 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class PhysicalAttackMute extends AbstractEffect { - public PhysicalAttackMute(StatsSet params) + public PhysicalAttackMute(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java index 112b41eb36..2093d45264 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAttackRange extends AbstractStatEffect { - public PhysicalAttackRange(StatsSet params) + public PhysicalAttackRange(StatSet params) { super(params, Stat.PHYSICAL_ATTACK_RANGE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index d3c2dcfaf2..5d66bd4c87 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ public class PhysicalAttackSaveHp extends AbstractEffect private final boolean _overHit; private final double _saveHp; - public PhysicalAttackSaveHp(StatsSet params) + public PhysicalAttackSaveHp(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java index 167b859572..cdf34eb6f6 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAttackSpeed extends AbstractStatEffect { - public PhysicalAttackSpeed(StatsSet params) + public PhysicalAttackSpeed(StatSet params) { super(params, Stat.PHYSICAL_ATTACK_SPEED); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 61bed5561b..a1a6818a00 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class PhysicalAttackWeaponBonus extends AbstractEffect private final Map _weaponBonus = new EnumMap<>(WeaponType.class); - public PhysicalAttackWeaponBonus(StatsSet params) + public PhysicalAttackWeaponBonus(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java index fa3925e725..078c3673b9 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalDefence extends AbstractConditionalHpEffect { - public PhysicalDefence(StatsSet params) + public PhysicalDefence(StatSet params) { super(params, Stat.PHYSICAL_DEFENCE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java index 812c641ac8..9714220e1b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalEvasion extends AbstractConditionalHpEffect { - public PhysicalEvasion(StatsSet params) + public PhysicalEvasion(StatSet params) { super(params, Stat.EVASION_RATE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index b337fed6cb..fe7cf853c8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class PhysicalMute extends AbstractEffect { - public PhysicalMute(StatsSet params) + public PhysicalMute(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java index 0fd835f4e3..1b843dda3d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class PhysicalShieldAngleAll extends AbstractEffect { - public PhysicalShieldAngleAll(StatsSet params) + public PhysicalShieldAngleAll(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java index 9d3f051659..507eb57326 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalSkillPower extends AbstractStatEffect { - public PhysicalSkillPower(StatsSet params) + public PhysicalSkillPower(StatSet params) { super(params, Stat.PHYSICAL_SKILL_POWER, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index a958116ff7..9ceccea4cc 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -42,7 +42,7 @@ public class PhysicalSoulAttack extends AbstractEffect private final boolean _ignoreShieldDefence; private final boolean _overHit; - public PhysicalSoulAttack(StatsSet params) + public PhysicalSoulAttack(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index e95e09ab90..fd2b23a2ae 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class PkCount extends AbstractEffect { private final int _amount; - public PkCount(StatsSet params) + public PkCount(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index 2a356bdbc9..18cecfb90e 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class Plunder extends AbstractEffect { - public Plunder(StatsSet params) + public Plunder(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index fd61584af1..3e885274b3 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PolearmSingleTarget extends AbstractEffect { - public PolearmSingleTarget(StatsSet params) + public PolearmSingleTarget(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java index 86f2e2cee8..b2fb920379 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class ProtectDeathPenalty extends AbstractEffect { - public ProtectDeathPenalty(StatsSet params) + public ProtectDeathPenalty(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java index 890b8980bd..6664b36bae 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ProtectionBlessing extends AbstractEffect { - public ProtectionBlessing(StatsSet params) + public ProtectionBlessing(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index 6de78c2c82..62c480716d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class PullBack extends AbstractEffect private final int _animationSpeed; private final FlyType _type; - public PullBack(StatsSet params) + public PullBack(StatSet params) { _speed = params.getInt("speed", 0); _delay = params.getInt("delay", _speed); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java index 1019c56778..84a72299f3 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveMagicalSkillDamageBonus extends AbstractStatPercentEffect { - public PveMagicalSkillDamageBonus(StatsSet params) + public PveMagicalSkillDamageBonus(StatSet params) { super(params, Stat.PVE_MAGICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java index 8da698c746..70870aa45c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveMagicalSkillDefenceBonus(StatsSet params) + public PveMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java index c7a82d4ded..8f60ea025c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalAttackDamageBonus extends AbstractStatPercentEffect { - public PvePhysicalAttackDamageBonus(StatsSet params) + public PvePhysicalAttackDamageBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_ATTACK_DAMAGE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java index 0717fe525b..ea01a4e1d8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PvePhysicalAttackDefenceBonus(StatsSet params) + public PvePhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java index 878f942877..1e8b9e76c4 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvePhysicalSkillDamageBonus(StatsSet params) + public PvePhysicalSkillDamageBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java index bdfa0dcc67..b1dbb0b217 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvePhysicalSkillDefenceBonus(StatsSet params) + public PvePhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java index 94fdc26015..fbe3119ba8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveRaidMagicalSkillDefenceBonus(StatsSet params) + public PveRaidMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java index f54d849752..83352e1b2f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidPhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PveRaidPhysicalAttackDefenceBonus(StatsSet params) + public PveRaidPhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java index 0a344f96de..be05bec159 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidPhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveRaidPhysicalSkillDefenceBonus(StatsSet params) + public PveRaidPhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java index 542c019420..2f0153189a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpMagicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvpMagicalSkillDamageBonus(StatsSet params) + public PvpMagicalSkillDamageBonus(StatSet params) { super(params, Stat.PVP_MAGICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java index bb006280fc..41ad3b7749 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvpMagicalSkillDefenceBonus(StatsSet params) + public PvpMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVP_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java index 483d7b02e4..23488ea000 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalAttackDamageBonus extends AbstractStatPercentEffect { - public PvpPhysicalAttackDamageBonus(StatsSet params) + public PvpPhysicalAttackDamageBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_ATTACK_DAMAGE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java index 40c3a22ea2..ff942b3d4d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PvpPhysicalAttackDefenceBonus(StatsSet params) + public PvpPhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java index 225c7c1e39..19a7c96003 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvpPhysicalSkillDamageBonus(StatsSet params) + public PvpPhysicalSkillDamageBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java index ea2d1fa126..211d14c5e3 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvpPhysicalSkillDefenceBonus(StatsSet params) + public PvpPhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 8a01583374..e500b487af 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -36,7 +36,7 @@ public class RandomizeHate extends AbstractEffect { private final int _chance; - public RandomizeHate(StatsSet params) + public RandomizeHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index 8b2801ee6c..18b07bd2d7 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class RealDamage extends AbstractEffect { private final double _power; - public RealDamage(StatsSet params) + public RealDamage(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java index 4372c15bcf..86738fae0f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class RearDamage extends AbstractStatPercentEffect { - public RearDamage(StatsSet params) + public RearDamage(StatSet params) { super(params, Stat.REAR_DAMAGE_RATE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 31c7a4e4b3..82ed18faa1 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RebalanceHP extends AbstractEffect { - public RebalanceHP(StatsSet params) + public RebalanceHP(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index 09d307be02..979809b533 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RebalanceHPSummon extends AbstractEffect { - public RebalanceHPSummon(StatsSet params) + public RebalanceHPSummon(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 7599b691ac..e76328929a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class RecoverVitalityInPeaceZone extends AbstractEffect private final double _amount; private final int _ticks; - public RecoverVitalityInPeaceZone(StatsSet params) + public RecoverVitalityInPeaceZone(StatSet params) { _amount = params.getDouble("amount", 0); _ticks = params.getInt("ticks", 10); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Recovery.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Recovery.java index 35c5cf3af1..30296eec4d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Recovery.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Recovery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Recovery extends AbstractEffect { - public Recovery(StatsSet params) + public Recovery(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java index 824044ae21..e52b5abafb 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ReduceCancel extends AbstractStatEffect { - public ReduceCancel(StatsSet params) + public ReduceCancel(StatSet params) { super(params, Stat.ATTACK_CANCEL); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index ecc7a10d31..be9188f3b0 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -33,7 +33,7 @@ public class ReduceDamage extends AbstractEffect { private final double _amount; - public ReduceDamage(StatsSet params) + public ReduceDamage(StatSet params) { _amount = params.getDouble("amount"); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java index 8534a94fc6..7b8862f608 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ReduceDropType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -32,7 +32,7 @@ public class ReduceDropPenalty extends AbstractEffect private final double _deathPenalty; private final ReduceDropType _type; - public ReduceDropPenalty(StatsSet params) + public ReduceDropPenalty(StatSet params) { _exp = params.getDouble("exp", 0); _deathPenalty = params.getDouble("deathPenalty", 0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java index c15f7301b9..6436b488e0 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ReflectMagic extends AbstractStatAddEffect { - public ReflectMagic(StatsSet params) + public ReflectMagic(StatSet params) { super(params, Stat.VENGEANCE_SKILL_MAGIC_DAMAGE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java index bf1d555351..583191fd4c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.BasicProperty; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ReflectSkill extends AbstractEffect private final Stat _stat; private final double _amount; - public ReflectSkill(StatsSet params) + public ReflectSkill(StatSet params) { _stat = params.getEnum("type", BasicProperty.class, BasicProperty.PHYSICAL) == BasicProperty.PHYSICAL ? Stat.REFLECT_SKILL_PHYSIC : Stat.REFLECT_SKILL_MAGIC; _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index e850ea6be9..77b96e4205 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class RefuelAirship extends AbstractEffect { private final int _value; - public RefuelAirship(StatsSet params) + public RefuelAirship(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Relax.java index c8c61fe47e..e2ba4420db 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ public class Relax extends AbstractEffect { private final double _power; - public Relax(StatsSet params) + public Relax(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java index 0a44550fbf..1600e28444 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class RemoveEquipPenalty extends AbstractEffect { private final CrystalType _grade; - public RemoveEquipPenalty(StatsSet params) + public RemoveEquipPenalty(StatSet params) { _grade = params.getEnum("grade", CrystalType.class); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java index f2c14333a2..1710414a4a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.ShortcutType; import org.l2jmobius.gameserver.model.Shortcut; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -38,7 +38,7 @@ public class ReplaceSkillBySkill extends AbstractEffect private final SkillHolder _existingSkill; private final SkillHolder _replacementSkill; - public ReplaceSkillBySkill(StatsSet params) + public ReplaceSkillBySkill(StatSet params) { _existingSkill = new SkillHolder(params.getInt("existingSkillId"), params.getInt("existingSkillLevel", -1)); _replacementSkill = new SkillHolder(params.getInt("replacementSkillId"), params.getInt("replacementSkillLevel", -1)); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 9678dc1174..0613c17234 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class ResetInstanceEntry extends AbstractEffect { private final Set _instanceId; - public ResetInstanceEntry(StatsSet params) + public ResetInstanceEntry(StatSet params) { final String instanceIds = params.getString("instanceId", null); if ((instanceIds != null) && !instanceIds.isEmpty()) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java index 940c731208..f15ff56189 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ResistAbnormalByCategory extends AbstractEffect private final DispelSlotType _slot; private final double _amount; - public ResistAbnormalByCategory(StatsSet params) + public ResistAbnormalByCategory(StatSet params) { _amount = params.getDouble("amount", 0); _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.DEBUFF); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java index dae38e5246..2e29b5cc8e 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ResistDDMagic extends AbstractStatPercentEffect { - public ResistDDMagic(StatsSet params) + public ResistDDMagic(StatSet params) { super(params, Stat.MAGIC_SUCCESS_RES); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java index af2b203aad..d08fcb262a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ResistDispelByCategory extends AbstractEffect private final DispelSlotType _slot; private final double _amount; - public ResistDispelByCategory(StatsSet params) + public ResistDispelByCategory(StatSet params) { _amount = params.getDouble("amount", 0); _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index af1e40bea8..cd03f1a74a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -34,7 +34,7 @@ public class ResistSkill extends AbstractEffect { private final List _skills = new ArrayList<>(); - public ResistSkill(StatsSet params) + public ResistSkill(StatSet params) { for (int i = 1;; i++) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index feb5885fb0..6f887a07cf 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class Restoration extends AbstractEffect private final int _itemCount; private final int _itemEnchantmentLevel; - public Restoration(StatsSet params) + public Restoration(StatSet params) { _itemId = params.getInt("itemId", 0); _itemCount = params.getInt("itemCount", 0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 37cd974643..0baf0aaae6 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -25,7 +25,7 @@ import java.util.Map.Entry; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.ExtractableProductItem; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,12 +47,12 @@ public class RestorationRandom extends AbstractEffect { private final List _products = new ArrayList<>(); - public RestorationRandom(StatsSet params) + public RestorationRandom(StatSet params) { - for (StatsSet group : params.getList("items", StatsSet.class)) + for (StatSet group : params.getList("items", StatSet.class)) { final List items = new ArrayList<>(); - for (StatsSet item : group.getList(".", StatsSet.class)) + for (StatSet item : group.getList(".", StatSet.class)) { items.add(new RestorationItemHolder(item.getInt(".id"), item.getInt(".count"), item.getInt(".minEnchant", 0), item.getInt(".maxEnchant", 0))); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index f9c10b7ff2..9b287dd419 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class Resurrection extends AbstractEffect { private final int _power; - public Resurrection(StatsSet params) + public Resurrection(StatSet params) { _power = params.getInt("power", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 18d8bdb0bd..6ef063ce91 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -39,7 +39,7 @@ public class ResurrectionSpecial extends AbstractEffect private final int _power; private final Set _instanceId; - public ResurrectionSpecial(StatsSet params) + public ResurrectionSpecial(StatSet params) { _power = params.getInt("power", 0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index e4d66b43d3..0e7391681b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class Reuse extends AbstractEffect private final int _magicType; private final double _amount; - public Reuse(StatsSet params) + public Reuse(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index 3716fc1922..e17cd7cc25 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ReuseSkillById extends AbstractEffect { private final int _skillId; - public ReuseSkillById(StatsSet params) + public ReuseSkillById(StatSet params) { _skillId = params.getInt("skillId", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Root.java index 1ca3492949..b6876e8e13 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Root extends AbstractEffect { - public Root(StatsSet params) + public Root(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index 66fc8d82c8..4c7ee53239 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class SacrificeSummon extends AbstractEffect { - public SacrificeSummon(StatsSet params) + public SacrificeSummon(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java index d00856c9bd..683f45bb55 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SafeFallHeight extends AbstractStatEffect { - public SafeFallHeight(StatsSet params) + public SafeFallHeight(StatSet params) { super(params, Stat.FALL); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 7f6bf69ee3..797aa95263 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -33,7 +33,7 @@ public class SendSystemMessageToClan extends AbstractEffect { private final SystemMessage _message; - public SendSystemMessageToClan(StatsSet params) + public SendSystemMessageToClan(StatSet params) { final int id = params.getInt("id", 0); _message = new SystemMessage(id); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java index 7acbf846df..a0508d73b1 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class ServitorShare extends AbstractEffect { private final Map _sharedStats = new EnumMap<>(Stat.class); - public ServitorShare(StatsSet params) + public ServitorShare(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 01dfd87c71..6e8187feae 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SetHp extends AbstractEffect private final double _amount; private final StatModifierType _mode; - public SetHp(StatsSet params) + public SetHp(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index 805d18160b..fae21baa51 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SetSkill extends AbstractEffect private final int _skillId; private final int _skillLvl; - public SetSkill(StatsSet params) + public SetSkill(StatSet params) { _skillId = params.getInt("skillId", 0); _skillLvl = params.getInt("skillLvl", 1); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java index a93bb5f253..354cb42b55 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ShieldDefence extends AbstractStatEffect { - public ShieldDefence(StatsSet params) + public ShieldDefence(StatSet params) { super(params, Stat.SHIELD_DEFENCE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java index f28d0e4ad2..1fdee75f69 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ShieldDefenceRate extends AbstractStatEffect { - public ShieldDefenceRate(StatsSet params) + public ShieldDefenceRate(StatSet params) { super(params, Stat.SHIELD_DEFENCE_RATE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java index 1d649082dc..533b631f10 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class SilentMove extends AbstractEffect { - public SilentMove(StatsSet params) + public SilentMove(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java index 89dad85514..7c929a7fe8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class SkillCritical extends AbstractEffect { private final BaseStat _stat; - public SkillCritical(StatsSet params) + public SkillCritical(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java index 369bef11f5..8f054f973b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillCriticalDamage extends AbstractStatEffect { - public SkillCriticalDamage(StatsSet params) + public SkillCriticalDamage(StatSet params) { super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java index c91f2d6b49..88ecf69e77 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillCriticalProbability extends AbstractStatPercentEffect { - public SkillCriticalProbability(StatsSet params) + public SkillCriticalProbability(StatSet params) { super(params, Stat.SKILL_CRITICAL_PROBABILITY); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 7b98a9e180..1664ea1827 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class SkillEvasion extends AbstractEffect private final int _magicType; private final double _amount; - public SkillEvasion(StatsSet params) + public SkillEvasion(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java index 9cc62532b4..2880d0ccef 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillPowerAdd extends AbstractStatAddEffect { - public SkillPowerAdd(StatsSet params) + public SkillPowerAdd(StatSet params) { super(params, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 9578c88f91..7156fff2df 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SkillTurning extends AbstractEffect private final int _chance; private final boolean _staticChance; - public SkillTurning(StatsSet params) + public SkillTurning(StatSet params) { _chance = params.getInt("chance", 100); _staticChance = params.getBoolean("staticChance", false); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 45b02206a4..04691304ed 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SkillTurningOverTime extends AbstractEffect private final int _chance; private final boolean _staticChance; - public SkillTurningOverTime(StatsSet params) + public SkillTurningOverTime(StatSet params) { _chance = params.getInt("chance", 100); _staticChance = params.getBoolean("staticChance", false); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index c1dd92cedb..b919c7acac 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -36,7 +36,7 @@ public class SoulBlow extends AbstractEffect private final double _chanceBoost; private final boolean _overHit; - public SoulBlow(StatsSet params) + public SoulBlow(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 8471aa236c..4f63a84081 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; @@ -40,7 +40,7 @@ public class SoulEating extends AbstractEffect private final int _expNeeded; private final int _maxSouls; - public SoulEating(StatsSet params) + public SoulEating(StatSet params) { _expNeeded = params.getInt("expNeeded"); _maxSouls = params.getInt("maxSouls"); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a7d5c2628a..ad261845eb 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Seed; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Sow extends AbstractEffect { - public Sow(StatsSet params) + public Sow(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SpModify.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SpModify.java index 24d124ecce..c3bc6193e9 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SpModify.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SpModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SpModify extends AbstractStatAddEffect { - public SpModify(StatsSet params) + public SpModify(StatSet params) { super(params, Stat.BONUS_SP); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 0718408ca2..890438d65f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.enums.SpeedType; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -36,7 +36,7 @@ public class Speed extends AbstractEffect private final StatModifierType _mode; private List _speedType; - public Speed(StatsSet params) + public Speed(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index 91b91ad05e..db247775f3 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SphericBarrier extends AbstractStatAddEffect { - public SphericBarrier(StatsSet params) + public SphericBarrier(StatSet params) { super(params, Stat.SPHERIC_BARRIER_RANGE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index d13eaf1c2e..385240377f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class Spoil extends AbstractEffect { - public Spoil(StatsSet params) + public Spoil(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index b63c24dc20..22c4132b63 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -36,7 +36,7 @@ public class StatBonusSkillCritical extends AbstractEffect private final BaseStat _stat; private final Condition _armorTypeCondition; - public StatBonusSkillCritical(StatsSet params) + public StatBonusSkillCritical(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.DEX); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index 41a20bfafe..49280eb774 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -36,7 +36,7 @@ public class StatBonusSpeed extends AbstractEffect private final BaseStat _stat; private final Condition _armorTypeCondition; - public StatBonusSpeed(StatsSet params) + public StatBonusSpeed(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.DEX); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index a007b118b2..bcf691e360 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class StatByMoveType extends AbstractEffect private final MoveType _type; private final double _value; - public StatByMoveType(StatsSet params) + public StatByMoveType(StatSet params) { _stat = params.getEnum("stat", Stat.class); _type = params.getEnum("type", MoveType.class); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StatUp.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StatUp.java index a22710ca7a..29d72bb4de 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StatUp.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StatUp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class StatUp extends AbstractEffect private final BaseStat _stat; private final double _amount; - public StatUp(StatsSet params) + public StatUp(StatSet params) { _amount = params.getDouble("amount", 0); _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index 0720057c19..23239887a7 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.List; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -39,7 +39,7 @@ public class StealAbnormal extends AbstractEffect private final int _rate; private final int _max; - public StealAbnormal(StatsSet params) + public StealAbnormal(StatSet params) { _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); _rate = params.getInt("rate", 0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Summon.java index 0f95637961..7ef79d4c39 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.ServitorInstance; @@ -43,7 +43,7 @@ public class Summon extends AbstractEffect private final int _lifeTime; private final int _consumeItemInterval; - public Summon(StatsSet params) + public Summon(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index 8929e1f2b0..50c025e572 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class SummonAgathion extends AbstractEffect { private final int _npcId; - public SummonAgathion(StatsSet params) + public SummonAgathion(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index 7716d58f16..49b816f272 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.CubicData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; @@ -42,7 +42,7 @@ public class SummonCubic extends AbstractEffect private final int _cubicId; private final int _cubicLvl; - public SummonCubic(StatsSet params) + public SummonCubic(StatSet params) { _cubicId = params.getInt("cubicId", -1); _cubicLvl = params.getInt("cubicLvl", 0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index d0a2a82738..13d5a2eac7 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoppelgangerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ public class SummonHallucination extends AbstractEffect private final int _npcId; private final int _npcCount; - public SummonHallucination(StatsSet params) + public SummonHallucination(StatSet params) { _despawnDelay = params.getInt("despawnDelay", 20000); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index bcd050e084..d61a6e5c02 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.ServitorInstance; @@ -43,7 +43,7 @@ public class SummonMulti extends AbstractEffect private final int _consumeItemInterval; private final int _summonPoints; - public SummonMulti(StatsSet params) + public SummonMulti(StatSet params) { _npcId = params.getInt("npcId"); _expMultiplier = params.getFloat("expMultiplier", 1); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index 6f4090eef0..eaff214b7c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DecoyInstance; @@ -48,7 +48,7 @@ public class SummonNpc extends AbstractEffect private final boolean _isSummonSpawn; private final boolean _singleInstance; // Only one instance of this NPC is allowed. - public SummonNpc(StatsSet params) + public SummonNpc(StatSet params) { _despawnDelay = params.getInt("despawnDelay", 20000); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 5ef621819e..534a41ee16 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.data.xml.impl.PetDataTable; import org.l2jmobius.gameserver.model.PetData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PetItemList; */ public class SummonPet extends AbstractEffect { - public SummonPet(StatsSet params) + public SummonPet(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java index 7dd690587c..b1d5ec38cb 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SummonPoints extends AbstractStatAddEffect { - public SummonPoints(StatsSet params) + public SummonPoints(StatSet params) { super(params, Stat.MAX_SUMMON_POINTS); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index d8a47b670f..ac1ddaa16a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; @@ -35,7 +35,7 @@ public class SummonTrap extends AbstractEffect private final int _despawnTime; private final int _npcId; - public SummonTrap(StatsSet params) + public SummonTrap(StatSet params) { _despawnTime = params.getInt("despawnTime", 0); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 84f6d070a8..3196bb949d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Collection; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Sweeper extends AbstractEffect { - public Sweeper(StatsSet params) + public Sweeper(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 1594a8a23b..77dc9b4af7 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ public class Synergy extends AbstractEffect private final int _skillLevelScaleTo; private final int _minSlot; - public Synergy(StatsSet params) + public Synergy(StatSet params) { final String requiredSlots = params.getString("requiredSlots", null); if ((requiredSlots != null) && !requiredSlots.isEmpty()) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index e35516fef5..39ed981bbf 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Castle; @@ -33,7 +33,7 @@ public class TakeCastle extends AbstractEffect { private final CastleSide _side; - public TakeCastle(StatsSet params) + public TakeCastle(StatSet params) { _side = params.getEnum("side", CastleSide.class); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 77fd9ec103..3be2bf5593 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Castle; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TakeCastleStart extends AbstractEffect { - public TakeCastleStart(StatsSet params) + public TakeCastleStart(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 70842191a7..18749c1aef 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Fort; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TakeFort extends AbstractEffect { - public TakeFort(StatsSet params) + public TakeFort(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 0eb23f6733..77355f9683 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TakeFortStart extends AbstractEffect { - public TakeFortStart(StatsSet params) + public TakeFortStart(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index cec32755ed..dd8e09278f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class TalismanSlot extends AbstractEffect { private final int _slots; - public TalismanSlot(StatsSet params) + public TalismanSlot(StatSet params) { _slots = params.getInt("slots", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 281b5322fd..32a126f499 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class TargetCancel extends AbstractEffect { private final int _chance; - public TargetCancel(StatsSet params) + public TargetCancel(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index b4463de391..86ff70c9ca 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMe extends AbstractEffect { - public TargetMe(StatsSet params) + public TargetMe(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index 11e581113e..e68a1e1faf 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class TargetMeProbability extends AbstractEffect { private final int _chance; - public TargetMeProbability(StatsSet params) + public TargetMeProbability(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 6c30519678..9ca01faf50 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -32,7 +32,7 @@ public class Teleport extends AbstractEffect { private final Location _loc; - public Teleport(StatsSet params) + public Teleport(StatSet params) { _loc = new Location(params.getInt("x", 0), params.getInt("y", 0), params.getInt("z", 0)); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index e0e715818c..bdc53208d5 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -38,7 +38,7 @@ public class TeleportToNpc extends AbstractEffect private final int _npcId; private final boolean _party; - public TeleportToNpc(StatsSet params) + public TeleportToNpc(StatSet params) { _npcId = params.getInt("npcId"); _party = params.getBoolean("party", false); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index c84c559322..4f4275fd41 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TeleportToPlayer extends AbstractEffect { - public TeleportToPlayer(StatsSet params) + public TeleportToPlayer(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index 1c9af0f535..b2d6b663de 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class TeleportToSummon extends AbstractEffect { private final double _maxDistance; - public TeleportToSummon(StatsSet params) + public TeleportToSummon(StatSet params) { _maxDistance = params.getDouble("distance", -1); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index e550302b02..c4bf787a10 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class TeleportToTarget extends AbstractEffect { - public TeleportToTarget(StatsSet params) + public TeleportToTarget(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java index 389d6ca266..a072291f5f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.EffectList; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -43,7 +43,7 @@ public class TrackLimitedSkill extends AbstractEffect private int limitSigelLevel = 0; private int limitIssLevel = 0; - public TrackLimitedSkill(StatsSet param) + public TrackLimitedSkill(StatSet param) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index ba1c55c615..ff63eea817 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class TransferDamageToPlayer extends AbstractStatAddEffect { - public TransferDamageToPlayer(StatsSet params) + public TransferDamageToPlayer(StatSet params) { super(params, Stat.TRANSFER_DAMAGE_TO_PLAYER); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java index b084bfc1cb..c87d5f0554 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class TransferDamageToSummon extends AbstractStatAddEffect { - public TransferDamageToSummon(StatsSet params) + public TransferDamageToSummon(StatSet params) { super(params, Stat.TRANSFER_DAMAGE_SUMMON_PERCENT); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index e9f0292113..48bc5e3a1c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -34,7 +34,7 @@ public class TransferHate extends AbstractEffect { private final int _chance; - public TransferHate(StatsSet params) + public TransferHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 2ddf95a4db..bf593eaed8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Transformation extends AbstractEffect { private final List _id; - public Transformation(StatsSet params) + public Transformation(StatSet params) { final String ids = params.getString("transformationId", null); if ((ids != null) && !ids.isEmpty()) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 103ccdf8ce..2b4af0a1d3 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class TrapDetect extends AbstractEffect { private final int _power; - public TrapDetect(StatsSet params) + public TrapDetect(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index eb7b073b36..c4a6c6aed9 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.TrapAction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class TrapRemove extends AbstractEffect { private final int _power; - public TrapRemove(StatsSet params) + public TrapRemove(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 6df3874ab1..8fb87050b1 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -59,7 +59,7 @@ public class TriggerSkillByAttack extends AbstractEffect * @param params */ - public TriggerSkillByAttack(StatsSet params) + public TriggerSkillByAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index ae6a3bc89f..78366b8047 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillByAvoid extends AbstractEffect /** * @param params */ - public TriggerSkillByAvoid(StatsSet params) + public TriggerSkillByAvoid(StatSet params) { _chance = params.getInt("chance", 100); _skill = new SkillHolder(params.getInt("skillId", 0), params.getInt("skillLevel", 0)); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index c24fb95246..9fe53c0622 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -48,7 +48,7 @@ public class TriggerSkillByDamage extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillByDamage(StatsSet params) + public TriggerSkillByDamage(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c086507336..8b84350293 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillByDeathBlow extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillByDeathBlow(StatsSet params) + public TriggerSkillByDeathBlow(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index a9bfcc320c..11802645f2 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -37,7 +37,7 @@ public class TriggerSkillByKill extends AbstractEffect private final int _chance; private final SkillHolder _skill; - public TriggerSkillByKill(StatsSet params) + public TriggerSkillByKill(StatSet params) { _chance = params.getInt("chance", 100); _skill = new SkillHolder(params.getInt("skillId", 0), params.getInt("skillLevel", 0)); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 2893d46f33..7f2d3f9fa7 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -52,7 +52,7 @@ public class TriggerSkillByMagicType extends AbstractEffect * @param params */ - public TriggerSkillByMagicType(StatsSet params) + public TriggerSkillByMagicType(StatSet params) { _chance = params.getInt("chance", 100); _magicTypes = params.getIntArray("magicTypes", ";"); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 1524e3d4f4..b77da803f5 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillBySkill extends AbstractEffect private final int _skillLevelScaleTo; private final TargetType _targetType; - public TriggerSkillBySkill(StatsSet params) + public TriggerSkillBySkill(StatSet params) { _castSkillId = params.getInt("castSkillId"); _chance = params.getInt("chance", 100); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index ec2124c44e..7bb68baec9 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -53,7 +53,7 @@ public class TriggerSkillBySkillAttack extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillBySkillAttack(StatsSet params) + public TriggerSkillBySkillAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 3f58619f0a..c209decfb3 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -69,7 +69,7 @@ public class TwoHandedBluntBonus extends AbstractEffect private final double _speedAmount; private final StatModifierType _speedMode; - public TwoHandedBluntBonus(StatsSet params) + public TwoHandedBluntBonus(StatSet params) { _pAtkAmount = params.getDouble("pAtkAmount", 0); _pAtkMode = params.getEnum("pAtkMode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index b2c50c4b88..344456a925 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -69,7 +69,7 @@ public class TwoHandedSwordBonus extends AbstractEffect private final double _speedAmount; private final StatModifierType _speedMode; - public TwoHandedSwordBonus(StatsSet params) + public TwoHandedSwordBonus(StatSet params) { _pAtkAmount = params.getDouble("pAtkAmount", 0); _pAtkMode = params.getEnum("pAtkMode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 01ae8122ec..20b418c29b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ public class Unsummon extends AbstractEffect { private final int _chance; - public Unsummon(StatsSet params) + public Unsummon(StatSet params) { _chance = params.getInt("chance", -1); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 57eb89196d..f73f0f57f0 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; */ public class UnsummonAgathion extends AbstractEffect { - public UnsummonAgathion(StatsSet params) + public UnsummonAgathion(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index a4fdc2c0aa..0779d018cc 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class UnsummonServitors extends AbstractEffect { - public UnsummonServitors(StatsSet params) + public UnsummonServitors(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index dbb0c700b5..ac33fcba0d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Untargetable extends AbstractEffect { - public Untargetable(StatsSet params) + public Untargetable(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java index ac6cae3d05..1c85196fe0 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class VampiricAttack extends AbstractEffect private final double _amount; private final double _sum; - public VampiricAttack(StatsSet params) + public VampiricAttack(StatSet params) { _amount = params.getDouble("amount"); _sum = _amount * params.getDouble("chance"); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java index ab724714e1..571ca55bbe 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ public class VampiricDefence extends AbstractEffect { private final int _amount; - public VampiricDefence(StatsSet params) + public VampiricDefence(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java index f8b9d76f3a..caaa8d02b4 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class VitalityExpRate extends AbstractStatPercentEffect { - public VitalityExpRate(StatsSet params) + public VitalityExpRate(StatSet params) { super(params, Stat.VITALITY_EXP_RATE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index cba2b14c35..385595e03d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class VitalityPointUp extends AbstractEffect { private final int _value; - public VitalityPointUp(StatsSet params) + public VitalityPointUp(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java index 86612955dd..72f78ec177 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class VitalityPointsRate extends AbstractStatPercentEffect { - public VitalityPointsRate(StatsSet params) + public VitalityPointsRate(StatSet params) { super(params, Stat.VITALITY_CONSUME_RATE); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java index 09500b3823..bf20bd5018 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WeightLimit extends AbstractStatEffect { - public WeightLimit(StatsSet params) + public WeightLimit(StatSet params) { super(params, Stat.WEIGHT_LIMIT); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java index f9be68f493..6020399f85 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WeightPenalty extends AbstractStatAddEffect { - public WeightPenalty(StatsSet params) + public WeightPenalty(StatSet params) { super(params, Stat.WEIGHT_PENALTY); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java index bdf9aca48d..81eb9a9688 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WorldChatPoints extends AbstractStatEffect { - public WorldChatPoints(StatsSet params) + public WorldChatPoints(StatSet params) { super(params, Stat.WORLD_CHAT_POINTS); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java index 5a3842921d..127dadf9d2 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class BuildAdvanceBaseSkillCondition implements ISkillCondition { - public BuildAdvanceBaseSkillCondition(StatsSet params) + public BuildAdvanceBaseSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java index a9dd2b9eba..ffb7d13539 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class BuildCampSkillCondition implements ISkillCondition { - public BuildCampSkillCondition(StatsSet params) + public BuildCampSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java index c1220c828a..aca51bafbf 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanAddMaxEntranceInzoneSkillCondition implements ISkillCondition { - public CanAddMaxEntranceInzoneSkillCondition(StatsSet params) + public CanAddMaxEntranceInzoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java index eddd45771c..6ac3c2e199 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ public class CanBookmarkAddSlotSkillCondition implements ISkillCondition { private final int _teleportBookmarkSlots; - public CanBookmarkAddSlotSkillCondition(StatsSet params) + public CanBookmarkAddSlotSkillCondition(StatSet params) { _teleportBookmarkSlots = params.getInt("teleportBookmarkSlots"); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java index 30fdb7f36f..ee1bf96e69 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanChangeVitalItemCountSkillCondition implements ISkillCondition { - public CanChangeVitalItemCountSkillCondition(StatsSet params) + public CanChangeVitalItemCountSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java index da553a6d9f..48e28e7af7 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanEnchantAttributeSkillCondition implements ISkillCondition { - public CanEnchantAttributeSkillCondition(StatsSet params) + public CanEnchantAttributeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java index c14f1ffe64..2908994776 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanMountForEventSkillCondition implements ISkillCondition { - public CanMountForEventSkillCondition(StatsSet params) + public CanMountForEventSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java index d07aa9a622..9dc5f99592 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShipInstance; @@ -31,7 +31,7 @@ public class CanRefuelAirshipSkillCondition implements ISkillCondition { private final int _amount; - public CanRefuelAirshipSkillCondition(StatsSet params) + public CanRefuelAirshipSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java index d451f3c997..67206b47bd 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanRestoreVitalPointSkillCondition implements ISkillCondition { - public CanRestoreVitalPointSkillCondition(StatsSet params) + public CanRestoreVitalPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java index 7e519025b0..49232af88f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CanSummonCubicSkillCondition implements ISkillCondition { - public CanSummonCubicSkillCondition(StatsSet params) + public CanSummonCubicSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java index 23cca508c1..6610f322f1 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class CanSummonMultiSkillCondition implements ISkillCondition { private final int _summonPoints; - public CanSummonMultiSkillCondition(StatsSet params) + public CanSummonMultiSkillCondition(StatSet params) { _summonPoints = params.getInt("summonPoints"); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java index 85419e1e5e..c38566dbdd 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.CharSummonTable; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; */ public class CanSummonPetSkillCondition implements ISkillCondition { - public CanSummonPetSkillCondition(StatsSet params) + public CanSummonPetSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java index ea41a2e22e..3655e158cb 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanSummonSiegeGolemSkillCondition implements ISkillCondition { - public CanSummonSiegeGolemSkillCondition(StatsSet params) + public CanSummonSiegeGolemSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java index 6248c5131f..4d59811c7b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanSummonSkillCondition implements ISkillCondition { - public CanSummonSkillCondition(StatsSet params) + public CanSummonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java index 309da529c9..bd8838d02f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanTransformInDominionSkillCondition implements ISkillCondition { - public CanTransformInDominionSkillCondition(StatsSet params) + public CanTransformInDominionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java index 81297944f1..2f4d780cab 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class CanTransformSkillCondition implements ISkillCondition // TODO: What to do with this? // private final int _transformId; - public CanTransformSkillCondition(StatsSet params) + public CanTransformSkillCondition(StatSet params) { // _transformId = params.getInt("transformId"); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java index 800d0375be..771873a553 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanUntransformSkillCondition implements ISkillCondition { - public CanUntransformSkillCondition(StatsSet params) + public CanUntransformSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java index e651b3b1d5..ffe2e4a026 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class CanUseInBattlefieldSkillCondition implements ISkillCondition { - public CanUseInBattlefieldSkillCondition(StatsSet params) + public CanUseInBattlefieldSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java index 5ff751abce..ba030b97a4 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanUseInDragonLairSkillCondition implements ISkillCondition { - public CanUseInDragonLairSkillCondition(StatsSet params) + public CanUseInDragonLairSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java index 4d914c28fe..8a0cb18ac7 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class CanUseSwoopCannonSkillCondition implements ISkillCondition { - public CanUseSwoopCannonSkillCondition(StatsSet params) + public CanUseSwoopCannonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java index 6a2d832a4c..e9996580fc 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanUseVitalityConsumeItemSkillCondition implements ISkillCondition { - public CanUseVitalityConsumeItemSkillCondition(StatsSet params) + public CanUseVitalityConsumeItemSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java index f694956e7e..48dafb46c3 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class CannotUseInTransformSkillCondition implements ISkillCondition { private final int _transformId; - public CannotUseInTransformSkillCondition(StatsSet params) + public CannotUseInTransformSkillCondition(StatSet params) { _transformId = params.getInt("transformId", -1); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java index 141c69322f..6591233504 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -32,7 +32,7 @@ public class CheckLevelSkillCondition implements ISkillCondition private final int _maxLevel; private final SkillConditionAffectType _affectType; - public CheckLevelSkillCondition(StatsSet params) + public CheckLevelSkillCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java index 15163a3373..d72f463c4e 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class CheckSexSkillCondition implements ISkillCondition { private final boolean _isFemale; - public CheckSexSkillCondition(StatsSet params) + public CheckSexSkillCondition(StatSet params) { _isFemale = params.getBoolean("isFemale"); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java index 8dee11ef9c..12e49c23a7 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConsumeBodySkillCondition implements ISkillCondition { - public ConsumeBodySkillCondition(StatsSet params) + public ConsumeBodySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java index c24da9ebcd..ba1b1cdd5f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class EnergySavedSkillCondition implements ISkillCondition { private final int _amount; - public EnergySavedSkillCondition(StatsSet params) + public EnergySavedSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 89d705e991..34f76973f0 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -35,7 +35,7 @@ public class EquipArmorSkillCondition implements ISkillCondition { private int _armorTypesMask = 0; - public EquipArmorSkillCondition(StatsSet params) + public EquipArmorSkillCondition(StatSet params) { final List armorTypes = params.getEnumList("armorType", ArmorType.class); if (armorTypes != null) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index e5f22008fa..708b4dd1d4 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class EquipShieldSkillCondition implements ISkillCondition { - public EquipShieldSkillCondition(StatsSet params) + public EquipShieldSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 4561945254..f733f81f62 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -33,7 +33,7 @@ public class EquipWeaponSkillCondition implements ISkillCondition { private int _weaponTypesMask = 0; - public EquipWeaponSkillCondition(StatsSet params) + public EquipWeaponSkillCondition(StatSet params) { final List weaponTypes = params.getEnumList("weaponType", WeaponType.class); if (weaponTypes != null) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java index 5f77215218..e36c06fa11 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class NotFearedSkillCondition implements ISkillCondition { - public NotFearedSkillCondition(StatsSet params) + public NotFearedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java index b9096cc1a9..b6e7bcd826 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class NotInUnderwaterSkillCondition implements ISkillCondition { - public NotInUnderwaterSkillCondition(StatsSet params) + public NotInUnderwaterSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index eee6ec73e9..18d8dc8a11 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -35,7 +35,7 @@ public class Op2hWeaponSkillCondition implements ISkillCondition { private final List _weaponTypes = new ArrayList<>(); - public Op2hWeaponSkillCondition(StatsSet params) + public Op2hWeaponSkillCondition(StatSet params) { final List weaponTypes = params.getList("weaponType", String.class); if (weaponTypes != null) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 3b91f36fe4..6223172dbc 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; - public OpAffectedBySkillSkillCondition(StatsSet params) + public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java index 2eb561291e..3818df4736 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAgathionEnergySkillCondition implements ISkillCondition { - public OpAgathionEnergySkillCondition(StatsSet params) + public OpAgathionEnergySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java index 76a7ebc5a8..ee2b415021 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.enums.SkillConditionAlignment; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -32,7 +32,7 @@ public class OpAlignmentSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final SkillConditionAlignment _alignment; - public OpAlignmentSkillCondition(StatsSet params) + public OpAlignmentSkillCondition(StatSet params) { _affectType = params.getEnum("affectType", SkillConditionAffectType.class); _alignment = params.getEnum("alignment", SkillConditionAlignment.class); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index 1c83d18f4e..bcc6715bb2 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -33,7 +33,7 @@ public class OpBlinkSkillCondition implements ISkillCondition private final int _angle; private final int _range; - public OpBlinkSkillCondition(StatsSet params) + public OpBlinkSkillCondition(StatSet params) { switch (params.getEnum("direction", Position.class)) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java index 5215f86ae6..fde0c7f0f8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpCallPcSkillCondition implements ISkillCondition { - public OpCallPcSkillCondition(StatsSet params) + public OpCallPcSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java index dddafec6f0..1de2a32550 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCanEscapeSkillCondition implements ISkillCondition { - public OpCanEscapeSkillCondition(StatsSet params) + public OpCanEscapeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java index 3f1685a1e0..a87fd8adb6 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCanNotUseAirshipSkillCondition implements ISkillCondition { - public OpCanNotUseAirshipSkillCondition(StatsSet params) + public OpCanNotUseAirshipSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java index 8eec19a568..ac7a81c015 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCannotUseTargetWithPrivateStoreSkillCondition implements ISkillCondition { - public OpCannotUseTargetWithPrivateStoreSkillCondition(StatsSet params) + public OpCannotUseTargetWithPrivateStoreSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 91de0adc8c..4030b79d00 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Weapon; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpChangeWeaponSkillCondition implements ISkillCondition { - public OpChangeWeaponSkillCondition(StatsSet params) + public OpChangeWeaponSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java index c2de03de1e..3e304e7d9d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.AbnormalType; @@ -34,7 +34,7 @@ public class OpCheckAbnormalSkillCondition implements ISkillCondition private final boolean _hasAbnormal; private final SkillConditionAffectType _affectType; - public OpCheckAbnormalSkillCondition(StatsSet params) + public OpCheckAbnormalSkillCondition(StatSet params) { _type = params.getEnum("type", AbnormalType.class); _level = params.getInt("level"); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java index 65084182b1..c70b58dc50 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCheckAccountTypeSkillCondition implements ISkillCondition { - public OpCheckAccountTypeSkillCondition(StatsSet params) + public OpCheckAccountTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java index 3d4f0a58a0..11eb804274 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpCheckCastRangeSkillCondition implements ISkillCondition { private final int _distance; - public OpCheckCastRangeSkillCondition(StatsSet params) + public OpCheckCastRangeSkillCondition(StatSet params) { _distance = params.getInt("distance"); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java index 7e2e391595..03af1ac63d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.ClassId; @@ -35,7 +35,7 @@ public class OpCheckClassListSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final boolean _isWithin; - public OpCheckClassListSkillCondition(StatsSet params) + public OpCheckClassListSkillCondition(StatSet params) { _classIds = params.getEnumList("classIds", ClassId.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java index 9f779f937a..9702804304 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.ClassId; @@ -33,7 +33,7 @@ public class OpCheckClassSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final boolean _isWithin; - public OpCheckClassSkillCondition(StatsSet params) + public OpCheckClassSkillCondition(StatSet params) { _classId = params.getEnum("classId", ClassId.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java index 3bf6b65dc8..ad997dced7 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckCrtEffectSkillCondition implements ISkillCondition { - public OpCheckCrtEffectSkillCondition(StatsSet params) + public OpCheckCrtEffectSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java index 61c3aa66a4..c0bb54afe0 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class OpCheckFlagSkillCondition implements ISkillCondition { - public OpCheckFlagSkillCondition(StatsSet params) + public OpCheckFlagSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java index 75af2ab89a..2e0c07d040 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckOnGoingEventCampaignSkillCondition implements ISkillCondition { - public OpCheckOnGoingEventCampaignSkillCondition(StatsSet params) + public OpCheckOnGoingEventCampaignSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java index c64f7c6722..f11569f43c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckPcbangPointSkillCondition implements ISkillCondition { - public OpCheckPcbangPointSkillCondition(StatsSet params) + public OpCheckPcbangPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java index 252519f7ff..997a4d0fec 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.data.xml.impl.ClanHallData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -35,7 +35,7 @@ public class OpCheckResidenceSkillCondition implements ISkillCondition private final List _residencesId; private final boolean _isWithin; - public OpCheckResidenceSkillCondition(StatsSet params) + public OpCheckResidenceSkillCondition(StatSet params) { _residencesId = params.getList("residencesId", Integer.class); _isWithin = params.getBoolean("isWithin"); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java index 6abeed7d35..3a1bcf424c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -34,7 +34,7 @@ public class OpCheckSkillListSkillCondition implements ISkillCondition private final List _skillIds; private final SkillConditionAffectType _affectType; - public OpCheckSkillListSkillCondition(StatsSet params) + public OpCheckSkillListSkillCondition(StatSet params) { _skillIds = params.getList("skillIds", Integer.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java index 984338b2c0..af563d983f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpCheckSkillSkillCondition implements ISkillCondition private final int _skillId; private final SkillConditionAffectType _affectType; - public OpCheckSkillSkillCondition(StatsSet params) + public OpCheckSkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java index ea882c3635..5d85a2dbdb 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionCompanionType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpCompanionSkillCondition implements ISkillCondition { private final SkillConditionCompanionType _type; - public OpCompanionSkillCondition(StatsSet params) + public OpCompanionSkillCondition(StatSet params) { _type = params.getEnum("type", SkillConditionCompanionType.class); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java index 069b9d1759..464853c00c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpEnchantRangeSkillCondition implements ISkillCondition { - public OpEnchantRangeSkillCondition(StatsSet params) + public OpEnchantRangeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java index 99f22bb16a..e12f3ae007 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class OpEncumberedSkillCondition implements ISkillCondition private final int _slotsPercent; private final int _weightPercent; - public OpEncumberedSkillCondition(StatsSet params) + public OpEncumberedSkillCondition(StatSet params) { _slotsPercent = params.getInt("slotsPercent"); _weightPercent = params.getInt("weightPercent"); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java index 187dfba744..49cf8e2cb8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpEnergyMaxSkillCondition implements ISkillCondition { private final int _amount; - public OpEnergyMaxSkillCondition(StatsSet params) + public OpEnergyMaxSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 75bdf465e0..82eb70b770 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class OpEquipItemSkillCondition implements ISkillCondition private final int _itemId; private final SkillConditionAffectType _affectType; - public OpEquipItemSkillCondition(StatsSet params) + public OpEquipItemSkillCondition(StatSet params) { _itemId = params.getInt("itemId"); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java index 2c4576c2fa..fa6e82082b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ public class OpExistNpcSkillCondition implements ISkillCondition private final int _range; private final boolean _isAround; - public OpExistNpcSkillCondition(StatsSet params) + public OpExistNpcSkillCondition(StatSet params) { _npcIds = params.getList("npcIds", Integer.class); _range = params.getInt("range"); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java index 27cc3e90a9..8299b40047 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingCastSkillCondition implements ISkillCondition { - public OpFishingCastSkillCondition(StatsSet params) + public OpFishingCastSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java index 84cc031a24..4b43eb834e 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingPumpingSkillCondition implements ISkillCondition { - public OpFishingPumpingSkillCondition(StatsSet params) + public OpFishingPumpingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java index 86aa667bee..a6a400f96f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingReelingSkillCondition implements ISkillCondition { - public OpFishingReelingSkillCondition(StatsSet params) + public OpFishingReelingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java index d22733df7e..50e6dafb82 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpHaveSummonSkillCondition implements ISkillCondition { - public OpHaveSummonSkillCondition(StatsSet params) + public OpHaveSummonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 2e854ca2b8..cceb4e937b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { private final int _npcId; - public OpHaveSummonedNpcSkillCondition(StatsSet params) + public OpHaveSummonedNpcSkillCondition(StatSet params) { _npcId = params.getInt("npcId"); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java index 16932ce531..374a75bfab 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.impl.ClanHallData; import org.l2jmobius.gameserver.enums.ResidenceType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -34,7 +34,7 @@ public class OpHomeSkillCondition implements ISkillCondition { private final ResidenceType _type; - public OpHomeSkillCondition(StatsSet params) + public OpHomeSkillCondition(StatSet params) { _type = params.getEnum("type", ResidenceType.class); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java index 9482a0bf55..62ad48bdcc 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpInSiegeTimeSkillCondition implements ISkillCondition { - public OpInSiegeTimeSkillCondition(StatsSet params) + public OpInSiegeTimeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java index 1bffdacd6c..f2fb298398 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -30,7 +30,7 @@ public class OpInstantzoneSkillCondition implements ISkillCondition { private final int _instanceId; - public OpInstantzoneSkillCondition(StatsSet params) + public OpInstantzoneSkillCondition(StatSet params) { _instanceId = params.getInt("instanceId"); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java index 76703cc53b..7418ef9b64 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpMainjobSkillCondition implements ISkillCondition { - public OpMainjobSkillCondition(StatsSet params) + public OpMainjobSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java index d4c9f1f331..3c81369bbb 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNeedAgathionSkillCondition implements ISkillCondition { - public OpNeedAgathionSkillCondition(StatsSet params) + public OpNeedAgathionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java index 96f6774f25..e7a477b0ee 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; @@ -34,7 +34,7 @@ public class OpNeedSummonOrPetSkillCondition implements ISkillCondition { private final List _npcIds = new ArrayList<>(); - public OpNeedSummonOrPetSkillCondition(StatsSet params) + public OpNeedSummonOrPetSkillCondition(StatSet params) { final List npcIds = params.getList("npcIds", String.class); if (npcIds != null) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java index 9701002065..ae1edfd719 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotCursedSkillCondition implements ISkillCondition { - public OpNotCursedSkillCondition(StatsSet params) + public OpNotCursedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInCeremonyOfChaosSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInCeremonyOfChaosSkillCondition.java index 9549fdc2ac..b5cefc61cc 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInCeremonyOfChaosSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInCeremonyOfChaosSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotInCeremonyOfChaosSkillCondition implements ISkillCondition { - public OpNotInCeremonyOfChaosSkillCondition(StatsSet params) + public OpNotInCeremonyOfChaosSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java index bf909425d8..1de79f388a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpNotInPeacezoneSkillCondition implements ISkillCondition { - public OpNotInPeacezoneSkillCondition(StatsSet params) + public OpNotInPeacezoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java index 0752ba4a6a..0d3e4cb4dd 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotInstantzoneSkillCondition implements ISkillCondition { - public OpNotInstantzoneSkillCondition(StatsSet params) + public OpNotInstantzoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java index 45891cd0ac..7ea02159ba 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotOlympiadSkillCondition implements ISkillCondition { - public OpNotOlympiadSkillCondition(StatsSet params) + public OpNotOlympiadSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java index 5c5d293ae8..2397a68e99 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpNotTerritorySkillCondition implements ISkillCondition { - public OpNotTerritorySkillCondition(StatsSet params) + public OpNotTerritorySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java index 874872bb2e..d9f8c1fa3b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpPeacezoneSkillCondition implements ISkillCondition { - public OpPeacezoneSkillCondition(StatsSet params) + public OpPeacezoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java index c20c4665bb..08d6bb095a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpPkcountSkillCondition implements ISkillCondition { private final SkillConditionAffectType _affectType; - public OpPkcountSkillCondition(StatsSet params) + public OpPkcountSkillCondition(StatSet params) { _affectType = params.getEnum("affectType", SkillConditionAffectType.class); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java index 879fc88c4c..d393c5ddc3 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -30,7 +30,7 @@ public class OpPledgeSkillCondition implements ISkillCondition { private final int _level; - public OpPledgeSkillCondition(StatsSet params) + public OpPledgeSkillCondition(StatSet params) { _level = params.getInt("level"); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java index 9adc89b98d..adf16f8feb 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpRestartPointSkillCondition implements ISkillCondition { - public OpRestartPointSkillCondition(StatsSet params) + public OpRestartPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java index bbd1d9d7d1..6874091ba2 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class OpResurrectionSkillCondition implements ISkillCondition { - public OpResurrectionSkillCondition(StatsSet params) + public OpResurrectionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java index 8bbf796ad2..566f935a50 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpSiegeHammerSkillCondition implements ISkillCondition { - public OpSiegeHammerSkillCondition(StatsSet params) + public OpSiegeHammerSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java index be3ad18e05..cbfc1a25b2 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition private final int _skillId; private final boolean _hasLearned; - public OpSkillAcquireSkillCondition(StatsSet params) + public OpSkillAcquireSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _hasLearned = params.getBoolean("hasLearned"); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java index c8789d28e4..a8382b83b3 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpSkillSkillCondition implements ISkillCondition private final int _skillLevel; private final boolean _hasLearned; - public OpSkillSkillCondition(StatsSet params) + public OpSkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _skillLevel = params.getInt("skillLevel"); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java index 5127071683..a3d188f3eb 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpSocialClassSkillCondition implements ISkillCondition { private final int _socialClass; - public OpSocialClassSkillCondition(StatsSet params) + public OpSocialClassSkillCondition(StatSet params) { _socialClass = params.getInt("socialClass"); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java index b9d37d18c0..c86984a218 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class OpSoulMaxSkillCondition implements ISkillCondition { - public OpSoulMaxSkillCondition(StatsSet params) + public OpSoulMaxSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java index 4780c13a58..0faa676bbe 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpSubjobSkillCondition implements ISkillCondition { - public OpSubjobSkillCondition(StatsSet params) + public OpSubjobSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java index 17a9a1a9e3..a14192847a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.concurrent.atomic.AtomicBoolean; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpSweeperSkillCondition implements ISkillCondition { - public OpSweeperSkillCondition(StatsSet params) + public OpSweeperSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java index b36585bf00..c4b3923e92 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTargetAllItemTypeSkillCondition implements ISkillCondition { - public OpTargetAllItemTypeSkillCondition(StatsSet params) + public OpTargetAllItemTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 6b85389d62..5492e96e1a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTargetArmorTypeSkillCondition implements ISkillCondition { - public OpTargetArmorTypeSkillCondition(StatsSet params) + public OpTargetArmorTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java index 0c0090fbc4..97e07a1822 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpTargetDoorSkillCondition implements ISkillCondition { private final List _doorIds; - public OpTargetDoorSkillCondition(StatsSet params) + public OpTargetDoorSkillCondition(StatSet params) { _doorIds = params.getList("doorIds", Integer.class); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java index 6fbc3cda10..eaabf4a73d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpTargetMyPledgeAcademySkillCondition implements ISkillCondition { - public OpTargetMyPledgeAcademySkillCondition(StatsSet params) + public OpTargetMyPledgeAcademySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java index d5820600dd..14a744613d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpTargetNpcSkillCondition implements ISkillCondition { private final List _npcId; - public OpTargetNpcSkillCondition(StatsSet params) + public OpTargetNpcSkillCondition(StatSet params) { _npcId = params.getList("npcIds", Integer.class); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java index 854225a75a..b0c5e50ae3 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpTargetPcSkillCondition implements ISkillCondition { - public OpTargetPcSkillCondition(StatsSet params) + public OpTargetPcSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index 7faecb2ffd..62fd4b365f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Weapon; @@ -34,7 +34,7 @@ public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition { private final List _weaponTypes = new ArrayList<>(); - public OpTargetWeaponAttackTypeSkillCondition(StatsSet params) + public OpTargetWeaponAttackTypeSkillCondition(StatSet params) { final List weaponTypes = params.getList("weaponType", String.class); if (weaponTypes != null) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java index 8451365885..e114c03412 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTerritorySkillCondition implements ISkillCondition { - public OpTerritorySkillCondition(StatsSet params) + public OpTerritorySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java index 13f287687e..fde1293086 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpUnlockSkillCondition implements ISkillCondition { - public OpUnlockSkillCondition(StatsSet params) + public OpUnlockSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java index 8cc76a34bb..46dea5bbcb 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpUseFirecrackerSkillCondition implements ISkillCondition { - public OpUseFirecrackerSkillCondition(StatsSet params) + public OpUseFirecrackerSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java index f3b54bbad7..651dade274 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpUsePraseedSkillCondition implements ISkillCondition { - public OpUsePraseedSkillCondition(StatsSet params) + public OpUsePraseedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java index 890b0fcd5f..dd57df0e13 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.MountType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpWyvernSkillCondition implements ISkillCondition { - public OpWyvernSkillCondition(StatsSet params) + public OpWyvernSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java index 8a4c974840..5ac80d3e62 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class PossessHolythingSkillCondition implements ISkillCondition { - public PossessHolythingSkillCondition(StatsSet params) + public PossessHolythingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java index 8b0fb55554..38b5644fb1 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class RemainCpPerSkillCondition implements ISkillCondition private final int _amount; private final SkillConditionPercentType _percentType; - public RemainCpPerSkillCondition(StatsSet params) + public RemainCpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java index 612367a233..1ad96100ad 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -33,7 +33,7 @@ public class RemainHpPerSkillCondition implements ISkillCondition private final SkillConditionPercentType _percentType; private final SkillConditionAffectType _affectType; - public RemainHpPerSkillCondition(StatsSet params) + public RemainHpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java index 5455c1587a..39085349d9 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class RemainMpPerSkillCondition implements ISkillCondition private final int _amount; private final SkillConditionPercentType _percentType; - public RemainMpPerSkillCondition(StatsSet params) + public RemainMpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java index 7de47f103f..6e9e5ad821 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class SoulSavedSkillCondition implements ISkillCondition { private final int _amount; - public SoulSavedSkillCondition(StatsSet params) + public SoulSavedSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java index 0b75a5a623..f4bdbaaecb 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class TargetItemCrystalTypeSkillCondition implements ISkillCondition { - public TargetItemCrystalTypeSkillCondition(StatsSet params) + public TargetItemCrystalTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java index 51502ff209..604a41f904 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.MentorManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMyMenteeSkillCondition implements ISkillCondition { - public TargetMyMenteeSkillCondition(StatsSet params) + public TargetMyMenteeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java index fc621365a9..4bfb496634 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class TargetMyPartySkillCondition implements ISkillCondition { private final boolean _includeMe; - public TargetMyPartySkillCondition(StatsSet params) + public TargetMyPartySkillCondition(StatSet params) { _includeMe = params.getBoolean("includeMe"); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java index 9ebec0e691..d44a1bc8a9 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMyPledgeSkillCondition implements ISkillCondition { - public TargetMyPledgeSkillCondition(StatsSet params) + public TargetMyPledgeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java index f4da8d6079..5045aa3848 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class TargetRaceSkillCondition implements ISkillCondition { private final Race _race; - public TargetRaceSkillCondition(StatsSet params) + public TargetRaceSkillCondition(StatSet params) { _race = params.getEnum("race", Race.class); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java index 55734b03bb..d1aac35879 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -350,7 +350,7 @@ public class ChamberOfDelusion extends AbstractInstance protected void changeRoom(Instance world) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); final List locations = world.getEnterLocations(); int newRoom = params.getInt("currentRoom", 0); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java index 95a96bb16e..bef23aa88c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java @@ -19,7 +19,7 @@ package instances.CrystalCaverns; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -64,12 +64,12 @@ public class CrystalCavernsCoralGarden extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (event) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java index d977f82481..5d6a8dda61 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java @@ -17,7 +17,7 @@ package instances.CrystalCaverns; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -90,13 +90,13 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); - final StatsSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); final int baseId = npcParams.getInt("base_id", -1); switch (event) @@ -156,7 +156,7 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (npc.getId()) { @@ -205,7 +205,7 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); final int baseId = npcParams.getInt("base_id", -1); switch (npc.getId()) @@ -365,7 +365,7 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance { case WATER_CANNON: { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); final int baseId = npcParams.getInt("base_id", -1); if (baseId != 1) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java index b9662a5d06..7624504082 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java @@ -19,7 +19,7 @@ package instances.CrystalCaverns; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -83,12 +83,12 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (event) { @@ -180,7 +180,7 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); switch (npc.getId()) { @@ -224,7 +224,7 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance final Instance instance = receiver.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = receiver.getParameters(); + final StatSet npcParams = receiver.getParameters(); if (eventName.equals(String.valueOf(24220005 + npcParams.getInt("Terri_ID", 0)))) { @@ -265,7 +265,7 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); final int killTarget = instance.getParameters().getInt("KILL_TARGET", 5); int currentKillCount = instance.getParameters().getInt("KILL_COUNT", 0); @@ -377,7 +377,7 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance if (isInInstance(instance) && creature.isPlayer()) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); switch (npc.getId()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java index 0d9724e766..1245a89ed0 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -404,7 +404,7 @@ public class DarkCloudMansion extends AbstractInstance { if (CommonUtil.contains(BELETH_SAMPLE, npc.getId())) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); if (!params.getBoolean("blocked", false)) { if (npc.isScriptValue(1)) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java index f8dec3de6e..31d966f9b2 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java @@ -18,7 +18,7 @@ package instances.FaeronTrainingGrounds1; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -273,7 +273,7 @@ public class FaeronTrainingGrounds1 extends AbstractInstance final Instance world = player.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); for (int i = 0; i < MOB_SPAWNS.length; i++) { if (params.getObject("Mob" + i, Npc.class) == null) @@ -295,7 +295,7 @@ public class FaeronTrainingGrounds1 extends AbstractInstance final Instance world = player.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); for (int i = 0; i < MOB_SPAWNS.length; i++) { final Npc mob = params.getObject("Mob" + i, Npc.class); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java index f3ae23d301..60e902fb43 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java @@ -18,7 +18,7 @@ package instances.FaeronTrainingGrounds2; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -270,7 +270,7 @@ public class FaeronTrainingGrounds2 extends AbstractInstance final Instance world = player.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); for (int i = 0; i < MOB_SPAWNS.length; i++) { if (params.getObject("Mob" + i, Npc.class) == null) @@ -292,7 +292,7 @@ public class FaeronTrainingGrounds2 extends AbstractInstance final Instance world = player.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); for (int i = 0; i < MOB_SPAWNS.length; i++) { final Npc mob = params.getObject("Mob" + i, Npc.class); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java index 20046a664b..54b93c8ccb 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -566,7 +566,7 @@ public class HarnakUndergroundRuins extends AbstractInstance } case 2: { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); final int waveNpc = params.getInt("waveNpcId"); if (world.getAliveNpcs(waveNpc).isEmpty()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaBoss.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaBoss.java index 181f892fbe..3ef76e5f72 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaBoss.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaBoss.java @@ -17,7 +17,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureAttacked; @@ -70,7 +70,7 @@ public class KartiaBoss extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SAY") && npc.isTargetable()) { @@ -107,7 +107,7 @@ public class KartiaBoss extends AbstractNpcAI public void spawnMinions(Npc npc) { - final StatsSet param = npc.getParameters(); + final StatSet param = npc.getParameters(); final int kartiaLevel = param.getInt("cartia_level", 0); final boolean isParty = param.getInt("party_type", 0) == 1; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java index bd312c7fe6..721a32deb0 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -97,12 +97,12 @@ public class KartiaHelperAdolph extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if ((instance != null) && event.equals("CHECK_ACTION")) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final PlayerInstance plr = npcVars.getObject("PLAYER_OBJECT", PlayerInstance.class); if (plr != null) { @@ -159,7 +159,7 @@ public class KartiaHelperAdolph extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder skill_01 = instParams.getSkillHolder("adolphHate"); final SkillHolder skill_02 = instParams.getSkillHolder("adolphPunish"); final SkillHolder skill_03 = instParams.getSkillHolder("adolphShield"); @@ -256,7 +256,7 @@ public class KartiaHelperAdolph extends AbstractNpcAI { npc.setTarget(event.getAttacker()); addAttackDesire(npc, (Creature) npc.getTarget()); - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder hateSkill = instParams.getSkillHolder("adolphHate"); if ((hateSkill != null) && SkillCaster.checkUseConditions(npc, hateSkill.getSkill())) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java index e9aada8d07..c87c49ae5b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java @@ -19,7 +19,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -92,7 +92,7 @@ public class KartiaHelperBarton extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if ((instance != null) && event.equals("CHECK_ACTION")) @@ -170,7 +170,7 @@ public class KartiaHelperBarton extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder skill01 = instParams.getSkillHolder("bartonInfinity"); final SkillHolder skill02 = instParams.getSkillHolder("bartonBerserker"); final SkillHolder skill03 = instParams.getSkillHolder("bartonHurricane"); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java index e383a62d49..01edde0bd4 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java @@ -26,7 +26,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -115,12 +115,12 @@ public class KartiaHelperElise extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if ((instance != null) && event.equals("CHECK_ACTION")) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final FriendlyNpcInstance adolph = npcVars.getObject("ADOLPH_OBJECT", FriendlyNpcInstance.class); if (!npc.isCastingNow()) { @@ -153,8 +153,8 @@ public class KartiaHelperElise extends AbstractNpcAI final Instance instance = npc.getInstanceWorld(); if (instance != null) { - final StatsSet npcVars = npc.getVariables(); - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet npcVars = npc.getVariables(); + final StatSet instParams = instance.getTemplateParameters(); if (!npc.isCastingNow()) { final PlayerInstance plr = npcVars.getObject("PLAYER_OBJECT", PlayerInstance.class); @@ -248,7 +248,7 @@ public class KartiaHelperElise extends AbstractNpcAI { if (creature.isPlayer() || (creature instanceof FriendlyNpcInstance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); if (creature.isPlayer()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperEliyah.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperEliyah.java index 244110429c..cb3013c46c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperEliyah.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperEliyah.java @@ -18,7 +18,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance; @@ -87,7 +87,7 @@ public class KartiaHelperEliyah extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if ((instance != null) && event.equals("CHECK_ACTION")) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java index 07fe730289..123414862a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java @@ -18,7 +18,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -96,7 +96,7 @@ public class KartiaHelperGuardian extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (instance == null) @@ -183,7 +183,7 @@ public class KartiaHelperGuardian extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder skill01 = instParams.getSkillHolder("guardianSpiritsBlow"); final SkillHolder skill02 = instParams.getSkillHolder("guardianSpiritsWrath"); final int numberOfActiveSkills = 2; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java index 1541261bac..45fdfece27 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java @@ -19,7 +19,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -93,7 +93,7 @@ public class KartiaHelperHayuk extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (instance == null) @@ -176,7 +176,7 @@ public class KartiaHelperHayuk extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder skill01 = instParams.getSkillHolder("hayukPinpointShot"); final SkillHolder skill02 = instParams.getSkillHolder("hayukRecoilShot"); final SkillHolder skill03 = instParams.getSkillHolder("hayukMultipleArrow"); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaSupportTroop.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaSupportTroop.java index bfdc9b4cd3..d17653b8e3 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaSupportTroop.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaSupportTroop.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -49,7 +49,7 @@ public class KartiaSupportTroop extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SAY") && !npc.isDead()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java index 0bf65e9c9b..01d0a1ab7a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -273,7 +273,7 @@ public class KartiasLabyrinth extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = (npc != null) ? npc.getInstanceWorld() : player.getInstanceWorld(); if (instance != null) @@ -363,7 +363,7 @@ public class KartiasLabyrinth extends AbstractInstance if (instance != null) { - final StatsSet param = instance.getParameters(); + final StatSet param = instance.getParameters(); if (param.getBoolean("BOSS_KILL_OPEN_DOOR", false) && CommonUtil.contains(MINI_BOSSES, npc.getId())) { instance.setParameter("BOSS_KILL_OPEN_DOOR", true); @@ -562,7 +562,7 @@ public class KartiasLabyrinth extends AbstractInstance private void manageProgressInInstance(Instance instance) { - final StatsSet param = instance.getParameters(); + final StatSet param = instance.getParameters(); final int room = param.getInt("ROOM", 1); final int stage = param.getInt("STAGE", 1); final int wave = param.getInt("WAVE", 1); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java index 5b0129dc4b..e3ab6bdbed 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -451,7 +451,7 @@ public class LabyrinthOfBelis extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (world != null) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java index f9c6c2b1af..7cd9254745 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -445,7 +445,7 @@ public class MemoryOfDisaster extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java index c5ebb7aa47..f1981550e1 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java @@ -19,7 +19,7 @@ package instances.MuseumDungeon; import java.util.List; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -161,7 +161,7 @@ public class MuseumDungeon extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); final Attackable toyron = (Attackable) instance.getNpc(TOYRON); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/Nursery/Nursery.java index 4e85e49c12..ff1ff2587e 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/Nursery/Nursery.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/Nursery/Nursery.java @@ -19,7 +19,7 @@ package instances.Nursery; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -80,12 +80,12 @@ public class Nursery extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int gameStage = npcVars.getInt("GAME_STAGE", 0); switch (event) @@ -142,7 +142,7 @@ public class Nursery extends AbstractInstance if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int gameStage = npcVars.getInt("GAME_STAGE", 0); switch (gameStage) @@ -200,7 +200,7 @@ public class Nursery extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int gameStage = npcVars.getInt("GAME_STAGE", 0); switch (event) @@ -281,7 +281,7 @@ public class Nursery extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int maguenStatus = npcVars.getInt("MAGUEN_STATUS", 0); switch (maguenStatus) @@ -407,8 +407,8 @@ public class Nursery extends AbstractInstance final Npc gameManager = instance.getNpc(TIE); if (gameManager != null) { - final StatsSet managerVars = gameManager.getVariables(); - final StatsSet npcVars = npc.getVariables(); + final StatSet managerVars = gameManager.getVariables(); + final StatSet npcVars = npc.getVariables(); final int gamePoints = managerVars.getInt("GAME_POINTS", 0); if (gamePoints > 0) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java index 501ea07ad2..1d546871e9 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java @@ -19,7 +19,7 @@ package instances.PailakaInjuredDragon; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -172,7 +172,7 @@ public class PailakaInjuredDragon extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (isInInstance(world)) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java index 8de90bca71..cd31666b75 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java @@ -19,7 +19,7 @@ package instances.PrisonOfDarkness; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -122,12 +122,12 @@ public class PrisonOfDarkness extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (event) { @@ -187,7 +187,7 @@ public class PrisonOfDarkness extends AbstractInstance if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (event) { @@ -327,7 +327,7 @@ public class PrisonOfDarkness extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (npc.getId()) { @@ -360,7 +360,7 @@ public class PrisonOfDarkness extends AbstractInstance if (isInInstance(instance) && (npc.getId() == EXIT_PORTAL)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (npcVars.getInt("PORTAL_STATE", 0)) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java index 415395c724..7d06cdeb54 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java @@ -18,7 +18,7 @@ package instances.TaintedDimension; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -97,7 +97,7 @@ public class TaintedDimension extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java index c8eda180d5..cfb333a649 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java @@ -18,7 +18,7 @@ package quests.Q10771_VolatilePower; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.quest.Quest; @@ -177,7 +177,7 @@ public class Q10771_VolatilePower extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java index 252229c5ba..7e7db63238 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java @@ -19,7 +19,7 @@ package quests.Q10772_ReportsFromCrumaTowerPart1; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -157,7 +157,7 @@ public class Q10772_ReportsFromCrumaTowerPart1 extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("DESPAWN_OWL") && (npc != null) && (npc.getId() == MAGIC_OWL)) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java index bfa9e949a7..17d390b01d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java @@ -19,7 +19,7 @@ package quests.Q10776_TheWrathOfTheGiants; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.quest.Quest; @@ -236,7 +236,7 @@ public class Q10776_TheWrathOfTheGiants extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java index 9f86ed0ad5..3effebfd33 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java @@ -19,7 +19,7 @@ package quests.Q10777_ReportsFromCrumaTowerPart2; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -159,7 +159,7 @@ public class Q10777_ReportsFromCrumaTowerPart2 extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if ((npc != null) && (npc.getId() == MAGIC_OWL) && event.equals("DESPAWN_OWL")) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java index 8322b9ae14..4e1b7e0133 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java @@ -17,7 +17,7 @@ package quests.Q10787_ASpyMission; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -154,7 +154,7 @@ public class Q10787_ASpyMission extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if ((npc != null) && (npc.getId() == SUSPICIOUS_BOX) && event.equals("DESPAWN")) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java index b1d0ec8553..7e9236b634 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.ActionDataHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -57,7 +57,7 @@ public class ActionData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "action", actionNode -> { - final ActionDataHolder holder = new ActionDataHolder(new StatsSet(parseAttributes(actionNode))); + final ActionDataHolder holder = new ActionDataHolder(new StatSet(parseAttributes(actionNode))); _actionData.put(holder.getId(), holder); })); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java index 36002572b0..f7762ab07b 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java @@ -32,7 +32,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.AdminCommandAccessRight; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -72,7 +72,7 @@ public class AdminData implements IXmlReader { NamedNodeMap attrs; Node attr; - StatsSet set; + StatSet set; AccessLevel level; AdminCommandAccessRight command; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -83,7 +83,7 @@ public class AdminData implements IXmlReader { if ("access".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -99,7 +99,7 @@ public class AdminData implements IXmlReader } else if ("admin".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java index b425296a19..6a14a867fc 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java @@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.alchemy.AlchemyCraftData; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -55,7 +55,7 @@ public class AlchemyData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node att; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -67,7 +67,7 @@ public class AlchemyData implements IXmlReader if ("skill".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index a5de47d07c..c31f2ea750 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; @@ -83,7 +83,7 @@ public class AppearanceItemData implements IXmlReader { if ("appearance_stone".equalsIgnoreCase(d.getNodeName())) { - final AppearanceStone stone = new AppearanceStone(new StatsSet(parseAttributes(d))); + final AppearanceStone stone = new AppearanceStone(new StatSet(parseAttributes(d))); for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) { switch (c.getNodeName()) @@ -120,7 +120,7 @@ public class AppearanceItemData implements IXmlReader } case "visual": { - stone.addVisualId(new AppearanceHolder(new StatsSet(parseAttributes(c)))); + stone.addVisualId(new AppearanceHolder(new StatSet(parseAttributes(c)))); } } } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java index 6c96d3874a..6eac3240e7 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -64,7 +64,7 @@ public class AttendanceRewardData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "item", rewardNode -> { - final StatsSet set = new StatsSet(parseAttributes(rewardNode)); + final StatSet set = new StatSet(parseAttributes(rewardNode)); final int itemId = set.getInt("id"); final int itemCount = set.getInt("count"); if (ItemTable.getInstance().getTemplate(itemId) == null) diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java index 891d19fcf2..3054b0e7ef 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.beautyshop.BeautyData; import org.l2jmobius.gameserver.model.beautyshop.BeautyItem; @@ -56,7 +56,7 @@ public class BeautyShopData implements IXmlReader public void parseDocument(Document doc, File f) { NamedNodeMap attrs; - StatsSet set; + StatSet set; Node att; Race race = null; Sex sex = null; @@ -92,7 +92,7 @@ public class BeautyShopData implements IXmlReader if ("hair".equalsIgnoreCase(a.getNodeName())) { attrs = a.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -105,7 +105,7 @@ public class BeautyShopData implements IXmlReader if ("color".equalsIgnoreCase(g.getNodeName())) { attrs = g.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -119,7 +119,7 @@ public class BeautyShopData implements IXmlReader else if ("face".equalsIgnoreCase(a.getNodeName())) { attrs = a.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java index 37e977c51e..530a5d975a 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java @@ -34,7 +34,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.entity.ClanHall; @@ -66,7 +66,7 @@ public class ClanHallData implements IXmlReader final List doors = new ArrayList<>(); final List npcs = new ArrayList<>(); final List teleports = new ArrayList<>(); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); for (Node listNode = doc.getFirstChild(); listNode != null; listNode = listNode.getNextSibling()) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ClanMasteryData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ClanMasteryData.java index fabd6f919e..36eaf42552 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ClanMasteryData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ClanMasteryData.java @@ -25,7 +25,7 @@ import java.util.logging.Logger; import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ClanMasteryHolder; import org.l2jmobius.gameserver.model.skills.Skill; @@ -57,7 +57,7 @@ public class ClanMasteryData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "clan", clanNode -> { - final StatsSet set = new StatsSet(parseAttributes(clanNode)); + final StatSet set = new StatSet(parseAttributes(clanNode)); final int id = set.getInt("mastery"); final int skill1Id = set.getInt("skill1Id"); final int skill1Level = set.getInt("skill1Level"); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ClanShopData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ClanShopData.java index 2ba5a1c504..092216b96d 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ClanShopData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ClanShopData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ClanShopProductHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -57,7 +57,7 @@ public class ClanShopData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "clan", productNode -> { - final StatsSet set = new StatsSet(parseAttributes(productNode)); + final StatSet set = new StatSet(parseAttributes(productNode)); final int clanLevel = set.getInt("level"); final int itemId = set.getInt("item"); final int count = set.getInt("count"); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java index ae608cefb6..f1a23734e0 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.combination.CombinationItem; import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; @@ -57,7 +57,7 @@ public class CombinationItemsData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "item", itemNode -> { - final CombinationItem item = new CombinationItem(new StatsSet(parseAttributes(itemNode))); + final CombinationItem item = new CombinationItem(new StatSet(parseAttributes(itemNode))); forEach(itemNode, "reward", rewardNode -> { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java index 038738b138..4af039b48d 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.CubicSkill; import org.l2jmobius.gameserver.model.cubic.ICubicConditionHolder; @@ -61,7 +61,7 @@ public class CubicData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - forEach(doc, "list", listNode -> forEach(listNode, "cubic", cubicNode -> parseTemplate(cubicNode, new CubicTemplate(new StatsSet(parseAttributes(cubicNode)))))); + forEach(doc, "list", listNode -> forEach(listNode, "cubic", cubicNode -> parseTemplate(cubicNode, new CubicTemplate(new StatSet(parseAttributes(cubicNode)))))); } /** @@ -137,7 +137,7 @@ public class CubicData implements IXmlReader { forEach(cubicNode, "skill", skillNode -> { - final CubicSkill skill = new CubicSkill(new StatsSet(parseAttributes(skillNode))); + final CubicSkill skill = new CubicSkill(new StatSet(parseAttributes(skillNode))); forEach(cubicNode, "conditions", conditionNode -> parseConditions(cubicNode, template, skill)); template.getSkills().add(skill); }); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java index 3d19bee079..ede9b72202 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -62,7 +62,7 @@ public class DailyMissionData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "reward", rewardNode -> { - final StatsSet set = new StatsSet(parseAttributes(rewardNode)); + final StatSet set = new StatSet(parseAttributes(rewardNode)); final List items = new ArrayList<>(1); forEach(rewardNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> @@ -80,14 +80,14 @@ public class DailyMissionData implements IXmlReader // Initial values in case handler doesn't exists set.set("handler", ""); - set.set("params", StatsSet.EMPTY_STATSET); + set.set("params", StatSet.EMPTY_STATSET); // Parse handler and parameters forEach(rewardNode, "handler", handlerNode -> { set.set("handler", parseString(handlerNode.getAttributes(), "name")); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); set.set("params", params); forEach(handlerNode, "param", paramNode -> params.set(parseString(paramNode.getAttributes(), "name"), paramNode.getTextContent())); }); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java index 835eab4fe9..53248de524 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java @@ -35,7 +35,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -51,7 +51,7 @@ public class DoorData implements IXmlReader // Info holders private final Map> _groups = new HashMap<>(); private final Map _doors = new HashMap<>(); - private final Map _templates = new HashMap<>(); + private final Map _templates = new HashMap<>(); private final Map> _regions = new HashMap<>(); protected DoorData() @@ -75,9 +75,9 @@ public class DoorData implements IXmlReader LOGGER.info(getClass().getSimpleName() + ": Loaded " + _doors.size() + " Door Templates for " + _regions.size() + " regions."); } - public StatsSet parseDoor(Node doorNode) + public StatSet parseDoor(Node doorNode) { - final StatsSet params = new StatsSet(parseAttributes(doorNode)); + final StatSet params = new StatSet(parseAttributes(doorNode)); params.set("baseHpMax", 1); // Avoid doors without HP value created dead due to default value 0 in CreatureTemplate forEach(doorNode, IXmlReader::isNode, innerDoorNode -> @@ -115,7 +115,7 @@ public class DoorData implements IXmlReader /** * @param set */ - private void applyCollisions(StatsSet set) + private void applyCollisions(StatSet set) { // Insert Collision data if (set.contains("nodeX_0") && set.contains("nodeY_0") && set.contains("nodeX_1") && set.contains("nodeY_1")) @@ -142,7 +142,7 @@ public class DoorData implements IXmlReader * @param set * @return */ - public DoorInstance spawnDoor(StatsSet set) + public DoorInstance spawnDoor(StatSet set) { // Create door template + door instance final DoorTemplate template = new DoorTemplate(set); @@ -183,7 +183,7 @@ public class DoorData implements IXmlReader return door; } - public StatsSet getDoorTemplate(int doorId) + public StatSet getDoorTemplate(int doorId) { return _templates.get(doorId); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java index eca42a9a34..637ef1e953 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -64,7 +64,7 @@ public class EnchantItemData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node att; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -76,7 +76,7 @@ public class EnchantItemData implements IXmlReader if ("enchant".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -107,7 +107,7 @@ public class EnchantItemData implements IXmlReader else if ("support".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java index 46701fd777..bb1e8026b7 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.SkillEnchantType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.EnchantSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -69,10 +69,10 @@ public class EnchantSkillGroupsData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "enchant", enchantNode -> { - final EnchantSkillHolder enchantSkillHolder = new EnchantSkillHolder(new StatsSet(parseAttributes(enchantNode))); + final EnchantSkillHolder enchantSkillHolder = new EnchantSkillHolder(new StatSet(parseAttributes(enchantNode))); forEach(enchantNode, "sps", spsNode -> forEach(spsNode, "sp", spNode -> enchantSkillHolder.addSp(parseEnum(spNode.getAttributes(), SkillEnchantType.class, "type"), parseInteger(spNode.getAttributes(), "amount")))); forEach(enchantNode, "chances", chancesNode -> forEach(chancesNode, "chance", chanceNode -> enchantSkillHolder.addChance(parseEnum(chanceNode.getAttributes(), SkillEnchantType.class, "type"), parseInteger(chanceNode.getAttributes(), "value")))); - forEach(enchantNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> enchantSkillHolder.addRequiredItem(parseEnum(itemNode.getAttributes(), SkillEnchantType.class, "type"), new ItemHolder(new StatsSet(parseAttributes(itemNode)))))); + forEach(enchantNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> enchantSkillHolder.addRequiredItem(parseEnum(itemNode.getAttributes(), SkillEnchantType.class, "type"), new ItemHolder(new StatSet(parseAttributes(itemNode)))))); _enchantSkillHolders.put(parseInteger(enchantNode.getAttributes(), "level"), enchantSkillHolder); })); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java index a8bb0397ac..037af7e1ae 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java @@ -34,7 +34,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.eventengine.AbstractEventManager; import org.l2jmobius.gameserver.model.eventengine.EventMethodNotification; import org.l2jmobius.gameserver.model.eventengine.EventScheduler; @@ -156,7 +156,7 @@ public class EventEngineData implements IXmlReader */ private void parseVariables(AbstractEventManager eventManager, Node innerNode) { - final StatsSet variables = new StatsSet(LinkedHashMap::new); + final StatSet variables = new StatSet(LinkedHashMap::new); for (Node variableNode = innerNode.getFirstChild(); variableNode != null; variableNode = variableNode.getNextSibling()) { if ("variable".equals(variableNode.getNodeName())) @@ -188,7 +188,7 @@ public class EventEngineData implements IXmlReader { if ("schedule".equals(scheduleNode.getNodeName())) { - final StatsSet params = new StatsSet(LinkedHashMap::new); + final StatSet params = new StatSet(LinkedHashMap::new); final NamedNodeMap attrs = scheduleNode.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -235,7 +235,7 @@ public class EventEngineData implements IXmlReader } else if ("conditionalSchedule".equals(scheduleNode.getNodeName())) { - final StatsSet params = new StatsSet(LinkedHashMap::new); + final StatSet params = new StatSet(LinkedHashMap::new); final NamedNodeMap attrs = scheduleNode.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -346,7 +346,7 @@ public class EventEngineData implements IXmlReader * @param variableNode */ @SuppressWarnings("unchecked") - private void parseListVariables(AbstractEventManager eventManager, StatsSet variables, Node variableNode) + private void parseListVariables(AbstractEventManager eventManager, StatSet variables, Node variableNode) { final String name = parseString(variableNode.getAttributes(), "name"); final String type = parseString(variableNode.getAttributes(), "type"); @@ -419,7 +419,7 @@ public class EventEngineData implements IXmlReader * @param variableNode */ @SuppressWarnings("unchecked") - private void parseMapVariables(AbstractEventManager eventManager, StatsSet variables, Node variableNode) + private void parseMapVariables(AbstractEventManager eventManager, StatSet variables, Node variableNode) { final String name = parseString(variableNode.getAttributes(), "name"); final String keyType = parseString(variableNode.getAttributes(), "keyType"); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java index db19c5fdff..0724877d9d 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.ConditionHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.ICondition; import org.l2jmobius.gameserver.model.holders.ExtendDropDataHolder; import org.l2jmobius.gameserver.model.holders.ExtendDropItemHolder; @@ -62,7 +62,7 @@ public class ExtendDropData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "drop", dropNode -> { - final StatsSet set = new StatsSet(parseAttributes(dropNode)); + final StatSet set = new StatSet(parseAttributes(dropNode)); final List items = new ArrayList<>(1); forEach(dropNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> @@ -80,8 +80,8 @@ public class ExtendDropData implements IXmlReader forEach(dropNode, "conditions", conditionsNode -> forEach(conditionsNode, "condition", conditionNode -> { final String conditionName = parseString(conditionNode.getAttributes(), "name"); - final StatsSet params = (StatsSet) parseValue(conditionNode); - final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); + final StatSet params = (StatSet) parseValue(conditionNode); + final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); if (conditionFunction != null) { conditions.add(conditionFunction.apply(params)); @@ -109,7 +109,7 @@ public class ExtendDropData implements IXmlReader private Object parseValue(Node node) { - StatsSet statsSet = null; + StatSet statSet = null; List list = null; Object text = null; for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) @@ -145,12 +145,12 @@ public class ExtendDropData implements IXmlReader final Object value = parseValue(node); if (value != null) { - if (statsSet == null) + if (statSet == null) { - statsSet = new StatsSet(); + statSet = new StatSet(); } - statsSet.set(nodeName, value); + statSet.set(nodeName, value); } } } @@ -161,9 +161,9 @@ public class ExtendDropData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", list); + statSet.set(".", list); } else { @@ -176,16 +176,16 @@ public class ExtendDropData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", text); + statSet.set(".", text); } else { return text; } } - return statsSet; + return statSet; } public ExtendDropDataHolder getExtendDropById(int id) diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java index 57a16d6390..608f4702b8 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.FakePlayerHolder; @@ -72,7 +72,7 @@ public class FakePlayerData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayer", fakePlayerNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerNode)); final int npcId = set.getInt("npcId"); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); final String name = template.getName(); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java index 18cc499b71..a5ade27c03 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.FenceState; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldRegion; import org.l2jmobius.gameserver.model.actor.instance.FenceInstance; @@ -79,7 +79,7 @@ public class FenceData implements IXmlReader private void spawnFence(Node fenceNode) { - final StatsSet set = new StatsSet(parseAttributes(fenceNode)); + final StatSet set = new StatSet(parseAttributes(fenceNode)); spawnFence(set.getInt("x"), set.getInt("y"), set.getInt("z"), set.getString("name"), set.getInt("width"), set.getInt("length"), set.getInt("height"), 0, set.getEnum("state", FenceState.class, FenceState.CLOSED)); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java index 67dd4e396b..02efb756f2 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.Henna; import org.l2jmobius.gameserver.model.skills.Skill; @@ -86,7 +86,7 @@ public class HennaData implements IXmlReader */ private void parseHenna(Node d) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final List wearClassIds = new ArrayList<>(); final List skills = new ArrayList<>(); NamedNodeMap attrs = d.getAttributes(); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java index 03ad8ab79e..d81e85948d 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; @@ -93,7 +93,7 @@ public class InitialEquipmentData implements IXmlReader { if ("item".equalsIgnoreCase(c.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java index 72080aa4ac..54b1909d60 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemPointHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; @@ -55,17 +55,17 @@ public class LuckyGameData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "luckygame", rewardNode -> { - final LuckyGameDataHolder holder = new LuckyGameDataHolder(new StatsSet(parseAttributes(rewardNode))); + final LuckyGameDataHolder holder = new LuckyGameDataHolder(new StatSet(parseAttributes(rewardNode))); forEach(rewardNode, "common_reward", commonRewardNode -> forEach(commonRewardNode, "item", itemNode -> { - final StatsSet stats = new StatsSet(parseAttributes(itemNode)); + final StatSet stats = new StatSet(parseAttributes(itemNode)); holder.addCommonReward(new ItemChanceHolder(stats.getInt("id"), stats.getDouble("chance"), stats.getLong("count"))); })); forEach(rewardNode, "unique_reward", uniqueRewardNode -> forEach(uniqueRewardNode, "item", itemNode -> { - holder.addUniqueReward(new ItemPointHolder(new StatsSet(parseAttributes(itemNode)))); + holder.addUniqueReward(new ItemPointHolder(new StatSet(parseAttributes(itemNode)))); })); forEach(rewardNode, "modify_reward", uniqueRewardNode -> @@ -74,7 +74,7 @@ public class LuckyGameData implements IXmlReader holder.setMaxModifyRewardGame(parseInteger(uniqueRewardNode.getAttributes(), "max_game")); forEach(uniqueRewardNode, "item", itemNode -> { - final StatsSet stats = new StatsSet(parseAttributes(itemNode)); + final StatSet stats = new StatSet(parseAttributes(itemNode)); holder.addModifyReward(new ItemChanceHolder(stats.getInt("id"), stats.getDouble("chance"), stats.getLong("count"))); }); }); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java index 75bb48ed37..190653cdec 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java @@ -35,7 +35,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.SpecialItemType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; @@ -90,7 +90,7 @@ public class MultisellData implements IXmlReader { forEach(doc, "list", listNode -> { - final StatsSet set = new StatsSet(parseAttributes(listNode)); + final StatSet set = new StatSet(parseAttributes(listNode)); final int listId = Integer.parseInt(f.getName().substring(0, f.getName().length() - 4)); final List entries = new ArrayList<>(listNode.getChildNodes().getLength()); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java index 12ad0f9f0e..de0567af09 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.enums.AISkillScope; import org.l2jmobius.gameserver.enums.DropType; import org.l2jmobius.gameserver.enums.MpRewardAffectType; import org.l2jmobius.gameserver.enums.MpRewardType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.DropHolder; @@ -95,7 +95,7 @@ public class NpcData implements IXmlReader if ("npc".equalsIgnoreCase(listNode.getNodeName())) { NamedNodeMap attrs = listNode.getAttributes(); - final StatsSet set = new StatsSet(new HashMap<>()); + final StatSet set = new StatSet(new HashMap<>()); final int npcId = parseInteger(attrs, "id"); Map parameters = null; Map skills = null; @@ -511,11 +511,11 @@ public class NpcData implements IXmlReader if (parameters != null) { // Using unmodifiable map parameters of template are not meant to be changed at runtime. - template.setParameters(new StatsSet(Collections.unmodifiableMap(parameters))); + template.setParameters(new StatSet(Collections.unmodifiableMap(parameters))); } else { - template.setParameters(StatsSet.EMPTY_STATSET); + template.setParameters(StatSet.EMPTY_STATSET); } if (skills != null) diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java index 3712cca6af..373f87ecfc 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -79,7 +79,7 @@ public class NpcNameLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); NPC_NAME_LOCALISATIONS.get(_lang).put(set.getInt("id"), new String[] { set.getString("name"), diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 55dcd539aa..36c5897ecd 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.EffectHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; @@ -71,7 +71,7 @@ public class OptionData implements IXmlReader forEach(innerNode, "effect", effectNode -> { final String name = parseString(effectNode.getAttributes(), "name"); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); forEach(effectNode, IXmlReader::isNode, paramNode -> params.set(paramNode.getNodeName(), SkillData.getInstance().parseValue(paramNode, true, false, Collections.emptyMap()))); option.addEffect(EffectHandler.getInstance().getHandlerFactory(name).apply(params)); }); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java index b1bb74baf6..c893725bc3 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.PetLevelData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * This class parse and hold all pet parameters.
@@ -116,7 +116,7 @@ public class PetDataTable implements IXmlReader if (s.getNodeName().equals("stat")) { final int level = Integer.parseInt(s.getAttributes().getNamedItem("level").getNodeValue()); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (Node bean = s.getFirstChild(); bean != null; bean = bean.getNextSibling()) { if (bean.getNodeName().equals("set")) diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java index ab1cb3b257..b646782547 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.base.ClassId; @@ -83,7 +83,7 @@ public class PlayerTemplateData implements IXmlReader } else if ("staticData".equalsIgnoreCase(d.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.set("classId", classId); final List creationPoints = new ArrayList<>(); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java index 34a04edd9b..35b879e73f 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; @@ -83,7 +83,7 @@ public class PrimeShopData implements IXmlReader { NamedNodeMap attrs = d.getAttributes(); Node att; - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java index 0158b153c6..9aa87a1f9f 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java @@ -31,7 +31,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.StatusUpdateType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.RecipeHolder; @@ -61,7 +61,7 @@ public class RecipeData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node att; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -73,7 +73,7 @@ public class RecipeData implements IXmlReader if ("recipe".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java index 796f5ae085..9a8397e085 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java @@ -29,7 +29,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate; /** @@ -60,7 +60,7 @@ public class ResidenceFunctionsData implements IXmlReader forEach(doc, "list", list -> forEach(list, "function", func -> { final NamedNodeMap attrs = func.getAttributes(); - final StatsSet set = new StatsSet(HashMap::new); + final StatSet set = new StatSet(HashMap::new); for (int i = 0; i < attrs.getLength(); i++) { final Node node = attrs.item(i); @@ -69,7 +69,7 @@ public class ResidenceFunctionsData implements IXmlReader forEach(func, "function", levelNode -> { final NamedNodeMap levelAttrs = levelNode.getAttributes(); - final StatsSet levelSet = new StatsSet(HashMap::new); + final StatSet levelSet = new StatSet(HashMap::new); levelSet.merge(set); for (int i = 0; i < levelAttrs.getLength(); i++) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java index 053d9089ce..d6b28a5962 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; /** @@ -82,7 +82,7 @@ public class SendMessageLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); SEND_MESSAGE_LOCALISATIONS.get(_lang).put(set.getString("message").split(SPLIT_STRING), set.getString("translation").split(SPLIT_STRING)); })); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java index e473030c56..c3eda1f3b8 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.actor.instance.ShuttleInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; @@ -72,7 +72,7 @@ public class ShuttleData implements IXmlReader public void parseDocument(Document doc, File f) { NamedNodeMap attrs; - StatsSet set; + StatSet set; Node att; ShuttleDataHolder data; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -84,7 +84,7 @@ public class ShuttleData implements IXmlReader if ("shuttle".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -164,7 +164,7 @@ public class ShuttleData implements IXmlReader { for (ShuttleDataHolder data : _shuttles.values()) { - final ShuttleInstance shuttle = new ShuttleInstance(new CreatureTemplate(new StatsSet())); + final ShuttleInstance shuttle = new ShuttleInstance(new CreatureTemplate(new StatSet())); shuttle.setData(data); shuttle.setHeading(data.getLocation().getHeading()); shuttle.setLocationInvisible(data.getLocation()); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java index 9db0b5f64b..ba000649f2 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.SiegeScheduleDate; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.util.Util; /** @@ -54,7 +54,7 @@ public class SiegeScheduleData implements IXmlReader LOGGER.info(getClass().getSimpleName() + ": Loaded " + _scheduleData.size() + " siege schedulers."); if (_scheduleData.isEmpty()) { - _scheduleData.add(new SiegeScheduleDate(new StatsSet())); + _scheduleData.add(new SiegeScheduleDate(new StatSet())); LOGGER.info(getClass().getSimpleName() + ": Emergency loaded " + _scheduleData.size() + " default siege schedulers."); } } @@ -72,7 +72,7 @@ public class SiegeScheduleData implements IXmlReader { case "schedule": { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final NamedNodeMap attrs = cd.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java index cc019c4dbb..2592b3ed97 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java @@ -40,7 +40,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.EffectHandler; import org.l2jmobius.gameserver.handler.SkillConditionHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.EffectScope; @@ -67,9 +67,9 @@ public class SkillData implements IXmlReader private final Integer _toLevel; private final Integer _fromSubLevel; private final Integer _toSubLevel; - private final Map> _info; + private final Map> _info; - public NamedParamInfo(String name, Integer fromLevel, Integer toLevel, Integer fromSubLevel, Integer toSubLevel, Map> info) + public NamedParamInfo(String name, Integer fromLevel, Integer toLevel, Integer fromSubLevel, Integer toSubLevel, Map> info) { _name = name; _fromLevel = fromLevel; @@ -104,7 +104,7 @@ public class SkillData implements IXmlReader return _toSubLevel; } - public Map> getInfo() + public Map> getInfo() { return _info; } @@ -241,8 +241,8 @@ public class SkillData implements IXmlReader { NamedNodeMap attributes = listNode.getAttributes(); final Map> levels = new HashMap<>(); - final Map> skillInfo = new HashMap<>(); - final StatsSet generalSkillInfo = skillInfo.computeIfAbsent(-1, k -> new HashMap<>()).computeIfAbsent(-1, k -> new StatsSet()); + final Map> skillInfo = new HashMap<>(); + final StatSet generalSkillInfo = skillInfo.computeIfAbsent(-1, k -> new HashMap<>()).computeIfAbsent(-1, k -> new StatSet()); parseAttributes(attributes, "", generalSkillInfo); @@ -321,7 +321,7 @@ public class SkillData implements IXmlReader { return; } - subLevelMap.forEach((subLevel, statsSet) -> + subLevelMap.forEach((subLevel, statSet) -> { if (subLevel == -1) { @@ -339,7 +339,7 @@ public class SkillData implements IXmlReader { return; } - subLevelMap.forEach((subLevel, statsSet) -> + subLevelMap.forEach((subLevel, statSet) -> { if (subLevel == -1) { @@ -371,31 +371,31 @@ public class SkillData implements IXmlReader levels.forEach((level, subLevels) -> subLevels.forEach(subLevel -> { - final StatsSet statsSet = Optional.ofNullable(skillInfo.getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatsSet::new); - skillInfo.getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(statsSet.getSet()::putIfAbsent); - skillInfo.getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(statsSet.getSet()::putIfAbsent); - statsSet.set(".level", level); - statsSet.set(".subLevel", subLevel); - final Skill skill = new Skill(statsSet); + final StatSet statSet = Optional.ofNullable(skillInfo.getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatSet::new); + skillInfo.getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(statSet.getSet()::putIfAbsent); + skillInfo.getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(statSet.getSet()::putIfAbsent); + statSet.set(".level", level); + statSet.set(".subLevel", subLevel); + final Skill skill = new Skill(statSet); forEachNamedParamInfoParam(effectParamInfo, level, subLevel, ((effectScope, params) -> { final String effectName = params.getString(".name"); params.remove(".name"); try { - final Function effectFunction = EffectHandler.getInstance().getHandlerFactory(effectName); + final Function effectFunction = EffectHandler.getInstance().getHandlerFactory(effectName); if (effectFunction != null) { skill.addEffect(effectScope, effectFunction.apply(params)); } else { - LOGGER.warning(getClass().getSimpleName() + ": Missing effect for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]"); + LOGGER.warning(getClass().getSimpleName() + ": Missing effect for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]"); } } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading effect for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading effect for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]", e); } })); @@ -405,19 +405,19 @@ public class SkillData implements IXmlReader params.remove(".name"); try { - final Function conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName); + final Function conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName); if (conditionFunction != null) { skill.addCondition(skillConditionScope, conditionFunction.apply(params)); } else { - LOGGER.warning(getClass().getSimpleName() + ": Missing condition for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + skillConditionScope + "] Effect Name[" + conditionName + "]"); + LOGGER.warning(getClass().getSimpleName() + ": Missing condition for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + skillConditionScope + "] Effect Name[" + conditionName + "]"); } } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading condition for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Condition Scope[" + skillConditionScope + "] Condition Name[" + conditionName + "]", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading condition for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Condition Scope[" + skillConditionScope + "] Condition Name[" + conditionName + "]", e); } })); @@ -434,16 +434,16 @@ public class SkillData implements IXmlReader } } - private void forEachNamedParamInfoParam(Map> paramInfo, int level, int subLevel, BiConsumer consumer) + private void forEachNamedParamInfoParam(Map> paramInfo, int level, int subLevel, BiConsumer consumer) { paramInfo.forEach((scope, namedParamInfos) -> namedParamInfos.forEach(namedParamInfo -> { if ((((namedParamInfo.getFromLevel() == null) && (namedParamInfo.getToLevel() == null)) || ((namedParamInfo.getFromLevel() <= level) && (namedParamInfo.getToLevel() >= level))) // && (((namedParamInfo.getFromSubLevel() == null) && (namedParamInfo.getToSubLevel() == null)) || ((namedParamInfo.getFromSubLevel() <= subLevel) && (namedParamInfo.getToSubLevel() >= subLevel)))) { - final StatsSet params = Optional.ofNullable(namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatsSet::new); - namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); - namedParamInfo.getInfo().getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); + final StatSet params = Optional.ofNullable(namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatSet::new); + namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); + namedParamInfo.getInfo().getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); params.set(".name", namedParamInfo.getName()); consumer.accept(scope, params); } @@ -460,7 +460,7 @@ public class SkillData implements IXmlReader final Integer subLevel = parseInteger(attributes, "subLevel"); final Integer fromSubLevel = parseInteger(attributes, "fromSubLevel", subLevel); final Integer toSubLevel = parseInteger(attributes, "toSubLevel", subLevel); - final Map> info = new HashMap<>(); + final Map> info = new HashMap<>(); for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) { if (!node.getNodeName().equals("#text")) @@ -471,7 +471,7 @@ public class SkillData implements IXmlReader return new NamedParamInfo(name, fromLevel, toLevel, fromSubLevel, toSubLevel, info); } - private void parseInfo(Node node, Map>> variableValues, Map> info) + private void parseInfo(Node node, Map>> variableValues, Map> info) { Map> values = parseValues(node); final Object generalValue = values.getOrDefault(-1, Collections.emptyMap()).get(-1); @@ -492,7 +492,7 @@ public class SkillData implements IXmlReader } } - values.forEach((level, subLevelMap) -> subLevelMap.forEach((subLevel, value) -> info.computeIfAbsent(level, k -> new HashMap<>()).computeIfAbsent(subLevel, k -> new StatsSet()).set(node.getNodeName(), value))); + values.forEach((level, subLevelMap) -> subLevelMap.forEach((subLevel, value) -> info.computeIfAbsent(level, k -> new HashMap<>()).computeIfAbsent(subLevel, k -> new StatSet()).set(node.getNodeName(), value))); } private Map> parseValues(Node node) @@ -535,7 +535,7 @@ public class SkillData implements IXmlReader variables.put("index", (i - fromLevel) + 1d); variables.put("subIndex", (j - fromSubLevel) + 1d); final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1); - if ((base != null) && !(base instanceof StatsSet)) + if ((base != null) && !(base instanceof StatSet)) { variables.put("base", Double.parseDouble(String.valueOf(base))); } @@ -555,13 +555,13 @@ public class SkillData implements IXmlReader Object parseValue(Node node, boolean blockValue, boolean parseAttributes, Map variables) { - StatsSet statsSet = null; + StatSet statSet = null; List list = null; Object text = null; if (parseAttributes && (!node.getNodeName().equals("value") || !blockValue) && (node.getAttributes().getLength() > 0)) { - statsSet = new StatsSet(); - parseAttributes(node.getAttributes(), "", statsSet, variables); + statSet = new StatSet(); + parseAttributes(node.getAttributes(), "", statSet, variables); } for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) { @@ -604,12 +604,12 @@ public class SkillData implements IXmlReader final Object value = parseValue(node, false, true, variables); if (value != null) { - if (statsSet == null) + if (statSet == null) { - statsSet = new StatsSet(); + statSet = new StatSet(); } - statsSet.set(nodeName, value); + statSet.set(nodeName, value); } } } @@ -620,9 +620,9 @@ public class SkillData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", list); + statSet.set(".", list); } else { @@ -635,30 +635,30 @@ public class SkillData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", text); + statSet.set(".", text); } else { return text; } } - return statsSet; + return statSet; } - private void parseAttributes(NamedNodeMap attributes, String prefix, StatsSet statsSet, Map variables) + private void parseAttributes(NamedNodeMap attributes, String prefix, StatSet statSet, Map variables) { for (int i = 0; i < attributes.getLength(); i++) { final Node attributeNode = attributes.item(i); - statsSet.set(prefix + "." + attributeNode.getNodeName(), parseNodeValue(attributeNode.getNodeValue(), variables)); + statSet.set(prefix + "." + attributeNode.getNodeName(), parseNodeValue(attributeNode.getNodeValue(), variables)); } } - private void parseAttributes(NamedNodeMap attributes, String prefix, StatsSet statsSet) + private void parseAttributes(NamedNodeMap attributes, String prefix, StatSet statSet) { - parseAttributes(attributes, prefix, statsSet, Collections.emptyMap()); + parseAttributes(attributes, prefix, statSet, Collections.emptyMap()); } private Object parseNodeValue(String value, Map variables) diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java index f1fc07cea5..b85011b133 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.SubclassType; import org.l2jmobius.gameserver.model.SkillLearn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.base.ClassId; @@ -229,7 +229,7 @@ public class SkillTreesData implements IXmlReader { if ("skill".equalsIgnoreCase(c.getNodeName())) { - final StatsSet learnSkillSet = new StatsSet(); + final StatSet learnSkillSet = new StatSet(); attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java index 87915d89eb..78c22d1e7d 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java @@ -36,7 +36,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.ChanceLocation; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.MinionHolder; import org.l2jmobius.gameserver.model.interfaces.IParameterized; @@ -169,7 +169,7 @@ public class SpawnsData implements IXmlReader public void parseSpawn(Node spawnsNode, File file, Collection spawns) { - final SpawnTemplate spawnTemplate = new SpawnTemplate(new StatsSet(parseAttributes(spawnsNode)), file); + final SpawnTemplate spawnTemplate = new SpawnTemplate(new StatSet(parseAttributes(spawnsNode)), file); SpawnGroup defaultGroup = null; for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling()) { @@ -185,7 +185,7 @@ public class SpawnsData implements IXmlReader { if (defaultGroup == null) { - defaultGroup = new SpawnGroup(StatsSet.EMPTY_STATSET); + defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET); } parseNpc(innerNode, spawnTemplate, defaultGroup); } @@ -244,7 +244,7 @@ public class SpawnsData implements IXmlReader private void parseGroup(Node n, SpawnTemplate spawnTemplate) { - final SpawnGroup group = new SpawnGroup(new StatsSet(parseAttributes(n))); + final SpawnGroup group = new SpawnGroup(new StatSet(parseAttributes(n))); forEach(n, IXmlReader::isNode, npcNode -> { switch (npcNode.getNodeName()) @@ -271,7 +271,7 @@ public class SpawnsData implements IXmlReader */ private void parseNpc(Node n, SpawnTemplate spawnTemplate, SpawnGroup group) { - final NpcSpawnTemplate npcTemplate = new NpcSpawnTemplate(spawnTemplate, group, new StatsSet(parseAttributes(n))); + final NpcSpawnTemplate npcTemplate = new NpcSpawnTemplate(spawnTemplate, group, new StatSet(parseAttributes(n))); final NpcTemplate template = NpcData.getInstance().getTemplate(npcTemplate.getId()); if (template == null) { @@ -332,10 +332,10 @@ public class SpawnsData implements IXmlReader * @param n * @param npcTemplate */ - private void parseParameters(Node n, IParameterized npcTemplate) + private void parseParameters(Node n, IParameterized npcTemplate) { final Map params = parseParameters(n); - npcTemplate.setParameters(!params.isEmpty() ? new StatsSet(Collections.unmodifiableMap(params)) : StatsSet.EMPTY_STATSET); + npcTemplate.setParameters(!params.isEmpty() ? new StatSet(Collections.unmodifiableMap(params)) : StatSet.EMPTY_STATSET); } /** @@ -344,7 +344,7 @@ public class SpawnsData implements IXmlReader */ private void parseMinions(Node n, NpcSpawnTemplate npcTemplate) { - forEach(n, "minion", minionNode -> npcTemplate.addMinion(new MinionHolder(new StatsSet(parseAttributes(minionNode))))); + forEach(n, "minion", minionNode -> npcTemplate.addMinion(new MinionHolder(new StatSet(parseAttributes(minionNode))))); } /** diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java index 98d333446c..ef93935404 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; @@ -69,7 +69,7 @@ public class StaticObjectData implements IXmlReader if ("object".equalsIgnoreCase(d.getNodeName())) { final NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -86,9 +86,9 @@ public class StaticObjectData implements IXmlReader * Initialize an static object based on the stats set and add it to the map. * @param set the stats set to add. */ - private void addObject(StatsSet set) + private void addObject(StatSet set) { - final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatsSet()), set.getInt("id")); + final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatSet()), set.getInt("id")); obj.setType(set.getInt("type", 0)); obj.setName(set.getString("name")); obj.setMap(set.getString("texture", "none"), set.getInt("map_x", 0), set.getInt("map_y", 0)); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java index 7c8c9a538d..487bae9dea 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.TeleportType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.teleporter.TeleportHolder; /** @@ -74,7 +74,7 @@ public class TeleportersData implements IXmlReader final String name = parseString(nodeAttrs, "name", type.name()); // Parse locations final TeleportHolder holder = new TeleportHolder(name, type); - forEach(node, "location", location -> holder.registerLocation(new StatsSet(parseAttributes(location)))); + forEach(node, "location", location -> holder.registerLocation(new StatSet(parseAttributes(location)))); // Register holder if (teleList.putIfAbsent(name, holder) != null) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java index b6b3bf2e90..c2f5f94adb 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java @@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.transform.Transform; import org.l2jmobius.gameserver.model.actor.transform.TransformLevelData; import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate; @@ -70,7 +70,7 @@ public class TransformData implements IXmlReader if ("transform".equalsIgnoreCase(d.getNodeName())) { NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -192,7 +192,7 @@ public class TransformData implements IXmlReader transform.setTemplate(isMale, templateData); } - final StatsSet levelsSet = new StatsSet(); + final StatSet levelsSet = new StatSet(); for (Node s = z.getFirstChild(); s != null; s = s.getNextSibling()) { if ("level".equals(s.getNodeName())) diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/engines/DocumentBase.java index 376aeccaa5..126f472492 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/engines/DocumentBase.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/engines/DocumentBase.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.PlayerState; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionCategoryType; @@ -177,7 +177,7 @@ public abstract class DocumentBase protected abstract void parseDocument(Document doc); - protected abstract StatsSet getStatsSet(); + protected abstract StatSet getStatSet(); protected abstract String getTableValue(String name); @@ -1238,7 +1238,7 @@ public abstract class DocumentBase setTable(name, array.toArray(new String[array.size()])); } - protected void parseBeanSet(Node n, StatsSet set, Integer level) + protected void parseBeanSet(Node n, StatSet set, Integer level) { final String name = n.getAttributes().getNamedItem("name").getNodeValue().trim(); final String value = n.getAttributes().getNamedItem("val").getNodeValue().trim(); @@ -1253,7 +1253,7 @@ public abstract class DocumentBase } } - protected void setExtractableSkillData(StatsSet set, String value) + protected void setExtractableSkillData(StatSet set, String value) { set.set("capsuled_items_skill", value); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java index e8c77b206e..46f8f9be1f 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java @@ -21,7 +21,7 @@ import java.io.File; import org.w3c.dom.Document; import org.w3c.dom.Node; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; /** @@ -41,7 +41,7 @@ public class DocumentBaseGeneral extends DocumentBase } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return null; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java index 3ea7f41bb6..419552cf68 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.engines.DocumentBase; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -57,7 +57,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return _currentItem.set; } @@ -111,7 +111,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader _currentItem.id = itemId; _currentItem.name = itemName; _currentItem.type = className; - _currentItem.set = new StatsSet(); + _currentItem.set = new StatSet(); _currentItem.set.set("item_id", itemId); _currentItem.set.set("name", itemName); _currentItem.set.set("additionalName", additionalName); @@ -218,7 +218,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatsSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (Item) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java index 56e5b21a9f..967c1fc34d 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.engines.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; public class ItemDataHolder @@ -24,7 +24,7 @@ public class ItemDataHolder int id; String type; String name; - StatsSet set; + StatSet set; int currentLevel; Item item; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/handler/ConditionHandler.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/handler/ConditionHandler.java index 47f24d690d..b53f170fb3 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/handler/ConditionHandler.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/handler/ConditionHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.ICondition; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class ConditionHandler { - private final Map> _conditionHandlerFactories = new HashMap<>(); + private final Map> _conditionHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _conditionHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _conditionHandlerFactories.get(name); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/handler/EffectHandler.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/handler/EffectHandler.java index a58de8efb4..328265d9db 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/handler/EffectHandler.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/handler/EffectHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class EffectHandler { - private final Map> _effectHandlerFactories = new HashMap<>(); + private final Map> _effectHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _effectHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _effectHandlerFactories.get(name); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java index a6e2275d04..32438040e0 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class SkillConditionHandler { - private final Map> _skillConditionHandlerFactories = new HashMap<>(); + private final Map> _skillConditionHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _skillConditionHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _skillConditionHandlerFactories.get(name); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java index 6992dd5366..65a8c52d7e 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.model.AirShipTeleportList; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShipInstance; @@ -45,13 +45,13 @@ public class AirShipManager private static final String UPDATE_DB = "UPDATE airships SET fuel=? WHERE owner_id=?"; private CreatureTemplate _airShipTemplate = null; - private final Map _airShipsInfo = new HashMap<>(); + private final Map _airShipsInfo = new HashMap<>(); private final Map _airShips = new HashMap<>(); private final Map _teleports = new HashMap<>(); protected AirShipManager() { - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", 9); npcDat.set("level", 0); npcDat.set("jClass", "boat"); @@ -113,7 +113,7 @@ public class AirShipManager public AirShipInstance getNewAirShip(int x, int y, int z, int heading, int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return null; @@ -147,7 +147,7 @@ public class AirShipManager if (ship.getOwnerId() != 0) { storeInDb(ship.getOwnerId()); - final StatsSet info = _airShipsInfo.get(ship.getOwnerId()); + final StatSet info = _airShipsInfo.get(ship.getOwnerId()); if (info != null) { info.set("fuel", ship.getFuel()); @@ -164,7 +164,7 @@ public class AirShipManager { if (!_airShipsInfo.containsKey(ownerId)) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("fuel", 600); _airShipsInfo.put(ownerId, info); @@ -264,10 +264,10 @@ public class AirShipManager Statement s = con.createStatement(); ResultSet rs = s.executeQuery(LOAD_DB)) { - StatsSet info; + StatSet info; while (rs.next()) { - info = new StatsSet(); + info = new StatSet(); info.set("fuel", rs.getInt("fuel")); _airShipsInfo.put(rs.getInt("owner_id"), info); } @@ -285,7 +285,7 @@ public class AirShipManager private void storeInDb(int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java index 2db10dd045..e5c610b3f2 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.BoatInstance; @@ -57,7 +57,7 @@ public class BoatManager return null; } - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", boatId); npcDat.set("level", 0); npcDat.set("jClass", "boat"); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 99a9678ece..56f08422cd 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.enums.ManorMode; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; import org.l2jmobius.gameserver.model.SeedProduction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.entity.Castle; @@ -126,7 +126,7 @@ public class CastleManorManager implements IXmlReader, IStorable @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; NamedNodeMap attrs; Node att; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -142,7 +142,7 @@ public class CastleManorManager implements IXmlReader, IStorable { if ("crop".equalsIgnoreCase(c.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); set.set("castleId", castleId); attrs = c.getAttributes(); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java index 2a703ed15d..97b07966a5 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java @@ -27,7 +27,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosState; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -181,7 +181,7 @@ public class CeremonyOfChaosManager extends AbstractEventManager _npcs = new ConcurrentHashMap<>(); protected final Map _spawns = new ConcurrentHashMap<>(); - protected final Map _storedInfo = new ConcurrentHashMap<>(); + protected final Map _storedInfo = new ConcurrentHashMap<>(); protected final Map> _schedules = new ConcurrentHashMap<>(); /** @@ -161,7 +161,7 @@ public class DBSpawnManager { npc.setDBStatus(RaidBossStatus.ALIVE); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getCurrentHp()); info.set("currentMP", npc.getCurrentMp()); info.set("respawnTime", 0); @@ -181,7 +181,7 @@ public class DBSpawnManager */ public void updateStatus(Npc npc, boolean isNpcDead) { - final StatsSet info = _storedInfo.get(npc.getId()); + final StatSet info = _storedInfo.get(npc.getId()); if (info == null) { return; @@ -254,7 +254,7 @@ public class DBSpawnManager _npcs.put(npcId, npc); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", currentHP); info.set("currentMP", currentMP); info.set("respawnTime", 0); @@ -316,7 +316,7 @@ public class DBSpawnManager } npc.setDBStatus(RaidBossStatus.ALIVE); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", 0); @@ -401,7 +401,7 @@ public class DBSpawnManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("UPDATE npc_respawns SET respawnTime = ?, currentHP = ?, currentMP = ? WHERE id = ?")) { - for (Entry entry : _storedInfo.entrySet()) + for (Entry entry : _storedInfo.entrySet()) { final Integer npcId = entry.getKey(); if (npcId == null) @@ -420,7 +420,7 @@ public class DBSpawnManager updateStatus(npc, false); } - final StatsSet info = entry.getValue(); + final StatSet info = entry.getValue(); if (info == null) { continue; @@ -529,7 +529,7 @@ public class DBSpawnManager */ public void notifySpawnNightNpc(Npc npc) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getCurrentHp()); info.set("currentMP", npc.getCurrentMp()); info.set("respawnTime", 0); @@ -572,7 +572,7 @@ public class DBSpawnManager * Gets the stored info. * @return the stored info */ - public Map getStoredInfo() + public Map getStoredInfo() { return _storedInfo; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index 3dd4e3f652..767bed6954 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.datatables.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.FakePlayerChatHolder; @@ -73,7 +73,7 @@ public class FakePlayerChatManager implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayerChat", fakePlayerChatNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerChatNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerChatNode)); MESSAGES.add(new FakePlayerChatHolder(set.getString("fpcName"), set.getString("searchMethod"), set.getString("searchText"), set.getString("answers"))); })); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java index 07c111065e..52bab09349 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java @@ -33,7 +33,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.tasks.GrandBossManagerStoreTask; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; import org.l2jmobius.gameserver.model.interfaces.IStorable; @@ -51,7 +51,7 @@ public class GrandBossManager implements IStorable protected static Map _bosses = new ConcurrentHashMap<>(); - protected static Map _storedInfo = new HashMap<>(); + protected static Map _storedInfo = new HashMap<>(); private final Map _bossStatus = new HashMap<>(); @@ -72,7 +72,7 @@ public class GrandBossManager implements IStorable final int bossId = rs.getInt("boss_id"); if (NpcData.getInstance().getTemplate(bossId) != null) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("loc_x", rs.getInt("loc_x")); info.set("loc_y", rs.getInt("loc_y")); info.set("loc_z", rs.getInt("loc_z")); @@ -140,12 +140,12 @@ public class GrandBossManager implements IStorable return _bosses.get(bossId); } - public StatsSet getStatsSet(int bossId) + public StatSet getStatSet(int bossId) { return _storedInfo.get(bossId); } - public void setStatsSet(int bossId, StatsSet info) + public void setStatSet(int bossId, StatSet info) { _storedInfo.put(bossId, info); updateDb(bossId, false); @@ -156,10 +156,10 @@ public class GrandBossManager implements IStorable { try (Connection con = DatabaseFactory.getConnection()) { - for (Entry e : _storedInfo.entrySet()) + for (Entry e : _storedInfo.entrySet()) { final GrandBossInstance boss = _bosses.get(e.getKey()); - final StatsSet info = e.getValue(); + final StatSet info = e.getValue(); if ((boss == null) || (info == null)) { try (PreparedStatement update = con.prepareStatement(UPDATE_GRAND_BOSS_DATA2)) @@ -209,7 +209,7 @@ public class GrandBossManager implements IStorable try (Connection con = DatabaseFactory.getConnection()) { final GrandBossInstance boss = _bosses.get(bossId); - final StatsSet info = _storedInfo.get(bossId); + final StatSet info = _storedInfo.get(bossId); if (statusOnly || (boss == null) || (info == null)) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index d77642378f..29e517b0cd 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.enums.InstanceReenterType; import org.l2jmobius.gameserver.enums.InstanceRemoveBuffType; import org.l2jmobius.gameserver.enums.InstanceTeleportType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.holders.InstanceReenterTimeHolder; @@ -151,7 +151,7 @@ public class InstanceManager implements IXmlReader return; } - final InstanceTemplate template = new InstanceTemplate(new StatsSet(parseAttributes(instanceNode))); + final InstanceTemplate template = new InstanceTemplate(new StatSet(parseAttributes(instanceNode))); // Update name if wasn't provided if (template.getName() == null) @@ -241,10 +241,10 @@ public class InstanceManager implements IXmlReader { if (doorNode.getNodeName().equals("door")) { - final StatsSet parsedSet = DoorData.getInstance().parseDoor(doorNode); - final StatsSet mergedSet = new StatsSet(); + final StatSet parsedSet = DoorData.getInstance().parseDoor(doorNode); + final StatSet mergedSet = new StatSet(); final int doorId = parsedSet.getInt("id"); - final StatsSet templateSet = DoorData.getInstance().getDoorTemplate(doorId); + final StatSet templateSet = DoorData.getInstance().getDoorTemplate(doorId); if (templateSet != null) { mergedSet.merge(templateSet); @@ -324,14 +324,14 @@ public class InstanceManager implements IXmlReader final boolean onlyLeader = parseBoolean(attrs, "onlyLeader", false); final boolean showMessageAndHtml = parseBoolean(attrs, "showMessageAndHtml", false); // Load parameters - StatsSet params = null; + StatSet params = null; for (Node f = conditionNode.getFirstChild(); f != null; f = f.getNextSibling()) { if (f.getNodeName().equals("param")) { if (params == null) { - params = new StatsSet(); + params = new StatSet(); } params.set(parseString(f.getAttributes(), "name"), parseString(f.getAttributes(), "value")); @@ -341,14 +341,14 @@ public class InstanceManager implements IXmlReader // If none parameters found then set empty StatSet if (params == null) { - params = StatsSet.EMPTY_STATSET; + params = StatSet.EMPTY_STATSET; } // Now when everything is loaded register condition to template try { final Class clazz = Class.forName("org.l2jmobius.gameserver.model.instancezone.conditions.Condition" + type); - final Constructor constructor = clazz.getConstructor(InstanceTemplate.class, StatsSet.class, boolean.class, boolean.class); + final Constructor constructor = clazz.getConstructor(InstanceTemplate.class, StatSet.class, boolean.class, boolean.class); conditions.add((Condition) constructor.newInstance(template, params, onlyLeader, showMessageAndHtml)); } catch (Exception ex) @@ -378,7 +378,7 @@ public class InstanceManager implements IXmlReader */ public Instance createInstance() { - return new Instance(getNewInstanceId(), new InstanceTemplate(StatsSet.EMPTY_STATSET), null); + return new Instance(getNewInstanceId(), new InstanceTemplate(StatSet.EMPTY_STATSET), null); } /** diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/AccessLevel.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/AccessLevel.java index 772c1fe77e..72b77905e1 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/AccessLevel.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/AccessLevel.java @@ -52,7 +52,7 @@ public class AccessLevel /** Flag to gain exp in party */ private boolean _gainExp = false; - public AccessLevel(StatsSet set) + public AccessLevel(StatSet set) { _accessLevel = set.getInt("level"); _name = set.getString("name"); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ActionDataHolder.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ActionDataHolder.java index 4887bedba8..ca6d9ee685 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ActionDataHolder.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ActionDataHolder.java @@ -25,7 +25,7 @@ public class ActionDataHolder private final String _handler; private final int _optionId; - public ActionDataHolder(StatsSet set) + public ActionDataHolder(StatSet set) { _id = set.getInt("id"); _handler = set.getString("handler"); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java index 656119098e..3f88e455d7 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java @@ -27,7 +27,7 @@ public class AdminCommandAccessRight private final int _accessLevel; private final boolean _requireConfirm; - public AdminCommandAccessRight(StatsSet set) + public AdminCommandAccessRight(StatSet set) { _adminCommand = set.getString("command"); _requireConfirm = set.getBoolean("confirmDlg", false); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index f1c86b8469..f9889f27cf 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -36,7 +36,7 @@ public class DailyMissionDataHolder private final List _rewardsItems; private final List _classRestriction; private final int _requiredCompletions; - private final StatsSet _params; + private final StatSet _params; private final boolean _dailyReset; private final boolean _isOneTime; private final boolean _isMainClassOnly; @@ -44,7 +44,7 @@ public class DailyMissionDataHolder private final boolean _isDisplayedWhenNotAvailable; private final AbstractDailyMissionHandler _handler; - public DailyMissionDataHolder(StatsSet set) + public DailyMissionDataHolder(StatSet set) { final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); @@ -53,7 +53,7 @@ public class DailyMissionDataHolder _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); - _params = set.getObject("params", StatsSet.class); + _params = set.getObject("params", StatSet.class); _dailyReset = set.getBoolean("dailyReset", true); _isOneTime = set.getBoolean("isOneTime", true); _isMainClassOnly = set.getBoolean("isMainClassOnly", true); @@ -87,7 +87,7 @@ public class DailyMissionDataHolder return _requiredCompletions; } - public StatsSet getParams() + public StatSet getParams() { return _params; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Location.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Location.java index 1c61740e4d..024c71075f 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Location.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Location.java @@ -49,7 +49,7 @@ public class Location implements IPositionable this(obj.getX(), obj.getY(), obj.getZ(), obj.getHeading()); } - public Location(StatsSet set) + public Location(StatSet set) { _x = set.getInt("x"); _y = set.getInt("y"); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/PetLevelData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/PetLevelData.java index e46b215b5f..7cad1a225a 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/PetLevelData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/PetLevelData.java @@ -46,7 +46,7 @@ public class PetLevelData private final double _slowFlySpeedOnRide; private final double _fastFlySpeedOnRide; - public PetLevelData(StatsSet set) + public PetLevelData(StatSet set) { _ownerExpTaken = set.getInt("get_exp_type"); _petMaxExp = set.getLong("exp"); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Seed.java index 4307849cf5..dd756c82e2 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Seed.java @@ -35,7 +35,7 @@ public class Seed private final long _seedReferencePrice; private final long _cropReferencePrice; - public Seed(StatsSet set) + public Seed(StatSet set) { _cropId = set.getInt("id"); _seedId = set.getInt("seedId"); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java index 78897cf4f1..4de77df228 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java @@ -27,7 +27,7 @@ public class SiegeScheduleDate private final int _hour; private final int _maxConcurrent; - public SiegeScheduleDate(StatsSet set) + public SiegeScheduleDate(StatSet set) { _day = set.getInt("day", Calendar.SUNDAY); _hour = set.getInt("hour", 16); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/SkillLearn.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/SkillLearn.java index e2ccdd6331..00f53c0cb9 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/SkillLearn.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/SkillLearn.java @@ -58,7 +58,7 @@ public class SkillLearn * Constructor for SkillLearn. * @param set the set with the SkillLearn data. */ - public SkillLearn(StatsSet set) + public SkillLearn(StatSet set) { _skillName = set.getString("skillName"); _skillId = set.getInt("skillId"); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/StatSet.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/StatSet.java new file mode 100644 index 0000000000..3c824d9fa4 --- /dev/null +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/StatSet.java @@ -0,0 +1,968 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Supplier; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.stream.Collectors; + +import org.l2jmobius.commons.util.TimeUtil; +import org.l2jmobius.gameserver.model.holders.MinionHolder; +import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.interfaces.IParserAdvUtils; +import org.l2jmobius.gameserver.util.Util; + +/** + * This class is meant to hold a set of (key,value) pairs.
+ * They are stored as object but can be retrieved in any type wanted. As long as cast is available.
+ * @author mkizub + */ +public class StatSet implements IParserAdvUtils +{ + private static final Logger LOGGER = Logger.getLogger(StatSet.class.getName()); + /** Static empty immutable map, used to avoid multiple null checks over the source. */ + public static final StatSet EMPTY_STATSET = new StatSet(Collections.emptyMap()); + + private final Map _set; + + public StatSet() + { + this(ConcurrentHashMap::new); + } + + public StatSet(Supplier> mapFactory) + { + this(mapFactory.get()); + } + + public StatSet(Map map) + { + _set = map; + } + + /** + * Returns the set of values + * @return HashMap + */ + public Map getSet() + { + return _set; + } + + /** + * Add a set of couple values in the current set + * @param newSet : StatSet pointing out the list of couples to add in the current set + */ + public void merge(StatSet newSet) + { + _set.putAll(newSet.getSet()); + } + + /** + * Verifies if the stat set is empty. + * @return {@code true} if the stat set is empty, {@code false} otherwise + */ + public boolean isEmpty() + { + return _set.isEmpty(); + } + + /** + * Return the boolean value associated with key. + * @param key : String designating the key in the set + * @return boolean : value associated to the key + * @throws IllegalArgumentException : If value is not set or value is not boolean + */ + @Override + public boolean getBoolean(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Boolean value required, but not specified"); + } + if (val instanceof Boolean) + { + return ((Boolean) val).booleanValue(); + } + try + { + return Boolean.parseBoolean((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Boolean value required, but found: " + val); + } + } + + /** + * Return the boolean value associated with key.
+ * If no value is associated with key, or type of value is wrong, returns defaultValue. + * @param key : String designating the key in the entry set + * @return boolean : value associated to the key + */ + @Override + public boolean getBoolean(String key, boolean defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Boolean) + { + return ((Boolean) val).booleanValue(); + } + try + { + return Boolean.parseBoolean((String) val); + } + catch (Exception e) + { + return defaultValue; + } + } + + @Override + public byte getByte(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Byte value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).byteValue(); + } + try + { + return Byte.parseByte((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + + @Override + public byte getByte(String key, byte defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).byteValue(); + } + try + { + return Byte.parseByte((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + + public short increaseByte(String key, byte increaseWith) + { + final byte newValue = (byte) (getByte(key) + increaseWith); + set(key, newValue); + return newValue; + } + + public short increaseByte(String key, byte defaultValue, byte increaseWith) + { + final byte newValue = (byte) (getByte(key, defaultValue) + increaseWith); + set(key, newValue); + return newValue; + } + + public byte[] getByteArray(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Byte value required, but not specified"); + } + if (val instanceof Number) + { + return new byte[] + { + ((Number) val).byteValue() + }; + } + int c = 0; + final String[] vals = ((String) val).split(splitOn); + final byte[] result = new byte[vals.length]; + for (String v : vals) + { + try + { + result[c++] = Byte.parseByte(v); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + return result; + } + + public List getByteList(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final List result = new ArrayList<>(); + for (Byte i : getByteArray(key, splitOn)) + { + result.add(i); + } + return result; + } + + @Override + public short getShort(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Short value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).shortValue(); + } + try + { + return Short.parseShort((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Short value required, but found: " + val); + } + } + + @Override + public short getShort(String key, short defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).shortValue(); + } + try + { + return Short.parseShort((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Short value required, but found: " + val); + } + } + + public short increaseShort(String key, short increaseWith) + { + final short newValue = (short) (getShort(key) + increaseWith); + set(key, newValue); + return newValue; + } + + public short increaseShort(String key, short defaultValue, short increaseWith) + { + final short newValue = (short) (getShort(key, defaultValue) + increaseWith); + set(key, newValue); + return newValue; + } + + @Override + public int getInt(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Integer value required, but not specified: " + key + "!"); + } + + if (val instanceof Number) + { + return ((Number) val).intValue(); + } + + try + { + return Integer.parseInt((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val + "!"); + } + } + + @Override + public int getInt(String key, int defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).intValue(); + } + try + { + return Integer.parseInt((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val); + } + } + + public int increaseInt(String key, int increaseWith) + { + final int newValue = getInt(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public int increaseInt(String key, int defaultValue, int increaseWith) + { + final int newValue = getInt(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + public int[] getIntArray(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Integer value required, but not specified"); + } + if (val instanceof Number) + { + return new int[] + { + ((Number) val).intValue() + }; + } + int c = 0; + final String[] vals = ((String) val).split(splitOn); + final int[] result = new int[vals.length]; + for (String v : vals) + { + try + { + result[c++] = Integer.parseInt(v); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val); + } + } + return result; + } + + public List getIntegerList(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final List result = new ArrayList<>(); + for (int i : getIntArray(key, splitOn)) + { + result.add(i); + } + return result; + } + + @Override + public long getLong(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Long value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).longValue(); + } + try + { + return Long.parseLong((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Long value required, but found: " + val); + } + } + + @Override + public long getLong(String key, long defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).longValue(); + } + try + { + return Long.parseLong((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Long value required, but found: " + val); + } + } + + public long increaseLong(String key, long increaseWith) + { + final long newValue = getLong(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public long increaseLong(String key, long defaultValue, long increaseWith) + { + final long newValue = getLong(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public float getFloat(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Float value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).floatValue(); + } + try + { + return Float.parseFloat((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Float value required, but found: " + val); + } + } + + @Override + public float getFloat(String key, float defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).floatValue(); + } + try + { + return Float.parseFloat((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Float value required, but found: " + val); + } + } + + public float increaseFloat(String key, float increaseWith) + { + final float newValue = getFloat(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public float increaseFloat(String key, float defaultValue, float increaseWith) + { + final float newValue = getFloat(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public double getDouble(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Double value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).doubleValue(); + } + try + { + return Double.parseDouble((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Double value required, but found: " + val); + } + } + + @Override + public double getDouble(String key, double defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).doubleValue(); + } + try + { + return Double.parseDouble((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Double value required, but found: " + val); + } + } + + public double increaseDouble(String key, double increaseWith) + { + final double newValue = getDouble(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public double increaseDouble(String key, double defaultValue, double increaseWith) + { + final double newValue = getDouble(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public String getString(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("String value required, but not specified"); + } + return String.valueOf(val); + } + + @Override + public String getString(String key, String defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + return String.valueOf(val); + } + + @Override + public Duration getDuration(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("String value required, but not specified"); + } + return TimeUtil.parseDuration(String.valueOf(val)); + } + + @Override + public Duration getDuration(String key, Duration defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + return TimeUtil.parseDuration(String.valueOf(val)); + } + + @Override + @SuppressWarnings("unchecked") + public > T getEnum(String key, Class enumClass) + { + Objects.requireNonNull(key); + Objects.requireNonNull(enumClass); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but not specified"); + } + if (enumClass.isInstance(val)) + { + return (T) val; + } + try + { + return Enum.valueOf(enumClass, String.valueOf(val)); + } + catch (Exception e) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); + } + } + + @Override + @SuppressWarnings("unchecked") + public > T getEnum(String key, Class enumClass, T defaultValue) + { + Objects.requireNonNull(key); + Objects.requireNonNull(enumClass); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (enumClass.isInstance(val)) + { + return (T) val; + } + try + { + return Enum.valueOf(enumClass, String.valueOf(val)); + } + catch (Exception e) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); + } + } + + @SuppressWarnings("unchecked") + public A getObject(String name, Class type) + { + Objects.requireNonNull(name); + Objects.requireNonNull(type); + final Object obj = _set.get(name); + if ((obj == null) || !type.isAssignableFrom(obj.getClass())) + { + return null; + } + + return (A) obj; + } + + @SuppressWarnings("unchecked") + public A getObject(String name, Class type, A defaultValue) + { + Objects.requireNonNull(name); + Objects.requireNonNull(type); + final Object obj = _set.get(name); + if ((obj == null) || !type.isAssignableFrom(obj.getClass())) + { + return defaultValue; + } + + return (A) obj; + } + + public SkillHolder getSkillHolder(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof SkillHolder)) + { + return null; + } + + return (SkillHolder) obj; + } + + public Location getLocation(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof Location)) + { + return null; + } + return (Location) obj; + } + + @SuppressWarnings("unchecked") + public List getMinionList(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return Collections.emptyList(); + } + + return (List) obj; + } + + @SuppressWarnings("unchecked") + public List getList(String key, Class clazz) + { + Objects.requireNonNull(key); + Objects.requireNonNull(clazz); + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return null; + } + + final List originalList = (List) obj; + if (!originalList.isEmpty() && !originalList.stream().allMatch(clazz::isInstance)) + { + if (clazz.getSuperclass() == Enum.class) + { + throw new IllegalAccessError("Please use getEnumList if you want to get list of Enums!"); + } + + // Attempt to convert the list + final List convertedList = convertList(originalList, clazz); + if (convertedList == null) + { + LOGGER.log(Level.WARNING, "getList(\"" + key + "\", " + clazz.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); + return null; + } + + // Overwrite the existing list with proper generic type + _set.put(key, convertedList); + return convertedList; + } + return (List) obj; + } + + public List getList(String key, Class clazz, List defaultValue) + { + final List list = getList(key, clazz); + return list == null ? defaultValue : list; + } + + @SuppressWarnings("unchecked") + public > List getEnumList(String key, Class clazz) + { + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return null; + } + + final List originalList = (List) obj; + if (!originalList.isEmpty() && (obj.getClass().getGenericInterfaces()[0] != clazz) && originalList.stream().allMatch(name -> Util.isEnum(name.toString(), clazz))) + { + final List convertedList = originalList.stream().map(Object::toString).map(name -> Enum.valueOf(clazz, name)).map(clazz::cast).collect(Collectors.toList()); + + // Overwrite the existing list with proper generic type + _set.put(key, convertedList); + return convertedList; + } + return (List) obj; + } + + /** + * @param + * @param originalList + * @param clazz + * @return + */ + private List convertList(List originalList, Class clazz) + { + if (clazz == Integer.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isInteger)) + { + return originalList.stream().map(Object::toString).map(Integer::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + else if (clazz == Float.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isFloat)) + { + return originalList.stream().map(Object::toString).map(Float::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + else if (clazz == Double.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isDouble)) + { + return originalList.stream().map(Object::toString).map(Double::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + return null; + } + + @SuppressWarnings("unchecked") + public Map getMap(String key, Class keyClass, Class valueClass) + { + final Object obj = _set.get(key); + if (!(obj instanceof Map)) + { + return null; + } + + final Map originalList = (Map) obj; + if (!originalList.isEmpty() && ((!originalList.keySet().stream().allMatch(keyClass::isInstance)) || (!originalList.values().stream().allMatch(valueClass::isInstance)))) + { + LOGGER.log(Level.WARNING, "getMap(\"" + key + "\", " + keyClass.getSimpleName() + ", " + valueClass.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); + } + return (Map) obj; + } + + public StatSet set(String name, Object value) + { + if (value == null) + { + return this; + } + _set.put(name, value); + return this; + } + + public StatSet set(String key, boolean value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, byte value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, short value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, int value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, long value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, float value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, double value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, String value) + { + if (value == null) + { + return this; + } + _set.put(key, value); + return this; + } + + public StatSet set(String key, Enum value) + { + if (value == null) + { + return this; + } + _set.put(key, value); + return this; + } + + public static StatSet valueOf(String key, Object value) + { + final StatSet set = new StatSet(); + set.set(key, value); + return set; + } + + public void remove(String key) + { + _set.remove(key); + } + + public boolean contains(String name) + { + return _set.containsKey(name); + } + + @Override + public String toString() + { + return "StatSet{_set=" + _set + '}'; + } +} diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/StatsSet.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/StatsSet.java deleted file mode 100644 index 5ce013ebd2..0000000000 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/StatsSet.java +++ /dev/null @@ -1,968 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.ConcurrentHashMap; -import java.util.function.Supplier; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.stream.Collectors; - -import org.l2jmobius.commons.util.TimeUtil; -import org.l2jmobius.gameserver.model.holders.MinionHolder; -import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.interfaces.IParserAdvUtils; -import org.l2jmobius.gameserver.util.Util; - -/** - * This class is meant to hold a set of (key,value) pairs.
- * They are stored as object but can be retrieved in any type wanted. As long as cast is available.
- * @author mkizub - */ -public class StatsSet implements IParserAdvUtils -{ - private static final Logger LOGGER = Logger.getLogger(StatsSet.class.getName()); - /** Static empty immutable map, used to avoid multiple null checks over the source. */ - public static final StatsSet EMPTY_STATSET = new StatsSet(Collections.emptyMap()); - - private final Map _set; - - public StatsSet() - { - this(ConcurrentHashMap::new); - } - - public StatsSet(Supplier> mapFactory) - { - this(mapFactory.get()); - } - - public StatsSet(Map map) - { - _set = map; - } - - /** - * Returns the set of values - * @return HashMap - */ - public Map getSet() - { - return _set; - } - - /** - * Add a set of couple values in the current set - * @param newSet : StatsSet pointing out the list of couples to add in the current set - */ - public void merge(StatsSet newSet) - { - _set.putAll(newSet.getSet()); - } - - /** - * Verifies if the stat set is empty. - * @return {@code true} if the stat set is empty, {@code false} otherwise - */ - public boolean isEmpty() - { - return _set.isEmpty(); - } - - /** - * Return the boolean value associated with key. - * @param key : String designating the key in the set - * @return boolean : value associated to the key - * @throws IllegalArgumentException : If value is not set or value is not boolean - */ - @Override - public boolean getBoolean(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Boolean value required, but not specified"); - } - if (val instanceof Boolean) - { - return ((Boolean) val).booleanValue(); - } - try - { - return Boolean.parseBoolean((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Boolean value required, but found: " + val); - } - } - - /** - * Return the boolean value associated with key.
- * If no value is associated with key, or type of value is wrong, returns defaultValue. - * @param key : String designating the key in the entry set - * @return boolean : value associated to the key - */ - @Override - public boolean getBoolean(String key, boolean defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Boolean) - { - return ((Boolean) val).booleanValue(); - } - try - { - return Boolean.parseBoolean((String) val); - } - catch (Exception e) - { - return defaultValue; - } - } - - @Override - public byte getByte(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Byte value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).byteValue(); - } - try - { - return Byte.parseByte((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - - @Override - public byte getByte(String key, byte defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).byteValue(); - } - try - { - return Byte.parseByte((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - - public short increaseByte(String key, byte increaseWith) - { - final byte newValue = (byte) (getByte(key) + increaseWith); - set(key, newValue); - return newValue; - } - - public short increaseByte(String key, byte defaultValue, byte increaseWith) - { - final byte newValue = (byte) (getByte(key, defaultValue) + increaseWith); - set(key, newValue); - return newValue; - } - - public byte[] getByteArray(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Byte value required, but not specified"); - } - if (val instanceof Number) - { - return new byte[] - { - ((Number) val).byteValue() - }; - } - int c = 0; - final String[] vals = ((String) val).split(splitOn); - final byte[] result = new byte[vals.length]; - for (String v : vals) - { - try - { - result[c++] = Byte.parseByte(v); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - return result; - } - - public List getByteList(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final List result = new ArrayList<>(); - for (Byte i : getByteArray(key, splitOn)) - { - result.add(i); - } - return result; - } - - @Override - public short getShort(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Short value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).shortValue(); - } - try - { - return Short.parseShort((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Short value required, but found: " + val); - } - } - - @Override - public short getShort(String key, short defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).shortValue(); - } - try - { - return Short.parseShort((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Short value required, but found: " + val); - } - } - - public short increaseShort(String key, short increaseWith) - { - final short newValue = (short) (getShort(key) + increaseWith); - set(key, newValue); - return newValue; - } - - public short increaseShort(String key, short defaultValue, short increaseWith) - { - final short newValue = (short) (getShort(key, defaultValue) + increaseWith); - set(key, newValue); - return newValue; - } - - @Override - public int getInt(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Integer value required, but not specified: " + key + "!"); - } - - if (val instanceof Number) - { - return ((Number) val).intValue(); - } - - try - { - return Integer.parseInt((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val + "!"); - } - } - - @Override - public int getInt(String key, int defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).intValue(); - } - try - { - return Integer.parseInt((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val); - } - } - - public int increaseInt(String key, int increaseWith) - { - final int newValue = getInt(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public int increaseInt(String key, int defaultValue, int increaseWith) - { - final int newValue = getInt(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - public int[] getIntArray(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Integer value required, but not specified"); - } - if (val instanceof Number) - { - return new int[] - { - ((Number) val).intValue() - }; - } - int c = 0; - final String[] vals = ((String) val).split(splitOn); - final int[] result = new int[vals.length]; - for (String v : vals) - { - try - { - result[c++] = Integer.parseInt(v); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val); - } - } - return result; - } - - public List getIntegerList(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final List result = new ArrayList<>(); - for (int i : getIntArray(key, splitOn)) - { - result.add(i); - } - return result; - } - - @Override - public long getLong(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Long value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).longValue(); - } - try - { - return Long.parseLong((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Long value required, but found: " + val); - } - } - - @Override - public long getLong(String key, long defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).longValue(); - } - try - { - return Long.parseLong((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Long value required, but found: " + val); - } - } - - public long increaseLong(String key, long increaseWith) - { - final long newValue = getLong(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public long increaseLong(String key, long defaultValue, long increaseWith) - { - final long newValue = getLong(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public float getFloat(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Float value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).floatValue(); - } - try - { - return Float.parseFloat((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Float value required, but found: " + val); - } - } - - @Override - public float getFloat(String key, float defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).floatValue(); - } - try - { - return Float.parseFloat((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Float value required, but found: " + val); - } - } - - public float increaseFloat(String key, float increaseWith) - { - final float newValue = getFloat(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public float increaseFloat(String key, float defaultValue, float increaseWith) - { - final float newValue = getFloat(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public double getDouble(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Double value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).doubleValue(); - } - try - { - return Double.parseDouble((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Double value required, but found: " + val); - } - } - - @Override - public double getDouble(String key, double defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).doubleValue(); - } - try - { - return Double.parseDouble((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Double value required, but found: " + val); - } - } - - public double increaseDouble(String key, double increaseWith) - { - final double newValue = getDouble(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public double increaseDouble(String key, double defaultValue, double increaseWith) - { - final double newValue = getDouble(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public String getString(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("String value required, but not specified"); - } - return String.valueOf(val); - } - - @Override - public String getString(String key, String defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - return String.valueOf(val); - } - - @Override - public Duration getDuration(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("String value required, but not specified"); - } - return TimeUtil.parseDuration(String.valueOf(val)); - } - - @Override - public Duration getDuration(String key, Duration defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - return TimeUtil.parseDuration(String.valueOf(val)); - } - - @Override - @SuppressWarnings("unchecked") - public > T getEnum(String key, Class enumClass) - { - Objects.requireNonNull(key); - Objects.requireNonNull(enumClass); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but not specified"); - } - if (enumClass.isInstance(val)) - { - return (T) val; - } - try - { - return Enum.valueOf(enumClass, String.valueOf(val)); - } - catch (Exception e) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); - } - } - - @Override - @SuppressWarnings("unchecked") - public > T getEnum(String key, Class enumClass, T defaultValue) - { - Objects.requireNonNull(key); - Objects.requireNonNull(enumClass); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (enumClass.isInstance(val)) - { - return (T) val; - } - try - { - return Enum.valueOf(enumClass, String.valueOf(val)); - } - catch (Exception e) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); - } - } - - @SuppressWarnings("unchecked") - public A getObject(String name, Class type) - { - Objects.requireNonNull(name); - Objects.requireNonNull(type); - final Object obj = _set.get(name); - if ((obj == null) || !type.isAssignableFrom(obj.getClass())) - { - return null; - } - - return (A) obj; - } - - @SuppressWarnings("unchecked") - public A getObject(String name, Class type, A defaultValue) - { - Objects.requireNonNull(name); - Objects.requireNonNull(type); - final Object obj = _set.get(name); - if ((obj == null) || !type.isAssignableFrom(obj.getClass())) - { - return defaultValue; - } - - return (A) obj; - } - - public SkillHolder getSkillHolder(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof SkillHolder)) - { - return null; - } - - return (SkillHolder) obj; - } - - public Location getLocation(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof Location)) - { - return null; - } - return (Location) obj; - } - - @SuppressWarnings("unchecked") - public List getMinionList(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return Collections.emptyList(); - } - - return (List) obj; - } - - @SuppressWarnings("unchecked") - public List getList(String key, Class clazz) - { - Objects.requireNonNull(key); - Objects.requireNonNull(clazz); - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return null; - } - - final List originalList = (List) obj; - if (!originalList.isEmpty() && !originalList.stream().allMatch(clazz::isInstance)) - { - if (clazz.getSuperclass() == Enum.class) - { - throw new IllegalAccessError("Please use getEnumList if you want to get list of Enums!"); - } - - // Attempt to convert the list - final List convertedList = convertList(originalList, clazz); - if (convertedList == null) - { - LOGGER.log(Level.WARNING, "getList(\"" + key + "\", " + clazz.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); - return null; - } - - // Overwrite the existing list with proper generic type - _set.put(key, convertedList); - return convertedList; - } - return (List) obj; - } - - public List getList(String key, Class clazz, List defaultValue) - { - final List list = getList(key, clazz); - return list == null ? defaultValue : list; - } - - @SuppressWarnings("unchecked") - public > List getEnumList(String key, Class clazz) - { - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return null; - } - - final List originalList = (List) obj; - if (!originalList.isEmpty() && (obj.getClass().getGenericInterfaces()[0] != clazz) && originalList.stream().allMatch(name -> Util.isEnum(name.toString(), clazz))) - { - final List convertedList = originalList.stream().map(Object::toString).map(name -> Enum.valueOf(clazz, name)).map(clazz::cast).collect(Collectors.toList()); - - // Overwrite the existing list with proper generic type - _set.put(key, convertedList); - return convertedList; - } - return (List) obj; - } - - /** - * @param - * @param originalList - * @param clazz - * @return - */ - private List convertList(List originalList, Class clazz) - { - if (clazz == Integer.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isInteger)) - { - return originalList.stream().map(Object::toString).map(Integer::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - else if (clazz == Float.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isFloat)) - { - return originalList.stream().map(Object::toString).map(Float::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - else if (clazz == Double.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isDouble)) - { - return originalList.stream().map(Object::toString).map(Double::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - return null; - } - - @SuppressWarnings("unchecked") - public Map getMap(String key, Class keyClass, Class valueClass) - { - final Object obj = _set.get(key); - if (!(obj instanceof Map)) - { - return null; - } - - final Map originalList = (Map) obj; - if (!originalList.isEmpty() && ((!originalList.keySet().stream().allMatch(keyClass::isInstance)) || (!originalList.values().stream().allMatch(valueClass::isInstance)))) - { - LOGGER.log(Level.WARNING, "getMap(\"" + key + "\", " + keyClass.getSimpleName() + ", " + valueClass.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); - } - return (Map) obj; - } - - public StatsSet set(String name, Object value) - { - if (value == null) - { - return this; - } - _set.put(name, value); - return this; - } - - public StatsSet set(String key, boolean value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, byte value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, short value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, int value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, long value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, float value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, double value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, String value) - { - if (value == null) - { - return this; - } - _set.put(key, value); - return this; - } - - public StatsSet set(String key, Enum value) - { - if (value == null) - { - return this; - } - _set.put(key, value); - return this; - } - - public static StatsSet valueOf(String key, Object value) - { - final StatsSet set = new StatsSet(); - set.set(key, value); - return set; - } - - public void remove(String key) - { - _set.remove(key); - } - - public boolean contains(String name) - { - return _set.containsKey(name); - } - - @Override - public String toString() - { - return "StatsSet{_set=" + _set + '}'; - } -} diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Npc.java index a1a7e98aba..2b90533cc5 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.MpRewardTask; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.FishermanInstance; @@ -148,7 +148,7 @@ public class Npc extends Creature private NpcStringId _titleString; private NpcStringId _nameString; - private StatsSet _params; + private StatSet _params; private RaidBossStatus _raidStatus; /** Contains information about local tax payments. */ @@ -1756,7 +1756,7 @@ public class Npc extends Creature /** * @return the parameters of the npc merged with the spawn parameters (if there are any) */ - public StatsSet getParameters() + public StatSet getParameters() { if (_params != null) { @@ -1768,10 +1768,10 @@ public class Npc extends Creature final NpcSpawnTemplate npcSpawnTemplate = _spawn.getNpcSpawnTemplate(); if ((npcSpawnTemplate != null) && (npcSpawnTemplate.getParameters() != null) && !npcSpawnTemplate.getParameters().isEmpty()) { - final StatsSet params = getTemplate().getParameters(); + final StatSet params = getTemplate().getParameters(); if ((params != null) && !params.getSet().isEmpty()) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.merge(params); set.merge(npcSpawnTemplate.getParameters()); _params = set; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 82f429bc18..4cb0835220 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -21,7 +21,7 @@ import java.util.EnumMap; import java.util.Map; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; @@ -49,12 +49,12 @@ public class CreatureTemplate extends ListenersContainer /** The creature's race. */ private Race _race; - public CreatureTemplate(StatsSet set) + public CreatureTemplate(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { // Base stats _baseValues.put(Stat.STAT_STR, set.getDouble("baseSTR", 0)); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java index 86441c678c..14f0e9cae8 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.CubicInstance; @@ -46,7 +46,7 @@ public class CubicTemplate implements ICubicConditionHolder private final List _conditions = new ArrayList<>(); public List _skills = new ArrayList<>(); - public CubicTemplate(StatsSet set) + public CubicTemplate(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java index c40883ac75..410040bc86 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.templates; import org.l2jmobius.gameserver.enums.DoorOpenType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -57,7 +57,7 @@ public class DoorTemplate extends CreatureTemplate implements IIdentifiable private final boolean _stealth; private final boolean _isInverted; - public DoorTemplate(StatsSet set) + public DoorTemplate(StatSet set) { super(set); _doorId = set.getInt("id"); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 767743de2e..8ab41c70e3 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.enums.MpRewardAffectType; import org.l2jmobius.gameserver.enums.MpRewardType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -63,7 +63,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private boolean _usingServerSideName; private String _title; private boolean _usingServerSideTitle; - private StatsSet _parameters; + private StatSet _parameters; private Sex _sex; private int _chestId; private int _rhandId; @@ -123,15 +123,15 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable /** * Constructor of Creature. - * @param set The StatsSet object to transfer data to the method + * @param set The StatSet object to transfer data to the method */ - public NpcTemplate(StatsSet set) + public NpcTemplate(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _id = set.getInt("id"); @@ -320,12 +320,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _usingServerSideTitle; } - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } - public void setParameters(StatsSet set) + public void setParameters(StatSet set) { _parameters = set; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 50292b8bc8..28458aa09e 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -50,7 +50,7 @@ public class PlayerTemplate extends CreatureTemplate private final List _creationPoints; private final Map _baseSlotDef; - public PlayerTemplate(StatsSet set, List creationPoints) + public PlayerTemplate(StatSet set, List creationPoints) { super(set); _classId = ClassId.getClassId(set.getInt("classId")); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index aa28a0f648..260da48365 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -23,7 +23,7 @@ import java.util.Objects; import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import org.l2jmobius.gameserver.enums.InventoryBlockType; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -57,7 +57,7 @@ public class Transform implements IIdentifiable private TransformTemplate _maleTemplate; private TransformTemplate _femaleTemplate; - public Transform(StatsSet set) + public Transform(StatSet set) { _id = set.getInt("id"); _displayId = set.getInt("displayId", _id); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java index 5660852a01..729998503f 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.actor.transform; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -31,7 +31,7 @@ public class TransformLevelData private final double _levelMod; private Map _stats; - public TransformLevelData(StatsSet set) + public TransformLevelData(StatSet set) { _level = set.getInt("val"); _levelMod = set.getDouble("levelMod"); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 4de84b8bdc..7aca059f91 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -23,7 +23,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -49,7 +49,7 @@ public class TransformTemplate private ExBasicActionList _list; private final Map _data = new LinkedHashMap<>(100); - public TransformTemplate(StatsSet set) + public TransformTemplate(StatSet set) { _collisionRadius = set.contains("radius") ? set.getDouble("radius") : null; _collisionHeight = set.contains("height") ? set.getDouble("height") : null; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java index d808a6b8bf..02550d2818 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -36,7 +36,7 @@ public class AlchemyCraftData private ItemHolder _productionSuccess; private ItemHolder _productionFailure; - public AlchemyCraftData(StatsSet set) + public AlchemyCraftData(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java index 0bd061d3c4..79dd6c0207 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.beautyshop; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -32,7 +32,7 @@ public class BeautyItem private final int _beautyShopTicket; private final Map _colors = new HashMap<>(); - public BeautyItem(StatsSet set) + public BeautyItem(StatSet set) { _id = set.getInt("id"); _adena = set.getInt("adena", 0); @@ -60,7 +60,7 @@ public class BeautyItem return _beautyShopTicket; } - public void addColor(StatsSet set) + public void addColor(StatSet set) { final BeautyItem color = new BeautyItem(set); _colors.put(set.getInt("id"), color); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index 0073677d1f..ad9a204a01 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party.MessageType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.appearance.PlayerAppearance; @@ -244,7 +244,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent player.teleToLocation(_instance.getEnterLocations().get(index++), 0, _instance); } - getTimers().addTimer("match_start_countdown", StatsSet.valueOf("time", 60), 100, null, null); + getTimers().addTimer("match_start_countdown", StatSet.valueOf("time", 60), 100, null, null); getTimers().addTimer("teleport_message1", 10000, null, null); getTimers().addTimer("teleport_message2", 14000, null, null); @@ -400,7 +400,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent } } getTimers().cancelTimer("update", null, null); - getTimers().addTimer("match_end_countdown", StatsSet.valueOf("time", 30), 30 * 1000, null, null); + getTimers().addTimer("match_end_countdown", StatSet.valueOf("time", 30), 30 * 1000, null, null); EventDispatcher.getInstance().notifyEvent(new OnCeremonyOfChaosMatchResult(winners, members)); } @@ -493,7 +493,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java index 39f9196d93..371f8dc459 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.conditions.ICubicCondition; @@ -38,7 +38,7 @@ public class CubicSkill extends SkillHolder implements ICubicConditionHolder private final List _conditions = new ArrayList<>(); private final boolean _targetDebuff; - public CubicSkill(StatsSet set) + public CubicSkill(StatSet set) { super(set.getInt("id"), set.getInt("level")); _triggerRate = set.getInt("triggerRate", 100); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/ClanHall.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/ClanHall.java index 8da77477fd..22af370709 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/ClanHall.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/ClanHall.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -75,7 +75,7 @@ public class ClanHall extends AbstractResidence private static final String LOAD_CLANHALL = "SELECT * FROM clanhall WHERE id=?"; private static final String UPDATE_CLANHALL = "UPDATE clanhall SET ownerId=?,paidUntil=? WHERE id=?"; - public ClanHall(StatsSet params) + public ClanHall(StatSet params) { super(params.getInt("id")); // Set static parameters diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Hero.java index ef005ff325..aee8b019ee 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Hero.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Hero.java @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.data.xml.impl.ClassListData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -74,13 +74,13 @@ public class Hero // delete hero items private static final String DELETE_ITEMS = "DELETE FROM items WHERE item_id IN (30392, 30393, 30394, 30395, 30396, 30397, 30398, 30399, 30400, 30401, 30402, 30403, 30404, 30405, 30372, 30373, 6842, 6611, 6612, 6613, 6614, 6615, 6616, 6617, 6618, 6619, 6620, 6621, 9388, 9389, 9390) AND owner_id NOT IN (SELECT charId FROM characters WHERE accesslevel > 0)"; - private static final Map HEROES = new ConcurrentHashMap<>(); - private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); + private static final Map HEROES = new ConcurrentHashMap<>(); + private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); - private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); - private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); + private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); + private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); - private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); + private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); private static final Map HERO_MESSAGE = new ConcurrentHashMap<>(); public static final String COUNT = "count"; @@ -118,7 +118,7 @@ public class Hero { while (rset.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset.getInt(Olympiad.CLASS_ID)); @@ -137,7 +137,7 @@ public class Hero while (rset2.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset2.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset2.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset2.getInt(Olympiad.CLASS_ID)); @@ -159,7 +159,7 @@ public class Hero LOGGER.info("Hero System: Loaded " + COMPLETE_HEROS.size() + " all time Heroes."); } - private void processHeros(PreparedStatement ps, int charId, StatsSet hero) throws SQLException + private void processHeros(PreparedStatement ps, int charId, StatSet hero) throws SQLException { ps.setInt(1, charId); try (ResultSet rs = ps.executeQuery()) @@ -224,7 +224,7 @@ public class Hero public void loadDiary(int charId) { - final List diary = new ArrayList<>(); + final List diary = new ArrayList<>(); int diaryentries = 0; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement("SELECT * FROM heroes_diary WHERE charId=? ORDER BY time ASC")) @@ -234,7 +234,7 @@ public class Hero { while (rset.next()) { - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final long time = rset.getLong("time"); final int action = rset.getInt("action"); @@ -279,8 +279,8 @@ public class Hero public void loadFights(int charId) { - final List fights = new ArrayList<>(); - final StatsSet heroCountData = new StatsSet(); + final List fights = new ArrayList<>(); + final StatSet heroCountData = new StatSet(); final Calendar data = Calendar.getInstance(); data.set(Calendar.DAY_OF_MONTH, 1); data.set(Calendar.HOUR_OF_DAY, 0); @@ -326,7 +326,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charTwoClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -362,7 +362,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charOneClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -410,14 +410,14 @@ public class Hero } } - public Map getHeroes() + public Map getHeroes() { return HEROES; } public int getHeroByClass(int classid) { - for (Entry e : HEROES.entrySet()) + for (Entry e : HEROES.entrySet()) { if (e.getValue().getInt(Olympiad.CLASS_ID) == classid) { @@ -438,7 +438,7 @@ public class Hero public void showHeroDiary(PlayerInstance player, int heroclass, int charid, int page) { final int perpage = 10; - final List mainList = HERO_DIARY.get(charid); + final List mainList = HERO_DIARY.get(charid); if (mainList != null) { final NpcHtmlMessage diaryReply = new NpcHtmlMessage(); @@ -453,7 +453,7 @@ public class Hero if (!mainList.isEmpty()) { - final List list = new ArrayList<>(mainList); + final List list = new ArrayList<>(mainList); Collections.reverse(list); boolean color = true; @@ -463,7 +463,7 @@ public class Hero for (int i = (page - 1) * perpage; i < list.size(); i++) { breakat = i; - final StatsSet diaryEntry = list.get(i); + final StatSet diaryEntry = list.get(i); fList.append(""); if (color) { @@ -524,7 +524,7 @@ public class Hero int loss = 0; int draw = 0; - final List heroFights = HERO_FIGHTS.get(charid); + final List heroFights = HERO_FIGHTS.get(charid); if (heroFights != null) { final NpcHtmlMessage fightReply = new NpcHtmlMessage(); @@ -536,7 +536,7 @@ public class Hero if (!heroFights.isEmpty()) { - final StatsSet heroCount = HERO_COUNTS.get(charid); + final StatSet heroCount = HERO_COUNTS.get(charid); if (heroCount != null) { win = heroCount.getInt("victory"); @@ -551,7 +551,7 @@ public class Hero for (int i = (page - 1) * perpage; i < heroFights.size(); i++) { breakat = i; - final StatsSet fight = heroFights.get(i); + final StatSet fight = heroFights.get(i); fList.append(""); if (color) { @@ -609,7 +609,7 @@ public class Hero } } - public synchronized void computeNewHeroes(List newHeroes) + public synchronized void computeNewHeroes(List newHeroes) { updateHeroes(true); @@ -659,13 +659,13 @@ public class Hero return; } - for (StatsSet hero : newHeroes) + for (StatSet hero : newHeroes) { final int charId = hero.getInt(Olympiad.CHAR_ID); if (COMPLETE_HEROS.containsKey(charId)) { - final StatsSet oldHero = COMPLETE_HEROS.get(charId); + final StatSet oldHero = COMPLETE_HEROS.get(charId); final int count = oldHero.getInt(COUNT); oldHero.set(COUNT, count + 1); oldHero.set(PLAYED, 1); @@ -674,7 +674,7 @@ public class Hero } else { - final StatsSet newHero = new StatsSet(); + final StatSet newHero = new StatSet(); newHero.set(Olympiad.CHAR_NAME, hero.getString(Olympiad.CHAR_NAME)); newHero.set(Olympiad.CLASS_ID, hero.getInt(Olympiad.CLASS_ID)); newHero.set(COUNT, 1); @@ -700,9 +700,9 @@ public class Hero } else { - StatsSet hero; + StatSet hero; int heroId; - for (Entry entry : HEROES.entrySet()) + for (Entry entry : HEROES.entrySet()) { hero = entry.getValue(); heroId = entry.getKey(); @@ -787,13 +787,13 @@ public class Hero setDiaryData(charId, ACTION_RAID_KILLED, npcId); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (template == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -806,13 +806,13 @@ public class Hero setDiaryData(charId, ACTION_CASTLE_TAKEN, castleId); final Castle castle = CastleManager.getInstance().getCastleById(castleId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (castle == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -922,10 +922,10 @@ public class Hero */ public void claimHero(PlayerInstance player) { - StatsSet hero = HEROES.get(player.getObjectId()); + StatSet hero = HEROES.get(player.getObjectId()); if (hero == null) { - hero = new StatsSet(); + hero = new StatSet(); HEROES.put(player.getObjectId(), hero); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java index f1263e8d44..c52f487402 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java @@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.atomic.AtomicReference; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.eventengine.drop.IEventDrop; import org.l2jmobius.gameserver.model.events.AbstractScript; @@ -42,7 +42,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout public abstract class AbstractEventManager>extends AbstractScript { private String _name; - private StatsSet _variables = StatsSet.EMPTY_STATSET; + private StatSet _variables = StatSet.EMPTY_STATSET; private Set _schedulers = Collections.emptySet(); private Set _conditionalSchedulers = Collections.emptySet(); private Map _rewards = Collections.emptyMap(); @@ -67,14 +67,14 @@ public abstract class AbstractEventManager>extends Ab /* ********************** */ - public StatsSet getVariables() + public StatSet getVariables() { return _variables; } - public void setVariables(StatsSet variables) + public void setVariables(StatSet variables) { - _variables = new StatsSet(Collections.unmodifiableMap(variables.getSet())); + _variables = new StatSet(Collections.unmodifiableMap(variables.getSet())); } /* ********************** */ diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java index 59c64b812c..e41af41d1a 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.util.cron4j.PastPredictor; import org.l2jmobius.gameserver.util.cron4j.Predictor; @@ -45,7 +45,7 @@ public class EventScheduler private List _notifications; private ScheduledFuture _task; - public EventScheduler(AbstractEventManager manager, StatsSet set) + public EventScheduler(AbstractEventManager manager, StatSet set) { _eventManager = manager; _name = set.getString("name", ""); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 1189dc9aa4..ca9d08a337 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -51,7 +51,7 @@ import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -183,12 +183,12 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime onTimerCancel(holder.getEvent(), holder.getParams(), holder.getNpc(), holder.getPlayer()); } - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { LOGGER.warning("[" + getClass().getSimpleName() + "]: Timer event arrived at non overriden onTimerEvent method event: " + event + " npc: " + npc + " player: " + player); } - public void onTimerCancel(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerCancel(String event, StatSet params, Npc npc, PlayerInstance player) { } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java index 400fb64b6e..861c4a9b31 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java @@ -24,7 +24,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.timers.IEventTimerCancel; @@ -69,7 +69,7 @@ public class TimerExecutor * @param eventTimer * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - public boolean addTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) + public boolean addTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) { return addTimer(new TimerHolder<>(event, params, time, npc, player, false, eventTimer, _cancelListener, this)); } @@ -95,7 +95,7 @@ public class TimerExecutor * @param player * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - public boolean addTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player) + public boolean addTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player) { return addTimer(event, params, time, npc, player, _eventListener); } @@ -123,7 +123,7 @@ public class TimerExecutor * @param eventTimer * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - private boolean addRepeatingTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) + private boolean addRepeatingTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) { return addTimer(new TimerHolder<>(event, params, time, npc, player, true, eventTimer, _cancelListener, this)); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java index ab8fa150ca..0fcafba759 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java @@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.gameserver.instancemanager.TimersManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.TimerExecutor; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.events.TimerExecutor; public class TimerHolder implements Runnable { private final T _event; - private final StatsSet _params; + private final StatSet _params; private final long _time; private final Npc _npc; private final PlayerInstance _player; @@ -44,7 +44,7 @@ public class TimerHolder implements Runnable private final TimerExecutor _postExecutor; private final ScheduledFuture _task; - public TimerHolder(T event, StatsSet params, long time, Npc npc, PlayerInstance player, boolean isRepeating, IEventTimerEvent eventScript, IEventTimerCancel cancelScript, TimerExecutor postExecutor) + public TimerHolder(T event, StatSet params, long time, Npc npc, PlayerInstance player, boolean isRepeating, IEventTimerEvent eventScript, IEventTimerCancel cancelScript, TimerExecutor postExecutor) { Objects.requireNonNull(event, getClass().getSimpleName() + ": \"event\" cannot be null!"); Objects.requireNonNull(eventScript, getClass().getSimpleName() + ": \"script\" cannot be null!"); @@ -73,7 +73,7 @@ public class TimerHolder implements Runnable /** * @return the parameters of this timer */ - public StatsSet getParams() + public StatSet getParams() { return _params; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index db95bd7dbc..df52427f29 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; @@ -37,7 +37,7 @@ public class AppearanceHolder private final AppearanceTargetType _targetType; private final long _bodyPart; - public AppearanceHolder(StatsSet set) + public AppearanceHolder(StatSet set) { _visualId = set.getInt("id", 0); _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java index 29740873cd..0f9488448d 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Nik @@ -43,7 +43,7 @@ public class AttachSkillHolder extends SkillHolder return _requiredSkillLevel; } - public static AttachSkillHolder fromStatsSet(StatsSet set) + public static AttachSkillHolder fromStatSet(StatSet set) { return new AttachSkillHolder(set.getInt("skillId"), set.getInt("skillLevel", 1), set.getInt("requiredSkillId"), set.getInt("requiredSkillLevel", 1)); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java index cc41724532..57b6d47c40 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Set; import org.l2jmobius.gameserver.enums.SkillEnchantType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -36,7 +36,7 @@ public class EnchantSkillHolder private final Map _chance = new EnumMap<>(SkillEnchantType.class); private final Map> _requiredItems = new EnumMap<>(SkillEnchantType.class); - public EnchantSkillHolder(StatsSet set) + public EnchantSkillHolder(StatSet set) { _level = set.getInt("level"); _enchantFailLevel = set.getInt("enchantFailLevel"); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java index e6706c8467..33d14e4345 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Map; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -36,7 +36,7 @@ public class ExtendDropDataHolder private final List _conditions; private final Map _systemMessages; - public ExtendDropDataHolder(StatsSet set) + public ExtendDropDataHolder(StatSet set) { _id = set.getInt("id"); _items = set.getList("items", ExtendDropItemHolder.class); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java index 16454d764a..d63d4eb775 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -52,7 +52,7 @@ public class FakePlayerHolder private final int _clanId; private final int _pledgeStatus; - public FakePlayerHolder(StatsSet set) + public FakePlayerHolder(StatSet set) { _classId = set.getInt("classId", 182); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java index a9c72776cd..86af0c1405 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -29,7 +29,7 @@ public class ItemHolder implements IIdentifiable private final int _id; private final long _count; - public ItemHolder(StatsSet set) + public ItemHolder(StatSet set) { _id = set.getInt("id"); _count = set.getLong("count"); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java index 5f7bb2008b..1c6f7b506b 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -25,7 +25,7 @@ public class ItemPointHolder extends ItemHolder { private final int _points; - public ItemPointHolder(StatsSet params) + public ItemPointHolder(StatSet params) { this(params.getInt("id"), params.getLong("count"), params.getInt("points")); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java index 71d4f56eea..1b65c8912f 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.holders; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -34,7 +34,7 @@ public class LuckyGameDataHolder private int _minModifyRewardGame; private int _maxModifyRewardGame; - public LuckyGameDataHolder(StatsSet params) + public LuckyGameDataHolder(StatSet params) { _index = params.getInt("index"); _turningPoints = params.getInt("turning_point"); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java index f77e380e8d..9fa8c99654 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.holders; import java.time.Duration; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -32,7 +32,7 @@ public class MinionHolder implements IIdentifiable private final long _respawnTime; private final int _weightPoint; - public MinionHolder(StatsSet set) + public MinionHolder(StatSet set) { _id = set.getInt("id"); _count = set.getInt("count", 1); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java index f4173594d1..36ac70176d 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -52,7 +52,7 @@ public class MultisellListHolder implements IIdentifiable } @SuppressWarnings("unchecked") - public MultisellListHolder(StatsSet set) + public MultisellListHolder(StatSet set) { _listId = set.getInt("listId"); _isChanceMultisell = set.getBoolean("isChanceMultisell", false); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java index cef1e13e8f..5e9c55ea74 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.StatusUpdateType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -56,7 +56,7 @@ public class RecipeHolder implements IIdentifiable private final double _maxOfferingBonus; private final long _maxOffering; - public RecipeHolder(StatsSet set, List ingredients, List productGroup, List npcFee, Map statUse) + public RecipeHolder(StatSet set, List ingredients, List productGroup, List npcFee, Map statUse) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 4be9476d1c..0e1b87a6d9 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -45,7 +45,7 @@ import org.l2jmobius.gameserver.enums.InstanceReenterType; import org.l2jmobius.gameserver.enums.InstanceTeleportType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -87,7 +87,7 @@ public class Instance implements IIdentifiable, INamable private final Set _players = ConcurrentHashMap.newKeySet(); // Players inside instance private final Set _npcs = ConcurrentHashMap.newKeySet(); // Spawned NPCs inside instance private final Map _doors = new HashMap<>(); // Spawned doors inside instance - private final StatsSet _parameters = new StatsSet(); + private final StatSet _parameters = new StatSet(); // Timers private final Map> _ejectDeadTasks = new ConcurrentHashMap<>(); private ScheduledFuture _cleanUpTask = null; @@ -171,7 +171,7 @@ public class Instance implements IIdentifiable, INamable * Get instance world parameters. * @return instance parameters */ - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } @@ -1020,7 +1020,7 @@ public class Instance implements IIdentifiable, INamable * Get parameters from instance template.
* @return template parameters */ - public StatsSet getTemplateParameters() + public StatSet getTemplateParameters() { return _template.getParameters(); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 2a196f73ef..b53b0a819d 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.AbstractPlayerGroup; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -71,7 +71,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl private float _spRate = Config.RATE_INSTANCE_SP; private float _expPartyRate = Config.RATE_INSTANCE_PARTY_XP; private float _spPartyRate = Config.RATE_INSTANCE_PARTY_SP; - private StatsSet _parameters = StatsSet.EMPTY_STATSET; + private StatSet _parameters = StatSet.EMPTY_STATSET; private final Map _doors = new HashMap<>(); private final List _spawns = new ArrayList<>(); // Locations @@ -92,7 +92,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl /** * @param set */ - public InstanceTemplate(StatsSet set) + public InstanceTemplate(StatSet set) { _templateId = set.getInt("id", 0); _name = set.getString("name", null); @@ -178,7 +178,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (!set.isEmpty()) { - _parameters = new StatsSet(Collections.unmodifiableMap(set)); + _parameters = new StatSet(Collections.unmodifiableMap(set)); } } @@ -469,7 +469,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl * Get instance template parameters. * @return parameters of template */ - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java index 3b67ff72f4..3627959662 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; import java.util.function.BiConsumer; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public abstract class Condition { private final InstanceTemplate _template; - private final StatsSet _parameters; + private final StatSet _parameters; private final boolean _leaderOnly; private final boolean _showMessageAndHtml; private SystemMessageId _systemMsg = null; @@ -46,7 +46,7 @@ public abstract class Condition * @param onlyLeader flag which means if only leader should be affected (leader means player who wants to enter not group leader!) * @param showMessageAndHtml if {@code true} and HTML message is defined then both are send, otherwise only HTML or message is send */ - public Condition(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public Condition(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { _template = template; _parameters = parameters; @@ -58,7 +58,7 @@ public abstract class Condition * Gets parameters of condition. * @return set of parameters */ - protected final StatsSet getParameters() + protected final StatSet getParameters() { return _parameters; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java index e379741b59..c27d92d662 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionCommandChannel extends Condition { - public ConditionCommandChannel(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionCommandChannel(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_CANNOT_ENTER_BECAUSE_YOU_ARE_NOT_ASSOCIATED_WITH_THE_CURRENT_COMMAND_CHANNEL); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java index ed434e3524..a828dcceae 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.model.AbstractPlayerGroup; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionCommandChannelLeader extends Condition { - public ConditionCommandChannelLeader(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionCommandChannelLeader(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java index d2a60816d0..423a37a94e 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionDistance extends Condition { - public ConditionDistance(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionDistance(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); setSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED, (message, player) -> message.addString(player.getName())); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java index 3dc78a98c7..8aa68b7e08 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionGroupMax extends Condition { - public ConditionGroupMax(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionGroupMax(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_CANNOT_ENTER_DUE_TO_THE_PARTY_HAVING_EXCEEDED_THE_LIMIT); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java index 818803c844..70ea03c187 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionGroupMin extends Condition { - public ConditionGroupMin(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionGroupMin(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_MUST_HAVE_A_MINIMUM_OF_S1_PEOPLE_TO_ENTER_THIS_INSTANCE_ZONE, (msg, player) -> msg.addInt(getLimit())); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 3088d8ae64..53fee609aa 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.enums.ResidenceType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; */ public class ConditionHasResidence extends Condition { - public ConditionHasResidence(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionHasResidence(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); } @@ -43,7 +43,7 @@ public class ConditionHasResidence extends Condition return false; } - final StatsSet params = getParameters(); + final StatSet params = getParameters(); final int id = params.getInt("id"); boolean test = false; switch (params.getEnum("type", ResidenceType.class)) diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java index 4e1c407325..eed350db38 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -32,7 +32,7 @@ public class ConditionItem extends Condition private final long _count; private final boolean _take; - public ConditionItem(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionItem(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Load params diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java index 7d509a20c7..b38f8c0e2c 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -32,7 +32,7 @@ public class ConditionLevel extends Condition private final int _min; private final int _max; - public ConditionLevel(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionLevel(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Load params diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java index b91deeffdb..d71e6d0a39 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; */ public class ConditionNoParty extends Condition { - public ConditionNoParty(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionNoParty(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java index dd31bf3ca5..5bf768a03e 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionParty extends Condition { - public ConditionParty(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionParty(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java index 524a59675a..0363715536 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionPartyLeader extends Condition { - public ConditionPartyLeader(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionPartyLeader(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java index 481cb251ce..48d7fc7981 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.instancemanager.QuestManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionQuest extends Condition { - public ConditionQuest(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionQuest(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Set message diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 899b17aff9..a073129734 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionReenter extends Condition { - public ConditionReenter(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionReenter(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); setSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET, (message, player) -> message.addString(player.getName())); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java index ec255025c3..fafafe5604 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.itemauction; import java.util.Calendar; import java.util.concurrent.TimeUnit; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Forsaiken @@ -40,7 +40,7 @@ public class AuctionDateGenerator private int _hour_of_day; private int _minute_of_hour; - public AuctionDateGenerator(StatsSet config) + public AuctionDateGenerator(StatSet config) { _calendar = Calendar.getInstance(); _interval = config.getInt(FIELD_INTERVAL, -1); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 64bf0a6ff1..cb554e4dce 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.itemauction; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.idfactory.IdFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,9 +34,9 @@ public class AuctionItem private final int _itemId; private final long _itemCount; @SuppressWarnings("unused") - private final StatsSet _itemExtra; + private final StatSet _itemExtra; - public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatsSet itemExtra) + public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatSet itemExtra) { _auctionItemId = auctionItemId; _auctionLength = auctionLength; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 6dff6e3a4d..dc3a7f6f6b 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -44,7 +44,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -84,7 +84,7 @@ public class ItemAuctionInstance _items = new ArrayList<>(); final NamedNodeMap nanode = node.getAttributes(); - final StatsSet generatorConfig = new StatsSet(); + final StatSet generatorConfig = new StatSet(); for (int i = nanode.getLength(); i-- > 0;) { final Node n = nanode.item(i); @@ -115,7 +115,7 @@ public class ItemAuctionInstance throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } - final StatsSet itemExtra = new StatsSet(); + final StatSet itemExtra = new StatSet(); final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/Armor.java index 9acdd1f30d..5986408f74 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/Armor.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.type.ArmorType; /** @@ -28,15 +28,15 @@ public class Armor extends Item /** * Constructor for Armor. - * @param set the StatsSet designating the set of couples (key,value) characterizing the armor. + * @param set the StatSet designating the set of couples (key,value) characterizing the armor. */ - public Armor(StatsSet set) + public Armor(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/EtcItem.java index 86d7291595..a902860c0d 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/EtcItem.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -38,15 +38,15 @@ public class EtcItem extends Item /** * Constructor for EtcItem. - * @param set StatsSet designating the set of couples (key,value) for description of the Etc + * @param set StatSet designating the set of couples (key,value) for description of the Etc */ - public EtcItem(StatsSet set) + public EtcItem(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/Henna.java index c669b86eec..c4c32e7cda 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -21,7 +21,7 @@ import java.util.EnumMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; @@ -45,7 +45,7 @@ public class Henna private final List _skills; private final List _wear_class; - public Henna(StatsSet set) + public Henna(StatSet set) { _dyeId = set.getInt("dyeId"); _dyeItemId = set.getInt("dyeItemId"); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/Item.java index 5c81709238..8dab17b4f2 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/Item.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.enums.ItemGrade; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; @@ -176,14 +176,14 @@ public abstract class Item extends ListenersContainer implements IIdentifiable /** * Constructor of the Item that fill class variables.
*
- * @param set : StatsSet corresponding to a set of couples (key,value) for description of the item + * @param set : StatSet corresponding to a set of couples (key,value) for description of the item */ - protected Item(StatsSet set) + protected Item(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { _itemId = set.getInt("item_id"); _displayId = set.getInt("displayId", _itemId); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java index ab196007a8..3ca228cbe5 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -29,7 +29,7 @@ public class PlayerItemTemplate extends ItemHolder /** * @param set the set containing the values for this object */ - public PlayerItemTemplate(StatsSet set) + public PlayerItemTemplate(StatSet set) { super(set.getInt("id"), set.getInt("count")); _equipped = set.getBoolean("equipped", false); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/Weapon.java index 16f0c47287..5f9f8507bd 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/Weapon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.items; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ItemSkillType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -58,15 +58,15 @@ public class Weapon extends Item /** * Constructor for Weapon. - * @param set the StatsSet designating the set of couples (key,value) characterizing the weapon. + * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. */ - public Weapon(StatsSet set) + public Weapon(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java index 7bdd968d90..6d05c20ff3 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java @@ -23,7 +23,7 @@ import java.util.List; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -54,7 +54,7 @@ public class AppearanceStone private List _racesNot; private List _allVisualIds; - public AppearanceStone(StatsSet set) + public AppearanceStone(StatSet set) { _id = set.getInt("id"); _visualId = set.getInt("visualId", 0); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java index f3b53f1a67..a2897ba911 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.items.combination; import java.util.EnumMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -31,7 +31,7 @@ public class CombinationItem private final int _chance; private final Map _rewards = new EnumMap<>(CombinationItemType.class); - public CombinationItem(StatsSet set) + public CombinationItem(StatSet set) { _itemOne = set.getInt("one"); _itemTwo = set.getInt("two"); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java index 1cde38a6d6..a7f1326bd8 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.CrystalType; @@ -59,7 +59,7 @@ public abstract class AbstractEnchantItem private final int _maxEnchantLevel; private final double _bonusRate; - public AbstractEnchantItem(StatsSet set) + public AbstractEnchantItem(StatSet set) { _id = set.getInt("id"); if (getItem() == null) diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java index 36ccf3a5a4..310a7643ec 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -40,7 +40,7 @@ public class EnchantScroll extends AbstractEnchantItem private final int _scrollGroupId; private Set _items; - public EnchantScroll(StatsSet set) + public EnchantScroll(StatSet set) { super(set); _scrollGroupId = set.getInt("scrollGroupId", 0); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java index c02095428b..978e38d533 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items.enchant; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.items.type.ItemType; @@ -30,7 +30,7 @@ public class EnchantSupportItem extends AbstractEnchantItem private final boolean _isGiant; private final ItemType type; - public EnchantSupportItem(StatsSet set) + public EnchantSupportItem(StatSet set) { super(set); type = getItem().getItemType(); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index d15d179719..0a67dd54f0 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.data.xml.impl.CategoryData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.entity.Hero; @@ -61,7 +61,7 @@ public class Olympiad extends ListenersContainer protected static final Logger LOGGER = Logger.getLogger(Olympiad.class.getName()); protected static final Logger LOGGER_OLYMPIAD = Logger.getLogger("olympiad"); - private static final Map NOBLES = new ConcurrentHashMap<>(); + private static final Map NOBLES = new ConcurrentHashMap<>(); private static final Map NOBLES_RANK = new HashMap<>(); public static final String OLYMPIAD_HTML_PATH = "data/html/olympiad/"; @@ -226,10 +226,10 @@ public class Olympiad extends ListenersContainer PreparedStatement statement = con.prepareStatement(OLYMPIAD_LOAD_NOBLES); ResultSet rset = statement.executeQuery()) { - StatsSet statData; + StatSet statData; while (rset.next()) { - statData = new StatsSet(); + statData = new StatSet(); statData.set(CLASS_ID, rset.getInt(CLASS_ID)); statData.set(CHAR_NAME, rset.getString(CHAR_NAME)); statData.set(POINTS, rset.getInt(POINTS)); @@ -452,7 +452,7 @@ public class Olympiad extends ListenersContainer saveNobleData(); _period = 1; - final List heroesToBe = sortHerosToBe(); + final List heroesToBe = sortHerosToBe(); Hero.getInstance().resetData(); Hero.getInstance().computeNewHeroes(heroesToBe); @@ -486,7 +486,7 @@ public class Olympiad extends ListenersContainer return NOBLES.size(); } - public static StatsSet getNobleStats(int playerId) + public static StatSet getNobleStats(int playerId) { return NOBLES.get(playerId); } @@ -785,7 +785,7 @@ public class Olympiad extends ListenersContainer } int currentPoints; - for (StatsSet nobleInfo : NOBLES.values()) + for (StatSet nobleInfo : NOBLES.values()) { currentPoints = nobleInfo.getInt(POINTS); currentPoints += WEEKLY_POINTS; @@ -803,7 +803,7 @@ public class Olympiad extends ListenersContainer return; } - for (StatsSet nobleInfo : NOBLES.values()) + for (StatSet nobleInfo : NOBLES.values()) { nobleInfo.set(COMP_DONE_WEEK, 0); } @@ -836,9 +836,9 @@ public class Olympiad extends ListenersContainer try (Connection con = DatabaseFactory.getConnection()) { - for (Entry entry : NOBLES.entrySet()) + for (Entry entry : NOBLES.entrySet()) { - final StatsSet nobleInfo = entry.getValue(); + final StatSet nobleInfo = entry.getValue(); if (nobleInfo == null) { @@ -951,7 +951,7 @@ public class Olympiad extends ListenersContainer } } - protected List sortHerosToBe() + protected List sortHerosToBe() { if (_period != 1) { @@ -961,8 +961,8 @@ public class Olympiad extends ListenersContainer if (NOBLES != null) { LOGGER_OLYMPIAD.info("Noble,charid,classid,compDone,points"); - StatsSet nobleInfo; - for (Entry entry : NOBLES.entrySet()) + StatSet nobleInfo; + for (Entry entry : NOBLES.entrySet()) { nobleInfo = entry.getValue(); if (nobleInfo == null) @@ -980,12 +980,12 @@ public class Olympiad extends ListenersContainer } } - final List heroesToBe = new LinkedList<>(); + final List heroesToBe = new LinkedList<>(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(OLYMPIAD_GET_HEROS)) { - StatsSet hero; + StatSet hero; for (int element : HERO_IDS) { statement.setInt(1, element); @@ -994,7 +994,7 @@ public class Olympiad extends ListenersContainer { if (rset.next()) { - hero = new StatsSet(); + hero = new StatSet(); hero.set(CLASS_ID, element); hero.set(CHAR_ID, rset.getInt(CHAR_ID)); hero.set(CHAR_NAME, rset.getString(CHAR_NAME)); @@ -1048,7 +1048,7 @@ public class Olympiad extends ListenersContainer return 0; } - final StatsSet noble = NOBLES.get(objectId); + final StatSet noble = NOBLES.get(objectId); if ((noble == null) || (noble.getInt(POINTS) == 0)) { return 0; @@ -1098,7 +1098,7 @@ public class Olympiad extends ListenersContainer { if (!NOBLES.containsKey(player.getObjectId())) { - final StatsSet statDat = new StatsSet(); + final StatSet statDat = new StatSet(); statDat.set(CLASS_ID, player.getBaseClass()); statDat.set(CHAR_NAME, player.getName()); statDat.set(POINTS, DEFAULT_POINTS); @@ -1205,7 +1205,7 @@ public class Olympiad extends ListenersContainer * @param data the stats set data to add. * @return the old stats set if the noble is already present, null otherwise. */ - public static StatsSet addNobleStats(int charId, StatsSet data) + public static StatSet addNobleStats(int charId, StatSet data) { return NOBLES.put(charId, data); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/Participant.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/Participant.java index 670066ac32..b6d879b902 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/Participant.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/Participant.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.olympiad; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class Participant private final int baseClass; private boolean disconnected = false; private boolean defaulted = false; - private final StatsSet stats; + private final StatSet stats; public String clanName; public int clanId; @@ -125,7 +125,7 @@ public class Participant /** * @return the stats */ - public StatsSet getStats() + public StatSet getStats() { return stats; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java index 4d5231ca5d..c1fb0f88f6 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.primeshop; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -49,7 +49,7 @@ public class PrimeShopGroup private final int _availableCount; private final List _items; - public PrimeShopGroup(StatsSet set, List items) + public PrimeShopGroup(StatSet set, List items) { _brId = set.getInt("id"); _category = set.getInt("cat", 0); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java index d150ec98cd..88795e0721 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.residences; import java.time.Duration; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -33,7 +33,7 @@ public class ResidenceFunctionTemplate private final Duration _duration; private final double _value; - public ResidenceFunctionTemplate(StatsSet set) + public ResidenceFunctionTemplate(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java index 4f15efda0b..b19f8e59d5 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; /** @@ -34,7 +34,7 @@ public class ShuttleDataHolder private final List _stops = new ArrayList<>(2); private final List _routes = new ArrayList<>(2); - public ShuttleDataHolder(StatsSet set) + public ShuttleDataHolder(StatSet set) { _id = set.getInt("id"); _loc = new Location(set); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/Skill.java index c44b45a781..0e97466a3a 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.handler.IAffectScopeHandler; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.CubicInstance; @@ -210,7 +210,7 @@ public class Skill implements IIdentifiable private final SkillBuffType _buffType; private final boolean _displayInList; - public Skill(StatsSet set) + public Skill(StatSet set) { _id = set.getInt(".id"); _level = set.getInt(".level"); @@ -391,7 +391,7 @@ public class Skill implements IIdentifiable _toggleGroupId = set.getInt("toggleGroupId", -1); _attachToggleGroupId = set.getInt("attachToggleGroupId", -1); - _attachSkills = set.getList("attachSkillList", StatsSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatsSet).collect(Collectors.toList()); + _attachSkills = set.getList("attachSkillList", StatSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatSet).collect(Collectors.toList()); final String abnormalResist = set.getString("abnormalResists", null); if (abnormalResist != null) diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java index bfc25bddde..39b738dbca 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.ChanceLocation; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory; /** * @author UnAfraid */ -public class NpcSpawnTemplate implements Cloneable, IParameterized +public class NpcSpawnTemplate implements Cloneable, IParameterized { private static final Logger LOGGER = Logger.getLogger(NpcSpawnTemplate.class.getName()); @@ -56,7 +56,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized private final Duration _respawnTimeRandom; private List _locations; private SpawnTerritory _zone; - private StatsSet _parameters; + private StatSet _parameters; private final boolean _spawnAnimation; private final boolean _saveInDB; private final String _dbName; @@ -82,7 +82,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized _minions = template._minions; } - public NpcSpawnTemplate(SpawnTemplate spawnTemplate, SpawnGroup group, StatsSet set) + public NpcSpawnTemplate(SpawnTemplate spawnTemplate, SpawnGroup group, StatSet set) { _spawnTemplate = spawnTemplate; _group = group; @@ -128,14 +128,14 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized mergeParameters(spawnTemplate, group); } - private StatsSet mergeParameters(SpawnTemplate spawnTemplate, SpawnGroup group) + private StatSet mergeParameters(SpawnTemplate spawnTemplate, SpawnGroup group) { if ((_parameters == null) && (spawnTemplate.getParameters() == null) && (group.getParameters() == null)) { return null; } - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); if (spawnTemplate.getParameters() != null) { set.merge(spawnTemplate.getParameters()); @@ -206,13 +206,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized } @Override - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } @Override - public void setParameters(StatsSet parameters) + public void setParameters(StatSet parameters) { if (_parameters == null) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java index 6723863c93..7ceb2d46af 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IParameterized; import org.l2jmobius.gameserver.model.interfaces.ITerritorized; @@ -31,16 +31,16 @@ import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory; /** * @author UnAfraid */ -public class SpawnGroup implements Cloneable, ITerritorized, IParameterized +public class SpawnGroup implements Cloneable, ITerritorized, IParameterized { private final String _name; private final boolean _spawnByDefault; private List _territories; private List _bannedTerritories; private final List _spawns = new ArrayList<>(); - private StatsSet _parameters; + private StatSet _parameters; - public SpawnGroup(StatsSet set) + public SpawnGroup(StatSet set) { this(set.getString("name", null), set.getBoolean("spawnByDefault", true)); } @@ -104,13 +104,13 @@ public class SpawnGroup implements Cloneable, ITerritorized, IParameterized +public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized { private final String _name; private final String _ai; @@ -45,9 +45,9 @@ public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized _territories; private List _bannedTerritories; private final List _groups = new ArrayList<>(); - private StatsSet _parameters; + private StatSet _parameters; - public SpawnTemplate(StatsSet set, File file) + public SpawnTemplate(StatSet set, File file) { this(set.getString("name", null), set.getString("ai", null), set.getBoolean("spawnByDefault", true), file); } @@ -128,13 +128,13 @@ public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized _castleId; - public TeleportLocation(int id, StatsSet set) + public TeleportLocation(int id, StatSet set) { super(set); _id = id; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java index 916ae0790c..33cf6ac3bc 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.variables; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.IRestorable; import org.l2jmobius.gameserver.model.interfaces.IStorable; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.interfaces.IStorable; /** * @author UnAfraid */ -public abstract class AbstractVariables extends StatsSet implements IRestorable, IStorable, IDeletable +public abstract class AbstractVariables extends StatSet implements IRestorable, IStorable, IDeletable { private final AtomicBoolean _hasChanges = new AtomicBoolean(false); @@ -41,42 +41,42 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, */ @Override - public StatsSet set(String name, boolean value) + public StatSet set(String name, boolean value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, double value) + public StatSet set(String name, double value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, Enum value) + public StatSet set(String name, Enum value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, int value) + public StatSet set(String name, int value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, long value) + public StatSet set(String name, long value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, String value) + public StatSet set(String name, String value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); @@ -89,7 +89,7 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, * @param markAsChanged * @return */ - public StatsSet set(String name, String value, boolean markAsChanged) + public StatSet set(String name, String value, boolean markAsChanged) { if (markAsChanged) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index 5c03122a62..4d97f0017a 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExHeroList implements IClientOutgoingPacket { - private final Map _heroList; + private final Map _heroList; public ExHeroList() { @@ -42,7 +42,7 @@ public class ExHeroList implements IClientOutgoingPacket OutgoingPackets.EX_HERO_LIST.writeId(packet); packet.writeD(_heroList.size()); - for (StatsSet hero : _heroList.values()) + for (StatSet hero : _heroList.values()) { packet.writeS(hero.getString(Olympiad.CHAR_NAME)); packet.writeD(hero.getInt(Olympiad.CLASS_ID)); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/BypassParser.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/BypassParser.java index 414125bdeb..a80323ba1f 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/BypassParser.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/BypassParser.java @@ -20,12 +20,12 @@ import java.util.LinkedHashMap; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid */ -public class BypassParser extends StatsSet +public class BypassParser extends StatSet { private static final String ALLOWED_CHARS = "a-zA-Z0-9-_`!@#%^&*()\\[\\]|\\\\/"; private static final Pattern PATTERN = Pattern.compile(String.format("([%s]*)=('([%s ]*)'|[%s]*)", ALLOWED_CHARS, ALLOWED_CHARS, ALLOWED_CHARS)); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java index 2ceebc156a..a3f07a6ad5 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java @@ -18,7 +18,7 @@ package ai.areas.BeastFarm; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -133,7 +133,7 @@ public class ImprovedBabyPets extends AbstractNpcAI private boolean castBuff(Summon summon, int stepNumber, int buffNumber) { final PlayerInstance owner = summon.getOwner(); - final StatsSet parameters = summon.getTemplate().getParameters(); + final StatSet parameters = summon.getTemplate().getParameters(); final SkillHolder skill = parameters.getObject("step" + stepNumber + "_buff0" + buffNumber, SkillHolder.class); if ((skill != null) && (owner != null)) @@ -174,7 +174,7 @@ public class ImprovedBabyPets extends AbstractNpcAI { final boolean previousFollowStatus = summon.getFollowStatus(); final PlayerInstance owner = summon.getOwner(); - final StatsSet parameters = summon.getTemplate().getParameters(); + final StatSet parameters = summon.getTemplate().getParameters(); final SkillHolder skill = parameters.getObject("step" + stepNumber + "_heal0" + healNumber, SkillHolder.class); final int targetType = parameters.getInt("step" + stepNumber + "_heal_target0" + healNumber, 0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java index efdbdd4460..9ff1875b62 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java @@ -18,7 +18,7 @@ package ai.areas.FairySettlement; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -50,11 +50,11 @@ public class Wisp extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("DELETE_NPC")) { - params = new StatsSet(); + params = new StatSet(); params.set("LOCATION_OBJECT", npc.getLocation()); getTimers().addTimer("RESPAWN_WISP_" + npc.getObjectId(), params, getRandom(RESPAWN_MIN, RESPAWN_MAX), null, null); npc.deleteMe(); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java index 5cd6622513..b52be69c96 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java @@ -19,7 +19,7 @@ package ai.areas.Parnassus.EntrancePortalToCrystalCaverns; import java.util.Calendar; import org.l2jmobius.gameserver.instancemanager.QuestManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -107,7 +107,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("LOOP_TIMER")) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/SeedOfHellfire/Zofan.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/SeedOfHellfire/Zofan.java index b6c122da75..03f451c9fd 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/SeedOfHellfire/Zofan.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/SeedOfHellfire/Zofan.java @@ -16,7 +16,7 @@ */ package ai.areas.SeedOfHellfire; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -61,7 +61,7 @@ public class Zofan extends AbstractNpcAI { if ((npc.getInstanceWorld() == null) && (npc.getSpawn() != null)) { - final StatsSet params = npc.getParameters(); + final StatSet params = npc.getParameters(); if (params.getInt("i_childrengarden_guard", 0) == 0) { for (String param : MINION_PARAMS) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Allada.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Allada.java index 5ccca8c99a..4291aeb5ec 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Allada.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Allada.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -45,7 +45,7 @@ public class Allada extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Mei.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Mei.java index 015ee0bc9a..7ad9623ec2 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Mei.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Mei.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -40,7 +40,7 @@ public class Mei extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SHOUT")) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Remons.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Remons.java index 41ec3c1bff..a1ea6ba90c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Remons.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Remons.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -43,7 +43,7 @@ public class Remons extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rinne.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rinne.java index 55ab4fc1a7..1d6eafa48a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rinne.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rinne.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -42,7 +42,7 @@ public class Rinne extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rotina.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rotina.java index 24ad1b6041..d0c8f2a81b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rotina.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rotina.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -45,7 +45,7 @@ public class Rotina extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Soros.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Soros.java index d7862030aa..632d1a78a8 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Soros.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Soros.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -40,7 +40,7 @@ public class Soros extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java index cbe7cc9ac9..4a2aaf21c4 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java @@ -17,7 +17,7 @@ package ai.areas.WallOfArgos.ElmoredenServantsGhost; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -58,7 +58,7 @@ public class ElmoredenServantsGhost extends AbstractNpcAI takeItems(player, USED_GRAVE_PASS, 1); final Location loc; - final StatsSet npcParameters = npc.getParameters(); + final StatSet npcParameters = npc.getParameters(); if (event.equals("teleport1")) { loc = new Location(npcParameters.getInt("TelPos_X1", 0), npcParameters.getInt("TelPos_Y1", 0), npcParameters.getInt("TelPos_Z1", 0)); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java index aca502d2cc..a46695ea27 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -341,7 +341,7 @@ public class Anakim extends AbstractNpcAI addSkillSeeId(ALL_MOBS); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANAKIM); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM); final int status = GrandBossManager.getInstance().getBossStatus(ANAKIM); if (status == DEAD) { @@ -613,9 +613,9 @@ public class Anakim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(ANAKIM, DEAD); final long respawnTime = getRespawnTime(); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANAKIM); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(ANAKIM, info); + GrandBossManager.getInstance().setStatSet(ANAKIM, info); startQuestTimer("unlock_anakim", respawnTime, null, null); startQuestTimer("end_anakim", 900000, null, null); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index b837d839d8..d12c29d422 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -138,7 +138,7 @@ public class Antharas extends AbstractNpcAI addAttackId(ANTHARAS, BOMBER, BEHEMOTH, TERASQUE); addKillId(ANTHARAS, TERASQUE, BEHEMOTH); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANTHARAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANTHARAS); final double curr_hp = info.getDouble("currentHP"); final double curr_mp = info.getDouble("currentMP"); final int loc_x = info.getInt("loc_x"); @@ -761,7 +761,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(PlayerInstance attacker, int damage) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Baium/Baium.java index ee6655da4d..bca22cc6a6 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -112,7 +112,7 @@ public class Baium extends AbstractNpcAI addSeeCreatureId(BAIUM); addSpellFinishedId(BAIUM); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(BAIUM); + final StatSet info = GrandBossManager.getInstance().getStatSet(BAIUM); switch (getStatus()) { @@ -666,7 +666,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java index 768ebbc11d..ebf5e78a5a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -122,7 +122,7 @@ public class BalokWarzone extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (isInInstance(world)) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java index 9919e58ce5..e8a2e67509 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java @@ -17,7 +17,7 @@ package ai.bosses.Baylor; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -77,7 +77,7 @@ public class BaylorWarzone extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (isInInstance(world)) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java index 1e80c81840..e8e9fa8756 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; @@ -104,7 +104,7 @@ public class Beleth extends AbstractNpcAI addStartNpc(STONE_COFFIN); addTalkId(STONE_COFFIN); addFirstTalkId(ELF); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(REAL_BELETH); + final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH); if (status == DEAD) { @@ -750,9 +750,9 @@ public class Beleth extends AbstractNpcAI setBelethKiller(killer); GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD); final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(REAL_BELETH); + final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(REAL_BELETH, info); + GrandBossManager.getInstance().setStatSet(REAL_BELETH, info); startQuestTimer("BELETH_UNLOCK", respawnTime, null, null); deleteAll(); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Core/Core.java index bfa7212b8c..c1452bf9de 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; @@ -85,7 +85,7 @@ public class Core extends AbstractNpcAI registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR); _firstAttacked = false; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. @@ -205,9 +205,9 @@ public class Core extends AbstractNpcAI final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000; startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(CORE, info); + GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java index 6ef025304c..764df30625 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -175,7 +175,7 @@ public class IceQueensCastleBattle extends AbstractInstance final Instance world = npc.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); final Npc controller = params.getObject("controller", Npc.class); final Npc freya = params.getObject("freya", Npc.class); switch (event) @@ -734,7 +734,7 @@ public class IceQueensCastleBattle extends AbstractInstance final Instance world = npc.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); switch (npc.getId()) { case FREYA_THRONE: @@ -1069,7 +1069,7 @@ public class IceQueensCastleBattle extends AbstractInstance final Instance world = npc.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); final Npc controller = params.getObject("controller", Npc.class); switch (npc.getId()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Helios/Helios.java index 7faa1d8823..0f70177f83 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Helios/Helios.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Helios/Helios.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.zone.type.NoSummonFriendZone; @@ -58,7 +58,7 @@ public class Helios extends AbstractNpcAI // Zone bossZone = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(HELIOS3); + final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3); final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3); if (status == DEAD) { @@ -136,9 +136,9 @@ public class Helios extends AbstractNpcAI bossZone.broadcastPacket(new ExShowScreenMessage(NpcStringId.HELIOS_DEFEATED_TAKES_FLIGHT_DEEP_IN_TO_THE_SUPERION_FORT_HIS_THRONE_IS_RENDERED_INACTIVE, ExShowScreenMessage.TOP_CENTER, 10000, true)); GrandBossManager.getInstance().setBossStatus(HELIOS3, DEAD); final long respawnTime = (Config.HELIOS_SPAWN_INTERVAL + getRandom(-Config.HELIOS_SPAWN_RANDOM, Config.HELIOS_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(HELIOS3); + final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(HELIOS3, info); + GrandBossManager.getInstance().setStatSet(HELIOS3, info); startQuestTimer("unlock_helios", respawnTime, null, null); break; } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java index dc6e826093..b863874cd2 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.AggroInfo; import org.l2jmobius.gameserver.model.DamageDoneInfo; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -153,13 +153,13 @@ public class IstinaCavern extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); - final StatsSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); switch (event) { case "DEATH_TIMER": @@ -391,7 +391,7 @@ public class IstinaCavern extends AbstractInstance } else { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); if (skillId == npcParams.getSkillHolder("Istina_Death_Skill01").getSkillId()) { @@ -440,7 +440,7 @@ public class IstinaCavern extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int stage = npcVars.getInt("ISTINA_STAGE", -1); if (npc.getId() == BALLISTA) @@ -657,7 +657,7 @@ public class IstinaCavern extends AbstractInstance private PlayerInstance setPlayerRewardInfo(Npc npc) { final Map rewards = new ConcurrentHashMap<>(); - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); PlayerInstance maxDealer = null; long maxDamage = 0; int totalDamage = 0; diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index 61b663a0f3..7aebfa337d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -116,7 +116,7 @@ public class Kelbim extends AbstractNpcAI addKillId(KELBIM); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(KELBIM); + final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM); final int status = GrandBossManager.getInstance().getBossStatus(KELBIM); if (status == DEAD) { @@ -429,9 +429,9 @@ public class Kelbim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(KELBIM, DEAD); final long respawnTime = (Config.KELBIM_SPAWN_INTERVAL + getRandom(-Config.KELBIM_SPAWN_RANDOM, Config.KELBIM_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(KELBIM); + final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(KELBIM, info); + GrandBossManager.getInstance().setStatSet(KELBIM, info); startQuestTimer("unlock_kelbim", respawnTime, null, null); startQuestTimer("end_kelbim", 1800000, null, null); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java index 31be0ec32d..f023ad5f8e 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java @@ -19,7 +19,7 @@ package ai.bosses.Kimerian; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -83,7 +83,7 @@ public class KimerianCommon extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) @@ -345,8 +345,8 @@ public class KimerianCommon extends AbstractInstance { final Creature creature = event.getSeen(); final Npc npc = (Npc) event.getSeer(); - final StatsSet npcParams = npc.getParameters(); - final StatsSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java index 9fbe2e6026..51ffd45923 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -367,7 +367,7 @@ public class Lilith extends AbstractNpcAI addSkillSeeId(ALL_MOBS); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LILITH); + final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH); final int status = GrandBossManager.getInstance().getBossStatus(LILITH); if (status == DEAD) { @@ -629,9 +629,9 @@ public class Lilith extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LILITH, DEAD); final long respawnTime = getRespawnTime(); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LILITH); + final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(LILITH, info); + GrandBossManager.getInstance().setStatSet(LILITH, info); startQuestTimer("unlock_lilith", respawnTime, null, null); startQuestTimer("end_lilith", 900000, null, null); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index 9ef473069d..cc00a33356 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -244,7 +244,7 @@ public class Lindvior extends AbstractNpcAI addSeeCreatureId(INVISIBLE); _zoneLair = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LINDVIOR_RAID); + final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID); final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID); if (status == DEAD) { @@ -821,9 +821,9 @@ public class Lindvior extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD); final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LINDVIOR_RAID); + final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(LINDVIOR_RAID, info); + GrandBossManager.getInstance().setStatSet(LINDVIOR_RAID, info); startQuestTimer("unlock_lindvior", respawnTime, null, null); } else if (npc.getId() == NPC_GENERATOR) @@ -867,7 +867,7 @@ public class Lindvior extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SHOUT") && (npc != null) && !npc.isDead()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/LionelHunter.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/LionelHunter.java index e02f478232..0677792823 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/LionelHunter.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/LionelHunter.java @@ -18,7 +18,7 @@ package ai.bosses.Lindvior; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.WalkingManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -43,7 +43,7 @@ public class LionelHunter extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SHOUT") && (npc != null)) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java index b9c19644c4..c5c62c8f2f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -152,13 +152,13 @@ public class OctavisWarzone extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (isInInstance(world)) { - final StatsSet npcVars = npc.getVariables(); - final StatsSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); switch (event) { @@ -378,7 +378,7 @@ public class OctavisWarzone extends AbstractInstance } else if (CommonUtil.contains(OCTAVIS_STAGE_2, npc.getId())) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); if (npcVars.getBoolean("START_TIMERS", true)) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index c2b594a26c..eb6c860981 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -92,7 +92,7 @@ public class Orfen extends AbstractNpcAI registerMobs(mobs); _IsTeleported = false; ZONE = ZoneManager.getInstance().getZoneById(12013); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); final int status = GrandBossManager.getInstance().getBossStatus(ORFEN); if (status == DEAD) { @@ -327,9 +327,9 @@ public class Orfen extends AbstractNpcAI respawnTime *= 3600000; startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(ORFEN, info); + GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); startQuestTimer("despawn_minions", 20000, null, null); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index c2564917c7..b9fdddaaf7 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; @@ -91,7 +91,7 @@ public class QueenAnt extends AbstractNpcAI addFactionCallId(NURSE); _zone = ZoneManager.getInstance().getZoneById(12012); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); final int status = GrandBossManager.getInstance().getBossStatus(QUEEN); if (status == DEAD) { @@ -367,9 +367,9 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("action", npc, null); cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(QUEEN, info); + GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); _larva.deleteMe(); _larva = null; diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java index 58d5b9d3a8..577a99ad9d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java @@ -19,7 +19,7 @@ package ai.bosses.Spezion.Cannon; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -170,7 +170,7 @@ public class Cannon extends AbstractNpcAI { if (skill.getId() == PRESENT_SKILL.getSkillId()) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); npc.broadcastPacket(new Earthquake(npc, 10, 5)); npc.broadcastPacket(new OnEventTrigger(npcParams.getInt("TRIGGER_ID"), true)); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java index 086615be42..4af559d521 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -105,13 +105,13 @@ public class TeredorWarzone extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); - final StatsSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); switch (event) { @@ -236,7 +236,7 @@ public class TeredorWarzone extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); switch (npc.getId()) { @@ -292,7 +292,7 @@ public class TeredorWarzone extends AbstractInstance if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); switch (npc.getId()) { @@ -472,7 +472,7 @@ public class TeredorWarzone extends AbstractInstance { case TEREDOR: { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int hpPer = npc.getCurrentHpPercent(); int teredorStatus = npcVars.getInt("TEREDOR_STATUS", 1); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java index 9d9a79d53a..1610356a26 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -322,7 +322,7 @@ public class Trasken extends AbstractNpcAI DoorData.getInstance().getDoor(DOOR).openMe(); } // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(TRASKEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN); final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN); if (status == DEAD) { @@ -603,9 +603,9 @@ public class Trasken extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD); final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(TRASKEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(TRASKEN, info); + GrandBossManager.getInstance().setStatSet(TRASKEN, info); startQuestTimer("unlock_trasken", respawnTime, null, null); break; } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java index 9414859da4..7233381898 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; @@ -123,7 +123,7 @@ public class Valakas extends AbstractNpcAI registerMobs(VALAKAS); ZONE = ZoneManager.getInstance().getZoneById(12010); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(VALAKAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); final int status = GrandBossManager.getInstance().getBossStatus(VALAKAS); if (status == DEAD) @@ -446,9 +446,9 @@ public class Valakas extends AbstractNpcAI final long respawnTime = (Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM)) * 3600000; startQuestTimer("valakas_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(VALAKAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(VALAKAS, info); + GrandBossManager.getInstance().setStatSet(VALAKAS, info); return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java index c73ef9d83c..703e55428a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -189,8 +189,8 @@ public class CavernOfThePirateCaptain extends AbstractInstance final Instance world = npc.getInstanceWorld(); if (world != null) { - final StatsSet templParams = world.getTemplateParameters(); - final StatsSet params = world.getParameters(); + final StatSet templParams = world.getTemplateParameters(); + final StatSet params = world.getParameters(); switch (event) { case "BURN_BLUE": diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/AreaSkillNpc.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/AreaSkillNpc.java index f84b001cc5..80291ac3be 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/AreaSkillNpc.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/AreaSkillNpc.java @@ -17,7 +17,7 @@ package ai.others; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -124,7 +124,7 @@ public class AreaSkillNpc extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java index 01b37387a8..ef9e26a221 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -101,7 +101,7 @@ public class CastleTeleporter extends AbstractNpcAI if (st.hasMoreTokens()) { final int unknowInt = Integer.parseInt(st.nextToken()); - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); Location teleLoc = null; switch (unknowInt) { @@ -191,7 +191,7 @@ public class CastleTeleporter extends AbstractNpcAI return htmltext; } - private Location getTeleportLocation(StatsSet npcParams, String paramName1, String paramName2, String paramName3) + private Location getTeleportLocation(StatSet npcParams, String paramName1, String paramName2, String paramName3) { final Location loc; if (getRandom(100) < 33) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java index b1355fa9c5..c05c1b184b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java @@ -16,7 +16,7 @@ */ package ai.others.NpcBuffers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ class NpcBufferSkillData private final int _scaleToLevel; private final int _initialDelay; - NpcBufferSkillData(StatsSet set) + NpcBufferSkillData(StatSet set) { _skill = new SkillHolder(set.getInt("id"), set.getInt("level")); _scaleToLevel = set.getInt("scaleToLevel", -1); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java index dd7f4187be..ecae9d2861 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -54,7 +54,7 @@ class NpcBuffersData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node attr; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -75,7 +75,7 @@ class NpcBuffersData implements IXmlReader case "skill": { attrs = c.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { attr = attrs.item(i); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/Servitors/ClanFlag.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/Servitors/ClanFlag.java index 558d57b407..b09a5f38e9 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/Servitors/ClanFlag.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/Servitors/ClanFlag.java @@ -17,7 +17,7 @@ package ai.others.Servitors; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -51,7 +51,7 @@ public class ClanFlag extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java index 55c9613eab..a50c042b7f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -68,7 +68,7 @@ public class GateOfUnlimitedSummoning extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java index f19f5dea69..c817501830 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java @@ -17,7 +17,7 @@ package ai.others.Servitors; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -52,7 +52,7 @@ public class TreeOfLife extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (player != null) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java index 3ee8063427..ee96be41d8 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -91,7 +91,7 @@ public class TersisHerald extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("DESPAWN_NPCS")) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index 2e5331f903..55dc363405 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.zone.type.NoRestartZone; @@ -309,7 +309,7 @@ public class AdminGrandBoss implements IAdminCommandHandler } } - final StatsSet info = GrandBossManager.getInstance().getStatsSet(grandBossId); + final StatSet info = GrandBossManager.getInstance().getStatSet(grandBossId); final String bossRespawn = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(info.getLong("respawn_time")); final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java index 075d9d050c..71aeb82ddd 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java @@ -19,7 +19,7 @@ package handlers.admincommandhandlers; import java.util.StringTokenizer; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -114,7 +114,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.getNobleLevel() > 0) { - final StatsSet statDat = getPlayerSet(player); + final StatSet statDat = getPlayerSet(player); final int oldpoints = Olympiad.getInstance().getNoblePoints(player); final int points = Math.max(oldpoints + val, 0); if (points > 1000) @@ -155,7 +155,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.getNobleLevel() > 0) { - final StatsSet playerStat = Olympiad.getNobleStats(player.getObjectId()); + final StatSet playerStat = Olympiad.getNobleStats(player.getObjectId()); if (playerStat == null) { BuilderUtil.sendSysMessage(activeChar, "This player hasn't played on Olympiad yet!"); @@ -197,7 +197,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.getNobleLevel() > 0) { - final StatsSet statDat = getPlayerSet(player); + final StatSet statDat = getPlayerSet(player); final int oldpoints = Olympiad.getInstance().getNoblePoints(player); final int points = oldpoints - val; if ((points < 1) && (points > 1000)) @@ -237,12 +237,12 @@ public class AdminOlympiad implements IAdminCommandHandler return Integer.decode(token); } - private StatsSet getPlayerSet(PlayerInstance player) + private StatSet getPlayerSet(PlayerInstance player) { - StatsSet statDat = Olympiad.getNobleStats(player.getObjectId()); + StatSet statDat = Olympiad.getNobleStats(player.getObjectId()); if (statDat == null) { - statDat = new StatsSet(); + statDat = new StatSet(); statDat.set(Olympiad.CLASS_ID, player.getBaseClass()); statDat.set(Olympiad.CHAR_NAME, player.getName()); statDat.set(Olympiad.POINTS, Olympiad.DEFAULT_POINTS); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java index d8a3d6e5ce..6382651e6c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java @@ -19,7 +19,7 @@ package handlers.conditions; import java.util.List; import org.l2jmobius.gameserver.enums.CategoryType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -31,7 +31,7 @@ public class CategoryTypeCondition implements ICondition { private final List _categoryTypes; - public CategoryTypeCondition(StatsSet params) + public CategoryTypeCondition(StatSet params) { _categoryTypes = params.getEnumList("category", CategoryType.class); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java index b24cfa0f14..9a14cb6fa2 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java @@ -16,7 +16,7 @@ */ package handlers.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -29,7 +29,7 @@ public class NpcLevelCondition implements ICondition private final int _minLevel; private final int _maxLevel; - public NpcLevelCondition(StatsSet params) + public NpcLevelCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java index afffe7a0c5..9e3deaa8ce 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java @@ -16,7 +16,7 @@ */ package handlers.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -29,7 +29,7 @@ public class PlayerLevelCondition implements ICondition private final int _minLevel; private final int _maxLevel; - public PlayerLevelCondition(StatsSet params) + public PlayerLevelCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 09f609dc37..0e81066579 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -32,7 +32,7 @@ public class AbnormalShield extends AbstractEffect { private final int _times; - public AbnormalShield(StatsSet params) + public AbnormalShield(StatSet params) { _times = params.getInt("times", -1); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 0496c9068d..9c508c8c52 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Objects; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class AbnormalTimeChange extends AbstractEffect private final int _time; private final int _mode; - public AbnormalTimeChange(StatsSet params) + public AbnormalTimeChange(StatSet params) { final String abnormals = params.getString("slot", null); if ((abnormals != null) && !abnormals.isEmpty()) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 98f85c7b21..3f9132b8e3 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -37,7 +37,7 @@ public class AbsorbDamage extends AbstractEffect private final double _damage; private static final Map _damageHolder = new ConcurrentHashMap<>(); - public AbsorbDamage(StatsSet params) + public AbsorbDamage(StatSet params) { _damage = params.getDouble("damage", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 26f51d5351..86fef7cf6d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; @@ -38,7 +38,7 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect private final int _hpPercent; private final Map _updates = new ConcurrentHashMap<>(); - protected AbstractConditionalHpEffect(StatsSet params, Stat stat) + protected AbstractConditionalHpEffect(StatSet params, Stat stat) { super(params, stat); _hpPercent = params.getInt("hpPercent", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java index 2e40124e39..f010f84271 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AbstractStatAddEffect extends AbstractEffect private final Stat _stat; protected final double _amount; - public AbstractStatAddEffect(StatsSet params, Stat stat) + public AbstractStatAddEffect(StatSet params, Stat stat) { _stat = stat; _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index da6a575c44..29e439684b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; @@ -42,12 +42,12 @@ public abstract class AbstractStatEffect extends AbstractEffect protected final StatModifierType _mode; protected final List _conditions = new ArrayList<>(); - public AbstractStatEffect(StatsSet params, Stat stat) + public AbstractStatEffect(StatSet params, Stat stat) { this(params, stat, stat); } - public AbstractStatEffect(StatsSet params, Stat mulStat, Stat addStat) + public AbstractStatEffect(StatSet params, Stat mulStat, Stat addStat) { _addStat = addStat; _mulStat = mulStat; diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java index 9811f395aa..33d08bff36 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AbstractStatPercentEffect extends AbstractEffect private final Stat _stat; protected final double _amount; - public AbstractStatPercentEffect(StatsSet params, Stat stat) + public AbstractStatPercentEffect(StatSet params, Stat stat) { _stat = stat; _amount = params.getDouble("amount", 1); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java index 539814ef2a..79c022a23c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class Accuracy extends AbstractStatEffect { - public Accuracy(StatsSet params) + public Accuracy(StatSet params) { super(params, Stat.ACCURACY_COMBAT); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index 0c1fcbd92b..48d69968c5 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddHate extends AbstractEffect private final double _power; private final boolean _affectSummoner; - public AddHate(StatsSet params) + public AddHate(StatSet params) { _power = params.getDouble("power", 0); _affectSummoner = params.getBoolean("affectSummoner", false); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java index e90d5cc7f3..324927947a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddSkillBySkill extends AbstractEffect private final int _existingSkillLevel; private final SkillHolder _addedSkill; - public AddSkillBySkill(StatsSet params) + public AddSkillBySkill(StatSet params) { _existingSkillId = params.getInt("existingSkillId"); _existingSkillLevel = params.getInt("existingSkillLevel"); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index bdd8314dd7..205bc82200 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddTeleportBookmarkSlot extends AbstractEffect { private final int _amount; - public AddTeleportBookmarkSlot(StatsSet params) + public AddTeleportBookmarkSlot(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java index c26ec5442f..658931ecb2 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionCp extends AbstractStatAddEffect { - public AdditionalPotionCp(StatsSet params) + public AdditionalPotionCp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_CP); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java index 6b68e40f32..57d54c7d3b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionHp extends AbstractStatAddEffect { - public AdditionalPotionHp(StatsSet params) + public AdditionalPotionHp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_HP); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java index c9e1cc237e..007547ebe7 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionMp extends AbstractStatAddEffect { - public AdditionalPotionMp(StatsSet params) + public AdditionalPotionMp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_MP); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AgathionSlot.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AgathionSlot.java index 2d2a3cf6df..b8a91b683f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AgathionSlot.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AgathionSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AgathionSlot extends AbstractStatAddEffect { - public AgathionSlot(StatsSet params) + public AgathionSlot(StatSet params) { super(params, Stat.AGATHION_SLOTS); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index cbbd845e23..c01bdec653 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -22,7 +22,7 @@ import java.util.Map; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -78,7 +78,7 @@ public class AirBind extends AbstractEffect _chainedAirSkills.put(ClassId.AEORE_SHILLIEN_SAINT, 11999); // Heavy Hit } - public AirBind(StatsSet params) + public AirBind(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java index f5cbb63465..9255ba1877 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AreaDamage extends AbstractStatAddEffect { - public AreaDamage(StatsSet params) + public AreaDamage(StatSet params) { super(params, Stat.DAMAGE_ZONE_VULN); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ArtifactSlot.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ArtifactSlot.java index 150e53d14e..0c146fc6a3 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ArtifactSlot.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ArtifactSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ArtifactSlot extends AbstractStatAddEffect { - public ArtifactSlot(StatsSet params) + public ArtifactSlot(StatSet params) { super(params, Stat.ARTIFACT_SLOTS); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java index 2ded14e7ae..a5d56477f5 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AttackAttribute extends AbstractEffect private final AttributeType _attribute; private final double _amount; - public AttackAttribute(StatsSet params) + public AttackAttribute(StatSet params) { _amount = params.getDouble("amount", 0); _attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java index ff58d09cc7..795366850d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class AttackAttributeAdd extends AbstractEffect { private final double _amount; - public AttackAttributeAdd(StatsSet params) + public AttackAttributeAdd(StatSet params) { _amount = params.getDouble("amount", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java index 37bfbf341a..fcd2b48c99 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class AttackBehind extends AbstractEffect { - public AttackBehind(StatsSet params) + public AttackBehind(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index 062c325a55..4136f5d530 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class AttackTrait extends AbstractEffect { private final Map _attackTraits = new EnumMap<>(TraitType.class); - public AttackTrait(StatsSet params) + public AttackTrait(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 02d6a8d78c..8ac42d45c3 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -37,7 +37,7 @@ public class Backstab extends AbstractEffect private final double _criticalChance; private final boolean _overHit; - public Backstab(StatsSet params) + public Backstab(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Betray.java index 32e3c65c55..79e8bd3360 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Betray extends AbstractEffect { - public Betray(StatsSet params) + public Betray(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Blink.java index ba1caed6ac..56d3f628fd 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -52,7 +52,7 @@ public class Blink extends AbstractEffect private final int _flyDelay; private final int _animationSpeed; - public Blink(StatsSet params) + public Blink(StatSet params) { _flyCourse = params.getInt("angle", 0); _flyRadius = params.getInt("range", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 8677f72407..596d4b752f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; */ public class BlinkSwap extends AbstractEffect { - public BlinkSwap(StatsSet params) + public BlinkSwap(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 7bec602aef..cea12039d2 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -20,7 +20,7 @@ import java.util.Arrays; import java.util.Set; import java.util.stream.Collectors; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class BlockAbnormalSlot extends AbstractEffect { private final Set _blockAbnormalSlots; - public BlockAbnormalSlot(StatsSet params) + public BlockAbnormalSlot(StatSet params) { _blockAbnormalSlots = Arrays.stream(params.getString("slot").split(";")).map(slot -> Enum.valueOf(AbnormalType.class, slot)).collect(Collectors.toSet()); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index b4839ab322..348881f970 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -21,7 +21,7 @@ import java.util.Set; import org.l2jmobius.gameserver.datatables.BotReportTable; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class BlockAction extends AbstractEffect { private final Set _blockedActions = new HashSet<>(); - public BlockAction(StatsSet params) + public BlockAction(StatSet params) { final String[] actions = params.getString("blockedActions").split(","); for (String action : actions) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index 68f6586e3e..635d2735f9 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -22,7 +22,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class BlockActions extends AbstractEffect { private final Set _allowedSkills; - public BlockActions(StatsSet params) + public BlockActions(StatSet params) { final String[] allowedSkills = params.getString("allowedSkills", "").split(";"); _allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet()); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 99af987208..3502d140d0 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockChat extends AbstractEffect { - public BlockChat(StatsSet params) + public BlockChat(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java index 6160114414..a2b084c918 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; */ public class BlockControl extends AbstractEffect { - public BlockControl(StatsSet params) + public BlockControl(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java index 3d96329b6d..69b390ae8f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BlockEscape extends AbstractEffect { - public BlockEscape(StatsSet params) + public BlockEscape(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index 8bbd7ac018..85d89180e7 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockMove extends AbstractEffect { - public BlockMove(StatsSet params) + public BlockMove(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index 316f82f855..9e28fc403a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockParty extends AbstractEffect { - public BlockParty(StatsSet params) + public BlockParty(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java index ae2ac8b035..d3235fc34f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BlockResurrection extends AbstractEffect { - public BlockResurrection(StatsSet params) + public BlockResurrection(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index f7f119691f..f2cc65b782 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -35,7 +35,7 @@ public class BlockSkill extends AbstractEffect { private final int[] _magicTypes; - public BlockSkill(StatsSet params) + public BlockSkill(StatSet params) { _magicTypes = params.getIntArray("magicTypes", ";"); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index d9b3d3a34d..9f0b7143d2 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockTarget extends AbstractEffect { - public BlockTarget(StatsSet params) + public BlockTarget(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index bc4cbd6320..bef60ad003 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class Bluff extends AbstractEffect { private final int _chance; - public Bluff(StatsSet params) + public Bluff(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java index 2ace40a596..69583d613b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusDropAmount extends AbstractStatPercentEffect { - public BonusDropAmount(StatsSet params) + public BonusDropAmount(StatSet params) { super(params, Stat.BONUS_DROP_AMOUNT); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java index b81560b040..e63c8f79f4 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusDropRate extends AbstractStatPercentEffect { - public BonusDropRate(StatsSet params) + public BonusDropRate(StatSet params) { super(params, Stat.BONUS_DROP_RATE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java index b984404cb2..e0fb54b162 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusSpoilRate extends AbstractStatPercentEffect { - public BonusSpoilRate(StatsSet params) + public BonusSpoilRate(StatSet params) { super(params, Stat.BONUS_SPOIL_RATE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Breath.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Breath.java index 859f341f3c..4235319f22 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Breath.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Breath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class Breath extends AbstractStatEffect { - public Breath(StatsSet params) + public Breath(StatSet params) { super(params, Stat.BREATH); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java index a6d25f3c36..4102506e6c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BuffBlock extends AbstractEffect { - public BuffBlock(StatsSet params) + public BuffBlock(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index de7497f8bf..4f470b06c7 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class CallLearnedSkill extends AbstractEffect { private final int _skillId; - public CallLearnedSkill(StatsSet params) + public CallLearnedSkill(StatSet params) { _skillId = params.getInt("skillId"); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index e6096be4be..b41daf073c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CallParty extends AbstractEffect { - public CallParty(StatsSet params) + public CallParty(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index 0760fb675e..eb4bdf2349 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class CallPc extends AbstractEffect private final int _itemId; private final int _itemCount; - public CallPc(StatsSet params) + public CallPc(StatSet params) { _itemId = params.getInt("itemId", 0); _itemCount = params.getInt("itemCount", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index d6d5cb721d..0da3802665 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -35,7 +35,7 @@ public class CallRandomSkill extends AbstractEffect { private final List _skills = new ArrayList<>(); - public CallRandomSkill(StatsSet params) + public CallRandomSkill(StatSet params) { final String skills = params.getString("skills", null); if (skills != null) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index 99c1494223..f8e4b226c4 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -35,7 +35,7 @@ public class CallSkill extends AbstractEffect private final SkillHolder _skill; private final int _skillLevelScaleTo; - public CallSkill(StatsSet params) + public CallSkill(StatSet params) { _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0)); _skillLevelScaleTo = params.getInt("skillLevelScaleTo", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index b340de4ae1..ff98639c37 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.Collections; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ public class CallSkillOnActionTime extends AbstractEffect { private final SkillHolder _skill; - public CallSkillOnActionTime(StatsSet params) + public CallSkillOnActionTime(StatSet params) { _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0)); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index d48eb90fb3..32753a71a0 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CallTargetParty extends AbstractEffect { - public CallTargetParty(StatsSet params) + public CallTargetParty(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index ef01f4a8ed..d4331bf5b7 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ public class ChameleonRest extends AbstractEffect { private final double _power; - public ChameleonRest(StatsSet params) + public ChameleonRest(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index e3b846674d..37054f2fd0 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; @@ -35,9 +35,9 @@ public class ChangeBody extends AbstractEffect { private final Set _transformations = new HashSet<>(); - public ChangeBody(StatsSet params) + public ChangeBody(StatSet params) { - for (StatsSet item : params.getList("templates", StatsSet.class)) + for (StatSet item : params.getList("templates", StatSet.class)) { _transformations.add(new TemplateChanceHolder(item.getInt(".templateId"), item.getInt(".minChance"), item.getInt(".maxChance"))); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 76c6e03aa6..6b6386909e 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeFace extends AbstractEffect { private final int _value; - public ChangeFace(StatsSet params) + public ChangeFace(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java index cee3ac1a6f..304afa821c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; /** @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; */ public class ChangeFishingMastery extends AbstractEffect { - public ChangeFishingMastery(StatsSet params) + public ChangeFishingMastery(StatSet params) { } } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index 0c583cbc13..64ac49f5d5 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeHairColor extends AbstractEffect { private final int _value; - public ChangeHairColor(StatsSet params) + public ChangeHairColor(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index ad2efbe6a0..ae7d6c6da1 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeHairStyle extends AbstractEffect { private final int _value; - public ChangeHairStyle(StatsSet params) + public ChangeHairStyle(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java index 2d536029fd..4d7c380c75 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class CheapShot extends AbstractEffect { - public CheapShot(StatsSet params) + public CheapShot(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index 207b7f0a3e..1a6a44fb31 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.SubclassInfoType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class ClassChange extends AbstractEffect private final int _index; private static final int IDENTITY_CRISIS_SKILL_ID = 1570; - public ClassChange(StatsSet params) + public ClassChange(StatSet params) { _index = params.getInt("index", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index ccf7598eff..e184022afc 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.stats.Formulas; */ public class Compelling extends AbstractEffect { - public Compelling(StatsSet params) + public Compelling(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index b6aa30f604..f164ac6f3f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class Confuse extends AbstractEffect { private final int _chance; - public Confuse(StatsSet params) + public Confuse(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 25e29532eb..78293c1b0f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ConsumeBody extends AbstractEffect { - public ConsumeBody(StatsSet params) + public ConsumeBody(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 6bca38d232..3185c28746 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class ConvertItem extends AbstractEffect { - public ConvertItem(StatsSet params) + public ConvertItem(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java index 9402fdb06d..857df659c0 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CounterPhysicalSkill extends AbstractStatAddEffect { - public CounterPhysicalSkill(StatsSet params) + public CounterPhysicalSkill(StatSet params) { super(params, Stat.VENGEANCE_SKILL_PHYSICAL_DAMAGE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 67bca7fd1b..598682037b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Cp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Cp(StatsSet params) + public Cp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index e0cd52808e..37303b0e7a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class CpHeal extends AbstractEffect { private final double _power; - public CpHeal(StatsSet params) + public CpHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index e2e8ee3479..54de5adfc6 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class CpHealOverTime extends AbstractEffect { private final double _power; - public CpHealOverTime(StatsSet params) + public CpHealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index 5665e937dc..b4a994d6df 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CpHealPercent extends AbstractEffect { private final double _power; - public CpHealPercent(StatsSet params) + public CpHealPercent(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java index 1cc851b2af..efb020bbd5 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CpRegen extends AbstractStatEffect { - public CpRegen(StatsSet params) + public CpRegen(StatSet params) { super(params, Stat.REGENERATE_CP_RATE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CraftingCritical.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CraftingCritical.java index fb8ef495fb..cb3f2aace2 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CraftingCritical.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CraftingCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CraftingCritical extends AbstractStatAddEffect { - public CraftingCritical(StatsSet params) + public CraftingCritical(StatSet params) { super(params, Stat.CRAFTING_CRITICAL); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java index 37231ac1af..00d3dfbaaa 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class CreateCommonItem extends AbstractEffect { private final int _recipeLevel; - public CreateCommonItem(StatsSet params) + public CreateCommonItem(StatSet params) { _recipeLevel = params.getInt("value"); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java index 99f31fecab..d01d510ba9 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class CreateItem extends AbstractEffect { private final int _recipeLevel; - public CreateItem(StatsSet params) + public CreateItem(StatSet params) { _recipeLevel = params.getInt("value"); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java index 8983497026..0b93eef45e 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CriticalDamage extends AbstractStatEffect { - public CriticalDamage(StatsSet params) + public CriticalDamage(StatSet params) { super(params, Stat.CRITICAL_DAMAGE, Stat.CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 7ef4f0ecb4..0630f087b7 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.Position; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CriticalDamagePosition extends AbstractEffect private final double _amount; private final Position _position; - public CriticalDamagePosition(StatsSet params) + public CriticalDamagePosition(StatSet params) { _amount = params.getDouble("amount", 0); _position = params.getEnum("position", Position.class, Position.FRONT); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java index 01f49380eb..0d4bded60e 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; public class CriticalRate extends AbstractConditionalHpEffect { - public CriticalRate(StatsSet params) + public CriticalRate(StatSet params) { super(params, Stat.CRITICAL_RATE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 863b385ca3..4d65fa84eb 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.Position; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CriticalRatePositionBonus extends AbstractEffect private final double _amount; private final Position _position; - public CriticalRatePositionBonus(StatsSet params) + public CriticalRatePositionBonus(StatSet params) { _amount = params.getDouble("amount", 0); _position = params.getEnum("position", Position.class, Position.FRONT); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index 0d307a3240..33ccbd1de1 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class CrystalGradeModify extends AbstractEffect { private final int _amount; - public CrystalGradeModify(StatsSet params) + public CrystalGradeModify(StatSet params) { _amount = params.getInt("_amount", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java index 5f86f9d343..bd48abf204 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ItemGrade; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class Crystallize extends AbstractEffect { private final ItemGrade _grade; - public Crystallize(StatsSet params) + public Crystallize(StatSet params) { _grade = params.getEnum("grade", ItemGrade.class); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java index 94ff8e64e2..79ee5b994e 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CubicMastery extends AbstractStatAddEffect { - public CubicMastery(StatsSet params) + public CubicMastery(StatSet params) { super(params, Stat.MAX_CUBIC); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index 36abf0accf..e6bb53fdea 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class DamOverTime extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTime(StatsSet params) + public DamOverTime(StatSet params) { _canKill = params.getBoolean("canKill", false); _power = params.getDouble("power"); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 13e57099e0..b5f25db4d8 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class DamOverTimePercent extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTimePercent(StatsSet params) + public DamOverTimePercent(StatSet params) { _canKill = params.getBoolean("canKill", false); _power = params.getDouble("power"); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java index dc7a45198f..c9567ea034 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ public class DamageBlock extends AbstractEffect private final boolean _blockHp; private final boolean _blockMp; - public DamageBlock(StatsSet params) + public DamageBlock(StatSet params) { final String type = params.getString("type", null); _blockHp = type.equalsIgnoreCase("BLOCK_HP"); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java index 5bc9b5fff8..3d8985d1d8 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DamageByAttackType; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -38,7 +38,7 @@ public class DamageByAttack extends AbstractEffect private final double _value; private final DamageByAttackType _type; - public DamageByAttack(StatsSet params) + public DamageByAttack(StatSet params) { _value = params.getDouble("amount"); _type = params.getEnum("type", DamageByAttackType.class, DamageByAttackType.NONE); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java index 5a7629482a..e823a9824a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DamageShield extends AbstractStatAddEffect { - public DamageShield(StatsSet params) + public DamageShield(StatSet params) { super(params, Stat.REFLECT_DAMAGE_PERCENT); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java index db1abe264d..3029a3f0aa 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DamageShieldResist extends AbstractStatAddEffect { - public DamageShieldResist(StatsSet params) + public DamageShieldResist(StatSet params) { super(params, Stat.REFLECT_DAMAGE_PERCENT_DEFENSE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index 8561ff46b0..369bd5483d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class DeathLink extends AbstractEffect { private final double _power; - public DeathLink(StatsSet params) + public DeathLink(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java index b948fad1fc..54261c6229 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class DebuffBlock extends AbstractEffect { - public DebuffBlock(StatsSet params) + public DebuffBlock(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java index 217ef3dfaa..4bc08271fa 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class DefenceAttribute extends AbstractEffect private final AttributeType _attribute; private final double _amount; - public DefenceAttribute(StatsSet params) + public DefenceAttribute(StatSet params) { _amount = params.getDouble("amount", 0); _attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java index 0c0c2e8d6a..daff53d9e1 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceCriticalDamage extends AbstractStatEffect { - public DefenceCriticalDamage(StatsSet params) + public DefenceCriticalDamage(StatSet params) { super(params, Stat.DEFENCE_CRITICAL_DAMAGE, Stat.DEFENCE_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java index 131eb500ea..74a729e38c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceCriticalRate extends AbstractStatEffect { - public DefenceCriticalRate(StatsSet params) + public DefenceCriticalRate(StatSet params) { super(params, Stat.DEFENCE_CRITICAL_RATE, Stat.DEFENCE_CRITICAL_RATE_ADD); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java index 1abee78e08..c664939977 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceMagicCriticalDamage extends AbstractStatEffect { - public DefenceMagicCriticalDamage(StatsSet params) + public DefenceMagicCriticalDamage(StatSet params) { super(params, Stat.DEFENCE_MAGIC_CRITICAL_DAMAGE, Stat.DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java index 2146b89551..6594dda2b3 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceMagicCriticalRate extends AbstractStatEffect { - public DefenceMagicCriticalRate(StatsSet params) + public DefenceMagicCriticalRate(StatSet params) { super(params, Stat.DEFENCE_MAGIC_CRITICAL_RATE, Stat.DEFENCE_MAGIC_CRITICAL_RATE_ADD); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index bd80f690cd..134ed56979 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class DefenceTrait extends AbstractEffect { private final Map _defenceTraits = new EnumMap<>(TraitType.class); - public DefenceTrait(StatsSet params) + public DefenceTrait(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index bab5e1a762..7cee616006 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class DeleteHate extends AbstractEffect { private final int _chance; - public DeleteHate(StatsSet params) + public DeleteHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index 85985653b8..f10f189e68 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class DeleteHateOfMe extends AbstractEffect { private final int _chance; - public DeleteHateOfMe(StatsSet params) + public DeleteHateOfMe(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index d3664ad00f..82833ac79d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class DeleteTopAgro extends AbstractEffect { private final int _chance; - public DeleteTopAgro(StatsSet params) + public DeleteTopAgro(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index ae1f2a5942..ba6dad4698 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DoorOpenType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DetectHiddenObjects extends AbstractEffect { - public DetectHiddenObjects(StatsSet params) + public DetectHiddenObjects(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Detection.java index 078360ff35..a20cbcb348 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Detection extends AbstractEffect { - public Detection(StatsSet params) + public Detection(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java index d679c71919..5227885bb5 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class DisableSkill extends AbstractEffect private final Set disableSkills; private Skill knownSKill; - public DisableSkill(StatsSet params) + public DisableSkill(StatSet params) { final String disable = params.getString("disable"); if ((disable != null) && !disable.isEmpty()) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 8567a94d12..32ee715df7 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DisableTargeting extends AbstractEffect { - public DisableTargeting(StatsSet params) + public DisableTargeting(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index fa06ec7221..5a80971f51 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Disarm extends AbstractEffect { - public Disarm(StatsSet params) + public Disarm(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index 48e357d1f2..eb8d99e41f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class Disarmor extends AbstractEffect private final Map _unequippedItems; // PlayerObjId, ItemObjId private final long _slot; - public Disarmor(StatsSet params) + public Disarmor(StatSet params) { _unequippedItems = new ConcurrentHashMap<>(); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 95de0300bb..a652a023f5 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DispelAll extends AbstractEffect { - public DispelAll(StatsSet params) + public DispelAll(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 88d979a0d9..040271d2a7 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.List; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -38,7 +38,7 @@ public class DispelByCategory extends AbstractEffect private final int _rate; private final int _max; - public DispelByCategory(StatsSet params) + public DispelByCategory(StatSet params) { _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); _rate = params.getInt("rate", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index a6e4c7cd19..ab79e046b2 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.EnumMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -37,7 +37,7 @@ public class DispelBySlot extends AbstractEffect private final String _dispel; private final Map _dispelAbnormals; - public DispelBySlot(StatsSet params) + public DispelBySlot(StatSet params) { _dispel = params.getString("dispel"); if ((_dispel != null) && !_dispel.isEmpty()) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 1ba6612e23..d1341d10b9 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class DispelBySlotMyself extends AbstractEffect { private final Set _dispelAbnormals; - public DispelBySlotMyself(StatsSet params) + public DispelBySlotMyself(StatSet params) { final String dispel = params.getString("dispel"); if ((dispel != null) && !dispel.isEmpty()) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 845980e59d..b58723058e 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -37,7 +37,7 @@ public class DispelBySlotProbability extends AbstractEffect private final Set _dispelAbnormals; private final int _rate; - public DispelBySlotProbability(StatsSet params) + public DispelBySlotProbability(StatSet params) { final String[] dispelEffects = params.getString("dispel").split(";"); _rate = params.getInt("rate", 100); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java index e52cabffb1..c0c5b040c9 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class DispelCaster extends AbstractEffect { private final Set _dispelAbnormals; - public DispelCaster(StatsSet params) + public DispelCaster(StatSet params) { final String dispel = params.getString("dispel"); if ((dispel != null) && !dispel.isEmpty()) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index 7acd9c4a6c..688d77a703 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -45,7 +45,7 @@ public class DoubleCast extends AbstractEffect private final Map> _addedToggles; - public DoubleCast(StatsSet params) + public DoubleCast(StatSet params) { _addedToggles = new HashMap<>(); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java index d7f067a2a0..d1e21edeb0 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DuelistFury extends AbstractEffect { - public DuelistFury(StatsSet params) + public DuelistFury(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index 409fed6a23..de397bb5ff 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class EnableCloak extends AbstractEffect { - public EnableCloak(StatsSet params) + public EnableCloak(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index e855c4ba1a..2fe2bef99f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -43,7 +43,7 @@ public class EnergyAttack extends AbstractEffect private final boolean _overHit; private final double _pDefMod; - public EnergyAttack(StatsSet params) + public EnergyAttack(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getInt("criticalChance", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index a8f108573f..ae463ef2a4 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class EnlargeAbnormalSlot extends AbstractEffect { private final int _slots; - public EnlargeAbnormalSlot(StatsSet params) + public EnlargeAbnormalSlot(StatSet params) { _slots = params.getInt("slots", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java index c43ea04413..c4073b1a47 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StorageType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class EnlargeSlot extends AbstractEffect private final StorageType _type; private final double _amount; - public EnlargeSlot(StatsSet params) + public EnlargeSlot(StatSet params) { _amount = params.getDouble("amount", 0); _type = params.getEnum("type", StorageType.class, StorageType.INVENTORY_NORMAL); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Escape.java index 936f82d8ce..f3a07c9d15 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class Escape extends AbstractEffect { private final TeleportWhereType _escapeType; - public Escape(StatsSet params) + public Escape(StatSet params) { _escapeType = params.getEnum("escapeType", TeleportWhereType.class, null); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java index 76dbc8171c..eb68d24af8 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ExpModify extends AbstractStatAddEffect { - public ExpModify(StatsSet params) + public ExpModify(StatSet params) { super(params, Stat.BONUS_EXP); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java index bf11db6e4b..1100ca25be 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Faceoff extends AbstractEffect { - public Faceoff(StatsSet params) + public Faceoff(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index e256209e39..79f7b43503 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -34,7 +34,7 @@ public class FakeDeath extends AbstractEffect { private final double _power; - public FakeDeath(StatsSet params) + public FakeDeath(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index a94c75d310..780d5cefba 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -44,7 +44,7 @@ public class FatalBlow extends AbstractEffect private final double _abnormalPower; private final boolean _overHit; - public FatalBlow(StatsSet params) + public FatalBlow(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java index c8ff8f7acb..6e7597e63d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class FatalBlowRate extends AbstractEffect private final double _amount; private final StatModifierType _mode; - public FatalBlowRate(StatsSet params) + public FatalBlowRate(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 9731e75e5d..ec2659ea2c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DefenderInstance; import org.l2jmobius.gameserver.model.actor.instance.FortCommanderInstance; @@ -40,7 +40,7 @@ public class Fear extends AbstractEffect { private static final int FEAR_RANGE = 500; - public Fear(StatsSet params) + public Fear(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 5e04e46d60..94d9912bdf 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.MountType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ public class Feed extends AbstractEffect private final int _ride; private final int _wyvern; - public Feed(StatsSet params) + public Feed(StatSet params) { _normal = params.getInt("normal", 0); _ride = params.getInt("ride", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java index 0b22a4d4c9..146e3b73e6 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class FishingExpSpBonus extends AbstractStatPercentEffect { - public FishingExpSpBonus(StatsSet params) + public FishingExpSpBonus(StatSet params) { super(params, Stat.FISHING_EXP_SP_BONUS); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Flag.java index c1469eab19..2442cbdb35 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Flag extends AbstractEffect { - public Flag(StatsSet params) + public Flag(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index 0243f0f543..74a9754a95 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.BlockInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class FlipBlock extends AbstractEffect { - public FlipBlock(StatsSet params) + public FlipBlock(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 7fc7da5fe6..3412e4d36d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class FlyAway extends AbstractEffect { private final int _radius; - public FlyAway(StatsSet params) + public FlyAway(StatSet params) { _radius = params.getInt("radius"); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java index fd3216286d..590fbbcd44 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class FocusEnergy extends AbstractStatAddEffect { - public FocusEnergy(StatsSet params) + public FocusEnergy(StatSet params) { super(params, Stat.MAX_MOMENTUM); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index efbd93f304..19f0163e42 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class FocusMaxMomentum extends AbstractEffect { - public FocusMaxMomentum(StatsSet params) + public FocusMaxMomentum(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index 284d19ee5f..e8c18e9682 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -36,7 +36,7 @@ public class FocusMomentum extends AbstractEffect private final int _amount; private final int _maxCharges; - public FocusMomentum(StatsSet params) + public FocusMomentum(StatSet params) { _amount = params.getInt("amount", 1); _maxCharges = params.getInt("maxCharges", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 18a9864bbc..debd491cfe 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class FocusSouls extends AbstractEffect { private final int _charge; - public FocusSouls(StatsSet params) + public FocusSouls(StatSet params) { _charge = params.getInt("charge", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 8540ccd49c..23328db910 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Set; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class GetAgro extends AbstractEffect { - public GetAgro(StatsSet params) + public GetAgro(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java index 1ca8722709..e91002d04b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class GetDamageLimit extends AbstractStatAddEffect { - public GetDamageLimit(StatsSet params) + public GetDamageLimit(StatSet params) { super(params, Stat.DAMAGE_LIMIT); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 2dfd3bf8c4..439f3e8e3a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class GetMomentum extends AbstractEffect { private static int _ticks; - public GetMomentum(StatsSet params) + public GetMomentum(StatSet params) { _ticks = params.getInt("ticks", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index 7c1c0f3fa2..2c842101ed 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class GiveClanReputation extends AbstractEffect { private final int _reputation; - public GiveClanReputation(StatsSet params) + public GiveClanReputation(StatSet params) { _reputation = params.getInt("reputation", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index fd4d61fa73..9052c63154 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class GiveExpAndSp extends AbstractEffect private final int _xp; private final int _sp; - public GiveExpAndSp(StatsSet params) + public GiveExpAndSp(StatSet params) { _xp = params.getInt("xp", 0); _sp = params.getInt("sp", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index 3448e09797..9d41a4395b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ public class GiveFame extends AbstractEffect { private final int _fame; - public GiveFame(StatsSet params) + public GiveFame(StatSet params) { _fame = params.getInt("fame", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index c948fa0948..617a8ef88a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class GiveRecommendation extends AbstractEffect { private final int _amount; - public GiveRecommendation(StatsSet params) + public GiveRecommendation(StatSet params) { _amount = params.getInt("amount", 0); if (_amount == 0) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index 5fe06566c7..75a16fe828 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class GiveSp extends AbstractEffect { private final int _sp; - public GiveSp(StatsSet params) + public GiveSp(StatSet params) { _sp = params.getInt("sp", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index e32735f4e9..7779c6f413 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class GiveXp extends AbstractEffect { private final long _xp; - public GiveXp(StatsSet params) + public GiveXp(StatSet params) { _xp = params.getLong("xp", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 17095c209a..5cf4994f32 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Grow extends AbstractEffect { - public Grow(StatsSet params) + public Grow(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index a2200e1a2f..350c8e659f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.UserInfoType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class HairAccessorySet extends AbstractEffect { - public HairAccessorySet(StatsSet params) + public HairAccessorySet(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index 04b0b8ac6f..8211e03c01 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Harvesting extends AbstractEffect { - public Harvesting(StatsSet params) + public Harvesting(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java index ac1c9f49d8..097db6604a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HateAttack extends AbstractStatPercentEffect { - public HateAttack(StatsSet params) + public HateAttack(StatSet params) { super(params, Stat.HATE_ATTACK); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index 00f569eb17..9963ff1336 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlagInstance; @@ -34,7 +34,7 @@ public class HeadquarterCreate extends AbstractEffect private static final int HQ_NPC_ID = 35062; private final boolean _isAdvanced; - public HeadquarterCreate(StatsSet params) + public HeadquarterCreate(StatSet params) { _isAdvanced = params.getBoolean("isAdvanced", false); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 6e611144f1..139972a272 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -40,7 +40,7 @@ public class Heal extends AbstractEffect { private final double _power; - public Heal(StatsSet params) + public Heal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java index 5a7457d3df..a9f75ab036 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HealEffect extends AbstractStatEffect { - public HealEffect(StatsSet params) + public HealEffect(StatSet params) { super(params, Stat.HEAL_EFFECT, Stat.HEAL_EFFECT_ADD); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 86e28dc8b4..da76f33058 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class HealOverTime extends AbstractEffect { private final double _power; - public HealOverTime(StatsSet params) + public HealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index 6c9c8986bb..8b1c821a0a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class HealPercent extends AbstractEffect { private final int _power; - public HealPercent(StatsSet params) + public HealPercent(StatSet params) { _power = params.getInt("power", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Hide.java index e431277964..d02898bac5 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Hide extends AbstractEffect { - public Hide(StatsSet params) + public Hide(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index e7e5f3f91b..78fa1c9392 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.GameTimeController; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HitAtNight extends AbstractStatEffect { - public HitAtNight(StatsSet params) + public HitAtNight(StatSet params) { super(params, Stat.HIT_AT_NIGHT); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java index 1fd98e7aa9..f14b922308 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HitNumber extends AbstractStatEffect { - public HitNumber(StatsSet params) + public HitNumber(StatSet params) { super(params, Stat.ATTACK_COUNT_MAX); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 3611fd7d74..c2426f8d11 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Hp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Hp(StatsSet params) + public Hp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index 3d125565fe..6244c76428 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class HpByLevel extends AbstractEffect { private final double _power; - public HpByLevel(StatsSet params) + public HpByLevel(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 3cdb210bba..80b4af9b46 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -40,7 +40,7 @@ public class HpCpHeal extends AbstractEffect { private final double _power; - public HpCpHeal(StatsSet params) + public HpCpHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java index 0394dab996..6f96c2dcb3 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class HpCpHealCritical extends AbstractEffect { - public HpCpHealCritical(StatsSet params) + public HpCpHealCritical(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 554b1cec79..7cf47c3a65 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class HpDrain extends AbstractEffect private final double _power; private final double _percentage; - public HpDrain(StatsSet params) + public HpDrain(StatSet params) { _power = params.getDouble("power", 0); _percentage = params.getDouble("percentage", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java index cb1d2bc3a7..b170bc62ba 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HpRegen extends AbstractStatEffect { - public HpRegen(StatsSet params) + public HpRegen(StatSet params) { super(params, Stat.REGENERATE_HP_RATE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 235e89a79b..f346fbaad8 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class HpToOwner extends AbstractEffect private final double _power; private final int _stealAmount; - public HpToOwner(StatsSet params) + public HpToOwner(StatSet params) { _power = params.getDouble("power"); _stealAmount = params.getInt("stealAmount"); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java index 9829519da9..c659684ae8 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class IgnoreDeath extends AbstractEffect { - public IgnoreDeath(StatsSet params) + public IgnoreDeath(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index f7c9baa155..44dceba10e 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ImmobilePetBuff extends AbstractEffect { - public ImmobilePetBuff(StatsSet params) + public ImmobilePetBuff(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java index a60fc45d15..a03eff933a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ public class InstantKillResist extends AbstractEffect { private final int _amount; - public InstantKillResist(StatsSet params) + public InstantKillResist(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java index 7e1fc8abe4..265a9aab97 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class JewelSlot extends AbstractStatAddEffect { - public JewelSlot(StatsSet params) + public JewelSlot(StatSet params) { super(params, Stat.BROOCH_JEWELS); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 3d5ff2dda3..a34d7cc5b3 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class KarmaCount extends AbstractEffect private final int _amount; private final int _mode; - public KarmaCount(StatsSet params) + public KarmaCount(StatSet params) { _amount = params.getInt("amount", 0); switch (params.getString("mode", "DIFF")) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index b6f5b03994..cffa4427c6 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -94,7 +94,7 @@ public class KnockBack extends AbstractEffect _chainKnockSkills.put(ClassId.AEORE_SHILLIEN_SAINT, 12000); // Heavy Hit } - public KnockBack(StatsSet params) + public KnockBack(StatSet params) { _distance = params.getInt("distance", 50); _speed = params.getInt("speed", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index 7bfac989cf..1affb1b141 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -38,7 +38,7 @@ public class Lethal extends AbstractEffect private final double _fullLethal; private final double _halfLethal; - public Lethal(StatsSet params) + public Lethal(StatSet params) { _fullLethal = params.getDouble("fullLethal", 0); _halfLethal = params.getDouble("halfLethal", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java index aeb42458a6..43b17877ad 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitCp extends AbstractStatEffect { - public LimitCp(StatsSet params) + public LimitCp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_CP); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java index cf76ec482a..45d8f37355 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitHp extends AbstractStatEffect { - public LimitHp(StatsSet params) + public LimitHp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_HP); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java index f5eda36ba6..8d31633d0a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitMp extends AbstractStatEffect { - public LimitMp(StatsSet params) + public LimitMp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_MP); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java index e7832ef5af..e502ad06f3 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class LimitSkill extends AbstractEffect private static final int CELESTIAL_PROTECTION = 11758; private static final int CELESTIAL_PARTY_PROTECTION = 11759; - public LimitSkill(StatsSet params) + public LimitSkill(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Lucky.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Lucky.java index 3775d2361d..4ff5ea9a01 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Lucky.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Lucky.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Lucky extends AbstractEffect { - public Lucky(StatsSet params) + public Lucky(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MAtk.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MAtk.java index 5f9ad5f32b..38c2fc9067 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MAtk.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MAtk.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MAtk extends AbstractStatEffect { - public MAtk(StatsSet params) + public MAtk(StatSet params) { super(params, Stat.MAGIC_ATTACK); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java index 2b9ae2e9e6..393d0d2d30 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicAccuracy extends AbstractStatEffect { - public MagicAccuracy(StatsSet params) + public MagicAccuracy(StatSet params) { super(params, Stat.ACCURACY_MAGIC); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java index 123706eb55..b9a58b09f3 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicCriticalDamage extends AbstractStatEffect { - public MagicCriticalDamage(StatsSet params) + public MagicCriticalDamage(StatSet params) { super(params, Stat.MAGIC_CRITICAL_DAMAGE, Stat.MAGIC_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java index 0c10014e50..c9fa9a4240 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicCriticalRate extends AbstractStatEffect { - public MagicCriticalRate(StatsSet params) + public MagicCriticalRate(StatSet params) { super(params, Stat.MAGIC_CRITICAL_RATE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index e8b6f5e8bf..5281bf8445 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class MagicMpCost extends AbstractEffect private final int _magicType; private final double _amount; - public MagicMpCost(StatsSet params) + public MagicMpCost(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index ed4a3fca8b..283a99176c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class MagicalAbnormalDispelAttack extends AbstractEffect private final double _power; private final AbnormalType _abnormalType; - public MagicalAbnormalDispelAttack(StatsSet params) + public MagicalAbnormalDispelAttack(StatSet params) { _power = params.getDouble("power", 0); _abnormalType = AbnormalType.getAbnormalType(params.getString("abnormalType", null)); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java index 8234db1c43..be6403077c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAbnormalResist extends AbstractStatAddEffect { - public MagicalAbnormalResist(StatsSet params) + public MagicalAbnormalResist(StatSet params) { super(params, Stat.ABNORMAL_RESIST_MAGICAL); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index 4e938809f1..25c7d25954 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -37,7 +37,7 @@ public class MagicalAttack extends AbstractEffect private final boolean _overHit; private final double _debuffModifier; - public MagicalAttack(StatsSet params) + public MagicalAttack(StatSet params) { _power = params.getDouble("power", 0); _overHit = params.getBoolean("overHit", false); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 424480b76c..11c387780e 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class MagicalAttackByAbnormal extends AbstractEffect { private final double _power; - public MagicalAttackByAbnormal(StatsSet params) + public MagicalAttackByAbnormal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9c3e263a05..348e904025 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -40,7 +40,7 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect private final double _power; private final Set _abnormals; - public MagicalAttackByAbnormalSlot(StatsSet params) + public MagicalAttackByAbnormalSlot(StatSet params) { _power = params.getDouble("power", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 49dd351046..de55dd0fcd 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -38,7 +38,7 @@ public class MagicalAttackMp extends AbstractEffect private final boolean _critical; private final double _criticalLimit; - public MagicalAttackMp(StatsSet params) + public MagicalAttackMp(StatSet params) { _power = params.getDouble("power"); _critical = params.getBoolean("critical"); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 4414b36fa7..93ac560169 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class MagicalAttackRange extends AbstractEffect private final double _power; private final double _shieldDefPercent; - public MagicalAttackRange(StatsSet params) + public MagicalAttackRange(StatSet params) { _power = params.getDouble("power"); _shieldDefPercent = params.getDouble("shieldDefPercent", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java index 2e304e5f8b..1cf39ed501 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAttackSpeed extends AbstractStatEffect { - public MagicalAttackSpeed(StatsSet params) + public MagicalAttackSpeed(StatSet params) { super(params, Stat.MAGIC_ATTACK_SPEED); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 9a3a776e32..880d71f0c5 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class MagicalDamOverTime extends AbstractEffect private final double _power; private final boolean _canKill; - public MagicalDamOverTime(StatsSet params) + public MagicalDamOverTime(StatSet params) { _power = params.getDouble("power", 0); _canKill = params.getBoolean("canKill", false); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java index 80fdf87050..9b4e6061aa 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalDefence extends AbstractStatEffect { - public MagicalDefence(StatsSet params) + public MagicalDefence(StatSet params) { super(params, Stat.MAGICAL_DEFENCE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java index c3c7c404f3..4e83b80e8b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalEvasion extends AbstractStatEffect { - public MagicalEvasion(StatsSet params) + public MagicalEvasion(StatSet params) { super(params, Stat.MAGIC_EVASION_RATE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java index 6253af7373..bf419a19f7 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalSkillPower extends AbstractStatEffect { - public MagicalSkillPower(StatsSet params) + public MagicalSkillPower(StatSet params) { super(params, Stat.MAGICAL_SKILL_POWER, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index d0047fedef..f4388dc16f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class MagicalSoulAttack extends AbstractEffect { private final double _power; - public MagicalSoulAttack(StatsSet params) + public MagicalSoulAttack(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java index fcc143cd4b..688243d9e1 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ManaCharge extends AbstractStatAddEffect { - public ManaCharge(StatsSet params) + public ManaCharge(StatSet params) { super(params, Stat.MANA_CHARGE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index 0c84b4ab61..b889e6e824 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class ManaDamOverTime extends AbstractEffect { private final double _power; - public ManaDamOverTime(StatsSet params) + public ManaDamOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index f48011c9a2..94286df1c8 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -34,7 +34,7 @@ public class ManaHeal extends AbstractEffect { private final double _power; - public ManaHeal(StatsSet params) + public ManaHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index bfdfa54380..61f15449a0 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -35,7 +35,7 @@ public class ManaHealByLevel extends AbstractEffect { private final double _power; - public ManaHealByLevel(StatsSet params) + public ManaHealByLevel(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 46937a8dd0..e505c9e7a2 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class ManaHealOverTime extends AbstractEffect { private final double _power; - public ManaHealOverTime(StatsSet params) + public ManaHealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 101961d1c4..71085da549 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class ManaHealPercent extends AbstractEffect { private final double _power; - public ManaHealPercent(StatsSet params) + public ManaHealPercent(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 7c9c63e3ad..07d15d826c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxCp extends AbstractStatEffect { private final boolean _heal; - public MaxCp(StatsSet params) + public MaxCp(StatSet params) { super(params, Stat.MAX_CP); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 6d2c3449bd..85867bca96 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxHp extends AbstractStatEffect { private final boolean _heal; - public MaxHp(StatsSet params) + public MaxHp(StatSet params) { super(params, Stat.MAX_HP); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index e554c63055..9ca46fda8d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxMp extends AbstractStatEffect { private final boolean _heal; - public MaxMp(StatsSet params) + public MaxMp(StatSet params) { super(params, Stat.MAX_MP); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 39cf62a95b..c27284e5f6 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -43,7 +43,7 @@ public class ModifyVital extends AbstractEffect private final int _mp; private final int _cp; - public ModifyVital(StatsSet params) + public ModifyVital(StatSet params) { _type = params.getEnum("type", ModifyType.class); if (_type != ModifyType.SET) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 29ee88f805..095d130f7f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Mp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Mp(StatsSet params) + public Mp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index 76d858ad8e..b13d7824d0 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class MpConsumePerLevel extends AbstractEffect { private final double _power; - public MpConsumePerLevel(StatsSet params) + public MpConsumePerLevel(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java index 2051009805..ae7bf0c48c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpRegen extends AbstractStatEffect { - public MpRegen(StatsSet params) + public MpRegen(StatSet params) { super(params, Stat.REGENERATE_MP_RATE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MpShield.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MpShield.java index 82e307a562..a4eb3e663f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MpShield.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MpShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpShield extends AbstractStatAddEffect { - public MpShield(StatsSet params) + public MpShield(StatSet params) { super(params, Stat.MANA_SHIELD_PERCENT); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java index af2ce119cc..366e96b18f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpVampiricAttack extends AbstractStatAddEffect { - public MpVampiricAttack(StatsSet params) + public MpVampiricAttack(StatSet params) { super(params, Stat.ABSORB_MANA_DAMAGE_PERCENT); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Mute.java index a7f2f76e23..7e5b5a528f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Mute extends AbstractEffect { - public Mute(StatsSet params) + public Mute(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java index 3cc4cae96f..513dc46ec7 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class NoblesseBless extends AbstractEffect { - public NoblesseBless(StatsSet params) + public NoblesseBless(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index bb0f02af5c..05f8c6a99b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpenChest extends AbstractEffect { - public OpenChest(StatsSet params) + public OpenChest(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 1b8f7ef59f..a4b09c13ec 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeBookItemList; */ public class OpenCommonRecipeBook extends AbstractEffect { - public OpenCommonRecipeBook(StatsSet params) + public OpenCommonRecipeBook(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 21dd337982..7b5effc6b4 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class OpenDoor extends AbstractEffect private final int _chance; private final boolean _isItem; - public OpenDoor(StatsSet params) + public OpenDoor(StatSet params) { _chance = params.getInt("chance", 0); _isItem = params.getBoolean("isItem", false); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index ebd6c6a668..8842de2ea8 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeBookItemList; */ public class OpenDwarfRecipeBook extends AbstractEffect { - public OpenDwarfRecipeBook(StatsSet params) + public OpenDwarfRecipeBook(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PAtk.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PAtk.java index c353d03a00..7f10b9dcc7 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PAtk.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PAtk.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PAtk extends AbstractConditionalHpEffect { - public PAtk(StatsSet params) + public PAtk(StatSet params) { super(params, Stat.PHYSICAL_ATTACK); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Passive.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Passive.java index cef680ca21..27ce15bb60 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Passive.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Passive.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Passive extends AbstractEffect { - public Passive(StatsSet params) + public Passive(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java index 05f55c7dac..1a9f29424f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAbnormalResist extends AbstractStatAddEffect { - public PhysicalAbnormalResist(StatsSet params) + public PhysicalAbnormalResist(StatSet params) { super(params, Stat.ABNORMAL_RESIST_PHYSICAL); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 098770705b..7e5fb14465 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -52,7 +52,7 @@ public class PhysicalAttack extends AbstractEffect private final Set _abnormals; private final double _abnormalPowerMod; - public PhysicalAttack(StatsSet params) + public PhysicalAttack(StatSet params) { _power = params.getDouble("power", 0); _pAtkMod = params.getDouble("pAtkMod", 1.0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index d325c3d5ed..f191867614 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -38,7 +38,7 @@ public class PhysicalAttackHpLink extends AbstractEffect private final double _criticalChance; private final boolean _overHit; - public PhysicalAttackHpLink(StatsSet params) + public PhysicalAttackHpLink(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index dc575c2c75..fe087a1bcc 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class PhysicalAttackMute extends AbstractEffect { - public PhysicalAttackMute(StatsSet params) + public PhysicalAttackMute(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java index 112b41eb36..2093d45264 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAttackRange extends AbstractStatEffect { - public PhysicalAttackRange(StatsSet params) + public PhysicalAttackRange(StatSet params) { super(params, Stat.PHYSICAL_ATTACK_RANGE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index d3c2dcfaf2..5d66bd4c87 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ public class PhysicalAttackSaveHp extends AbstractEffect private final boolean _overHit; private final double _saveHp; - public PhysicalAttackSaveHp(StatsSet params) + public PhysicalAttackSaveHp(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java index 167b859572..cdf34eb6f6 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAttackSpeed extends AbstractStatEffect { - public PhysicalAttackSpeed(StatsSet params) + public PhysicalAttackSpeed(StatSet params) { super(params, Stat.PHYSICAL_ATTACK_SPEED); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 61bed5561b..a1a6818a00 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class PhysicalAttackWeaponBonus extends AbstractEffect private final Map _weaponBonus = new EnumMap<>(WeaponType.class); - public PhysicalAttackWeaponBonus(StatsSet params) + public PhysicalAttackWeaponBonus(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java index fa3925e725..078c3673b9 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalDefence extends AbstractConditionalHpEffect { - public PhysicalDefence(StatsSet params) + public PhysicalDefence(StatSet params) { super(params, Stat.PHYSICAL_DEFENCE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java index 812c641ac8..9714220e1b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalEvasion extends AbstractConditionalHpEffect { - public PhysicalEvasion(StatsSet params) + public PhysicalEvasion(StatSet params) { super(params, Stat.EVASION_RATE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index b337fed6cb..fe7cf853c8 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class PhysicalMute extends AbstractEffect { - public PhysicalMute(StatsSet params) + public PhysicalMute(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java index 0fd835f4e3..1b843dda3d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class PhysicalShieldAngleAll extends AbstractEffect { - public PhysicalShieldAngleAll(StatsSet params) + public PhysicalShieldAngleAll(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java index 9d3f051659..507eb57326 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalSkillPower extends AbstractStatEffect { - public PhysicalSkillPower(StatsSet params) + public PhysicalSkillPower(StatSet params) { super(params, Stat.PHYSICAL_SKILL_POWER, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index a958116ff7..9ceccea4cc 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -42,7 +42,7 @@ public class PhysicalSoulAttack extends AbstractEffect private final boolean _ignoreShieldDefence; private final boolean _overHit; - public PhysicalSoulAttack(StatsSet params) + public PhysicalSoulAttack(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index e95e09ab90..fd2b23a2ae 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class PkCount extends AbstractEffect { private final int _amount; - public PkCount(StatsSet params) + public PkCount(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index 2a356bdbc9..18cecfb90e 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class Plunder extends AbstractEffect { - public Plunder(StatsSet params) + public Plunder(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index fd61584af1..3e885274b3 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PolearmSingleTarget extends AbstractEffect { - public PolearmSingleTarget(StatsSet params) + public PolearmSingleTarget(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java index 86f2e2cee8..b2fb920379 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class ProtectDeathPenalty extends AbstractEffect { - public ProtectDeathPenalty(StatsSet params) + public ProtectDeathPenalty(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java index 890b8980bd..6664b36bae 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ProtectionBlessing extends AbstractEffect { - public ProtectionBlessing(StatsSet params) + public ProtectionBlessing(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index 6de78c2c82..62c480716d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class PullBack extends AbstractEffect private final int _animationSpeed; private final FlyType _type; - public PullBack(StatsSet params) + public PullBack(StatSet params) { _speed = params.getInt("speed", 0); _delay = params.getInt("delay", _speed); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java index 1019c56778..84a72299f3 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveMagicalSkillDamageBonus extends AbstractStatPercentEffect { - public PveMagicalSkillDamageBonus(StatsSet params) + public PveMagicalSkillDamageBonus(StatSet params) { super(params, Stat.PVE_MAGICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java index 8da698c746..70870aa45c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveMagicalSkillDefenceBonus(StatsSet params) + public PveMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java index c7a82d4ded..8f60ea025c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalAttackDamageBonus extends AbstractStatPercentEffect { - public PvePhysicalAttackDamageBonus(StatsSet params) + public PvePhysicalAttackDamageBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_ATTACK_DAMAGE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java index 0717fe525b..ea01a4e1d8 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PvePhysicalAttackDefenceBonus(StatsSet params) + public PvePhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java index 878f942877..1e8b9e76c4 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvePhysicalSkillDamageBonus(StatsSet params) + public PvePhysicalSkillDamageBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java index bdfa0dcc67..b1dbb0b217 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvePhysicalSkillDefenceBonus(StatsSet params) + public PvePhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java index 94fdc26015..fbe3119ba8 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveRaidMagicalSkillDefenceBonus(StatsSet params) + public PveRaidMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java index f54d849752..83352e1b2f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidPhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PveRaidPhysicalAttackDefenceBonus(StatsSet params) + public PveRaidPhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java index 0a344f96de..be05bec159 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidPhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveRaidPhysicalSkillDefenceBonus(StatsSet params) + public PveRaidPhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java index 542c019420..2f0153189a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpMagicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvpMagicalSkillDamageBonus(StatsSet params) + public PvpMagicalSkillDamageBonus(StatSet params) { super(params, Stat.PVP_MAGICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java index bb006280fc..41ad3b7749 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvpMagicalSkillDefenceBonus(StatsSet params) + public PvpMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVP_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java index 483d7b02e4..23488ea000 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalAttackDamageBonus extends AbstractStatPercentEffect { - public PvpPhysicalAttackDamageBonus(StatsSet params) + public PvpPhysicalAttackDamageBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_ATTACK_DAMAGE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java index 40c3a22ea2..ff942b3d4d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PvpPhysicalAttackDefenceBonus(StatsSet params) + public PvpPhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java index 225c7c1e39..19a7c96003 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvpPhysicalSkillDamageBonus(StatsSet params) + public PvpPhysicalSkillDamageBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java index ea2d1fa126..211d14c5e3 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvpPhysicalSkillDefenceBonus(StatsSet params) + public PvpPhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 8a01583374..e500b487af 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -36,7 +36,7 @@ public class RandomizeHate extends AbstractEffect { private final int _chance; - public RandomizeHate(StatsSet params) + public RandomizeHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index 8b2801ee6c..18b07bd2d7 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class RealDamage extends AbstractEffect { private final double _power; - public RealDamage(StatsSet params) + public RealDamage(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java index 4372c15bcf..86738fae0f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class RearDamage extends AbstractStatPercentEffect { - public RearDamage(StatsSet params) + public RearDamage(StatSet params) { super(params, Stat.REAR_DAMAGE_RATE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 31c7a4e4b3..82ed18faa1 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RebalanceHP extends AbstractEffect { - public RebalanceHP(StatsSet params) + public RebalanceHP(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index 09d307be02..979809b533 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RebalanceHPSummon extends AbstractEffect { - public RebalanceHPSummon(StatsSet params) + public RebalanceHPSummon(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 7599b691ac..e76328929a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class RecoverVitalityInPeaceZone extends AbstractEffect private final double _amount; private final int _ticks; - public RecoverVitalityInPeaceZone(StatsSet params) + public RecoverVitalityInPeaceZone(StatSet params) { _amount = params.getDouble("amount", 0); _ticks = params.getInt("ticks", 10); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Recovery.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Recovery.java index 35c5cf3af1..30296eec4d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Recovery.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Recovery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Recovery extends AbstractEffect { - public Recovery(StatsSet params) + public Recovery(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java index 824044ae21..e52b5abafb 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ReduceCancel extends AbstractStatEffect { - public ReduceCancel(StatsSet params) + public ReduceCancel(StatSet params) { super(params, Stat.ATTACK_CANCEL); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index ecc7a10d31..be9188f3b0 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -33,7 +33,7 @@ public class ReduceDamage extends AbstractEffect { private final double _amount; - public ReduceDamage(StatsSet params) + public ReduceDamage(StatSet params) { _amount = params.getDouble("amount"); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java index 8534a94fc6..7b8862f608 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ReduceDropType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -32,7 +32,7 @@ public class ReduceDropPenalty extends AbstractEffect private final double _deathPenalty; private final ReduceDropType _type; - public ReduceDropPenalty(StatsSet params) + public ReduceDropPenalty(StatSet params) { _exp = params.getDouble("exp", 0); _deathPenalty = params.getDouble("deathPenalty", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java index c15f7301b9..6436b488e0 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ReflectMagic extends AbstractStatAddEffect { - public ReflectMagic(StatsSet params) + public ReflectMagic(StatSet params) { super(params, Stat.VENGEANCE_SKILL_MAGIC_DAMAGE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java index bf1d555351..583191fd4c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.BasicProperty; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ReflectSkill extends AbstractEffect private final Stat _stat; private final double _amount; - public ReflectSkill(StatsSet params) + public ReflectSkill(StatSet params) { _stat = params.getEnum("type", BasicProperty.class, BasicProperty.PHYSICAL) == BasicProperty.PHYSICAL ? Stat.REFLECT_SKILL_PHYSIC : Stat.REFLECT_SKILL_MAGIC; _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index e850ea6be9..77b96e4205 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class RefuelAirship extends AbstractEffect { private final int _value; - public RefuelAirship(StatsSet params) + public RefuelAirship(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Relax.java index c8c61fe47e..e2ba4420db 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ public class Relax extends AbstractEffect { private final double _power; - public Relax(StatsSet params) + public Relax(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java index 0a44550fbf..1600e28444 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class RemoveEquipPenalty extends AbstractEffect { private final CrystalType _grade; - public RemoveEquipPenalty(StatsSet params) + public RemoveEquipPenalty(StatSet params) { _grade = params.getEnum("grade", CrystalType.class); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java index f2c14333a2..1710414a4a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.ShortcutType; import org.l2jmobius.gameserver.model.Shortcut; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -38,7 +38,7 @@ public class ReplaceSkillBySkill extends AbstractEffect private final SkillHolder _existingSkill; private final SkillHolder _replacementSkill; - public ReplaceSkillBySkill(StatsSet params) + public ReplaceSkillBySkill(StatSet params) { _existingSkill = new SkillHolder(params.getInt("existingSkillId"), params.getInt("existingSkillLevel", -1)); _replacementSkill = new SkillHolder(params.getInt("replacementSkillId"), params.getInt("replacementSkillLevel", -1)); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 9678dc1174..0613c17234 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class ResetInstanceEntry extends AbstractEffect { private final Set _instanceId; - public ResetInstanceEntry(StatsSet params) + public ResetInstanceEntry(StatSet params) { final String instanceIds = params.getString("instanceId", null); if ((instanceIds != null) && !instanceIds.isEmpty()) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java index 940c731208..f15ff56189 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ResistAbnormalByCategory extends AbstractEffect private final DispelSlotType _slot; private final double _amount; - public ResistAbnormalByCategory(StatsSet params) + public ResistAbnormalByCategory(StatSet params) { _amount = params.getDouble("amount", 0); _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.DEBUFF); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java index dae38e5246..2e29b5cc8e 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ResistDDMagic extends AbstractStatPercentEffect { - public ResistDDMagic(StatsSet params) + public ResistDDMagic(StatSet params) { super(params, Stat.MAGIC_SUCCESS_RES); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java index af2b203aad..d08fcb262a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ResistDispelByCategory extends AbstractEffect private final DispelSlotType _slot; private final double _amount; - public ResistDispelByCategory(StatsSet params) + public ResistDispelByCategory(StatSet params) { _amount = params.getDouble("amount", 0); _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index af1e40bea8..cd03f1a74a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -34,7 +34,7 @@ public class ResistSkill extends AbstractEffect { private final List _skills = new ArrayList<>(); - public ResistSkill(StatsSet params) + public ResistSkill(StatSet params) { for (int i = 1;; i++) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index feb5885fb0..6f887a07cf 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class Restoration extends AbstractEffect private final int _itemCount; private final int _itemEnchantmentLevel; - public Restoration(StatsSet params) + public Restoration(StatSet params) { _itemId = params.getInt("itemId", 0); _itemCount = params.getInt("itemCount", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 37cd974643..0baf0aaae6 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -25,7 +25,7 @@ import java.util.Map.Entry; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.ExtractableProductItem; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,12 +47,12 @@ public class RestorationRandom extends AbstractEffect { private final List _products = new ArrayList<>(); - public RestorationRandom(StatsSet params) + public RestorationRandom(StatSet params) { - for (StatsSet group : params.getList("items", StatsSet.class)) + for (StatSet group : params.getList("items", StatSet.class)) { final List items = new ArrayList<>(); - for (StatsSet item : group.getList(".", StatsSet.class)) + for (StatSet item : group.getList(".", StatSet.class)) { items.add(new RestorationItemHolder(item.getInt(".id"), item.getInt(".count"), item.getInt(".minEnchant", 0), item.getInt(".maxEnchant", 0))); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index f9c10b7ff2..9b287dd419 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class Resurrection extends AbstractEffect { private final int _power; - public Resurrection(StatsSet params) + public Resurrection(StatSet params) { _power = params.getInt("power", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 18d8bdb0bd..6ef063ce91 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -39,7 +39,7 @@ public class ResurrectionSpecial extends AbstractEffect private final int _power; private final Set _instanceId; - public ResurrectionSpecial(StatsSet params) + public ResurrectionSpecial(StatSet params) { _power = params.getInt("power", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index e4d66b43d3..0e7391681b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class Reuse extends AbstractEffect private final int _magicType; private final double _amount; - public Reuse(StatsSet params) + public Reuse(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index 3716fc1922..e17cd7cc25 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ReuseSkillById extends AbstractEffect { private final int _skillId; - public ReuseSkillById(StatsSet params) + public ReuseSkillById(StatSet params) { _skillId = params.getInt("skillId", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Root.java index 1ca3492949..b6876e8e13 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Root extends AbstractEffect { - public Root(StatsSet params) + public Root(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index 66fc8d82c8..4c7ee53239 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class SacrificeSummon extends AbstractEffect { - public SacrificeSummon(StatsSet params) + public SacrificeSummon(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java index d00856c9bd..683f45bb55 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SafeFallHeight extends AbstractStatEffect { - public SafeFallHeight(StatsSet params) + public SafeFallHeight(StatSet params) { super(params, Stat.FALL); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 7f6bf69ee3..797aa95263 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -33,7 +33,7 @@ public class SendSystemMessageToClan extends AbstractEffect { private final SystemMessage _message; - public SendSystemMessageToClan(StatsSet params) + public SendSystemMessageToClan(StatSet params) { final int id = params.getInt("id", 0); _message = new SystemMessage(id); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java index 7acbf846df..a0508d73b1 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class ServitorShare extends AbstractEffect { private final Map _sharedStats = new EnumMap<>(Stat.class); - public ServitorShare(StatsSet params) + public ServitorShare(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 01dfd87c71..6e8187feae 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SetHp extends AbstractEffect private final double _amount; private final StatModifierType _mode; - public SetHp(StatsSet params) + public SetHp(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index 805d18160b..fae21baa51 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SetSkill extends AbstractEffect private final int _skillId; private final int _skillLvl; - public SetSkill(StatsSet params) + public SetSkill(StatSet params) { _skillId = params.getInt("skillId", 0); _skillLvl = params.getInt("skillLvl", 1); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java index a93bb5f253..354cb42b55 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ShieldDefence extends AbstractStatEffect { - public ShieldDefence(StatsSet params) + public ShieldDefence(StatSet params) { super(params, Stat.SHIELD_DEFENCE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java index f28d0e4ad2..1fdee75f69 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ShieldDefenceRate extends AbstractStatEffect { - public ShieldDefenceRate(StatsSet params) + public ShieldDefenceRate(StatSet params) { super(params, Stat.SHIELD_DEFENCE_RATE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java index 1d649082dc..533b631f10 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class SilentMove extends AbstractEffect { - public SilentMove(StatsSet params) + public SilentMove(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java index 89dad85514..7c929a7fe8 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class SkillCritical extends AbstractEffect { private final BaseStat _stat; - public SkillCritical(StatsSet params) + public SkillCritical(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java index 369bef11f5..8f054f973b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillCriticalDamage extends AbstractStatEffect { - public SkillCriticalDamage(StatsSet params) + public SkillCriticalDamage(StatSet params) { super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java index c91f2d6b49..88ecf69e77 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillCriticalProbability extends AbstractStatPercentEffect { - public SkillCriticalProbability(StatsSet params) + public SkillCriticalProbability(StatSet params) { super(params, Stat.SKILL_CRITICAL_PROBABILITY); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 7b98a9e180..1664ea1827 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class SkillEvasion extends AbstractEffect private final int _magicType; private final double _amount; - public SkillEvasion(StatsSet params) + public SkillEvasion(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java index 9cc62532b4..2880d0ccef 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillPowerAdd extends AbstractStatAddEffect { - public SkillPowerAdd(StatsSet params) + public SkillPowerAdd(StatSet params) { super(params, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 9578c88f91..7156fff2df 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SkillTurning extends AbstractEffect private final int _chance; private final boolean _staticChance; - public SkillTurning(StatsSet params) + public SkillTurning(StatSet params) { _chance = params.getInt("chance", 100); _staticChance = params.getBoolean("staticChance", false); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 45b02206a4..04691304ed 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SkillTurningOverTime extends AbstractEffect private final int _chance; private final boolean _staticChance; - public SkillTurningOverTime(StatsSet params) + public SkillTurningOverTime(StatSet params) { _chance = params.getInt("chance", 100); _staticChance = params.getBoolean("staticChance", false); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index c1dd92cedb..b919c7acac 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -36,7 +36,7 @@ public class SoulBlow extends AbstractEffect private final double _chanceBoost; private final boolean _overHit; - public SoulBlow(StatsSet params) + public SoulBlow(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 8471aa236c..4f63a84081 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; @@ -40,7 +40,7 @@ public class SoulEating extends AbstractEffect private final int _expNeeded; private final int _maxSouls; - public SoulEating(StatsSet params) + public SoulEating(StatSet params) { _expNeeded = params.getInt("expNeeded"); _maxSouls = params.getInt("maxSouls"); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a7d5c2628a..ad261845eb 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Seed; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Sow extends AbstractEffect { - public Sow(StatsSet params) + public Sow(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SpModify.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SpModify.java index 24d124ecce..c3bc6193e9 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SpModify.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SpModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SpModify extends AbstractStatAddEffect { - public SpModify(StatsSet params) + public SpModify(StatSet params) { super(params, Stat.BONUS_SP); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 0718408ca2..890438d65f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.enums.SpeedType; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -36,7 +36,7 @@ public class Speed extends AbstractEffect private final StatModifierType _mode; private List _speedType; - public Speed(StatsSet params) + public Speed(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index 91b91ad05e..db247775f3 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SphericBarrier extends AbstractStatAddEffect { - public SphericBarrier(StatsSet params) + public SphericBarrier(StatSet params) { super(params, Stat.SPHERIC_BARRIER_RANGE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index d13eaf1c2e..385240377f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class Spoil extends AbstractEffect { - public Spoil(StatsSet params) + public Spoil(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index b63c24dc20..22c4132b63 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -36,7 +36,7 @@ public class StatBonusSkillCritical extends AbstractEffect private final BaseStat _stat; private final Condition _armorTypeCondition; - public StatBonusSkillCritical(StatsSet params) + public StatBonusSkillCritical(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.DEX); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index 41a20bfafe..49280eb774 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -36,7 +36,7 @@ public class StatBonusSpeed extends AbstractEffect private final BaseStat _stat; private final Condition _armorTypeCondition; - public StatBonusSpeed(StatsSet params) + public StatBonusSpeed(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.DEX); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index a007b118b2..bcf691e360 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class StatByMoveType extends AbstractEffect private final MoveType _type; private final double _value; - public StatByMoveType(StatsSet params) + public StatByMoveType(StatSet params) { _stat = params.getEnum("stat", Stat.class); _type = params.getEnum("type", MoveType.class); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StatUp.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StatUp.java index a22710ca7a..29d72bb4de 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StatUp.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StatUp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class StatUp extends AbstractEffect private final BaseStat _stat; private final double _amount; - public StatUp(StatsSet params) + public StatUp(StatSet params) { _amount = params.getDouble("amount", 0); _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index 0720057c19..23239887a7 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.List; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -39,7 +39,7 @@ public class StealAbnormal extends AbstractEffect private final int _rate; private final int _max; - public StealAbnormal(StatsSet params) + public StealAbnormal(StatSet params) { _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); _rate = params.getInt("rate", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Summon.java index 0f95637961..7ef79d4c39 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.ServitorInstance; @@ -43,7 +43,7 @@ public class Summon extends AbstractEffect private final int _lifeTime; private final int _consumeItemInterval; - public Summon(StatsSet params) + public Summon(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index 8929e1f2b0..50c025e572 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class SummonAgathion extends AbstractEffect { private final int _npcId; - public SummonAgathion(StatsSet params) + public SummonAgathion(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index 7716d58f16..49b816f272 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.CubicData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; @@ -42,7 +42,7 @@ public class SummonCubic extends AbstractEffect private final int _cubicId; private final int _cubicLvl; - public SummonCubic(StatsSet params) + public SummonCubic(StatSet params) { _cubicId = params.getInt("cubicId", -1); _cubicLvl = params.getInt("cubicLvl", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index d0a2a82738..13d5a2eac7 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoppelgangerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ public class SummonHallucination extends AbstractEffect private final int _npcId; private final int _npcCount; - public SummonHallucination(StatsSet params) + public SummonHallucination(StatSet params) { _despawnDelay = params.getInt("despawnDelay", 20000); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index bcd050e084..d61a6e5c02 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.ServitorInstance; @@ -43,7 +43,7 @@ public class SummonMulti extends AbstractEffect private final int _consumeItemInterval; private final int _summonPoints; - public SummonMulti(StatsSet params) + public SummonMulti(StatSet params) { _npcId = params.getInt("npcId"); _expMultiplier = params.getFloat("expMultiplier", 1); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index 6f4090eef0..eaff214b7c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DecoyInstance; @@ -48,7 +48,7 @@ public class SummonNpc extends AbstractEffect private final boolean _isSummonSpawn; private final boolean _singleInstance; // Only one instance of this NPC is allowed. - public SummonNpc(StatsSet params) + public SummonNpc(StatSet params) { _despawnDelay = params.getInt("despawnDelay", 20000); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 5ef621819e..534a41ee16 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.data.xml.impl.PetDataTable; import org.l2jmobius.gameserver.model.PetData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PetItemList; */ public class SummonPet extends AbstractEffect { - public SummonPet(StatsSet params) + public SummonPet(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java index 7dd690587c..b1d5ec38cb 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SummonPoints extends AbstractStatAddEffect { - public SummonPoints(StatsSet params) + public SummonPoints(StatSet params) { super(params, Stat.MAX_SUMMON_POINTS); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index d8a47b670f..ac1ddaa16a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; @@ -35,7 +35,7 @@ public class SummonTrap extends AbstractEffect private final int _despawnTime; private final int _npcId; - public SummonTrap(StatsSet params) + public SummonTrap(StatSet params) { _despawnTime = params.getInt("despawnTime", 0); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 84f6d070a8..3196bb949d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Collection; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Sweeper extends AbstractEffect { - public Sweeper(StatsSet params) + public Sweeper(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 1594a8a23b..77dc9b4af7 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ public class Synergy extends AbstractEffect private final int _skillLevelScaleTo; private final int _minSlot; - public Synergy(StatsSet params) + public Synergy(StatSet params) { final String requiredSlots = params.getString("requiredSlots", null); if ((requiredSlots != null) && !requiredSlots.isEmpty()) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index e35516fef5..39ed981bbf 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Castle; @@ -33,7 +33,7 @@ public class TakeCastle extends AbstractEffect { private final CastleSide _side; - public TakeCastle(StatsSet params) + public TakeCastle(StatSet params) { _side = params.getEnum("side", CastleSide.class); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 77fd9ec103..3be2bf5593 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Castle; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TakeCastleStart extends AbstractEffect { - public TakeCastleStart(StatsSet params) + public TakeCastleStart(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 70842191a7..18749c1aef 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Fort; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TakeFort extends AbstractEffect { - public TakeFort(StatsSet params) + public TakeFort(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 0eb23f6733..77355f9683 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TakeFortStart extends AbstractEffect { - public TakeFortStart(StatsSet params) + public TakeFortStart(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index cec32755ed..dd8e09278f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class TalismanSlot extends AbstractEffect { private final int _slots; - public TalismanSlot(StatsSet params) + public TalismanSlot(StatSet params) { _slots = params.getInt("slots", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 281b5322fd..32a126f499 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class TargetCancel extends AbstractEffect { private final int _chance; - public TargetCancel(StatsSet params) + public TargetCancel(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index b4463de391..86ff70c9ca 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMe extends AbstractEffect { - public TargetMe(StatsSet params) + public TargetMe(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index 11e581113e..e68a1e1faf 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class TargetMeProbability extends AbstractEffect { private final int _chance; - public TargetMeProbability(StatsSet params) + public TargetMeProbability(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 6c30519678..9ca01faf50 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -32,7 +32,7 @@ public class Teleport extends AbstractEffect { private final Location _loc; - public Teleport(StatsSet params) + public Teleport(StatSet params) { _loc = new Location(params.getInt("x", 0), params.getInt("y", 0), params.getInt("z", 0)); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index e0e715818c..bdc53208d5 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -38,7 +38,7 @@ public class TeleportToNpc extends AbstractEffect private final int _npcId; private final boolean _party; - public TeleportToNpc(StatsSet params) + public TeleportToNpc(StatSet params) { _npcId = params.getInt("npcId"); _party = params.getBoolean("party", false); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index c84c559322..4f4275fd41 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TeleportToPlayer extends AbstractEffect { - public TeleportToPlayer(StatsSet params) + public TeleportToPlayer(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index 1c9af0f535..b2d6b663de 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class TeleportToSummon extends AbstractEffect { private final double _maxDistance; - public TeleportToSummon(StatsSet params) + public TeleportToSummon(StatSet params) { _maxDistance = params.getDouble("distance", -1); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index e550302b02..c4bf787a10 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class TeleportToTarget extends AbstractEffect { - public TeleportToTarget(StatsSet params) + public TeleportToTarget(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java index 389d6ca266..a072291f5f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.EffectList; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -43,7 +43,7 @@ public class TrackLimitedSkill extends AbstractEffect private int limitSigelLevel = 0; private int limitIssLevel = 0; - public TrackLimitedSkill(StatsSet param) + public TrackLimitedSkill(StatSet param) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index ba1c55c615..ff63eea817 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class TransferDamageToPlayer extends AbstractStatAddEffect { - public TransferDamageToPlayer(StatsSet params) + public TransferDamageToPlayer(StatSet params) { super(params, Stat.TRANSFER_DAMAGE_TO_PLAYER); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java index b084bfc1cb..c87d5f0554 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class TransferDamageToSummon extends AbstractStatAddEffect { - public TransferDamageToSummon(StatsSet params) + public TransferDamageToSummon(StatSet params) { super(params, Stat.TRANSFER_DAMAGE_SUMMON_PERCENT); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index e9f0292113..48bc5e3a1c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -34,7 +34,7 @@ public class TransferHate extends AbstractEffect { private final int _chance; - public TransferHate(StatsSet params) + public TransferHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 2ddf95a4db..bf593eaed8 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Transformation extends AbstractEffect { private final List _id; - public Transformation(StatsSet params) + public Transformation(StatSet params) { final String ids = params.getString("transformationId", null); if ((ids != null) && !ids.isEmpty()) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 103ccdf8ce..2b4af0a1d3 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class TrapDetect extends AbstractEffect { private final int _power; - public TrapDetect(StatsSet params) + public TrapDetect(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index eb7b073b36..c4a6c6aed9 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.TrapAction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class TrapRemove extends AbstractEffect { private final int _power; - public TrapRemove(StatsSet params) + public TrapRemove(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 6df3874ab1..8fb87050b1 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -59,7 +59,7 @@ public class TriggerSkillByAttack extends AbstractEffect * @param params */ - public TriggerSkillByAttack(StatsSet params) + public TriggerSkillByAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index ae6a3bc89f..78366b8047 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillByAvoid extends AbstractEffect /** * @param params */ - public TriggerSkillByAvoid(StatsSet params) + public TriggerSkillByAvoid(StatSet params) { _chance = params.getInt("chance", 100); _skill = new SkillHolder(params.getInt("skillId", 0), params.getInt("skillLevel", 0)); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index c24fb95246..9fe53c0622 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -48,7 +48,7 @@ public class TriggerSkillByDamage extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillByDamage(StatsSet params) + public TriggerSkillByDamage(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c086507336..8b84350293 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillByDeathBlow extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillByDeathBlow(StatsSet params) + public TriggerSkillByDeathBlow(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index a9bfcc320c..11802645f2 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -37,7 +37,7 @@ public class TriggerSkillByKill extends AbstractEffect private final int _chance; private final SkillHolder _skill; - public TriggerSkillByKill(StatsSet params) + public TriggerSkillByKill(StatSet params) { _chance = params.getInt("chance", 100); _skill = new SkillHolder(params.getInt("skillId", 0), params.getInt("skillLevel", 0)); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 2893d46f33..7f2d3f9fa7 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -52,7 +52,7 @@ public class TriggerSkillByMagicType extends AbstractEffect * @param params */ - public TriggerSkillByMagicType(StatsSet params) + public TriggerSkillByMagicType(StatSet params) { _chance = params.getInt("chance", 100); _magicTypes = params.getIntArray("magicTypes", ";"); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 1524e3d4f4..b77da803f5 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillBySkill extends AbstractEffect private final int _skillLevelScaleTo; private final TargetType _targetType; - public TriggerSkillBySkill(StatsSet params) + public TriggerSkillBySkill(StatSet params) { _castSkillId = params.getInt("castSkillId"); _chance = params.getInt("chance", 100); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index ec2124c44e..7bb68baec9 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -53,7 +53,7 @@ public class TriggerSkillBySkillAttack extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillBySkillAttack(StatsSet params) + public TriggerSkillBySkillAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 3f58619f0a..c209decfb3 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -69,7 +69,7 @@ public class TwoHandedBluntBonus extends AbstractEffect private final double _speedAmount; private final StatModifierType _speedMode; - public TwoHandedBluntBonus(StatsSet params) + public TwoHandedBluntBonus(StatSet params) { _pAtkAmount = params.getDouble("pAtkAmount", 0); _pAtkMode = params.getEnum("pAtkMode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index b2c50c4b88..344456a925 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -69,7 +69,7 @@ public class TwoHandedSwordBonus extends AbstractEffect private final double _speedAmount; private final StatModifierType _speedMode; - public TwoHandedSwordBonus(StatsSet params) + public TwoHandedSwordBonus(StatSet params) { _pAtkAmount = params.getDouble("pAtkAmount", 0); _pAtkMode = params.getEnum("pAtkMode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 01ae8122ec..20b418c29b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ public class Unsummon extends AbstractEffect { private final int _chance; - public Unsummon(StatsSet params) + public Unsummon(StatSet params) { _chance = params.getInt("chance", -1); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 57eb89196d..f73f0f57f0 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; */ public class UnsummonAgathion extends AbstractEffect { - public UnsummonAgathion(StatsSet params) + public UnsummonAgathion(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index a4fdc2c0aa..0779d018cc 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class UnsummonServitors extends AbstractEffect { - public UnsummonServitors(StatsSet params) + public UnsummonServitors(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index dbb0c700b5..ac33fcba0d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Untargetable extends AbstractEffect { - public Untargetable(StatsSet params) + public Untargetable(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java index ac6cae3d05..1c85196fe0 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class VampiricAttack extends AbstractEffect private final double _amount; private final double _sum; - public VampiricAttack(StatsSet params) + public VampiricAttack(StatSet params) { _amount = params.getDouble("amount"); _sum = _amount * params.getDouble("chance"); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java index ab724714e1..571ca55bbe 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ public class VampiricDefence extends AbstractEffect { private final int _amount; - public VampiricDefence(StatsSet params) + public VampiricDefence(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java index f8b9d76f3a..caaa8d02b4 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class VitalityExpRate extends AbstractStatPercentEffect { - public VitalityExpRate(StatsSet params) + public VitalityExpRate(StatSet params) { super(params, Stat.VITALITY_EXP_RATE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index cba2b14c35..385595e03d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class VitalityPointUp extends AbstractEffect { private final int _value; - public VitalityPointUp(StatsSet params) + public VitalityPointUp(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java index 86612955dd..72f78ec177 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class VitalityPointsRate extends AbstractStatPercentEffect { - public VitalityPointsRate(StatsSet params) + public VitalityPointsRate(StatSet params) { super(params, Stat.VITALITY_CONSUME_RATE); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java index 09500b3823..bf20bd5018 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WeightLimit extends AbstractStatEffect { - public WeightLimit(StatsSet params) + public WeightLimit(StatSet params) { super(params, Stat.WEIGHT_LIMIT); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java index f9be68f493..6020399f85 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WeightPenalty extends AbstractStatAddEffect { - public WeightPenalty(StatsSet params) + public WeightPenalty(StatSet params) { super(params, Stat.WEIGHT_PENALTY); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java index bdf9aca48d..81eb9a9688 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WorldChatPoints extends AbstractStatEffect { - public WorldChatPoints(StatsSet params) + public WorldChatPoints(StatSet params) { super(params, Stat.WORLD_CHAT_POINTS); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java index 5a3842921d..127dadf9d2 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class BuildAdvanceBaseSkillCondition implements ISkillCondition { - public BuildAdvanceBaseSkillCondition(StatsSet params) + public BuildAdvanceBaseSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java index a9dd2b9eba..ffb7d13539 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class BuildCampSkillCondition implements ISkillCondition { - public BuildCampSkillCondition(StatsSet params) + public BuildCampSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java index c1220c828a..aca51bafbf 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanAddMaxEntranceInzoneSkillCondition implements ISkillCondition { - public CanAddMaxEntranceInzoneSkillCondition(StatsSet params) + public CanAddMaxEntranceInzoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java index eddd45771c..6ac3c2e199 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ public class CanBookmarkAddSlotSkillCondition implements ISkillCondition { private final int _teleportBookmarkSlots; - public CanBookmarkAddSlotSkillCondition(StatsSet params) + public CanBookmarkAddSlotSkillCondition(StatSet params) { _teleportBookmarkSlots = params.getInt("teleportBookmarkSlots"); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java index 30fdb7f36f..ee1bf96e69 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanChangeVitalItemCountSkillCondition implements ISkillCondition { - public CanChangeVitalItemCountSkillCondition(StatsSet params) + public CanChangeVitalItemCountSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java index da553a6d9f..48e28e7af7 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanEnchantAttributeSkillCondition implements ISkillCondition { - public CanEnchantAttributeSkillCondition(StatsSet params) + public CanEnchantAttributeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java index c14f1ffe64..2908994776 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanMountForEventSkillCondition implements ISkillCondition { - public CanMountForEventSkillCondition(StatsSet params) + public CanMountForEventSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java index d07aa9a622..9dc5f99592 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShipInstance; @@ -31,7 +31,7 @@ public class CanRefuelAirshipSkillCondition implements ISkillCondition { private final int _amount; - public CanRefuelAirshipSkillCondition(StatsSet params) + public CanRefuelAirshipSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java index d451f3c997..67206b47bd 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanRestoreVitalPointSkillCondition implements ISkillCondition { - public CanRestoreVitalPointSkillCondition(StatsSet params) + public CanRestoreVitalPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java index 7e519025b0..49232af88f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CanSummonCubicSkillCondition implements ISkillCondition { - public CanSummonCubicSkillCondition(StatsSet params) + public CanSummonCubicSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java index 23cca508c1..6610f322f1 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class CanSummonMultiSkillCondition implements ISkillCondition { private final int _summonPoints; - public CanSummonMultiSkillCondition(StatsSet params) + public CanSummonMultiSkillCondition(StatSet params) { _summonPoints = params.getInt("summonPoints"); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java index 85419e1e5e..c38566dbdd 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.CharSummonTable; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; */ public class CanSummonPetSkillCondition implements ISkillCondition { - public CanSummonPetSkillCondition(StatsSet params) + public CanSummonPetSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java index ea41a2e22e..3655e158cb 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanSummonSiegeGolemSkillCondition implements ISkillCondition { - public CanSummonSiegeGolemSkillCondition(StatsSet params) + public CanSummonSiegeGolemSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java index 6248c5131f..4d59811c7b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanSummonSkillCondition implements ISkillCondition { - public CanSummonSkillCondition(StatsSet params) + public CanSummonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java index 309da529c9..bd8838d02f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanTransformInDominionSkillCondition implements ISkillCondition { - public CanTransformInDominionSkillCondition(StatsSet params) + public CanTransformInDominionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java index 81297944f1..2f4d780cab 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class CanTransformSkillCondition implements ISkillCondition // TODO: What to do with this? // private final int _transformId; - public CanTransformSkillCondition(StatsSet params) + public CanTransformSkillCondition(StatSet params) { // _transformId = params.getInt("transformId"); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java index 800d0375be..771873a553 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanUntransformSkillCondition implements ISkillCondition { - public CanUntransformSkillCondition(StatsSet params) + public CanUntransformSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java index e651b3b1d5..ffe2e4a026 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class CanUseInBattlefieldSkillCondition implements ISkillCondition { - public CanUseInBattlefieldSkillCondition(StatsSet params) + public CanUseInBattlefieldSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java index 5ff751abce..ba030b97a4 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanUseInDragonLairSkillCondition implements ISkillCondition { - public CanUseInDragonLairSkillCondition(StatsSet params) + public CanUseInDragonLairSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java index 4d914c28fe..8a0cb18ac7 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class CanUseSwoopCannonSkillCondition implements ISkillCondition { - public CanUseSwoopCannonSkillCondition(StatsSet params) + public CanUseSwoopCannonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java index 6a2d832a4c..e9996580fc 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanUseVitalityConsumeItemSkillCondition implements ISkillCondition { - public CanUseVitalityConsumeItemSkillCondition(StatsSet params) + public CanUseVitalityConsumeItemSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java index f694956e7e..48dafb46c3 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class CannotUseInTransformSkillCondition implements ISkillCondition { private final int _transformId; - public CannotUseInTransformSkillCondition(StatsSet params) + public CannotUseInTransformSkillCondition(StatSet params) { _transformId = params.getInt("transformId", -1); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java index 141c69322f..6591233504 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -32,7 +32,7 @@ public class CheckLevelSkillCondition implements ISkillCondition private final int _maxLevel; private final SkillConditionAffectType _affectType; - public CheckLevelSkillCondition(StatsSet params) + public CheckLevelSkillCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java index 15163a3373..d72f463c4e 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class CheckSexSkillCondition implements ISkillCondition { private final boolean _isFemale; - public CheckSexSkillCondition(StatsSet params) + public CheckSexSkillCondition(StatSet params) { _isFemale = params.getBoolean("isFemale"); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java index 8dee11ef9c..12e49c23a7 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConsumeBodySkillCondition implements ISkillCondition { - public ConsumeBodySkillCondition(StatsSet params) + public ConsumeBodySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java index c24da9ebcd..ba1b1cdd5f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class EnergySavedSkillCondition implements ISkillCondition { private final int _amount; - public EnergySavedSkillCondition(StatsSet params) + public EnergySavedSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 89d705e991..34f76973f0 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -35,7 +35,7 @@ public class EquipArmorSkillCondition implements ISkillCondition { private int _armorTypesMask = 0; - public EquipArmorSkillCondition(StatsSet params) + public EquipArmorSkillCondition(StatSet params) { final List armorTypes = params.getEnumList("armorType", ArmorType.class); if (armorTypes != null) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index e5f22008fa..708b4dd1d4 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class EquipShieldSkillCondition implements ISkillCondition { - public EquipShieldSkillCondition(StatsSet params) + public EquipShieldSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 4561945254..f733f81f62 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -33,7 +33,7 @@ public class EquipWeaponSkillCondition implements ISkillCondition { private int _weaponTypesMask = 0; - public EquipWeaponSkillCondition(StatsSet params) + public EquipWeaponSkillCondition(StatSet params) { final List weaponTypes = params.getEnumList("weaponType", WeaponType.class); if (weaponTypes != null) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java index 5f77215218..e36c06fa11 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class NotFearedSkillCondition implements ISkillCondition { - public NotFearedSkillCondition(StatsSet params) + public NotFearedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java index b9096cc1a9..b6e7bcd826 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class NotInUnderwaterSkillCondition implements ISkillCondition { - public NotInUnderwaterSkillCondition(StatsSet params) + public NotInUnderwaterSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index eee6ec73e9..18d8dc8a11 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -35,7 +35,7 @@ public class Op2hWeaponSkillCondition implements ISkillCondition { private final List _weaponTypes = new ArrayList<>(); - public Op2hWeaponSkillCondition(StatsSet params) + public Op2hWeaponSkillCondition(StatSet params) { final List weaponTypes = params.getList("weaponType", String.class); if (weaponTypes != null) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 3b91f36fe4..6223172dbc 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; - public OpAffectedBySkillSkillCondition(StatsSet params) + public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java index 2eb561291e..3818df4736 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAgathionEnergySkillCondition implements ISkillCondition { - public OpAgathionEnergySkillCondition(StatsSet params) + public OpAgathionEnergySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java index 76a7ebc5a8..ee2b415021 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.enums.SkillConditionAlignment; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -32,7 +32,7 @@ public class OpAlignmentSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final SkillConditionAlignment _alignment; - public OpAlignmentSkillCondition(StatsSet params) + public OpAlignmentSkillCondition(StatSet params) { _affectType = params.getEnum("affectType", SkillConditionAffectType.class); _alignment = params.getEnum("alignment", SkillConditionAlignment.class); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index 1c83d18f4e..bcc6715bb2 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -33,7 +33,7 @@ public class OpBlinkSkillCondition implements ISkillCondition private final int _angle; private final int _range; - public OpBlinkSkillCondition(StatsSet params) + public OpBlinkSkillCondition(StatSet params) { switch (params.getEnum("direction", Position.class)) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java index 5215f86ae6..fde0c7f0f8 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpCallPcSkillCondition implements ISkillCondition { - public OpCallPcSkillCondition(StatsSet params) + public OpCallPcSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java index dddafec6f0..1de2a32550 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCanEscapeSkillCondition implements ISkillCondition { - public OpCanEscapeSkillCondition(StatsSet params) + public OpCanEscapeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java index 3f1685a1e0..a87fd8adb6 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCanNotUseAirshipSkillCondition implements ISkillCondition { - public OpCanNotUseAirshipSkillCondition(StatsSet params) + public OpCanNotUseAirshipSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java index 8eec19a568..ac7a81c015 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCannotUseTargetWithPrivateStoreSkillCondition implements ISkillCondition { - public OpCannotUseTargetWithPrivateStoreSkillCondition(StatsSet params) + public OpCannotUseTargetWithPrivateStoreSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 91de0adc8c..4030b79d00 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Weapon; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpChangeWeaponSkillCondition implements ISkillCondition { - public OpChangeWeaponSkillCondition(StatsSet params) + public OpChangeWeaponSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java index c2de03de1e..3e304e7d9d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.AbnormalType; @@ -34,7 +34,7 @@ public class OpCheckAbnormalSkillCondition implements ISkillCondition private final boolean _hasAbnormal; private final SkillConditionAffectType _affectType; - public OpCheckAbnormalSkillCondition(StatsSet params) + public OpCheckAbnormalSkillCondition(StatSet params) { _type = params.getEnum("type", AbnormalType.class); _level = params.getInt("level"); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java index 65084182b1..c70b58dc50 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCheckAccountTypeSkillCondition implements ISkillCondition { - public OpCheckAccountTypeSkillCondition(StatsSet params) + public OpCheckAccountTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java index 3d4f0a58a0..11eb804274 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpCheckCastRangeSkillCondition implements ISkillCondition { private final int _distance; - public OpCheckCastRangeSkillCondition(StatsSet params) + public OpCheckCastRangeSkillCondition(StatSet params) { _distance = params.getInt("distance"); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java index 7e2e391595..03af1ac63d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.ClassId; @@ -35,7 +35,7 @@ public class OpCheckClassListSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final boolean _isWithin; - public OpCheckClassListSkillCondition(StatsSet params) + public OpCheckClassListSkillCondition(StatSet params) { _classIds = params.getEnumList("classIds", ClassId.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java index 9f779f937a..9702804304 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.ClassId; @@ -33,7 +33,7 @@ public class OpCheckClassSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final boolean _isWithin; - public OpCheckClassSkillCondition(StatsSet params) + public OpCheckClassSkillCondition(StatSet params) { _classId = params.getEnum("classId", ClassId.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java index 3bf6b65dc8..ad997dced7 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckCrtEffectSkillCondition implements ISkillCondition { - public OpCheckCrtEffectSkillCondition(StatsSet params) + public OpCheckCrtEffectSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java index 61c3aa66a4..c0bb54afe0 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class OpCheckFlagSkillCondition implements ISkillCondition { - public OpCheckFlagSkillCondition(StatsSet params) + public OpCheckFlagSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java index 75af2ab89a..2e0c07d040 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckOnGoingEventCampaignSkillCondition implements ISkillCondition { - public OpCheckOnGoingEventCampaignSkillCondition(StatsSet params) + public OpCheckOnGoingEventCampaignSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java index c64f7c6722..f11569f43c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckPcbangPointSkillCondition implements ISkillCondition { - public OpCheckPcbangPointSkillCondition(StatsSet params) + public OpCheckPcbangPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java index 252519f7ff..997a4d0fec 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.data.xml.impl.ClanHallData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -35,7 +35,7 @@ public class OpCheckResidenceSkillCondition implements ISkillCondition private final List _residencesId; private final boolean _isWithin; - public OpCheckResidenceSkillCondition(StatsSet params) + public OpCheckResidenceSkillCondition(StatSet params) { _residencesId = params.getList("residencesId", Integer.class); _isWithin = params.getBoolean("isWithin"); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java index 6abeed7d35..3a1bcf424c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -34,7 +34,7 @@ public class OpCheckSkillListSkillCondition implements ISkillCondition private final List _skillIds; private final SkillConditionAffectType _affectType; - public OpCheckSkillListSkillCondition(StatsSet params) + public OpCheckSkillListSkillCondition(StatSet params) { _skillIds = params.getList("skillIds", Integer.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java index 984338b2c0..af563d983f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpCheckSkillSkillCondition implements ISkillCondition private final int _skillId; private final SkillConditionAffectType _affectType; - public OpCheckSkillSkillCondition(StatsSet params) + public OpCheckSkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java index ea882c3635..5d85a2dbdb 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionCompanionType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpCompanionSkillCondition implements ISkillCondition { private final SkillConditionCompanionType _type; - public OpCompanionSkillCondition(StatsSet params) + public OpCompanionSkillCondition(StatSet params) { _type = params.getEnum("type", SkillConditionCompanionType.class); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java index 069b9d1759..464853c00c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpEnchantRangeSkillCondition implements ISkillCondition { - public OpEnchantRangeSkillCondition(StatsSet params) + public OpEnchantRangeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java index 99f22bb16a..e12f3ae007 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class OpEncumberedSkillCondition implements ISkillCondition private final int _slotsPercent; private final int _weightPercent; - public OpEncumberedSkillCondition(StatsSet params) + public OpEncumberedSkillCondition(StatSet params) { _slotsPercent = params.getInt("slotsPercent"); _weightPercent = params.getInt("weightPercent"); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java index 187dfba744..49cf8e2cb8 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpEnergyMaxSkillCondition implements ISkillCondition { private final int _amount; - public OpEnergyMaxSkillCondition(StatsSet params) + public OpEnergyMaxSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 75bdf465e0..82eb70b770 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class OpEquipItemSkillCondition implements ISkillCondition private final int _itemId; private final SkillConditionAffectType _affectType; - public OpEquipItemSkillCondition(StatsSet params) + public OpEquipItemSkillCondition(StatSet params) { _itemId = params.getInt("itemId"); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java index 2c4576c2fa..fa6e82082b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ public class OpExistNpcSkillCondition implements ISkillCondition private final int _range; private final boolean _isAround; - public OpExistNpcSkillCondition(StatsSet params) + public OpExistNpcSkillCondition(StatSet params) { _npcIds = params.getList("npcIds", Integer.class); _range = params.getInt("range"); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java index 27cc3e90a9..8299b40047 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingCastSkillCondition implements ISkillCondition { - public OpFishingCastSkillCondition(StatsSet params) + public OpFishingCastSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java index 84cc031a24..4b43eb834e 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingPumpingSkillCondition implements ISkillCondition { - public OpFishingPumpingSkillCondition(StatsSet params) + public OpFishingPumpingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java index 86aa667bee..a6a400f96f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingReelingSkillCondition implements ISkillCondition { - public OpFishingReelingSkillCondition(StatsSet params) + public OpFishingReelingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java index d22733df7e..50e6dafb82 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpHaveSummonSkillCondition implements ISkillCondition { - public OpHaveSummonSkillCondition(StatsSet params) + public OpHaveSummonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 2e854ca2b8..cceb4e937b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { private final int _npcId; - public OpHaveSummonedNpcSkillCondition(StatsSet params) + public OpHaveSummonedNpcSkillCondition(StatSet params) { _npcId = params.getInt("npcId"); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java index 16932ce531..374a75bfab 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.impl.ClanHallData; import org.l2jmobius.gameserver.enums.ResidenceType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -34,7 +34,7 @@ public class OpHomeSkillCondition implements ISkillCondition { private final ResidenceType _type; - public OpHomeSkillCondition(StatsSet params) + public OpHomeSkillCondition(StatSet params) { _type = params.getEnum("type", ResidenceType.class); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java index 9482a0bf55..62ad48bdcc 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpInSiegeTimeSkillCondition implements ISkillCondition { - public OpInSiegeTimeSkillCondition(StatsSet params) + public OpInSiegeTimeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java index 1bffdacd6c..f2fb298398 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -30,7 +30,7 @@ public class OpInstantzoneSkillCondition implements ISkillCondition { private final int _instanceId; - public OpInstantzoneSkillCondition(StatsSet params) + public OpInstantzoneSkillCondition(StatSet params) { _instanceId = params.getInt("instanceId"); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java index 76703cc53b..7418ef9b64 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpMainjobSkillCondition implements ISkillCondition { - public OpMainjobSkillCondition(StatsSet params) + public OpMainjobSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java index d4c9f1f331..3c81369bbb 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNeedAgathionSkillCondition implements ISkillCondition { - public OpNeedAgathionSkillCondition(StatsSet params) + public OpNeedAgathionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java index 96f6774f25..e7a477b0ee 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; @@ -34,7 +34,7 @@ public class OpNeedSummonOrPetSkillCondition implements ISkillCondition { private final List _npcIds = new ArrayList<>(); - public OpNeedSummonOrPetSkillCondition(StatsSet params) + public OpNeedSummonOrPetSkillCondition(StatSet params) { final List npcIds = params.getList("npcIds", String.class); if (npcIds != null) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java index 9701002065..ae1edfd719 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotCursedSkillCondition implements ISkillCondition { - public OpNotCursedSkillCondition(StatsSet params) + public OpNotCursedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInCeremonyOfChaosSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInCeremonyOfChaosSkillCondition.java index 9549fdc2ac..b5cefc61cc 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInCeremonyOfChaosSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInCeremonyOfChaosSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotInCeremonyOfChaosSkillCondition implements ISkillCondition { - public OpNotInCeremonyOfChaosSkillCondition(StatsSet params) + public OpNotInCeremonyOfChaosSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java index bf909425d8..1de79f388a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpNotInPeacezoneSkillCondition implements ISkillCondition { - public OpNotInPeacezoneSkillCondition(StatsSet params) + public OpNotInPeacezoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java index 0752ba4a6a..0d3e4cb4dd 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotInstantzoneSkillCondition implements ISkillCondition { - public OpNotInstantzoneSkillCondition(StatsSet params) + public OpNotInstantzoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java index 45891cd0ac..7ea02159ba 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotOlympiadSkillCondition implements ISkillCondition { - public OpNotOlympiadSkillCondition(StatsSet params) + public OpNotOlympiadSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java index 5c5d293ae8..2397a68e99 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpNotTerritorySkillCondition implements ISkillCondition { - public OpNotTerritorySkillCondition(StatsSet params) + public OpNotTerritorySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java index 874872bb2e..d9f8c1fa3b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpPeacezoneSkillCondition implements ISkillCondition { - public OpPeacezoneSkillCondition(StatsSet params) + public OpPeacezoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java index c20c4665bb..08d6bb095a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpPkcountSkillCondition implements ISkillCondition { private final SkillConditionAffectType _affectType; - public OpPkcountSkillCondition(StatsSet params) + public OpPkcountSkillCondition(StatSet params) { _affectType = params.getEnum("affectType", SkillConditionAffectType.class); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java index 879fc88c4c..d393c5ddc3 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -30,7 +30,7 @@ public class OpPledgeSkillCondition implements ISkillCondition { private final int _level; - public OpPledgeSkillCondition(StatsSet params) + public OpPledgeSkillCondition(StatSet params) { _level = params.getInt("level"); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java index 9adc89b98d..adf16f8feb 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpRestartPointSkillCondition implements ISkillCondition { - public OpRestartPointSkillCondition(StatsSet params) + public OpRestartPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java index bbd1d9d7d1..6874091ba2 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class OpResurrectionSkillCondition implements ISkillCondition { - public OpResurrectionSkillCondition(StatsSet params) + public OpResurrectionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java index 8bbf796ad2..566f935a50 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpSiegeHammerSkillCondition implements ISkillCondition { - public OpSiegeHammerSkillCondition(StatsSet params) + public OpSiegeHammerSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java index be3ad18e05..cbfc1a25b2 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition private final int _skillId; private final boolean _hasLearned; - public OpSkillAcquireSkillCondition(StatsSet params) + public OpSkillAcquireSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _hasLearned = params.getBoolean("hasLearned"); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java index c8789d28e4..a8382b83b3 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpSkillSkillCondition implements ISkillCondition private final int _skillLevel; private final boolean _hasLearned; - public OpSkillSkillCondition(StatsSet params) + public OpSkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _skillLevel = params.getInt("skillLevel"); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java index 5127071683..a3d188f3eb 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpSocialClassSkillCondition implements ISkillCondition { private final int _socialClass; - public OpSocialClassSkillCondition(StatsSet params) + public OpSocialClassSkillCondition(StatSet params) { _socialClass = params.getInt("socialClass"); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java index b9d37d18c0..c86984a218 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class OpSoulMaxSkillCondition implements ISkillCondition { - public OpSoulMaxSkillCondition(StatsSet params) + public OpSoulMaxSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java index 4780c13a58..0faa676bbe 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpSubjobSkillCondition implements ISkillCondition { - public OpSubjobSkillCondition(StatsSet params) + public OpSubjobSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java index 17a9a1a9e3..a14192847a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.concurrent.atomic.AtomicBoolean; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpSweeperSkillCondition implements ISkillCondition { - public OpSweeperSkillCondition(StatsSet params) + public OpSweeperSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java index b36585bf00..c4b3923e92 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTargetAllItemTypeSkillCondition implements ISkillCondition { - public OpTargetAllItemTypeSkillCondition(StatsSet params) + public OpTargetAllItemTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 6b85389d62..5492e96e1a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTargetArmorTypeSkillCondition implements ISkillCondition { - public OpTargetArmorTypeSkillCondition(StatsSet params) + public OpTargetArmorTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java index 0c0090fbc4..97e07a1822 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpTargetDoorSkillCondition implements ISkillCondition { private final List _doorIds; - public OpTargetDoorSkillCondition(StatsSet params) + public OpTargetDoorSkillCondition(StatSet params) { _doorIds = params.getList("doorIds", Integer.class); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java index 6fbc3cda10..eaabf4a73d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpTargetMyPledgeAcademySkillCondition implements ISkillCondition { - public OpTargetMyPledgeAcademySkillCondition(StatsSet params) + public OpTargetMyPledgeAcademySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java index d5820600dd..14a744613d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpTargetNpcSkillCondition implements ISkillCondition { private final List _npcId; - public OpTargetNpcSkillCondition(StatsSet params) + public OpTargetNpcSkillCondition(StatSet params) { _npcId = params.getList("npcIds", Integer.class); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java index 854225a75a..b0c5e50ae3 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpTargetPcSkillCondition implements ISkillCondition { - public OpTargetPcSkillCondition(StatsSet params) + public OpTargetPcSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index 7faecb2ffd..62fd4b365f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Weapon; @@ -34,7 +34,7 @@ public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition { private final List _weaponTypes = new ArrayList<>(); - public OpTargetWeaponAttackTypeSkillCondition(StatsSet params) + public OpTargetWeaponAttackTypeSkillCondition(StatSet params) { final List weaponTypes = params.getList("weaponType", String.class); if (weaponTypes != null) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java index 8451365885..e114c03412 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTerritorySkillCondition implements ISkillCondition { - public OpTerritorySkillCondition(StatsSet params) + public OpTerritorySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java index 13f287687e..fde1293086 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpUnlockSkillCondition implements ISkillCondition { - public OpUnlockSkillCondition(StatsSet params) + public OpUnlockSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java index 8cc76a34bb..46dea5bbcb 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpUseFirecrackerSkillCondition implements ISkillCondition { - public OpUseFirecrackerSkillCondition(StatsSet params) + public OpUseFirecrackerSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java index f3b54bbad7..651dade274 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpUsePraseedSkillCondition implements ISkillCondition { - public OpUsePraseedSkillCondition(StatsSet params) + public OpUsePraseedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java index 890b0fcd5f..dd57df0e13 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.MountType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpWyvernSkillCondition implements ISkillCondition { - public OpWyvernSkillCondition(StatsSet params) + public OpWyvernSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java index 8a4c974840..5ac80d3e62 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class PossessHolythingSkillCondition implements ISkillCondition { - public PossessHolythingSkillCondition(StatsSet params) + public PossessHolythingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java index 8b0fb55554..38b5644fb1 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class RemainCpPerSkillCondition implements ISkillCondition private final int _amount; private final SkillConditionPercentType _percentType; - public RemainCpPerSkillCondition(StatsSet params) + public RemainCpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java index 612367a233..1ad96100ad 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -33,7 +33,7 @@ public class RemainHpPerSkillCondition implements ISkillCondition private final SkillConditionPercentType _percentType; private final SkillConditionAffectType _affectType; - public RemainHpPerSkillCondition(StatsSet params) + public RemainHpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java index 5455c1587a..39085349d9 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class RemainMpPerSkillCondition implements ISkillCondition private final int _amount; private final SkillConditionPercentType _percentType; - public RemainMpPerSkillCondition(StatsSet params) + public RemainMpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java index 7de47f103f..6e9e5ad821 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class SoulSavedSkillCondition implements ISkillCondition { private final int _amount; - public SoulSavedSkillCondition(StatsSet params) + public SoulSavedSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java index 0b75a5a623..f4bdbaaecb 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class TargetItemCrystalTypeSkillCondition implements ISkillCondition { - public TargetItemCrystalTypeSkillCondition(StatsSet params) + public TargetItemCrystalTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java index 51502ff209..604a41f904 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.MentorManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMyMenteeSkillCondition implements ISkillCondition { - public TargetMyMenteeSkillCondition(StatsSet params) + public TargetMyMenteeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java index fc621365a9..4bfb496634 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class TargetMyPartySkillCondition implements ISkillCondition { private final boolean _includeMe; - public TargetMyPartySkillCondition(StatsSet params) + public TargetMyPartySkillCondition(StatSet params) { _includeMe = params.getBoolean("includeMe"); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java index 9ebec0e691..d44a1bc8a9 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMyPledgeSkillCondition implements ISkillCondition { - public TargetMyPledgeSkillCondition(StatsSet params) + public TargetMyPledgeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java index f4da8d6079..5045aa3848 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class TargetRaceSkillCondition implements ISkillCondition { private final Race _race; - public TargetRaceSkillCondition(StatsSet params) + public TargetRaceSkillCondition(StatSet params) { _race = params.getEnum("race", Race.class); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java index 55734b03bb..d1aac35879 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -350,7 +350,7 @@ public class ChamberOfDelusion extends AbstractInstance protected void changeRoom(Instance world) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); final List locations = world.getEnterLocations(); int newRoom = params.getInt("currentRoom", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java index 95a96bb16e..bef23aa88c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java @@ -19,7 +19,7 @@ package instances.CrystalCaverns; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -64,12 +64,12 @@ public class CrystalCavernsCoralGarden extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (event) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java index d977f82481..5d6a8dda61 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java @@ -17,7 +17,7 @@ package instances.CrystalCaverns; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -90,13 +90,13 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); - final StatsSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); final int baseId = npcParams.getInt("base_id", -1); switch (event) @@ -156,7 +156,7 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (npc.getId()) { @@ -205,7 +205,7 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); final int baseId = npcParams.getInt("base_id", -1); switch (npc.getId()) @@ -365,7 +365,7 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance { case WATER_CANNON: { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); final int baseId = npcParams.getInt("base_id", -1); if (baseId != 1) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java index b9662a5d06..7624504082 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java @@ -19,7 +19,7 @@ package instances.CrystalCaverns; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -83,12 +83,12 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (event) { @@ -180,7 +180,7 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); switch (npc.getId()) { @@ -224,7 +224,7 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance final Instance instance = receiver.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = receiver.getParameters(); + final StatSet npcParams = receiver.getParameters(); if (eventName.equals(String.valueOf(24220005 + npcParams.getInt("Terri_ID", 0)))) { @@ -265,7 +265,7 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); final int killTarget = instance.getParameters().getInt("KILL_TARGET", 5); int currentKillCount = instance.getParameters().getInt("KILL_COUNT", 0); @@ -377,7 +377,7 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance if (isInInstance(instance) && creature.isPlayer()) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); switch (npc.getId()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java index 0d9724e766..1245a89ed0 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -404,7 +404,7 @@ public class DarkCloudMansion extends AbstractInstance { if (CommonUtil.contains(BELETH_SAMPLE, npc.getId())) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); if (!params.getBoolean("blocked", false)) { if (npc.isScriptValue(1)) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java index f8dec3de6e..31d966f9b2 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java @@ -18,7 +18,7 @@ package instances.FaeronTrainingGrounds1; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -273,7 +273,7 @@ public class FaeronTrainingGrounds1 extends AbstractInstance final Instance world = player.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); for (int i = 0; i < MOB_SPAWNS.length; i++) { if (params.getObject("Mob" + i, Npc.class) == null) @@ -295,7 +295,7 @@ public class FaeronTrainingGrounds1 extends AbstractInstance final Instance world = player.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); for (int i = 0; i < MOB_SPAWNS.length; i++) { final Npc mob = params.getObject("Mob" + i, Npc.class); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java index f3ae23d301..60e902fb43 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java @@ -18,7 +18,7 @@ package instances.FaeronTrainingGrounds2; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -270,7 +270,7 @@ public class FaeronTrainingGrounds2 extends AbstractInstance final Instance world = player.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); for (int i = 0; i < MOB_SPAWNS.length; i++) { if (params.getObject("Mob" + i, Npc.class) == null) @@ -292,7 +292,7 @@ public class FaeronTrainingGrounds2 extends AbstractInstance final Instance world = player.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); for (int i = 0; i < MOB_SPAWNS.length; i++) { final Npc mob = params.getObject("Mob" + i, Npc.class); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java index 20046a664b..54b93c8ccb 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -566,7 +566,7 @@ public class HarnakUndergroundRuins extends AbstractInstance } case 2: { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); final int waveNpc = params.getInt("waveNpcId"); if (world.getAliveNpcs(waveNpc).isEmpty()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaBoss.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaBoss.java index 181f892fbe..3ef76e5f72 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaBoss.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaBoss.java @@ -17,7 +17,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureAttacked; @@ -70,7 +70,7 @@ public class KartiaBoss extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SAY") && npc.isTargetable()) { @@ -107,7 +107,7 @@ public class KartiaBoss extends AbstractNpcAI public void spawnMinions(Npc npc) { - final StatsSet param = npc.getParameters(); + final StatSet param = npc.getParameters(); final int kartiaLevel = param.getInt("cartia_level", 0); final boolean isParty = param.getInt("party_type", 0) == 1; diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java index bd312c7fe6..721a32deb0 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -97,12 +97,12 @@ public class KartiaHelperAdolph extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if ((instance != null) && event.equals("CHECK_ACTION")) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final PlayerInstance plr = npcVars.getObject("PLAYER_OBJECT", PlayerInstance.class); if (plr != null) { @@ -159,7 +159,7 @@ public class KartiaHelperAdolph extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder skill_01 = instParams.getSkillHolder("adolphHate"); final SkillHolder skill_02 = instParams.getSkillHolder("adolphPunish"); final SkillHolder skill_03 = instParams.getSkillHolder("adolphShield"); @@ -256,7 +256,7 @@ public class KartiaHelperAdolph extends AbstractNpcAI { npc.setTarget(event.getAttacker()); addAttackDesire(npc, (Creature) npc.getTarget()); - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder hateSkill = instParams.getSkillHolder("adolphHate"); if ((hateSkill != null) && SkillCaster.checkUseConditions(npc, hateSkill.getSkill())) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java index e9aada8d07..c87c49ae5b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java @@ -19,7 +19,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -92,7 +92,7 @@ public class KartiaHelperBarton extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if ((instance != null) && event.equals("CHECK_ACTION")) @@ -170,7 +170,7 @@ public class KartiaHelperBarton extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder skill01 = instParams.getSkillHolder("bartonInfinity"); final SkillHolder skill02 = instParams.getSkillHolder("bartonBerserker"); final SkillHolder skill03 = instParams.getSkillHolder("bartonHurricane"); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java index e383a62d49..01edde0bd4 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java @@ -26,7 +26,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -115,12 +115,12 @@ public class KartiaHelperElise extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if ((instance != null) && event.equals("CHECK_ACTION")) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final FriendlyNpcInstance adolph = npcVars.getObject("ADOLPH_OBJECT", FriendlyNpcInstance.class); if (!npc.isCastingNow()) { @@ -153,8 +153,8 @@ public class KartiaHelperElise extends AbstractNpcAI final Instance instance = npc.getInstanceWorld(); if (instance != null) { - final StatsSet npcVars = npc.getVariables(); - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet npcVars = npc.getVariables(); + final StatSet instParams = instance.getTemplateParameters(); if (!npc.isCastingNow()) { final PlayerInstance plr = npcVars.getObject("PLAYER_OBJECT", PlayerInstance.class); @@ -248,7 +248,7 @@ public class KartiaHelperElise extends AbstractNpcAI { if (creature.isPlayer() || (creature instanceof FriendlyNpcInstance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); if (creature.isPlayer()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperEliyah.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperEliyah.java index 244110429c..cb3013c46c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperEliyah.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperEliyah.java @@ -18,7 +18,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance; @@ -87,7 +87,7 @@ public class KartiaHelperEliyah extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if ((instance != null) && event.equals("CHECK_ACTION")) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java index 07fe730289..123414862a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java @@ -18,7 +18,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -96,7 +96,7 @@ public class KartiaHelperGuardian extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (instance == null) @@ -183,7 +183,7 @@ public class KartiaHelperGuardian extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder skill01 = instParams.getSkillHolder("guardianSpiritsBlow"); final SkillHolder skill02 = instParams.getSkillHolder("guardianSpiritsWrath"); final int numberOfActiveSkills = 2; diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java index 1541261bac..45fdfece27 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java @@ -19,7 +19,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -93,7 +93,7 @@ public class KartiaHelperHayuk extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (instance == null) @@ -176,7 +176,7 @@ public class KartiaHelperHayuk extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder skill01 = instParams.getSkillHolder("hayukPinpointShot"); final SkillHolder skill02 = instParams.getSkillHolder("hayukRecoilShot"); final SkillHolder skill03 = instParams.getSkillHolder("hayukMultipleArrow"); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaSupportTroop.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaSupportTroop.java index bfdc9b4cd3..d17653b8e3 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaSupportTroop.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaSupportTroop.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -49,7 +49,7 @@ public class KartiaSupportTroop extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SAY") && !npc.isDead()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java index 0bf65e9c9b..01d0a1ab7a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -273,7 +273,7 @@ public class KartiasLabyrinth extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = (npc != null) ? npc.getInstanceWorld() : player.getInstanceWorld(); if (instance != null) @@ -363,7 +363,7 @@ public class KartiasLabyrinth extends AbstractInstance if (instance != null) { - final StatsSet param = instance.getParameters(); + final StatSet param = instance.getParameters(); if (param.getBoolean("BOSS_KILL_OPEN_DOOR", false) && CommonUtil.contains(MINI_BOSSES, npc.getId())) { instance.setParameter("BOSS_KILL_OPEN_DOOR", true); @@ -562,7 +562,7 @@ public class KartiasLabyrinth extends AbstractInstance private void manageProgressInInstance(Instance instance) { - final StatsSet param = instance.getParameters(); + final StatSet param = instance.getParameters(); final int room = param.getInt("ROOM", 1); final int stage = param.getInt("STAGE", 1); final int wave = param.getInt("WAVE", 1); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java index 5b0129dc4b..e3ab6bdbed 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -451,7 +451,7 @@ public class LabyrinthOfBelis extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (world != null) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java index f9c6c2b1af..7cd9254745 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -445,7 +445,7 @@ public class MemoryOfDisaster extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java index c5ebb7aa47..f1981550e1 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java @@ -19,7 +19,7 @@ package instances.MuseumDungeon; import java.util.List; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -161,7 +161,7 @@ public class MuseumDungeon extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); final Attackable toyron = (Attackable) instance.getNpc(TOYRON); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/Nursery/Nursery.java index 4e85e49c12..ff1ff2587e 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/Nursery/Nursery.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/Nursery/Nursery.java @@ -19,7 +19,7 @@ package instances.Nursery; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -80,12 +80,12 @@ public class Nursery extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int gameStage = npcVars.getInt("GAME_STAGE", 0); switch (event) @@ -142,7 +142,7 @@ public class Nursery extends AbstractInstance if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int gameStage = npcVars.getInt("GAME_STAGE", 0); switch (gameStage) @@ -200,7 +200,7 @@ public class Nursery extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int gameStage = npcVars.getInt("GAME_STAGE", 0); switch (event) @@ -281,7 +281,7 @@ public class Nursery extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int maguenStatus = npcVars.getInt("MAGUEN_STATUS", 0); switch (maguenStatus) @@ -407,8 +407,8 @@ public class Nursery extends AbstractInstance final Npc gameManager = instance.getNpc(TIE); if (gameManager != null) { - final StatsSet managerVars = gameManager.getVariables(); - final StatsSet npcVars = npc.getVariables(); + final StatSet managerVars = gameManager.getVariables(); + final StatSet npcVars = npc.getVariables(); final int gamePoints = managerVars.getInt("GAME_POINTS", 0); if (gamePoints > 0) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java index 501ea07ad2..1d546871e9 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java @@ -19,7 +19,7 @@ package instances.PailakaInjuredDragon; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -172,7 +172,7 @@ public class PailakaInjuredDragon extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (isInInstance(world)) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java index 8de90bca71..cd31666b75 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java @@ -19,7 +19,7 @@ package instances.PrisonOfDarkness; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -122,12 +122,12 @@ public class PrisonOfDarkness extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (event) { @@ -187,7 +187,7 @@ public class PrisonOfDarkness extends AbstractInstance if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (event) { @@ -327,7 +327,7 @@ public class PrisonOfDarkness extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (npc.getId()) { @@ -360,7 +360,7 @@ public class PrisonOfDarkness extends AbstractInstance if (isInInstance(instance) && (npc.getId() == EXIT_PORTAL)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (npcVars.getInt("PORTAL_STATE", 0)) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java index 415395c724..7d06cdeb54 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java @@ -18,7 +18,7 @@ package instances.TaintedDimension; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -97,7 +97,7 @@ public class TaintedDimension extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java index c8eda180d5..cfb333a649 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java @@ -18,7 +18,7 @@ package quests.Q10771_VolatilePower; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.quest.Quest; @@ -177,7 +177,7 @@ public class Q10771_VolatilePower extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java index 252229c5ba..7e7db63238 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java @@ -19,7 +19,7 @@ package quests.Q10772_ReportsFromCrumaTowerPart1; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -157,7 +157,7 @@ public class Q10772_ReportsFromCrumaTowerPart1 extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("DESPAWN_OWL") && (npc != null) && (npc.getId() == MAGIC_OWL)) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java index bfa9e949a7..17d390b01d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java @@ -19,7 +19,7 @@ package quests.Q10776_TheWrathOfTheGiants; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.quest.Quest; @@ -236,7 +236,7 @@ public class Q10776_TheWrathOfTheGiants extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java index 9f86ed0ad5..3effebfd33 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java @@ -19,7 +19,7 @@ package quests.Q10777_ReportsFromCrumaTowerPart2; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -159,7 +159,7 @@ public class Q10777_ReportsFromCrumaTowerPart2 extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if ((npc != null) && (npc.getId() == MAGIC_OWL) && event.equals("DESPAWN_OWL")) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java index 8322b9ae14..4e1b7e0133 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java @@ -17,7 +17,7 @@ package quests.Q10787_ASpyMission; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -154,7 +154,7 @@ public class Q10787_ASpyMission extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if ((npc != null) && (npc.getId() == SUSPICIOUS_BOX) && event.equals("DESPAWN")) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java index b1d0ec8553..7e9236b634 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.ActionDataHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -57,7 +57,7 @@ public class ActionData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "action", actionNode -> { - final ActionDataHolder holder = new ActionDataHolder(new StatsSet(parseAttributes(actionNode))); + final ActionDataHolder holder = new ActionDataHolder(new StatSet(parseAttributes(actionNode))); _actionData.put(holder.getId(), holder); })); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java index 36002572b0..f7762ab07b 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java @@ -32,7 +32,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.AdminCommandAccessRight; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -72,7 +72,7 @@ public class AdminData implements IXmlReader { NamedNodeMap attrs; Node attr; - StatsSet set; + StatSet set; AccessLevel level; AdminCommandAccessRight command; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -83,7 +83,7 @@ public class AdminData implements IXmlReader { if ("access".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -99,7 +99,7 @@ public class AdminData implements IXmlReader } else if ("admin".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java index b425296a19..6a14a867fc 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java @@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.alchemy.AlchemyCraftData; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -55,7 +55,7 @@ public class AlchemyData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node att; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -67,7 +67,7 @@ public class AlchemyData implements IXmlReader if ("skill".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index a5de47d07c..c31f2ea750 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; @@ -83,7 +83,7 @@ public class AppearanceItemData implements IXmlReader { if ("appearance_stone".equalsIgnoreCase(d.getNodeName())) { - final AppearanceStone stone = new AppearanceStone(new StatsSet(parseAttributes(d))); + final AppearanceStone stone = new AppearanceStone(new StatSet(parseAttributes(d))); for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) { switch (c.getNodeName()) @@ -120,7 +120,7 @@ public class AppearanceItemData implements IXmlReader } case "visual": { - stone.addVisualId(new AppearanceHolder(new StatsSet(parseAttributes(c)))); + stone.addVisualId(new AppearanceHolder(new StatSet(parseAttributes(c)))); } } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java index 6c96d3874a..6eac3240e7 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -64,7 +64,7 @@ public class AttendanceRewardData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "item", rewardNode -> { - final StatsSet set = new StatsSet(parseAttributes(rewardNode)); + final StatSet set = new StatSet(parseAttributes(rewardNode)); final int itemId = set.getInt("id"); final int itemCount = set.getInt("count"); if (ItemTable.getInstance().getTemplate(itemId) == null) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java index 891d19fcf2..3054b0e7ef 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.beautyshop.BeautyData; import org.l2jmobius.gameserver.model.beautyshop.BeautyItem; @@ -56,7 +56,7 @@ public class BeautyShopData implements IXmlReader public void parseDocument(Document doc, File f) { NamedNodeMap attrs; - StatsSet set; + StatSet set; Node att; Race race = null; Sex sex = null; @@ -92,7 +92,7 @@ public class BeautyShopData implements IXmlReader if ("hair".equalsIgnoreCase(a.getNodeName())) { attrs = a.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -105,7 +105,7 @@ public class BeautyShopData implements IXmlReader if ("color".equalsIgnoreCase(g.getNodeName())) { attrs = g.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -119,7 +119,7 @@ public class BeautyShopData implements IXmlReader else if ("face".equalsIgnoreCase(a.getNodeName())) { attrs = a.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java index 37e977c51e..530a5d975a 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java @@ -34,7 +34,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.entity.ClanHall; @@ -66,7 +66,7 @@ public class ClanHallData implements IXmlReader final List doors = new ArrayList<>(); final List npcs = new ArrayList<>(); final List teleports = new ArrayList<>(); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); for (Node listNode = doc.getFirstChild(); listNode != null; listNode = listNode.getNextSibling()) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ClanMasteryData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ClanMasteryData.java index fabd6f919e..36eaf42552 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ClanMasteryData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ClanMasteryData.java @@ -25,7 +25,7 @@ import java.util.logging.Logger; import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ClanMasteryHolder; import org.l2jmobius.gameserver.model.skills.Skill; @@ -57,7 +57,7 @@ public class ClanMasteryData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "clan", clanNode -> { - final StatsSet set = new StatsSet(parseAttributes(clanNode)); + final StatSet set = new StatSet(parseAttributes(clanNode)); final int id = set.getInt("mastery"); final int skill1Id = set.getInt("skill1Id"); final int skill1Level = set.getInt("skill1Level"); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ClanShopData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ClanShopData.java index 2ba5a1c504..092216b96d 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ClanShopData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ClanShopData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ClanShopProductHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -57,7 +57,7 @@ public class ClanShopData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "clan", productNode -> { - final StatsSet set = new StatsSet(parseAttributes(productNode)); + final StatSet set = new StatSet(parseAttributes(productNode)); final int clanLevel = set.getInt("level"); final int itemId = set.getInt("item"); final int count = set.getInt("count"); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java index ae608cefb6..f1a23734e0 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.combination.CombinationItem; import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; @@ -57,7 +57,7 @@ public class CombinationItemsData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "item", itemNode -> { - final CombinationItem item = new CombinationItem(new StatsSet(parseAttributes(itemNode))); + final CombinationItem item = new CombinationItem(new StatSet(parseAttributes(itemNode))); forEach(itemNode, "reward", rewardNode -> { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java index 038738b138..4af039b48d 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.CubicSkill; import org.l2jmobius.gameserver.model.cubic.ICubicConditionHolder; @@ -61,7 +61,7 @@ public class CubicData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - forEach(doc, "list", listNode -> forEach(listNode, "cubic", cubicNode -> parseTemplate(cubicNode, new CubicTemplate(new StatsSet(parseAttributes(cubicNode)))))); + forEach(doc, "list", listNode -> forEach(listNode, "cubic", cubicNode -> parseTemplate(cubicNode, new CubicTemplate(new StatSet(parseAttributes(cubicNode)))))); } /** @@ -137,7 +137,7 @@ public class CubicData implements IXmlReader { forEach(cubicNode, "skill", skillNode -> { - final CubicSkill skill = new CubicSkill(new StatsSet(parseAttributes(skillNode))); + final CubicSkill skill = new CubicSkill(new StatSet(parseAttributes(skillNode))); forEach(cubicNode, "conditions", conditionNode -> parseConditions(cubicNode, template, skill)); template.getSkills().add(skill); }); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java index 3d19bee079..ede9b72202 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -62,7 +62,7 @@ public class DailyMissionData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "reward", rewardNode -> { - final StatsSet set = new StatsSet(parseAttributes(rewardNode)); + final StatSet set = new StatSet(parseAttributes(rewardNode)); final List items = new ArrayList<>(1); forEach(rewardNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> @@ -80,14 +80,14 @@ public class DailyMissionData implements IXmlReader // Initial values in case handler doesn't exists set.set("handler", ""); - set.set("params", StatsSet.EMPTY_STATSET); + set.set("params", StatSet.EMPTY_STATSET); // Parse handler and parameters forEach(rewardNode, "handler", handlerNode -> { set.set("handler", parseString(handlerNode.getAttributes(), "name")); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); set.set("params", params); forEach(handlerNode, "param", paramNode -> params.set(parseString(paramNode.getAttributes(), "name"), paramNode.getTextContent())); }); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java index 835eab4fe9..53248de524 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java @@ -35,7 +35,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -51,7 +51,7 @@ public class DoorData implements IXmlReader // Info holders private final Map> _groups = new HashMap<>(); private final Map _doors = new HashMap<>(); - private final Map _templates = new HashMap<>(); + private final Map _templates = new HashMap<>(); private final Map> _regions = new HashMap<>(); protected DoorData() @@ -75,9 +75,9 @@ public class DoorData implements IXmlReader LOGGER.info(getClass().getSimpleName() + ": Loaded " + _doors.size() + " Door Templates for " + _regions.size() + " regions."); } - public StatsSet parseDoor(Node doorNode) + public StatSet parseDoor(Node doorNode) { - final StatsSet params = new StatsSet(parseAttributes(doorNode)); + final StatSet params = new StatSet(parseAttributes(doorNode)); params.set("baseHpMax", 1); // Avoid doors without HP value created dead due to default value 0 in CreatureTemplate forEach(doorNode, IXmlReader::isNode, innerDoorNode -> @@ -115,7 +115,7 @@ public class DoorData implements IXmlReader /** * @param set */ - private void applyCollisions(StatsSet set) + private void applyCollisions(StatSet set) { // Insert Collision data if (set.contains("nodeX_0") && set.contains("nodeY_0") && set.contains("nodeX_1") && set.contains("nodeY_1")) @@ -142,7 +142,7 @@ public class DoorData implements IXmlReader * @param set * @return */ - public DoorInstance spawnDoor(StatsSet set) + public DoorInstance spawnDoor(StatSet set) { // Create door template + door instance final DoorTemplate template = new DoorTemplate(set); @@ -183,7 +183,7 @@ public class DoorData implements IXmlReader return door; } - public StatsSet getDoorTemplate(int doorId) + public StatSet getDoorTemplate(int doorId) { return _templates.get(doorId); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java index eca42a9a34..637ef1e953 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -64,7 +64,7 @@ public class EnchantItemData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node att; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -76,7 +76,7 @@ public class EnchantItemData implements IXmlReader if ("enchant".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -107,7 +107,7 @@ public class EnchantItemData implements IXmlReader else if ("support".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java index 46701fd777..bb1e8026b7 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.SkillEnchantType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.EnchantSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -69,10 +69,10 @@ public class EnchantSkillGroupsData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "enchant", enchantNode -> { - final EnchantSkillHolder enchantSkillHolder = new EnchantSkillHolder(new StatsSet(parseAttributes(enchantNode))); + final EnchantSkillHolder enchantSkillHolder = new EnchantSkillHolder(new StatSet(parseAttributes(enchantNode))); forEach(enchantNode, "sps", spsNode -> forEach(spsNode, "sp", spNode -> enchantSkillHolder.addSp(parseEnum(spNode.getAttributes(), SkillEnchantType.class, "type"), parseInteger(spNode.getAttributes(), "amount")))); forEach(enchantNode, "chances", chancesNode -> forEach(chancesNode, "chance", chanceNode -> enchantSkillHolder.addChance(parseEnum(chanceNode.getAttributes(), SkillEnchantType.class, "type"), parseInteger(chanceNode.getAttributes(), "value")))); - forEach(enchantNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> enchantSkillHolder.addRequiredItem(parseEnum(itemNode.getAttributes(), SkillEnchantType.class, "type"), new ItemHolder(new StatsSet(parseAttributes(itemNode)))))); + forEach(enchantNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> enchantSkillHolder.addRequiredItem(parseEnum(itemNode.getAttributes(), SkillEnchantType.class, "type"), new ItemHolder(new StatSet(parseAttributes(itemNode)))))); _enchantSkillHolders.put(parseInteger(enchantNode.getAttributes(), "level"), enchantSkillHolder); })); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java index a8bb0397ac..037af7e1ae 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java @@ -34,7 +34,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.eventengine.AbstractEventManager; import org.l2jmobius.gameserver.model.eventengine.EventMethodNotification; import org.l2jmobius.gameserver.model.eventengine.EventScheduler; @@ -156,7 +156,7 @@ public class EventEngineData implements IXmlReader */ private void parseVariables(AbstractEventManager eventManager, Node innerNode) { - final StatsSet variables = new StatsSet(LinkedHashMap::new); + final StatSet variables = new StatSet(LinkedHashMap::new); for (Node variableNode = innerNode.getFirstChild(); variableNode != null; variableNode = variableNode.getNextSibling()) { if ("variable".equals(variableNode.getNodeName())) @@ -188,7 +188,7 @@ public class EventEngineData implements IXmlReader { if ("schedule".equals(scheduleNode.getNodeName())) { - final StatsSet params = new StatsSet(LinkedHashMap::new); + final StatSet params = new StatSet(LinkedHashMap::new); final NamedNodeMap attrs = scheduleNode.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -235,7 +235,7 @@ public class EventEngineData implements IXmlReader } else if ("conditionalSchedule".equals(scheduleNode.getNodeName())) { - final StatsSet params = new StatsSet(LinkedHashMap::new); + final StatSet params = new StatSet(LinkedHashMap::new); final NamedNodeMap attrs = scheduleNode.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -346,7 +346,7 @@ public class EventEngineData implements IXmlReader * @param variableNode */ @SuppressWarnings("unchecked") - private void parseListVariables(AbstractEventManager eventManager, StatsSet variables, Node variableNode) + private void parseListVariables(AbstractEventManager eventManager, StatSet variables, Node variableNode) { final String name = parseString(variableNode.getAttributes(), "name"); final String type = parseString(variableNode.getAttributes(), "type"); @@ -419,7 +419,7 @@ public class EventEngineData implements IXmlReader * @param variableNode */ @SuppressWarnings("unchecked") - private void parseMapVariables(AbstractEventManager eventManager, StatsSet variables, Node variableNode) + private void parseMapVariables(AbstractEventManager eventManager, StatSet variables, Node variableNode) { final String name = parseString(variableNode.getAttributes(), "name"); final String keyType = parseString(variableNode.getAttributes(), "keyType"); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java index db19c5fdff..0724877d9d 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.ConditionHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.ICondition; import org.l2jmobius.gameserver.model.holders.ExtendDropDataHolder; import org.l2jmobius.gameserver.model.holders.ExtendDropItemHolder; @@ -62,7 +62,7 @@ public class ExtendDropData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "drop", dropNode -> { - final StatsSet set = new StatsSet(parseAttributes(dropNode)); + final StatSet set = new StatSet(parseAttributes(dropNode)); final List items = new ArrayList<>(1); forEach(dropNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> @@ -80,8 +80,8 @@ public class ExtendDropData implements IXmlReader forEach(dropNode, "conditions", conditionsNode -> forEach(conditionsNode, "condition", conditionNode -> { final String conditionName = parseString(conditionNode.getAttributes(), "name"); - final StatsSet params = (StatsSet) parseValue(conditionNode); - final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); + final StatSet params = (StatSet) parseValue(conditionNode); + final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); if (conditionFunction != null) { conditions.add(conditionFunction.apply(params)); @@ -109,7 +109,7 @@ public class ExtendDropData implements IXmlReader private Object parseValue(Node node) { - StatsSet statsSet = null; + StatSet statSet = null; List list = null; Object text = null; for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) @@ -145,12 +145,12 @@ public class ExtendDropData implements IXmlReader final Object value = parseValue(node); if (value != null) { - if (statsSet == null) + if (statSet == null) { - statsSet = new StatsSet(); + statSet = new StatSet(); } - statsSet.set(nodeName, value); + statSet.set(nodeName, value); } } } @@ -161,9 +161,9 @@ public class ExtendDropData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", list); + statSet.set(".", list); } else { @@ -176,16 +176,16 @@ public class ExtendDropData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", text); + statSet.set(".", text); } else { return text; } } - return statsSet; + return statSet; } public ExtendDropDataHolder getExtendDropById(int id) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java index 57a16d6390..608f4702b8 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.FakePlayerHolder; @@ -72,7 +72,7 @@ public class FakePlayerData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayer", fakePlayerNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerNode)); final int npcId = set.getInt("npcId"); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); final String name = template.getName(); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java index 18cc499b71..a5ade27c03 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.FenceState; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldRegion; import org.l2jmobius.gameserver.model.actor.instance.FenceInstance; @@ -79,7 +79,7 @@ public class FenceData implements IXmlReader private void spawnFence(Node fenceNode) { - final StatsSet set = new StatsSet(parseAttributes(fenceNode)); + final StatSet set = new StatSet(parseAttributes(fenceNode)); spawnFence(set.getInt("x"), set.getInt("y"), set.getInt("z"), set.getString("name"), set.getInt("width"), set.getInt("length"), set.getInt("height"), 0, set.getEnum("state", FenceState.class, FenceState.CLOSED)); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java index 67dd4e396b..02efb756f2 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.Henna; import org.l2jmobius.gameserver.model.skills.Skill; @@ -86,7 +86,7 @@ public class HennaData implements IXmlReader */ private void parseHenna(Node d) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final List wearClassIds = new ArrayList<>(); final List skills = new ArrayList<>(); NamedNodeMap attrs = d.getAttributes(); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java index 03ad8ab79e..d81e85948d 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; @@ -93,7 +93,7 @@ public class InitialEquipmentData implements IXmlReader { if ("item".equalsIgnoreCase(c.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java index 72080aa4ac..54b1909d60 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemPointHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; @@ -55,17 +55,17 @@ public class LuckyGameData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "luckygame", rewardNode -> { - final LuckyGameDataHolder holder = new LuckyGameDataHolder(new StatsSet(parseAttributes(rewardNode))); + final LuckyGameDataHolder holder = new LuckyGameDataHolder(new StatSet(parseAttributes(rewardNode))); forEach(rewardNode, "common_reward", commonRewardNode -> forEach(commonRewardNode, "item", itemNode -> { - final StatsSet stats = new StatsSet(parseAttributes(itemNode)); + final StatSet stats = new StatSet(parseAttributes(itemNode)); holder.addCommonReward(new ItemChanceHolder(stats.getInt("id"), stats.getDouble("chance"), stats.getLong("count"))); })); forEach(rewardNode, "unique_reward", uniqueRewardNode -> forEach(uniqueRewardNode, "item", itemNode -> { - holder.addUniqueReward(new ItemPointHolder(new StatsSet(parseAttributes(itemNode)))); + holder.addUniqueReward(new ItemPointHolder(new StatSet(parseAttributes(itemNode)))); })); forEach(rewardNode, "modify_reward", uniqueRewardNode -> @@ -74,7 +74,7 @@ public class LuckyGameData implements IXmlReader holder.setMaxModifyRewardGame(parseInteger(uniqueRewardNode.getAttributes(), "max_game")); forEach(uniqueRewardNode, "item", itemNode -> { - final StatsSet stats = new StatsSet(parseAttributes(itemNode)); + final StatSet stats = new StatSet(parseAttributes(itemNode)); holder.addModifyReward(new ItemChanceHolder(stats.getInt("id"), stats.getDouble("chance"), stats.getLong("count"))); }); }); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java index 75bb48ed37..190653cdec 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java @@ -35,7 +35,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.SpecialItemType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; @@ -90,7 +90,7 @@ public class MultisellData implements IXmlReader { forEach(doc, "list", listNode -> { - final StatsSet set = new StatsSet(parseAttributes(listNode)); + final StatSet set = new StatSet(parseAttributes(listNode)); final int listId = Integer.parseInt(f.getName().substring(0, f.getName().length() - 4)); final List entries = new ArrayList<>(listNode.getChildNodes().getLength()); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java index 12ad0f9f0e..de0567af09 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.enums.AISkillScope; import org.l2jmobius.gameserver.enums.DropType; import org.l2jmobius.gameserver.enums.MpRewardAffectType; import org.l2jmobius.gameserver.enums.MpRewardType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.DropHolder; @@ -95,7 +95,7 @@ public class NpcData implements IXmlReader if ("npc".equalsIgnoreCase(listNode.getNodeName())) { NamedNodeMap attrs = listNode.getAttributes(); - final StatsSet set = new StatsSet(new HashMap<>()); + final StatSet set = new StatSet(new HashMap<>()); final int npcId = parseInteger(attrs, "id"); Map parameters = null; Map skills = null; @@ -511,11 +511,11 @@ public class NpcData implements IXmlReader if (parameters != null) { // Using unmodifiable map parameters of template are not meant to be changed at runtime. - template.setParameters(new StatsSet(Collections.unmodifiableMap(parameters))); + template.setParameters(new StatSet(Collections.unmodifiableMap(parameters))); } else { - template.setParameters(StatsSet.EMPTY_STATSET); + template.setParameters(StatSet.EMPTY_STATSET); } if (skills != null) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java index 3712cca6af..373f87ecfc 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -79,7 +79,7 @@ public class NpcNameLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); NPC_NAME_LOCALISATIONS.get(_lang).put(set.getInt("id"), new String[] { set.getString("name"), diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 55dcd539aa..36c5897ecd 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.EffectHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; @@ -71,7 +71,7 @@ public class OptionData implements IXmlReader forEach(innerNode, "effect", effectNode -> { final String name = parseString(effectNode.getAttributes(), "name"); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); forEach(effectNode, IXmlReader::isNode, paramNode -> params.set(paramNode.getNodeName(), SkillData.getInstance().parseValue(paramNode, true, false, Collections.emptyMap()))); option.addEffect(EffectHandler.getInstance().getHandlerFactory(name).apply(params)); }); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java index b1bb74baf6..c893725bc3 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.PetLevelData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * This class parse and hold all pet parameters.
@@ -116,7 +116,7 @@ public class PetDataTable implements IXmlReader if (s.getNodeName().equals("stat")) { final int level = Integer.parseInt(s.getAttributes().getNamedItem("level").getNodeValue()); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (Node bean = s.getFirstChild(); bean != null; bean = bean.getNextSibling()) { if (bean.getNodeName().equals("set")) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java index ab1cb3b257..b646782547 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.base.ClassId; @@ -83,7 +83,7 @@ public class PlayerTemplateData implements IXmlReader } else if ("staticData".equalsIgnoreCase(d.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.set("classId", classId); final List creationPoints = new ArrayList<>(); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java index 34a04edd9b..35b879e73f 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; @@ -83,7 +83,7 @@ public class PrimeShopData implements IXmlReader { NamedNodeMap attrs = d.getAttributes(); Node att; - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java index 0158b153c6..9aa87a1f9f 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java @@ -31,7 +31,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.StatusUpdateType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.RecipeHolder; @@ -61,7 +61,7 @@ public class RecipeData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node att; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -73,7 +73,7 @@ public class RecipeData implements IXmlReader if ("recipe".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java index 796f5ae085..9a8397e085 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java @@ -29,7 +29,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate; /** @@ -60,7 +60,7 @@ public class ResidenceFunctionsData implements IXmlReader forEach(doc, "list", list -> forEach(list, "function", func -> { final NamedNodeMap attrs = func.getAttributes(); - final StatsSet set = new StatsSet(HashMap::new); + final StatSet set = new StatSet(HashMap::new); for (int i = 0; i < attrs.getLength(); i++) { final Node node = attrs.item(i); @@ -69,7 +69,7 @@ public class ResidenceFunctionsData implements IXmlReader forEach(func, "function", levelNode -> { final NamedNodeMap levelAttrs = levelNode.getAttributes(); - final StatsSet levelSet = new StatsSet(HashMap::new); + final StatSet levelSet = new StatSet(HashMap::new); levelSet.merge(set); for (int i = 0; i < levelAttrs.getLength(); i++) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java index 053d9089ce..d6b28a5962 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; /** @@ -82,7 +82,7 @@ public class SendMessageLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); SEND_MESSAGE_LOCALISATIONS.get(_lang).put(set.getString("message").split(SPLIT_STRING), set.getString("translation").split(SPLIT_STRING)); })); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java index e473030c56..c3eda1f3b8 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.actor.instance.ShuttleInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; @@ -72,7 +72,7 @@ public class ShuttleData implements IXmlReader public void parseDocument(Document doc, File f) { NamedNodeMap attrs; - StatsSet set; + StatSet set; Node att; ShuttleDataHolder data; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -84,7 +84,7 @@ public class ShuttleData implements IXmlReader if ("shuttle".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -164,7 +164,7 @@ public class ShuttleData implements IXmlReader { for (ShuttleDataHolder data : _shuttles.values()) { - final ShuttleInstance shuttle = new ShuttleInstance(new CreatureTemplate(new StatsSet())); + final ShuttleInstance shuttle = new ShuttleInstance(new CreatureTemplate(new StatSet())); shuttle.setData(data); shuttle.setHeading(data.getLocation().getHeading()); shuttle.setLocationInvisible(data.getLocation()); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java index 9db0b5f64b..ba000649f2 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.SiegeScheduleDate; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.util.Util; /** @@ -54,7 +54,7 @@ public class SiegeScheduleData implements IXmlReader LOGGER.info(getClass().getSimpleName() + ": Loaded " + _scheduleData.size() + " siege schedulers."); if (_scheduleData.isEmpty()) { - _scheduleData.add(new SiegeScheduleDate(new StatsSet())); + _scheduleData.add(new SiegeScheduleDate(new StatSet())); LOGGER.info(getClass().getSimpleName() + ": Emergency loaded " + _scheduleData.size() + " default siege schedulers."); } } @@ -72,7 +72,7 @@ public class SiegeScheduleData implements IXmlReader { case "schedule": { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final NamedNodeMap attrs = cd.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java index cc019c4dbb..2592b3ed97 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java @@ -40,7 +40,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.EffectHandler; import org.l2jmobius.gameserver.handler.SkillConditionHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.EffectScope; @@ -67,9 +67,9 @@ public class SkillData implements IXmlReader private final Integer _toLevel; private final Integer _fromSubLevel; private final Integer _toSubLevel; - private final Map> _info; + private final Map> _info; - public NamedParamInfo(String name, Integer fromLevel, Integer toLevel, Integer fromSubLevel, Integer toSubLevel, Map> info) + public NamedParamInfo(String name, Integer fromLevel, Integer toLevel, Integer fromSubLevel, Integer toSubLevel, Map> info) { _name = name; _fromLevel = fromLevel; @@ -104,7 +104,7 @@ public class SkillData implements IXmlReader return _toSubLevel; } - public Map> getInfo() + public Map> getInfo() { return _info; } @@ -241,8 +241,8 @@ public class SkillData implements IXmlReader { NamedNodeMap attributes = listNode.getAttributes(); final Map> levels = new HashMap<>(); - final Map> skillInfo = new HashMap<>(); - final StatsSet generalSkillInfo = skillInfo.computeIfAbsent(-1, k -> new HashMap<>()).computeIfAbsent(-1, k -> new StatsSet()); + final Map> skillInfo = new HashMap<>(); + final StatSet generalSkillInfo = skillInfo.computeIfAbsent(-1, k -> new HashMap<>()).computeIfAbsent(-1, k -> new StatSet()); parseAttributes(attributes, "", generalSkillInfo); @@ -321,7 +321,7 @@ public class SkillData implements IXmlReader { return; } - subLevelMap.forEach((subLevel, statsSet) -> + subLevelMap.forEach((subLevel, statSet) -> { if (subLevel == -1) { @@ -339,7 +339,7 @@ public class SkillData implements IXmlReader { return; } - subLevelMap.forEach((subLevel, statsSet) -> + subLevelMap.forEach((subLevel, statSet) -> { if (subLevel == -1) { @@ -371,31 +371,31 @@ public class SkillData implements IXmlReader levels.forEach((level, subLevels) -> subLevels.forEach(subLevel -> { - final StatsSet statsSet = Optional.ofNullable(skillInfo.getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatsSet::new); - skillInfo.getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(statsSet.getSet()::putIfAbsent); - skillInfo.getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(statsSet.getSet()::putIfAbsent); - statsSet.set(".level", level); - statsSet.set(".subLevel", subLevel); - final Skill skill = new Skill(statsSet); + final StatSet statSet = Optional.ofNullable(skillInfo.getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatSet::new); + skillInfo.getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(statSet.getSet()::putIfAbsent); + skillInfo.getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(statSet.getSet()::putIfAbsent); + statSet.set(".level", level); + statSet.set(".subLevel", subLevel); + final Skill skill = new Skill(statSet); forEachNamedParamInfoParam(effectParamInfo, level, subLevel, ((effectScope, params) -> { final String effectName = params.getString(".name"); params.remove(".name"); try { - final Function effectFunction = EffectHandler.getInstance().getHandlerFactory(effectName); + final Function effectFunction = EffectHandler.getInstance().getHandlerFactory(effectName); if (effectFunction != null) { skill.addEffect(effectScope, effectFunction.apply(params)); } else { - LOGGER.warning(getClass().getSimpleName() + ": Missing effect for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]"); + LOGGER.warning(getClass().getSimpleName() + ": Missing effect for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]"); } } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading effect for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading effect for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]", e); } })); @@ -405,19 +405,19 @@ public class SkillData implements IXmlReader params.remove(".name"); try { - final Function conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName); + final Function conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName); if (conditionFunction != null) { skill.addCondition(skillConditionScope, conditionFunction.apply(params)); } else { - LOGGER.warning(getClass().getSimpleName() + ": Missing condition for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + skillConditionScope + "] Effect Name[" + conditionName + "]"); + LOGGER.warning(getClass().getSimpleName() + ": Missing condition for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + skillConditionScope + "] Effect Name[" + conditionName + "]"); } } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading condition for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Condition Scope[" + skillConditionScope + "] Condition Name[" + conditionName + "]", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading condition for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Condition Scope[" + skillConditionScope + "] Condition Name[" + conditionName + "]", e); } })); @@ -434,16 +434,16 @@ public class SkillData implements IXmlReader } } - private void forEachNamedParamInfoParam(Map> paramInfo, int level, int subLevel, BiConsumer consumer) + private void forEachNamedParamInfoParam(Map> paramInfo, int level, int subLevel, BiConsumer consumer) { paramInfo.forEach((scope, namedParamInfos) -> namedParamInfos.forEach(namedParamInfo -> { if ((((namedParamInfo.getFromLevel() == null) && (namedParamInfo.getToLevel() == null)) || ((namedParamInfo.getFromLevel() <= level) && (namedParamInfo.getToLevel() >= level))) // && (((namedParamInfo.getFromSubLevel() == null) && (namedParamInfo.getToSubLevel() == null)) || ((namedParamInfo.getFromSubLevel() <= subLevel) && (namedParamInfo.getToSubLevel() >= subLevel)))) { - final StatsSet params = Optional.ofNullable(namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatsSet::new); - namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); - namedParamInfo.getInfo().getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); + final StatSet params = Optional.ofNullable(namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatSet::new); + namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); + namedParamInfo.getInfo().getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); params.set(".name", namedParamInfo.getName()); consumer.accept(scope, params); } @@ -460,7 +460,7 @@ public class SkillData implements IXmlReader final Integer subLevel = parseInteger(attributes, "subLevel"); final Integer fromSubLevel = parseInteger(attributes, "fromSubLevel", subLevel); final Integer toSubLevel = parseInteger(attributes, "toSubLevel", subLevel); - final Map> info = new HashMap<>(); + final Map> info = new HashMap<>(); for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) { if (!node.getNodeName().equals("#text")) @@ -471,7 +471,7 @@ public class SkillData implements IXmlReader return new NamedParamInfo(name, fromLevel, toLevel, fromSubLevel, toSubLevel, info); } - private void parseInfo(Node node, Map>> variableValues, Map> info) + private void parseInfo(Node node, Map>> variableValues, Map> info) { Map> values = parseValues(node); final Object generalValue = values.getOrDefault(-1, Collections.emptyMap()).get(-1); @@ -492,7 +492,7 @@ public class SkillData implements IXmlReader } } - values.forEach((level, subLevelMap) -> subLevelMap.forEach((subLevel, value) -> info.computeIfAbsent(level, k -> new HashMap<>()).computeIfAbsent(subLevel, k -> new StatsSet()).set(node.getNodeName(), value))); + values.forEach((level, subLevelMap) -> subLevelMap.forEach((subLevel, value) -> info.computeIfAbsent(level, k -> new HashMap<>()).computeIfAbsent(subLevel, k -> new StatSet()).set(node.getNodeName(), value))); } private Map> parseValues(Node node) @@ -535,7 +535,7 @@ public class SkillData implements IXmlReader variables.put("index", (i - fromLevel) + 1d); variables.put("subIndex", (j - fromSubLevel) + 1d); final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1); - if ((base != null) && !(base instanceof StatsSet)) + if ((base != null) && !(base instanceof StatSet)) { variables.put("base", Double.parseDouble(String.valueOf(base))); } @@ -555,13 +555,13 @@ public class SkillData implements IXmlReader Object parseValue(Node node, boolean blockValue, boolean parseAttributes, Map variables) { - StatsSet statsSet = null; + StatSet statSet = null; List list = null; Object text = null; if (parseAttributes && (!node.getNodeName().equals("value") || !blockValue) && (node.getAttributes().getLength() > 0)) { - statsSet = new StatsSet(); - parseAttributes(node.getAttributes(), "", statsSet, variables); + statSet = new StatSet(); + parseAttributes(node.getAttributes(), "", statSet, variables); } for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) { @@ -604,12 +604,12 @@ public class SkillData implements IXmlReader final Object value = parseValue(node, false, true, variables); if (value != null) { - if (statsSet == null) + if (statSet == null) { - statsSet = new StatsSet(); + statSet = new StatSet(); } - statsSet.set(nodeName, value); + statSet.set(nodeName, value); } } } @@ -620,9 +620,9 @@ public class SkillData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", list); + statSet.set(".", list); } else { @@ -635,30 +635,30 @@ public class SkillData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", text); + statSet.set(".", text); } else { return text; } } - return statsSet; + return statSet; } - private void parseAttributes(NamedNodeMap attributes, String prefix, StatsSet statsSet, Map variables) + private void parseAttributes(NamedNodeMap attributes, String prefix, StatSet statSet, Map variables) { for (int i = 0; i < attributes.getLength(); i++) { final Node attributeNode = attributes.item(i); - statsSet.set(prefix + "." + attributeNode.getNodeName(), parseNodeValue(attributeNode.getNodeValue(), variables)); + statSet.set(prefix + "." + attributeNode.getNodeName(), parseNodeValue(attributeNode.getNodeValue(), variables)); } } - private void parseAttributes(NamedNodeMap attributes, String prefix, StatsSet statsSet) + private void parseAttributes(NamedNodeMap attributes, String prefix, StatSet statSet) { - parseAttributes(attributes, prefix, statsSet, Collections.emptyMap()); + parseAttributes(attributes, prefix, statSet, Collections.emptyMap()); } private Object parseNodeValue(String value, Map variables) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java index f1fc07cea5..b85011b133 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.SubclassType; import org.l2jmobius.gameserver.model.SkillLearn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.base.ClassId; @@ -229,7 +229,7 @@ public class SkillTreesData implements IXmlReader { if ("skill".equalsIgnoreCase(c.getNodeName())) { - final StatsSet learnSkillSet = new StatsSet(); + final StatSet learnSkillSet = new StatSet(); attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java index 87915d89eb..78c22d1e7d 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java @@ -36,7 +36,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.ChanceLocation; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.MinionHolder; import org.l2jmobius.gameserver.model.interfaces.IParameterized; @@ -169,7 +169,7 @@ public class SpawnsData implements IXmlReader public void parseSpawn(Node spawnsNode, File file, Collection spawns) { - final SpawnTemplate spawnTemplate = new SpawnTemplate(new StatsSet(parseAttributes(spawnsNode)), file); + final SpawnTemplate spawnTemplate = new SpawnTemplate(new StatSet(parseAttributes(spawnsNode)), file); SpawnGroup defaultGroup = null; for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling()) { @@ -185,7 +185,7 @@ public class SpawnsData implements IXmlReader { if (defaultGroup == null) { - defaultGroup = new SpawnGroup(StatsSet.EMPTY_STATSET); + defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET); } parseNpc(innerNode, spawnTemplate, defaultGroup); } @@ -244,7 +244,7 @@ public class SpawnsData implements IXmlReader private void parseGroup(Node n, SpawnTemplate spawnTemplate) { - final SpawnGroup group = new SpawnGroup(new StatsSet(parseAttributes(n))); + final SpawnGroup group = new SpawnGroup(new StatSet(parseAttributes(n))); forEach(n, IXmlReader::isNode, npcNode -> { switch (npcNode.getNodeName()) @@ -271,7 +271,7 @@ public class SpawnsData implements IXmlReader */ private void parseNpc(Node n, SpawnTemplate spawnTemplate, SpawnGroup group) { - final NpcSpawnTemplate npcTemplate = new NpcSpawnTemplate(spawnTemplate, group, new StatsSet(parseAttributes(n))); + final NpcSpawnTemplate npcTemplate = new NpcSpawnTemplate(spawnTemplate, group, new StatSet(parseAttributes(n))); final NpcTemplate template = NpcData.getInstance().getTemplate(npcTemplate.getId()); if (template == null) { @@ -332,10 +332,10 @@ public class SpawnsData implements IXmlReader * @param n * @param npcTemplate */ - private void parseParameters(Node n, IParameterized npcTemplate) + private void parseParameters(Node n, IParameterized npcTemplate) { final Map params = parseParameters(n); - npcTemplate.setParameters(!params.isEmpty() ? new StatsSet(Collections.unmodifiableMap(params)) : StatsSet.EMPTY_STATSET); + npcTemplate.setParameters(!params.isEmpty() ? new StatSet(Collections.unmodifiableMap(params)) : StatSet.EMPTY_STATSET); } /** @@ -344,7 +344,7 @@ public class SpawnsData implements IXmlReader */ private void parseMinions(Node n, NpcSpawnTemplate npcTemplate) { - forEach(n, "minion", minionNode -> npcTemplate.addMinion(new MinionHolder(new StatsSet(parseAttributes(minionNode))))); + forEach(n, "minion", minionNode -> npcTemplate.addMinion(new MinionHolder(new StatSet(parseAttributes(minionNode))))); } /** diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java index 98d333446c..ef93935404 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; @@ -69,7 +69,7 @@ public class StaticObjectData implements IXmlReader if ("object".equalsIgnoreCase(d.getNodeName())) { final NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -86,9 +86,9 @@ public class StaticObjectData implements IXmlReader * Initialize an static object based on the stats set and add it to the map. * @param set the stats set to add. */ - private void addObject(StatsSet set) + private void addObject(StatSet set) { - final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatsSet()), set.getInt("id")); + final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatSet()), set.getInt("id")); obj.setType(set.getInt("type", 0)); obj.setName(set.getString("name")); obj.setMap(set.getString("texture", "none"), set.getInt("map_x", 0), set.getInt("map_y", 0)); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java index 7c8c9a538d..487bae9dea 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.TeleportType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.teleporter.TeleportHolder; /** @@ -74,7 +74,7 @@ public class TeleportersData implements IXmlReader final String name = parseString(nodeAttrs, "name", type.name()); // Parse locations final TeleportHolder holder = new TeleportHolder(name, type); - forEach(node, "location", location -> holder.registerLocation(new StatsSet(parseAttributes(location)))); + forEach(node, "location", location -> holder.registerLocation(new StatSet(parseAttributes(location)))); // Register holder if (teleList.putIfAbsent(name, holder) != null) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java index b6b3bf2e90..c2f5f94adb 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java @@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.transform.Transform; import org.l2jmobius.gameserver.model.actor.transform.TransformLevelData; import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate; @@ -70,7 +70,7 @@ public class TransformData implements IXmlReader if ("transform".equalsIgnoreCase(d.getNodeName())) { NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -192,7 +192,7 @@ public class TransformData implements IXmlReader transform.setTemplate(isMale, templateData); } - final StatsSet levelsSet = new StatsSet(); + final StatSet levelsSet = new StatSet(); for (Node s = z.getFirstChild(); s != null; s = s.getNextSibling()) { if ("level".equals(s.getNodeName())) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/engines/DocumentBase.java index 376aeccaa5..126f472492 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/engines/DocumentBase.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/engines/DocumentBase.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.PlayerState; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionCategoryType; @@ -177,7 +177,7 @@ public abstract class DocumentBase protected abstract void parseDocument(Document doc); - protected abstract StatsSet getStatsSet(); + protected abstract StatSet getStatSet(); protected abstract String getTableValue(String name); @@ -1238,7 +1238,7 @@ public abstract class DocumentBase setTable(name, array.toArray(new String[array.size()])); } - protected void parseBeanSet(Node n, StatsSet set, Integer level) + protected void parseBeanSet(Node n, StatSet set, Integer level) { final String name = n.getAttributes().getNamedItem("name").getNodeValue().trim(); final String value = n.getAttributes().getNamedItem("val").getNodeValue().trim(); @@ -1253,7 +1253,7 @@ public abstract class DocumentBase } } - protected void setExtractableSkillData(StatsSet set, String value) + protected void setExtractableSkillData(StatSet set, String value) { set.set("capsuled_items_skill", value); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java index e8c77b206e..46f8f9be1f 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java @@ -21,7 +21,7 @@ import java.io.File; import org.w3c.dom.Document; import org.w3c.dom.Node; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; /** @@ -41,7 +41,7 @@ public class DocumentBaseGeneral extends DocumentBase } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return null; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java index 3ea7f41bb6..419552cf68 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.engines.DocumentBase; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -57,7 +57,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return _currentItem.set; } @@ -111,7 +111,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader _currentItem.id = itemId; _currentItem.name = itemName; _currentItem.type = className; - _currentItem.set = new StatsSet(); + _currentItem.set = new StatSet(); _currentItem.set.set("item_id", itemId); _currentItem.set.set("name", itemName); _currentItem.set.set("additionalName", additionalName); @@ -218,7 +218,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatsSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (Item) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java index 56e5b21a9f..967c1fc34d 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.engines.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; public class ItemDataHolder @@ -24,7 +24,7 @@ public class ItemDataHolder int id; String type; String name; - StatsSet set; + StatSet set; int currentLevel; Item item; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/handler/ConditionHandler.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/handler/ConditionHandler.java index 47f24d690d..b53f170fb3 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/handler/ConditionHandler.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/handler/ConditionHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.ICondition; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class ConditionHandler { - private final Map> _conditionHandlerFactories = new HashMap<>(); + private final Map> _conditionHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _conditionHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _conditionHandlerFactories.get(name); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/handler/EffectHandler.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/handler/EffectHandler.java index a58de8efb4..328265d9db 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/handler/EffectHandler.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/handler/EffectHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class EffectHandler { - private final Map> _effectHandlerFactories = new HashMap<>(); + private final Map> _effectHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _effectHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _effectHandlerFactories.get(name); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java index a6e2275d04..32438040e0 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class SkillConditionHandler { - private final Map> _skillConditionHandlerFactories = new HashMap<>(); + private final Map> _skillConditionHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _skillConditionHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _skillConditionHandlerFactories.get(name); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java index 6992dd5366..65a8c52d7e 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.model.AirShipTeleportList; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShipInstance; @@ -45,13 +45,13 @@ public class AirShipManager private static final String UPDATE_DB = "UPDATE airships SET fuel=? WHERE owner_id=?"; private CreatureTemplate _airShipTemplate = null; - private final Map _airShipsInfo = new HashMap<>(); + private final Map _airShipsInfo = new HashMap<>(); private final Map _airShips = new HashMap<>(); private final Map _teleports = new HashMap<>(); protected AirShipManager() { - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", 9); npcDat.set("level", 0); npcDat.set("jClass", "boat"); @@ -113,7 +113,7 @@ public class AirShipManager public AirShipInstance getNewAirShip(int x, int y, int z, int heading, int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return null; @@ -147,7 +147,7 @@ public class AirShipManager if (ship.getOwnerId() != 0) { storeInDb(ship.getOwnerId()); - final StatsSet info = _airShipsInfo.get(ship.getOwnerId()); + final StatSet info = _airShipsInfo.get(ship.getOwnerId()); if (info != null) { info.set("fuel", ship.getFuel()); @@ -164,7 +164,7 @@ public class AirShipManager { if (!_airShipsInfo.containsKey(ownerId)) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("fuel", 600); _airShipsInfo.put(ownerId, info); @@ -264,10 +264,10 @@ public class AirShipManager Statement s = con.createStatement(); ResultSet rs = s.executeQuery(LOAD_DB)) { - StatsSet info; + StatSet info; while (rs.next()) { - info = new StatsSet(); + info = new StatSet(); info.set("fuel", rs.getInt("fuel")); _airShipsInfo.put(rs.getInt("owner_id"), info); } @@ -285,7 +285,7 @@ public class AirShipManager private void storeInDb(int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return; diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java index 2db10dd045..e5c610b3f2 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.BoatInstance; @@ -57,7 +57,7 @@ public class BoatManager return null; } - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", boatId); npcDat.set("level", 0); npcDat.set("jClass", "boat"); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 99a9678ece..56f08422cd 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.enums.ManorMode; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; import org.l2jmobius.gameserver.model.SeedProduction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.entity.Castle; @@ -126,7 +126,7 @@ public class CastleManorManager implements IXmlReader, IStorable @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; NamedNodeMap attrs; Node att; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -142,7 +142,7 @@ public class CastleManorManager implements IXmlReader, IStorable { if ("crop".equalsIgnoreCase(c.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); set.set("castleId", castleId); attrs = c.getAttributes(); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java index 2ad7e1d5fe..bf30080665 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java @@ -27,7 +27,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosState; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -181,7 +181,7 @@ public class CeremonyOfChaosManager extends AbstractEventManager _npcs = new ConcurrentHashMap<>(); protected final Map _spawns = new ConcurrentHashMap<>(); - protected final Map _storedInfo = new ConcurrentHashMap<>(); + protected final Map _storedInfo = new ConcurrentHashMap<>(); protected final Map> _schedules = new ConcurrentHashMap<>(); /** @@ -161,7 +161,7 @@ public class DBSpawnManager { npc.setDBStatus(RaidBossStatus.ALIVE); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getCurrentHp()); info.set("currentMP", npc.getCurrentMp()); info.set("respawnTime", 0); @@ -181,7 +181,7 @@ public class DBSpawnManager */ public void updateStatus(Npc npc, boolean isNpcDead) { - final StatsSet info = _storedInfo.get(npc.getId()); + final StatSet info = _storedInfo.get(npc.getId()); if (info == null) { return; @@ -254,7 +254,7 @@ public class DBSpawnManager _npcs.put(npcId, npc); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", currentHP); info.set("currentMP", currentMP); info.set("respawnTime", 0); @@ -316,7 +316,7 @@ public class DBSpawnManager } npc.setDBStatus(RaidBossStatus.ALIVE); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", 0); @@ -401,7 +401,7 @@ public class DBSpawnManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("UPDATE npc_respawns SET respawnTime = ?, currentHP = ?, currentMP = ? WHERE id = ?")) { - for (Entry entry : _storedInfo.entrySet()) + for (Entry entry : _storedInfo.entrySet()) { final Integer npcId = entry.getKey(); if (npcId == null) @@ -420,7 +420,7 @@ public class DBSpawnManager updateStatus(npc, false); } - final StatsSet info = entry.getValue(); + final StatSet info = entry.getValue(); if (info == null) { continue; @@ -529,7 +529,7 @@ public class DBSpawnManager */ public void notifySpawnNightNpc(Npc npc) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getCurrentHp()); info.set("currentMP", npc.getCurrentMp()); info.set("respawnTime", 0); @@ -572,7 +572,7 @@ public class DBSpawnManager * Gets the stored info. * @return the stored info */ - public Map getStoredInfo() + public Map getStoredInfo() { return _storedInfo; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index 3dd4e3f652..767bed6954 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.datatables.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.FakePlayerChatHolder; @@ -73,7 +73,7 @@ public class FakePlayerChatManager implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayerChat", fakePlayerChatNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerChatNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerChatNode)); MESSAGES.add(new FakePlayerChatHolder(set.getString("fpcName"), set.getString("searchMethod"), set.getString("searchText"), set.getString("answers"))); })); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java index 07c111065e..52bab09349 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java @@ -33,7 +33,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.tasks.GrandBossManagerStoreTask; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; import org.l2jmobius.gameserver.model.interfaces.IStorable; @@ -51,7 +51,7 @@ public class GrandBossManager implements IStorable protected static Map _bosses = new ConcurrentHashMap<>(); - protected static Map _storedInfo = new HashMap<>(); + protected static Map _storedInfo = new HashMap<>(); private final Map _bossStatus = new HashMap<>(); @@ -72,7 +72,7 @@ public class GrandBossManager implements IStorable final int bossId = rs.getInt("boss_id"); if (NpcData.getInstance().getTemplate(bossId) != null) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("loc_x", rs.getInt("loc_x")); info.set("loc_y", rs.getInt("loc_y")); info.set("loc_z", rs.getInt("loc_z")); @@ -140,12 +140,12 @@ public class GrandBossManager implements IStorable return _bosses.get(bossId); } - public StatsSet getStatsSet(int bossId) + public StatSet getStatSet(int bossId) { return _storedInfo.get(bossId); } - public void setStatsSet(int bossId, StatsSet info) + public void setStatSet(int bossId, StatSet info) { _storedInfo.put(bossId, info); updateDb(bossId, false); @@ -156,10 +156,10 @@ public class GrandBossManager implements IStorable { try (Connection con = DatabaseFactory.getConnection()) { - for (Entry e : _storedInfo.entrySet()) + for (Entry e : _storedInfo.entrySet()) { final GrandBossInstance boss = _bosses.get(e.getKey()); - final StatsSet info = e.getValue(); + final StatSet info = e.getValue(); if ((boss == null) || (info == null)) { try (PreparedStatement update = con.prepareStatement(UPDATE_GRAND_BOSS_DATA2)) @@ -209,7 +209,7 @@ public class GrandBossManager implements IStorable try (Connection con = DatabaseFactory.getConnection()) { final GrandBossInstance boss = _bosses.get(bossId); - final StatsSet info = _storedInfo.get(bossId); + final StatSet info = _storedInfo.get(bossId); if (statusOnly || (boss == null) || (info == null)) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index d77642378f..29e517b0cd 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.enums.InstanceReenterType; import org.l2jmobius.gameserver.enums.InstanceRemoveBuffType; import org.l2jmobius.gameserver.enums.InstanceTeleportType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.holders.InstanceReenterTimeHolder; @@ -151,7 +151,7 @@ public class InstanceManager implements IXmlReader return; } - final InstanceTemplate template = new InstanceTemplate(new StatsSet(parseAttributes(instanceNode))); + final InstanceTemplate template = new InstanceTemplate(new StatSet(parseAttributes(instanceNode))); // Update name if wasn't provided if (template.getName() == null) @@ -241,10 +241,10 @@ public class InstanceManager implements IXmlReader { if (doorNode.getNodeName().equals("door")) { - final StatsSet parsedSet = DoorData.getInstance().parseDoor(doorNode); - final StatsSet mergedSet = new StatsSet(); + final StatSet parsedSet = DoorData.getInstance().parseDoor(doorNode); + final StatSet mergedSet = new StatSet(); final int doorId = parsedSet.getInt("id"); - final StatsSet templateSet = DoorData.getInstance().getDoorTemplate(doorId); + final StatSet templateSet = DoorData.getInstance().getDoorTemplate(doorId); if (templateSet != null) { mergedSet.merge(templateSet); @@ -324,14 +324,14 @@ public class InstanceManager implements IXmlReader final boolean onlyLeader = parseBoolean(attrs, "onlyLeader", false); final boolean showMessageAndHtml = parseBoolean(attrs, "showMessageAndHtml", false); // Load parameters - StatsSet params = null; + StatSet params = null; for (Node f = conditionNode.getFirstChild(); f != null; f = f.getNextSibling()) { if (f.getNodeName().equals("param")) { if (params == null) { - params = new StatsSet(); + params = new StatSet(); } params.set(parseString(f.getAttributes(), "name"), parseString(f.getAttributes(), "value")); @@ -341,14 +341,14 @@ public class InstanceManager implements IXmlReader // If none parameters found then set empty StatSet if (params == null) { - params = StatsSet.EMPTY_STATSET; + params = StatSet.EMPTY_STATSET; } // Now when everything is loaded register condition to template try { final Class clazz = Class.forName("org.l2jmobius.gameserver.model.instancezone.conditions.Condition" + type); - final Constructor constructor = clazz.getConstructor(InstanceTemplate.class, StatsSet.class, boolean.class, boolean.class); + final Constructor constructor = clazz.getConstructor(InstanceTemplate.class, StatSet.class, boolean.class, boolean.class); conditions.add((Condition) constructor.newInstance(template, params, onlyLeader, showMessageAndHtml)); } catch (Exception ex) @@ -378,7 +378,7 @@ public class InstanceManager implements IXmlReader */ public Instance createInstance() { - return new Instance(getNewInstanceId(), new InstanceTemplate(StatsSet.EMPTY_STATSET), null); + return new Instance(getNewInstanceId(), new InstanceTemplate(StatSet.EMPTY_STATSET), null); } /** diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/AccessLevel.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/AccessLevel.java index 772c1fe77e..72b77905e1 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/AccessLevel.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/AccessLevel.java @@ -52,7 +52,7 @@ public class AccessLevel /** Flag to gain exp in party */ private boolean _gainExp = false; - public AccessLevel(StatsSet set) + public AccessLevel(StatSet set) { _accessLevel = set.getInt("level"); _name = set.getString("name"); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/ActionDataHolder.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/ActionDataHolder.java index 4887bedba8..ca6d9ee685 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/ActionDataHolder.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/ActionDataHolder.java @@ -25,7 +25,7 @@ public class ActionDataHolder private final String _handler; private final int _optionId; - public ActionDataHolder(StatsSet set) + public ActionDataHolder(StatSet set) { _id = set.getInt("id"); _handler = set.getString("handler"); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java index 656119098e..3f88e455d7 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java @@ -27,7 +27,7 @@ public class AdminCommandAccessRight private final int _accessLevel; private final boolean _requireConfirm; - public AdminCommandAccessRight(StatsSet set) + public AdminCommandAccessRight(StatSet set) { _adminCommand = set.getString("command"); _requireConfirm = set.getBoolean("confirmDlg", false); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index f1c86b8469..f9889f27cf 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -36,7 +36,7 @@ public class DailyMissionDataHolder private final List _rewardsItems; private final List _classRestriction; private final int _requiredCompletions; - private final StatsSet _params; + private final StatSet _params; private final boolean _dailyReset; private final boolean _isOneTime; private final boolean _isMainClassOnly; @@ -44,7 +44,7 @@ public class DailyMissionDataHolder private final boolean _isDisplayedWhenNotAvailable; private final AbstractDailyMissionHandler _handler; - public DailyMissionDataHolder(StatsSet set) + public DailyMissionDataHolder(StatSet set) { final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); @@ -53,7 +53,7 @@ public class DailyMissionDataHolder _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); - _params = set.getObject("params", StatsSet.class); + _params = set.getObject("params", StatSet.class); _dailyReset = set.getBoolean("dailyReset", true); _isOneTime = set.getBoolean("isOneTime", true); _isMainClassOnly = set.getBoolean("isMainClassOnly", true); @@ -87,7 +87,7 @@ public class DailyMissionDataHolder return _requiredCompletions; } - public StatsSet getParams() + public StatSet getParams() { return _params; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Location.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Location.java index 1c61740e4d..024c71075f 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Location.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Location.java @@ -49,7 +49,7 @@ public class Location implements IPositionable this(obj.getX(), obj.getY(), obj.getZ(), obj.getHeading()); } - public Location(StatsSet set) + public Location(StatSet set) { _x = set.getInt("x"); _y = set.getInt("y"); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/PetLevelData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/PetLevelData.java index e46b215b5f..7cad1a225a 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/PetLevelData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/PetLevelData.java @@ -46,7 +46,7 @@ public class PetLevelData private final double _slowFlySpeedOnRide; private final double _fastFlySpeedOnRide; - public PetLevelData(StatsSet set) + public PetLevelData(StatSet set) { _ownerExpTaken = set.getInt("get_exp_type"); _petMaxExp = set.getLong("exp"); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Seed.java index 4307849cf5..dd756c82e2 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Seed.java @@ -35,7 +35,7 @@ public class Seed private final long _seedReferencePrice; private final long _cropReferencePrice; - public Seed(StatsSet set) + public Seed(StatSet set) { _cropId = set.getInt("id"); _seedId = set.getInt("seedId"); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java index 78897cf4f1..4de77df228 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java @@ -27,7 +27,7 @@ public class SiegeScheduleDate private final int _hour; private final int _maxConcurrent; - public SiegeScheduleDate(StatsSet set) + public SiegeScheduleDate(StatSet set) { _day = set.getInt("day", Calendar.SUNDAY); _hour = set.getInt("hour", 16); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/SkillLearn.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/SkillLearn.java index e2ccdd6331..00f53c0cb9 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/SkillLearn.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/SkillLearn.java @@ -58,7 +58,7 @@ public class SkillLearn * Constructor for SkillLearn. * @param set the set with the SkillLearn data. */ - public SkillLearn(StatsSet set) + public SkillLearn(StatSet set) { _skillName = set.getString("skillName"); _skillId = set.getInt("skillId"); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/StatSet.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/StatSet.java new file mode 100644 index 0000000000..3c824d9fa4 --- /dev/null +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/StatSet.java @@ -0,0 +1,968 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Supplier; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.stream.Collectors; + +import org.l2jmobius.commons.util.TimeUtil; +import org.l2jmobius.gameserver.model.holders.MinionHolder; +import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.interfaces.IParserAdvUtils; +import org.l2jmobius.gameserver.util.Util; + +/** + * This class is meant to hold a set of (key,value) pairs.
+ * They are stored as object but can be retrieved in any type wanted. As long as cast is available.
+ * @author mkizub + */ +public class StatSet implements IParserAdvUtils +{ + private static final Logger LOGGER = Logger.getLogger(StatSet.class.getName()); + /** Static empty immutable map, used to avoid multiple null checks over the source. */ + public static final StatSet EMPTY_STATSET = new StatSet(Collections.emptyMap()); + + private final Map _set; + + public StatSet() + { + this(ConcurrentHashMap::new); + } + + public StatSet(Supplier> mapFactory) + { + this(mapFactory.get()); + } + + public StatSet(Map map) + { + _set = map; + } + + /** + * Returns the set of values + * @return HashMap + */ + public Map getSet() + { + return _set; + } + + /** + * Add a set of couple values in the current set + * @param newSet : StatSet pointing out the list of couples to add in the current set + */ + public void merge(StatSet newSet) + { + _set.putAll(newSet.getSet()); + } + + /** + * Verifies if the stat set is empty. + * @return {@code true} if the stat set is empty, {@code false} otherwise + */ + public boolean isEmpty() + { + return _set.isEmpty(); + } + + /** + * Return the boolean value associated with key. + * @param key : String designating the key in the set + * @return boolean : value associated to the key + * @throws IllegalArgumentException : If value is not set or value is not boolean + */ + @Override + public boolean getBoolean(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Boolean value required, but not specified"); + } + if (val instanceof Boolean) + { + return ((Boolean) val).booleanValue(); + } + try + { + return Boolean.parseBoolean((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Boolean value required, but found: " + val); + } + } + + /** + * Return the boolean value associated with key.
+ * If no value is associated with key, or type of value is wrong, returns defaultValue. + * @param key : String designating the key in the entry set + * @return boolean : value associated to the key + */ + @Override + public boolean getBoolean(String key, boolean defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Boolean) + { + return ((Boolean) val).booleanValue(); + } + try + { + return Boolean.parseBoolean((String) val); + } + catch (Exception e) + { + return defaultValue; + } + } + + @Override + public byte getByte(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Byte value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).byteValue(); + } + try + { + return Byte.parseByte((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + + @Override + public byte getByte(String key, byte defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).byteValue(); + } + try + { + return Byte.parseByte((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + + public short increaseByte(String key, byte increaseWith) + { + final byte newValue = (byte) (getByte(key) + increaseWith); + set(key, newValue); + return newValue; + } + + public short increaseByte(String key, byte defaultValue, byte increaseWith) + { + final byte newValue = (byte) (getByte(key, defaultValue) + increaseWith); + set(key, newValue); + return newValue; + } + + public byte[] getByteArray(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Byte value required, but not specified"); + } + if (val instanceof Number) + { + return new byte[] + { + ((Number) val).byteValue() + }; + } + int c = 0; + final String[] vals = ((String) val).split(splitOn); + final byte[] result = new byte[vals.length]; + for (String v : vals) + { + try + { + result[c++] = Byte.parseByte(v); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + return result; + } + + public List getByteList(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final List result = new ArrayList<>(); + for (Byte i : getByteArray(key, splitOn)) + { + result.add(i); + } + return result; + } + + @Override + public short getShort(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Short value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).shortValue(); + } + try + { + return Short.parseShort((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Short value required, but found: " + val); + } + } + + @Override + public short getShort(String key, short defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).shortValue(); + } + try + { + return Short.parseShort((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Short value required, but found: " + val); + } + } + + public short increaseShort(String key, short increaseWith) + { + final short newValue = (short) (getShort(key) + increaseWith); + set(key, newValue); + return newValue; + } + + public short increaseShort(String key, short defaultValue, short increaseWith) + { + final short newValue = (short) (getShort(key, defaultValue) + increaseWith); + set(key, newValue); + return newValue; + } + + @Override + public int getInt(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Integer value required, but not specified: " + key + "!"); + } + + if (val instanceof Number) + { + return ((Number) val).intValue(); + } + + try + { + return Integer.parseInt((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val + "!"); + } + } + + @Override + public int getInt(String key, int defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).intValue(); + } + try + { + return Integer.parseInt((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val); + } + } + + public int increaseInt(String key, int increaseWith) + { + final int newValue = getInt(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public int increaseInt(String key, int defaultValue, int increaseWith) + { + final int newValue = getInt(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + public int[] getIntArray(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Integer value required, but not specified"); + } + if (val instanceof Number) + { + return new int[] + { + ((Number) val).intValue() + }; + } + int c = 0; + final String[] vals = ((String) val).split(splitOn); + final int[] result = new int[vals.length]; + for (String v : vals) + { + try + { + result[c++] = Integer.parseInt(v); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val); + } + } + return result; + } + + public List getIntegerList(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final List result = new ArrayList<>(); + for (int i : getIntArray(key, splitOn)) + { + result.add(i); + } + return result; + } + + @Override + public long getLong(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Long value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).longValue(); + } + try + { + return Long.parseLong((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Long value required, but found: " + val); + } + } + + @Override + public long getLong(String key, long defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).longValue(); + } + try + { + return Long.parseLong((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Long value required, but found: " + val); + } + } + + public long increaseLong(String key, long increaseWith) + { + final long newValue = getLong(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public long increaseLong(String key, long defaultValue, long increaseWith) + { + final long newValue = getLong(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public float getFloat(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Float value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).floatValue(); + } + try + { + return Float.parseFloat((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Float value required, but found: " + val); + } + } + + @Override + public float getFloat(String key, float defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).floatValue(); + } + try + { + return Float.parseFloat((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Float value required, but found: " + val); + } + } + + public float increaseFloat(String key, float increaseWith) + { + final float newValue = getFloat(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public float increaseFloat(String key, float defaultValue, float increaseWith) + { + final float newValue = getFloat(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public double getDouble(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Double value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).doubleValue(); + } + try + { + return Double.parseDouble((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Double value required, but found: " + val); + } + } + + @Override + public double getDouble(String key, double defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).doubleValue(); + } + try + { + return Double.parseDouble((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Double value required, but found: " + val); + } + } + + public double increaseDouble(String key, double increaseWith) + { + final double newValue = getDouble(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public double increaseDouble(String key, double defaultValue, double increaseWith) + { + final double newValue = getDouble(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public String getString(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("String value required, but not specified"); + } + return String.valueOf(val); + } + + @Override + public String getString(String key, String defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + return String.valueOf(val); + } + + @Override + public Duration getDuration(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("String value required, but not specified"); + } + return TimeUtil.parseDuration(String.valueOf(val)); + } + + @Override + public Duration getDuration(String key, Duration defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + return TimeUtil.parseDuration(String.valueOf(val)); + } + + @Override + @SuppressWarnings("unchecked") + public > T getEnum(String key, Class enumClass) + { + Objects.requireNonNull(key); + Objects.requireNonNull(enumClass); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but not specified"); + } + if (enumClass.isInstance(val)) + { + return (T) val; + } + try + { + return Enum.valueOf(enumClass, String.valueOf(val)); + } + catch (Exception e) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); + } + } + + @Override + @SuppressWarnings("unchecked") + public > T getEnum(String key, Class enumClass, T defaultValue) + { + Objects.requireNonNull(key); + Objects.requireNonNull(enumClass); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (enumClass.isInstance(val)) + { + return (T) val; + } + try + { + return Enum.valueOf(enumClass, String.valueOf(val)); + } + catch (Exception e) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); + } + } + + @SuppressWarnings("unchecked") + public A getObject(String name, Class type) + { + Objects.requireNonNull(name); + Objects.requireNonNull(type); + final Object obj = _set.get(name); + if ((obj == null) || !type.isAssignableFrom(obj.getClass())) + { + return null; + } + + return (A) obj; + } + + @SuppressWarnings("unchecked") + public A getObject(String name, Class type, A defaultValue) + { + Objects.requireNonNull(name); + Objects.requireNonNull(type); + final Object obj = _set.get(name); + if ((obj == null) || !type.isAssignableFrom(obj.getClass())) + { + return defaultValue; + } + + return (A) obj; + } + + public SkillHolder getSkillHolder(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof SkillHolder)) + { + return null; + } + + return (SkillHolder) obj; + } + + public Location getLocation(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof Location)) + { + return null; + } + return (Location) obj; + } + + @SuppressWarnings("unchecked") + public List getMinionList(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return Collections.emptyList(); + } + + return (List) obj; + } + + @SuppressWarnings("unchecked") + public List getList(String key, Class clazz) + { + Objects.requireNonNull(key); + Objects.requireNonNull(clazz); + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return null; + } + + final List originalList = (List) obj; + if (!originalList.isEmpty() && !originalList.stream().allMatch(clazz::isInstance)) + { + if (clazz.getSuperclass() == Enum.class) + { + throw new IllegalAccessError("Please use getEnumList if you want to get list of Enums!"); + } + + // Attempt to convert the list + final List convertedList = convertList(originalList, clazz); + if (convertedList == null) + { + LOGGER.log(Level.WARNING, "getList(\"" + key + "\", " + clazz.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); + return null; + } + + // Overwrite the existing list with proper generic type + _set.put(key, convertedList); + return convertedList; + } + return (List) obj; + } + + public List getList(String key, Class clazz, List defaultValue) + { + final List list = getList(key, clazz); + return list == null ? defaultValue : list; + } + + @SuppressWarnings("unchecked") + public > List getEnumList(String key, Class clazz) + { + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return null; + } + + final List originalList = (List) obj; + if (!originalList.isEmpty() && (obj.getClass().getGenericInterfaces()[0] != clazz) && originalList.stream().allMatch(name -> Util.isEnum(name.toString(), clazz))) + { + final List convertedList = originalList.stream().map(Object::toString).map(name -> Enum.valueOf(clazz, name)).map(clazz::cast).collect(Collectors.toList()); + + // Overwrite the existing list with proper generic type + _set.put(key, convertedList); + return convertedList; + } + return (List) obj; + } + + /** + * @param + * @param originalList + * @param clazz + * @return + */ + private List convertList(List originalList, Class clazz) + { + if (clazz == Integer.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isInteger)) + { + return originalList.stream().map(Object::toString).map(Integer::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + else if (clazz == Float.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isFloat)) + { + return originalList.stream().map(Object::toString).map(Float::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + else if (clazz == Double.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isDouble)) + { + return originalList.stream().map(Object::toString).map(Double::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + return null; + } + + @SuppressWarnings("unchecked") + public Map getMap(String key, Class keyClass, Class valueClass) + { + final Object obj = _set.get(key); + if (!(obj instanceof Map)) + { + return null; + } + + final Map originalList = (Map) obj; + if (!originalList.isEmpty() && ((!originalList.keySet().stream().allMatch(keyClass::isInstance)) || (!originalList.values().stream().allMatch(valueClass::isInstance)))) + { + LOGGER.log(Level.WARNING, "getMap(\"" + key + "\", " + keyClass.getSimpleName() + ", " + valueClass.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); + } + return (Map) obj; + } + + public StatSet set(String name, Object value) + { + if (value == null) + { + return this; + } + _set.put(name, value); + return this; + } + + public StatSet set(String key, boolean value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, byte value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, short value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, int value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, long value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, float value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, double value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, String value) + { + if (value == null) + { + return this; + } + _set.put(key, value); + return this; + } + + public StatSet set(String key, Enum value) + { + if (value == null) + { + return this; + } + _set.put(key, value); + return this; + } + + public static StatSet valueOf(String key, Object value) + { + final StatSet set = new StatSet(); + set.set(key, value); + return set; + } + + public void remove(String key) + { + _set.remove(key); + } + + public boolean contains(String name) + { + return _set.containsKey(name); + } + + @Override + public String toString() + { + return "StatSet{_set=" + _set + '}'; + } +} diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/StatsSet.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/StatsSet.java deleted file mode 100644 index 5ce013ebd2..0000000000 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/StatsSet.java +++ /dev/null @@ -1,968 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.ConcurrentHashMap; -import java.util.function.Supplier; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.stream.Collectors; - -import org.l2jmobius.commons.util.TimeUtil; -import org.l2jmobius.gameserver.model.holders.MinionHolder; -import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.interfaces.IParserAdvUtils; -import org.l2jmobius.gameserver.util.Util; - -/** - * This class is meant to hold a set of (key,value) pairs.
- * They are stored as object but can be retrieved in any type wanted. As long as cast is available.
- * @author mkizub - */ -public class StatsSet implements IParserAdvUtils -{ - private static final Logger LOGGER = Logger.getLogger(StatsSet.class.getName()); - /** Static empty immutable map, used to avoid multiple null checks over the source. */ - public static final StatsSet EMPTY_STATSET = new StatsSet(Collections.emptyMap()); - - private final Map _set; - - public StatsSet() - { - this(ConcurrentHashMap::new); - } - - public StatsSet(Supplier> mapFactory) - { - this(mapFactory.get()); - } - - public StatsSet(Map map) - { - _set = map; - } - - /** - * Returns the set of values - * @return HashMap - */ - public Map getSet() - { - return _set; - } - - /** - * Add a set of couple values in the current set - * @param newSet : StatsSet pointing out the list of couples to add in the current set - */ - public void merge(StatsSet newSet) - { - _set.putAll(newSet.getSet()); - } - - /** - * Verifies if the stat set is empty. - * @return {@code true} if the stat set is empty, {@code false} otherwise - */ - public boolean isEmpty() - { - return _set.isEmpty(); - } - - /** - * Return the boolean value associated with key. - * @param key : String designating the key in the set - * @return boolean : value associated to the key - * @throws IllegalArgumentException : If value is not set or value is not boolean - */ - @Override - public boolean getBoolean(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Boolean value required, but not specified"); - } - if (val instanceof Boolean) - { - return ((Boolean) val).booleanValue(); - } - try - { - return Boolean.parseBoolean((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Boolean value required, but found: " + val); - } - } - - /** - * Return the boolean value associated with key.
- * If no value is associated with key, or type of value is wrong, returns defaultValue. - * @param key : String designating the key in the entry set - * @return boolean : value associated to the key - */ - @Override - public boolean getBoolean(String key, boolean defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Boolean) - { - return ((Boolean) val).booleanValue(); - } - try - { - return Boolean.parseBoolean((String) val); - } - catch (Exception e) - { - return defaultValue; - } - } - - @Override - public byte getByte(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Byte value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).byteValue(); - } - try - { - return Byte.parseByte((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - - @Override - public byte getByte(String key, byte defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).byteValue(); - } - try - { - return Byte.parseByte((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - - public short increaseByte(String key, byte increaseWith) - { - final byte newValue = (byte) (getByte(key) + increaseWith); - set(key, newValue); - return newValue; - } - - public short increaseByte(String key, byte defaultValue, byte increaseWith) - { - final byte newValue = (byte) (getByte(key, defaultValue) + increaseWith); - set(key, newValue); - return newValue; - } - - public byte[] getByteArray(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Byte value required, but not specified"); - } - if (val instanceof Number) - { - return new byte[] - { - ((Number) val).byteValue() - }; - } - int c = 0; - final String[] vals = ((String) val).split(splitOn); - final byte[] result = new byte[vals.length]; - for (String v : vals) - { - try - { - result[c++] = Byte.parseByte(v); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - return result; - } - - public List getByteList(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final List result = new ArrayList<>(); - for (Byte i : getByteArray(key, splitOn)) - { - result.add(i); - } - return result; - } - - @Override - public short getShort(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Short value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).shortValue(); - } - try - { - return Short.parseShort((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Short value required, but found: " + val); - } - } - - @Override - public short getShort(String key, short defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).shortValue(); - } - try - { - return Short.parseShort((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Short value required, but found: " + val); - } - } - - public short increaseShort(String key, short increaseWith) - { - final short newValue = (short) (getShort(key) + increaseWith); - set(key, newValue); - return newValue; - } - - public short increaseShort(String key, short defaultValue, short increaseWith) - { - final short newValue = (short) (getShort(key, defaultValue) + increaseWith); - set(key, newValue); - return newValue; - } - - @Override - public int getInt(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Integer value required, but not specified: " + key + "!"); - } - - if (val instanceof Number) - { - return ((Number) val).intValue(); - } - - try - { - return Integer.parseInt((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val + "!"); - } - } - - @Override - public int getInt(String key, int defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).intValue(); - } - try - { - return Integer.parseInt((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val); - } - } - - public int increaseInt(String key, int increaseWith) - { - final int newValue = getInt(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public int increaseInt(String key, int defaultValue, int increaseWith) - { - final int newValue = getInt(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - public int[] getIntArray(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Integer value required, but not specified"); - } - if (val instanceof Number) - { - return new int[] - { - ((Number) val).intValue() - }; - } - int c = 0; - final String[] vals = ((String) val).split(splitOn); - final int[] result = new int[vals.length]; - for (String v : vals) - { - try - { - result[c++] = Integer.parseInt(v); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val); - } - } - return result; - } - - public List getIntegerList(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final List result = new ArrayList<>(); - for (int i : getIntArray(key, splitOn)) - { - result.add(i); - } - return result; - } - - @Override - public long getLong(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Long value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).longValue(); - } - try - { - return Long.parseLong((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Long value required, but found: " + val); - } - } - - @Override - public long getLong(String key, long defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).longValue(); - } - try - { - return Long.parseLong((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Long value required, but found: " + val); - } - } - - public long increaseLong(String key, long increaseWith) - { - final long newValue = getLong(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public long increaseLong(String key, long defaultValue, long increaseWith) - { - final long newValue = getLong(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public float getFloat(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Float value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).floatValue(); - } - try - { - return Float.parseFloat((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Float value required, but found: " + val); - } - } - - @Override - public float getFloat(String key, float defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).floatValue(); - } - try - { - return Float.parseFloat((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Float value required, but found: " + val); - } - } - - public float increaseFloat(String key, float increaseWith) - { - final float newValue = getFloat(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public float increaseFloat(String key, float defaultValue, float increaseWith) - { - final float newValue = getFloat(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public double getDouble(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Double value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).doubleValue(); - } - try - { - return Double.parseDouble((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Double value required, but found: " + val); - } - } - - @Override - public double getDouble(String key, double defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).doubleValue(); - } - try - { - return Double.parseDouble((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Double value required, but found: " + val); - } - } - - public double increaseDouble(String key, double increaseWith) - { - final double newValue = getDouble(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public double increaseDouble(String key, double defaultValue, double increaseWith) - { - final double newValue = getDouble(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public String getString(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("String value required, but not specified"); - } - return String.valueOf(val); - } - - @Override - public String getString(String key, String defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - return String.valueOf(val); - } - - @Override - public Duration getDuration(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("String value required, but not specified"); - } - return TimeUtil.parseDuration(String.valueOf(val)); - } - - @Override - public Duration getDuration(String key, Duration defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - return TimeUtil.parseDuration(String.valueOf(val)); - } - - @Override - @SuppressWarnings("unchecked") - public > T getEnum(String key, Class enumClass) - { - Objects.requireNonNull(key); - Objects.requireNonNull(enumClass); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but not specified"); - } - if (enumClass.isInstance(val)) - { - return (T) val; - } - try - { - return Enum.valueOf(enumClass, String.valueOf(val)); - } - catch (Exception e) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); - } - } - - @Override - @SuppressWarnings("unchecked") - public > T getEnum(String key, Class enumClass, T defaultValue) - { - Objects.requireNonNull(key); - Objects.requireNonNull(enumClass); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (enumClass.isInstance(val)) - { - return (T) val; - } - try - { - return Enum.valueOf(enumClass, String.valueOf(val)); - } - catch (Exception e) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); - } - } - - @SuppressWarnings("unchecked") - public A getObject(String name, Class type) - { - Objects.requireNonNull(name); - Objects.requireNonNull(type); - final Object obj = _set.get(name); - if ((obj == null) || !type.isAssignableFrom(obj.getClass())) - { - return null; - } - - return (A) obj; - } - - @SuppressWarnings("unchecked") - public A getObject(String name, Class type, A defaultValue) - { - Objects.requireNonNull(name); - Objects.requireNonNull(type); - final Object obj = _set.get(name); - if ((obj == null) || !type.isAssignableFrom(obj.getClass())) - { - return defaultValue; - } - - return (A) obj; - } - - public SkillHolder getSkillHolder(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof SkillHolder)) - { - return null; - } - - return (SkillHolder) obj; - } - - public Location getLocation(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof Location)) - { - return null; - } - return (Location) obj; - } - - @SuppressWarnings("unchecked") - public List getMinionList(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return Collections.emptyList(); - } - - return (List) obj; - } - - @SuppressWarnings("unchecked") - public List getList(String key, Class clazz) - { - Objects.requireNonNull(key); - Objects.requireNonNull(clazz); - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return null; - } - - final List originalList = (List) obj; - if (!originalList.isEmpty() && !originalList.stream().allMatch(clazz::isInstance)) - { - if (clazz.getSuperclass() == Enum.class) - { - throw new IllegalAccessError("Please use getEnumList if you want to get list of Enums!"); - } - - // Attempt to convert the list - final List convertedList = convertList(originalList, clazz); - if (convertedList == null) - { - LOGGER.log(Level.WARNING, "getList(\"" + key + "\", " + clazz.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); - return null; - } - - // Overwrite the existing list with proper generic type - _set.put(key, convertedList); - return convertedList; - } - return (List) obj; - } - - public List getList(String key, Class clazz, List defaultValue) - { - final List list = getList(key, clazz); - return list == null ? defaultValue : list; - } - - @SuppressWarnings("unchecked") - public > List getEnumList(String key, Class clazz) - { - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return null; - } - - final List originalList = (List) obj; - if (!originalList.isEmpty() && (obj.getClass().getGenericInterfaces()[0] != clazz) && originalList.stream().allMatch(name -> Util.isEnum(name.toString(), clazz))) - { - final List convertedList = originalList.stream().map(Object::toString).map(name -> Enum.valueOf(clazz, name)).map(clazz::cast).collect(Collectors.toList()); - - // Overwrite the existing list with proper generic type - _set.put(key, convertedList); - return convertedList; - } - return (List) obj; - } - - /** - * @param - * @param originalList - * @param clazz - * @return - */ - private List convertList(List originalList, Class clazz) - { - if (clazz == Integer.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isInteger)) - { - return originalList.stream().map(Object::toString).map(Integer::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - else if (clazz == Float.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isFloat)) - { - return originalList.stream().map(Object::toString).map(Float::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - else if (clazz == Double.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isDouble)) - { - return originalList.stream().map(Object::toString).map(Double::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - return null; - } - - @SuppressWarnings("unchecked") - public Map getMap(String key, Class keyClass, Class valueClass) - { - final Object obj = _set.get(key); - if (!(obj instanceof Map)) - { - return null; - } - - final Map originalList = (Map) obj; - if (!originalList.isEmpty() && ((!originalList.keySet().stream().allMatch(keyClass::isInstance)) || (!originalList.values().stream().allMatch(valueClass::isInstance)))) - { - LOGGER.log(Level.WARNING, "getMap(\"" + key + "\", " + keyClass.getSimpleName() + ", " + valueClass.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); - } - return (Map) obj; - } - - public StatsSet set(String name, Object value) - { - if (value == null) - { - return this; - } - _set.put(name, value); - return this; - } - - public StatsSet set(String key, boolean value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, byte value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, short value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, int value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, long value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, float value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, double value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, String value) - { - if (value == null) - { - return this; - } - _set.put(key, value); - return this; - } - - public StatsSet set(String key, Enum value) - { - if (value == null) - { - return this; - } - _set.put(key, value); - return this; - } - - public static StatsSet valueOf(String key, Object value) - { - final StatsSet set = new StatsSet(); - set.set(key, value); - return set; - } - - public void remove(String key) - { - _set.remove(key); - } - - public boolean contains(String name) - { - return _set.containsKey(name); - } - - @Override - public String toString() - { - return "StatsSet{_set=" + _set + '}'; - } -} diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Npc.java index a1a7e98aba..2b90533cc5 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.MpRewardTask; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.FishermanInstance; @@ -148,7 +148,7 @@ public class Npc extends Creature private NpcStringId _titleString; private NpcStringId _nameString; - private StatsSet _params; + private StatSet _params; private RaidBossStatus _raidStatus; /** Contains information about local tax payments. */ @@ -1756,7 +1756,7 @@ public class Npc extends Creature /** * @return the parameters of the npc merged with the spawn parameters (if there are any) */ - public StatsSet getParameters() + public StatSet getParameters() { if (_params != null) { @@ -1768,10 +1768,10 @@ public class Npc extends Creature final NpcSpawnTemplate npcSpawnTemplate = _spawn.getNpcSpawnTemplate(); if ((npcSpawnTemplate != null) && (npcSpawnTemplate.getParameters() != null) && !npcSpawnTemplate.getParameters().isEmpty()) { - final StatsSet params = getTemplate().getParameters(); + final StatSet params = getTemplate().getParameters(); if ((params != null) && !params.getSet().isEmpty()) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.merge(params); set.merge(npcSpawnTemplate.getParameters()); _params = set; diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 82f429bc18..4cb0835220 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -21,7 +21,7 @@ import java.util.EnumMap; import java.util.Map; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; @@ -49,12 +49,12 @@ public class CreatureTemplate extends ListenersContainer /** The creature's race. */ private Race _race; - public CreatureTemplate(StatsSet set) + public CreatureTemplate(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { // Base stats _baseValues.put(Stat.STAT_STR, set.getDouble("baseSTR", 0)); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java index 86441c678c..14f0e9cae8 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.CubicInstance; @@ -46,7 +46,7 @@ public class CubicTemplate implements ICubicConditionHolder private final List _conditions = new ArrayList<>(); public List _skills = new ArrayList<>(); - public CubicTemplate(StatsSet set) + public CubicTemplate(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java index c40883ac75..410040bc86 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.templates; import org.l2jmobius.gameserver.enums.DoorOpenType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -57,7 +57,7 @@ public class DoorTemplate extends CreatureTemplate implements IIdentifiable private final boolean _stealth; private final boolean _isInverted; - public DoorTemplate(StatsSet set) + public DoorTemplate(StatSet set) { super(set); _doorId = set.getInt("id"); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 767743de2e..8ab41c70e3 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.enums.MpRewardAffectType; import org.l2jmobius.gameserver.enums.MpRewardType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -63,7 +63,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private boolean _usingServerSideName; private String _title; private boolean _usingServerSideTitle; - private StatsSet _parameters; + private StatSet _parameters; private Sex _sex; private int _chestId; private int _rhandId; @@ -123,15 +123,15 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable /** * Constructor of Creature. - * @param set The StatsSet object to transfer data to the method + * @param set The StatSet object to transfer data to the method */ - public NpcTemplate(StatsSet set) + public NpcTemplate(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _id = set.getInt("id"); @@ -320,12 +320,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _usingServerSideTitle; } - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } - public void setParameters(StatsSet set) + public void setParameters(StatSet set) { _parameters = set; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 50292b8bc8..28458aa09e 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -50,7 +50,7 @@ public class PlayerTemplate extends CreatureTemplate private final List _creationPoints; private final Map _baseSlotDef; - public PlayerTemplate(StatsSet set, List creationPoints) + public PlayerTemplate(StatSet set, List creationPoints) { super(set); _classId = ClassId.getClassId(set.getInt("classId")); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index aa28a0f648..260da48365 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -23,7 +23,7 @@ import java.util.Objects; import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import org.l2jmobius.gameserver.enums.InventoryBlockType; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -57,7 +57,7 @@ public class Transform implements IIdentifiable private TransformTemplate _maleTemplate; private TransformTemplate _femaleTemplate; - public Transform(StatsSet set) + public Transform(StatSet set) { _id = set.getInt("id"); _displayId = set.getInt("displayId", _id); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java index 5660852a01..729998503f 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.actor.transform; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -31,7 +31,7 @@ public class TransformLevelData private final double _levelMod; private Map _stats; - public TransformLevelData(StatsSet set) + public TransformLevelData(StatSet set) { _level = set.getInt("val"); _levelMod = set.getDouble("levelMod"); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 4de84b8bdc..7aca059f91 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -23,7 +23,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -49,7 +49,7 @@ public class TransformTemplate private ExBasicActionList _list; private final Map _data = new LinkedHashMap<>(100); - public TransformTemplate(StatsSet set) + public TransformTemplate(StatSet set) { _collisionRadius = set.contains("radius") ? set.getDouble("radius") : null; _collisionHeight = set.contains("height") ? set.getDouble("height") : null; diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java index d808a6b8bf..02550d2818 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -36,7 +36,7 @@ public class AlchemyCraftData private ItemHolder _productionSuccess; private ItemHolder _productionFailure; - public AlchemyCraftData(StatsSet set) + public AlchemyCraftData(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java index 0bd061d3c4..79dd6c0207 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.beautyshop; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -32,7 +32,7 @@ public class BeautyItem private final int _beautyShopTicket; private final Map _colors = new HashMap<>(); - public BeautyItem(StatsSet set) + public BeautyItem(StatSet set) { _id = set.getInt("id"); _adena = set.getInt("adena", 0); @@ -60,7 +60,7 @@ public class BeautyItem return _beautyShopTicket; } - public void addColor(StatsSet set) + public void addColor(StatSet set) { final BeautyItem color = new BeautyItem(set); _colors.put(set.getInt("id"), color); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index 689a61464d..8b32364c1a 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party.MessageType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.appearance.PlayerAppearance; @@ -244,7 +244,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent player.teleToLocation(_instance.getEnterLocations().get(index++), 0, _instance); } - getTimers().addTimer("match_start_countdown", StatsSet.valueOf("time", 60), 100, null, null); + getTimers().addTimer("match_start_countdown", StatSet.valueOf("time", 60), 100, null, null); getTimers().addTimer("teleport_message1", 10000, null, null); getTimers().addTimer("teleport_message2", 14000, null, null); @@ -400,7 +400,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent } } getTimers().cancelTimer("update", null, null); - getTimers().addTimer("match_end_countdown", StatsSet.valueOf("time", 30), 30 * 1000, null, null); + getTimers().addTimer("match_end_countdown", StatSet.valueOf("time", 30), 30 * 1000, null, null); EventDispatcher.getInstance().notifyEvent(new OnCeremonyOfChaosMatchResult(winners, members)); } @@ -493,7 +493,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java index 39f9196d93..371f8dc459 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.conditions.ICubicCondition; @@ -38,7 +38,7 @@ public class CubicSkill extends SkillHolder implements ICubicConditionHolder private final List _conditions = new ArrayList<>(); private final boolean _targetDebuff; - public CubicSkill(StatsSet set) + public CubicSkill(StatSet set) { super(set.getInt("id"), set.getInt("level")); _triggerRate = set.getInt("triggerRate", 100); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/ClanHall.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/ClanHall.java index 8da77477fd..22af370709 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/ClanHall.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/ClanHall.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -75,7 +75,7 @@ public class ClanHall extends AbstractResidence private static final String LOAD_CLANHALL = "SELECT * FROM clanhall WHERE id=?"; private static final String UPDATE_CLANHALL = "UPDATE clanhall SET ownerId=?,paidUntil=? WHERE id=?"; - public ClanHall(StatsSet params) + public ClanHall(StatSet params) { super(params.getInt("id")); // Set static parameters diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/Hero.java index ef005ff325..aee8b019ee 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/Hero.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/Hero.java @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.data.xml.impl.ClassListData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -74,13 +74,13 @@ public class Hero // delete hero items private static final String DELETE_ITEMS = "DELETE FROM items WHERE item_id IN (30392, 30393, 30394, 30395, 30396, 30397, 30398, 30399, 30400, 30401, 30402, 30403, 30404, 30405, 30372, 30373, 6842, 6611, 6612, 6613, 6614, 6615, 6616, 6617, 6618, 6619, 6620, 6621, 9388, 9389, 9390) AND owner_id NOT IN (SELECT charId FROM characters WHERE accesslevel > 0)"; - private static final Map HEROES = new ConcurrentHashMap<>(); - private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); + private static final Map HEROES = new ConcurrentHashMap<>(); + private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); - private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); - private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); + private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); + private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); - private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); + private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); private static final Map HERO_MESSAGE = new ConcurrentHashMap<>(); public static final String COUNT = "count"; @@ -118,7 +118,7 @@ public class Hero { while (rset.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset.getInt(Olympiad.CLASS_ID)); @@ -137,7 +137,7 @@ public class Hero while (rset2.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset2.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset2.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset2.getInt(Olympiad.CLASS_ID)); @@ -159,7 +159,7 @@ public class Hero LOGGER.info("Hero System: Loaded " + COMPLETE_HEROS.size() + " all time Heroes."); } - private void processHeros(PreparedStatement ps, int charId, StatsSet hero) throws SQLException + private void processHeros(PreparedStatement ps, int charId, StatSet hero) throws SQLException { ps.setInt(1, charId); try (ResultSet rs = ps.executeQuery()) @@ -224,7 +224,7 @@ public class Hero public void loadDiary(int charId) { - final List diary = new ArrayList<>(); + final List diary = new ArrayList<>(); int diaryentries = 0; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement("SELECT * FROM heroes_diary WHERE charId=? ORDER BY time ASC")) @@ -234,7 +234,7 @@ public class Hero { while (rset.next()) { - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final long time = rset.getLong("time"); final int action = rset.getInt("action"); @@ -279,8 +279,8 @@ public class Hero public void loadFights(int charId) { - final List fights = new ArrayList<>(); - final StatsSet heroCountData = new StatsSet(); + final List fights = new ArrayList<>(); + final StatSet heroCountData = new StatSet(); final Calendar data = Calendar.getInstance(); data.set(Calendar.DAY_OF_MONTH, 1); data.set(Calendar.HOUR_OF_DAY, 0); @@ -326,7 +326,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charTwoClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -362,7 +362,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charOneClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -410,14 +410,14 @@ public class Hero } } - public Map getHeroes() + public Map getHeroes() { return HEROES; } public int getHeroByClass(int classid) { - for (Entry e : HEROES.entrySet()) + for (Entry e : HEROES.entrySet()) { if (e.getValue().getInt(Olympiad.CLASS_ID) == classid) { @@ -438,7 +438,7 @@ public class Hero public void showHeroDiary(PlayerInstance player, int heroclass, int charid, int page) { final int perpage = 10; - final List mainList = HERO_DIARY.get(charid); + final List mainList = HERO_DIARY.get(charid); if (mainList != null) { final NpcHtmlMessage diaryReply = new NpcHtmlMessage(); @@ -453,7 +453,7 @@ public class Hero if (!mainList.isEmpty()) { - final List list = new ArrayList<>(mainList); + final List list = new ArrayList<>(mainList); Collections.reverse(list); boolean color = true; @@ -463,7 +463,7 @@ public class Hero for (int i = (page - 1) * perpage; i < list.size(); i++) { breakat = i; - final StatsSet diaryEntry = list.get(i); + final StatSet diaryEntry = list.get(i); fList.append(""); if (color) { @@ -524,7 +524,7 @@ public class Hero int loss = 0; int draw = 0; - final List heroFights = HERO_FIGHTS.get(charid); + final List heroFights = HERO_FIGHTS.get(charid); if (heroFights != null) { final NpcHtmlMessage fightReply = new NpcHtmlMessage(); @@ -536,7 +536,7 @@ public class Hero if (!heroFights.isEmpty()) { - final StatsSet heroCount = HERO_COUNTS.get(charid); + final StatSet heroCount = HERO_COUNTS.get(charid); if (heroCount != null) { win = heroCount.getInt("victory"); @@ -551,7 +551,7 @@ public class Hero for (int i = (page - 1) * perpage; i < heroFights.size(); i++) { breakat = i; - final StatsSet fight = heroFights.get(i); + final StatSet fight = heroFights.get(i); fList.append(""); if (color) { @@ -609,7 +609,7 @@ public class Hero } } - public synchronized void computeNewHeroes(List newHeroes) + public synchronized void computeNewHeroes(List newHeroes) { updateHeroes(true); @@ -659,13 +659,13 @@ public class Hero return; } - for (StatsSet hero : newHeroes) + for (StatSet hero : newHeroes) { final int charId = hero.getInt(Olympiad.CHAR_ID); if (COMPLETE_HEROS.containsKey(charId)) { - final StatsSet oldHero = COMPLETE_HEROS.get(charId); + final StatSet oldHero = COMPLETE_HEROS.get(charId); final int count = oldHero.getInt(COUNT); oldHero.set(COUNT, count + 1); oldHero.set(PLAYED, 1); @@ -674,7 +674,7 @@ public class Hero } else { - final StatsSet newHero = new StatsSet(); + final StatSet newHero = new StatSet(); newHero.set(Olympiad.CHAR_NAME, hero.getString(Olympiad.CHAR_NAME)); newHero.set(Olympiad.CLASS_ID, hero.getInt(Olympiad.CLASS_ID)); newHero.set(COUNT, 1); @@ -700,9 +700,9 @@ public class Hero } else { - StatsSet hero; + StatSet hero; int heroId; - for (Entry entry : HEROES.entrySet()) + for (Entry entry : HEROES.entrySet()) { hero = entry.getValue(); heroId = entry.getKey(); @@ -787,13 +787,13 @@ public class Hero setDiaryData(charId, ACTION_RAID_KILLED, npcId); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (template == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -806,13 +806,13 @@ public class Hero setDiaryData(charId, ACTION_CASTLE_TAKEN, castleId); final Castle castle = CastleManager.getInstance().getCastleById(castleId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (castle == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -922,10 +922,10 @@ public class Hero */ public void claimHero(PlayerInstance player) { - StatsSet hero = HEROES.get(player.getObjectId()); + StatSet hero = HEROES.get(player.getObjectId()); if (hero == null) { - hero = new StatsSet(); + hero = new StatSet(); HEROES.put(player.getObjectId(), hero); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java index f1263e8d44..c52f487402 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java @@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.atomic.AtomicReference; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.eventengine.drop.IEventDrop; import org.l2jmobius.gameserver.model.events.AbstractScript; @@ -42,7 +42,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout public abstract class AbstractEventManager>extends AbstractScript { private String _name; - private StatsSet _variables = StatsSet.EMPTY_STATSET; + private StatSet _variables = StatSet.EMPTY_STATSET; private Set _schedulers = Collections.emptySet(); private Set _conditionalSchedulers = Collections.emptySet(); private Map _rewards = Collections.emptyMap(); @@ -67,14 +67,14 @@ public abstract class AbstractEventManager>extends Ab /* ********************** */ - public StatsSet getVariables() + public StatSet getVariables() { return _variables; } - public void setVariables(StatsSet variables) + public void setVariables(StatSet variables) { - _variables = new StatsSet(Collections.unmodifiableMap(variables.getSet())); + _variables = new StatSet(Collections.unmodifiableMap(variables.getSet())); } /* ********************** */ diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java index 59c64b812c..e41af41d1a 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.util.cron4j.PastPredictor; import org.l2jmobius.gameserver.util.cron4j.Predictor; @@ -45,7 +45,7 @@ public class EventScheduler private List _notifications; private ScheduledFuture _task; - public EventScheduler(AbstractEventManager manager, StatsSet set) + public EventScheduler(AbstractEventManager manager, StatSet set) { _eventManager = manager; _name = set.getString("name", ""); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 1189dc9aa4..ca9d08a337 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -51,7 +51,7 @@ import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -183,12 +183,12 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime onTimerCancel(holder.getEvent(), holder.getParams(), holder.getNpc(), holder.getPlayer()); } - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { LOGGER.warning("[" + getClass().getSimpleName() + "]: Timer event arrived at non overriden onTimerEvent method event: " + event + " npc: " + npc + " player: " + player); } - public void onTimerCancel(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerCancel(String event, StatSet params, Npc npc, PlayerInstance player) { } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java index 400fb64b6e..861c4a9b31 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java @@ -24,7 +24,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.timers.IEventTimerCancel; @@ -69,7 +69,7 @@ public class TimerExecutor * @param eventTimer * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - public boolean addTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) + public boolean addTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) { return addTimer(new TimerHolder<>(event, params, time, npc, player, false, eventTimer, _cancelListener, this)); } @@ -95,7 +95,7 @@ public class TimerExecutor * @param player * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - public boolean addTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player) + public boolean addTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player) { return addTimer(event, params, time, npc, player, _eventListener); } @@ -123,7 +123,7 @@ public class TimerExecutor * @param eventTimer * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - private boolean addRepeatingTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) + private boolean addRepeatingTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) { return addTimer(new TimerHolder<>(event, params, time, npc, player, true, eventTimer, _cancelListener, this)); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java index ab8fa150ca..0fcafba759 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java @@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.gameserver.instancemanager.TimersManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.TimerExecutor; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.events.TimerExecutor; public class TimerHolder implements Runnable { private final T _event; - private final StatsSet _params; + private final StatSet _params; private final long _time; private final Npc _npc; private final PlayerInstance _player; @@ -44,7 +44,7 @@ public class TimerHolder implements Runnable private final TimerExecutor _postExecutor; private final ScheduledFuture _task; - public TimerHolder(T event, StatsSet params, long time, Npc npc, PlayerInstance player, boolean isRepeating, IEventTimerEvent eventScript, IEventTimerCancel cancelScript, TimerExecutor postExecutor) + public TimerHolder(T event, StatSet params, long time, Npc npc, PlayerInstance player, boolean isRepeating, IEventTimerEvent eventScript, IEventTimerCancel cancelScript, TimerExecutor postExecutor) { Objects.requireNonNull(event, getClass().getSimpleName() + ": \"event\" cannot be null!"); Objects.requireNonNull(eventScript, getClass().getSimpleName() + ": \"script\" cannot be null!"); @@ -73,7 +73,7 @@ public class TimerHolder implements Runnable /** * @return the parameters of this timer */ - public StatsSet getParams() + public StatSet getParams() { return _params; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index db95bd7dbc..df52427f29 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; @@ -37,7 +37,7 @@ public class AppearanceHolder private final AppearanceTargetType _targetType; private final long _bodyPart; - public AppearanceHolder(StatsSet set) + public AppearanceHolder(StatSet set) { _visualId = set.getInt("id", 0); _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java index 29740873cd..0f9488448d 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Nik @@ -43,7 +43,7 @@ public class AttachSkillHolder extends SkillHolder return _requiredSkillLevel; } - public static AttachSkillHolder fromStatsSet(StatsSet set) + public static AttachSkillHolder fromStatSet(StatSet set) { return new AttachSkillHolder(set.getInt("skillId"), set.getInt("skillLevel", 1), set.getInt("requiredSkillId"), set.getInt("requiredSkillLevel", 1)); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java index cc41724532..57b6d47c40 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Set; import org.l2jmobius.gameserver.enums.SkillEnchantType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -36,7 +36,7 @@ public class EnchantSkillHolder private final Map _chance = new EnumMap<>(SkillEnchantType.class); private final Map> _requiredItems = new EnumMap<>(SkillEnchantType.class); - public EnchantSkillHolder(StatsSet set) + public EnchantSkillHolder(StatSet set) { _level = set.getInt("level"); _enchantFailLevel = set.getInt("enchantFailLevel"); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java index e6706c8467..33d14e4345 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Map; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -36,7 +36,7 @@ public class ExtendDropDataHolder private final List _conditions; private final Map _systemMessages; - public ExtendDropDataHolder(StatsSet set) + public ExtendDropDataHolder(StatSet set) { _id = set.getInt("id"); _items = set.getList("items", ExtendDropItemHolder.class); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java index 16454d764a..d63d4eb775 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -52,7 +52,7 @@ public class FakePlayerHolder private final int _clanId; private final int _pledgeStatus; - public FakePlayerHolder(StatsSet set) + public FakePlayerHolder(StatSet set) { _classId = set.getInt("classId", 182); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java index a9c72776cd..86af0c1405 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -29,7 +29,7 @@ public class ItemHolder implements IIdentifiable private final int _id; private final long _count; - public ItemHolder(StatsSet set) + public ItemHolder(StatSet set) { _id = set.getInt("id"); _count = set.getLong("count"); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java index 5f7bb2008b..1c6f7b506b 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -25,7 +25,7 @@ public class ItemPointHolder extends ItemHolder { private final int _points; - public ItemPointHolder(StatsSet params) + public ItemPointHolder(StatSet params) { this(params.getInt("id"), params.getLong("count"), params.getInt("points")); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java index 71d4f56eea..1b65c8912f 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.holders; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -34,7 +34,7 @@ public class LuckyGameDataHolder private int _minModifyRewardGame; private int _maxModifyRewardGame; - public LuckyGameDataHolder(StatsSet params) + public LuckyGameDataHolder(StatSet params) { _index = params.getInt("index"); _turningPoints = params.getInt("turning_point"); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java index f77e380e8d..9fa8c99654 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.holders; import java.time.Duration; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -32,7 +32,7 @@ public class MinionHolder implements IIdentifiable private final long _respawnTime; private final int _weightPoint; - public MinionHolder(StatsSet set) + public MinionHolder(StatSet set) { _id = set.getInt("id"); _count = set.getInt("count", 1); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java index f4173594d1..36ac70176d 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -52,7 +52,7 @@ public class MultisellListHolder implements IIdentifiable } @SuppressWarnings("unchecked") - public MultisellListHolder(StatsSet set) + public MultisellListHolder(StatSet set) { _listId = set.getInt("listId"); _isChanceMultisell = set.getBoolean("isChanceMultisell", false); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java index cef1e13e8f..5e9c55ea74 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.StatusUpdateType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -56,7 +56,7 @@ public class RecipeHolder implements IIdentifiable private final double _maxOfferingBonus; private final long _maxOffering; - public RecipeHolder(StatsSet set, List ingredients, List productGroup, List npcFee, Map statUse) + public RecipeHolder(StatSet set, List ingredients, List productGroup, List npcFee, Map statUse) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index f1b98ee9ac..ecd1069283 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -45,7 +45,7 @@ import org.l2jmobius.gameserver.enums.InstanceReenterType; import org.l2jmobius.gameserver.enums.InstanceTeleportType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -87,7 +87,7 @@ public class Instance implements IIdentifiable, INamable private final Set _players = ConcurrentHashMap.newKeySet(); // Players inside instance private final Set _npcs = ConcurrentHashMap.newKeySet(); // Spawned NPCs inside instance private final Map _doors = new HashMap<>(); // Spawned doors inside instance - private final StatsSet _parameters = new StatsSet(); + private final StatSet _parameters = new StatSet(); // Timers private final Map> _ejectDeadTasks = new ConcurrentHashMap<>(); private ScheduledFuture _cleanUpTask = null; @@ -171,7 +171,7 @@ public class Instance implements IIdentifiable, INamable * Get instance world parameters. * @return instance parameters */ - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } @@ -1020,7 +1020,7 @@ public class Instance implements IIdentifiable, INamable * Get parameters from instance template.
* @return template parameters */ - public StatsSet getTemplateParameters() + public StatSet getTemplateParameters() { return _template.getParameters(); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 2a196f73ef..b53b0a819d 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.AbstractPlayerGroup; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -71,7 +71,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl private float _spRate = Config.RATE_INSTANCE_SP; private float _expPartyRate = Config.RATE_INSTANCE_PARTY_XP; private float _spPartyRate = Config.RATE_INSTANCE_PARTY_SP; - private StatsSet _parameters = StatsSet.EMPTY_STATSET; + private StatSet _parameters = StatSet.EMPTY_STATSET; private final Map _doors = new HashMap<>(); private final List _spawns = new ArrayList<>(); // Locations @@ -92,7 +92,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl /** * @param set */ - public InstanceTemplate(StatsSet set) + public InstanceTemplate(StatSet set) { _templateId = set.getInt("id", 0); _name = set.getString("name", null); @@ -178,7 +178,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (!set.isEmpty()) { - _parameters = new StatsSet(Collections.unmodifiableMap(set)); + _parameters = new StatSet(Collections.unmodifiableMap(set)); } } @@ -469,7 +469,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl * Get instance template parameters. * @return parameters of template */ - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java index 3b67ff72f4..3627959662 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; import java.util.function.BiConsumer; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public abstract class Condition { private final InstanceTemplate _template; - private final StatsSet _parameters; + private final StatSet _parameters; private final boolean _leaderOnly; private final boolean _showMessageAndHtml; private SystemMessageId _systemMsg = null; @@ -46,7 +46,7 @@ public abstract class Condition * @param onlyLeader flag which means if only leader should be affected (leader means player who wants to enter not group leader!) * @param showMessageAndHtml if {@code true} and HTML message is defined then both are send, otherwise only HTML or message is send */ - public Condition(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public Condition(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { _template = template; _parameters = parameters; @@ -58,7 +58,7 @@ public abstract class Condition * Gets parameters of condition. * @return set of parameters */ - protected final StatsSet getParameters() + protected final StatSet getParameters() { return _parameters; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java index e379741b59..c27d92d662 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionCommandChannel extends Condition { - public ConditionCommandChannel(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionCommandChannel(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_CANNOT_ENTER_BECAUSE_YOU_ARE_NOT_ASSOCIATED_WITH_THE_CURRENT_COMMAND_CHANNEL); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java index ed434e3524..a828dcceae 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.model.AbstractPlayerGroup; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionCommandChannelLeader extends Condition { - public ConditionCommandChannelLeader(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionCommandChannelLeader(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java index d2a60816d0..423a37a94e 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionDistance extends Condition { - public ConditionDistance(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionDistance(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); setSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED, (message, player) -> message.addString(player.getName())); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java index 3dc78a98c7..8aa68b7e08 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionGroupMax extends Condition { - public ConditionGroupMax(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionGroupMax(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_CANNOT_ENTER_DUE_TO_THE_PARTY_HAVING_EXCEEDED_THE_LIMIT); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java index 818803c844..70ea03c187 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionGroupMin extends Condition { - public ConditionGroupMin(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionGroupMin(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_MUST_HAVE_A_MINIMUM_OF_S1_PEOPLE_TO_ENTER_THIS_INSTANCE_ZONE, (msg, player) -> msg.addInt(getLimit())); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 3088d8ae64..53fee609aa 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.enums.ResidenceType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; */ public class ConditionHasResidence extends Condition { - public ConditionHasResidence(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionHasResidence(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); } @@ -43,7 +43,7 @@ public class ConditionHasResidence extends Condition return false; } - final StatsSet params = getParameters(); + final StatSet params = getParameters(); final int id = params.getInt("id"); boolean test = false; switch (params.getEnum("type", ResidenceType.class)) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java index 4e1c407325..eed350db38 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -32,7 +32,7 @@ public class ConditionItem extends Condition private final long _count; private final boolean _take; - public ConditionItem(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionItem(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Load params diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java index 7d509a20c7..b38f8c0e2c 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -32,7 +32,7 @@ public class ConditionLevel extends Condition private final int _min; private final int _max; - public ConditionLevel(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionLevel(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Load params diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java index b91deeffdb..d71e6d0a39 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; */ public class ConditionNoParty extends Condition { - public ConditionNoParty(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionNoParty(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java index dd31bf3ca5..5bf768a03e 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionParty extends Condition { - public ConditionParty(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionParty(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java index 524a59675a..0363715536 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionPartyLeader extends Condition { - public ConditionPartyLeader(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionPartyLeader(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java index 481cb251ce..48d7fc7981 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.instancemanager.QuestManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionQuest extends Condition { - public ConditionQuest(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionQuest(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Set message diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 899b17aff9..a073129734 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionReenter extends Condition { - public ConditionReenter(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionReenter(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); setSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET, (message, player) -> message.addString(player.getName())); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java index ec255025c3..fafafe5604 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.itemauction; import java.util.Calendar; import java.util.concurrent.TimeUnit; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Forsaiken @@ -40,7 +40,7 @@ public class AuctionDateGenerator private int _hour_of_day; private int _minute_of_hour; - public AuctionDateGenerator(StatsSet config) + public AuctionDateGenerator(StatSet config) { _calendar = Calendar.getInstance(); _interval = config.getInt(FIELD_INTERVAL, -1); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 64bf0a6ff1..cb554e4dce 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.itemauction; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.idfactory.IdFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,9 +34,9 @@ public class AuctionItem private final int _itemId; private final long _itemCount; @SuppressWarnings("unused") - private final StatsSet _itemExtra; + private final StatSet _itemExtra; - public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatsSet itemExtra) + public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatSet itemExtra) { _auctionItemId = auctionItemId; _auctionLength = auctionLength; diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 6dff6e3a4d..dc3a7f6f6b 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -44,7 +44,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -84,7 +84,7 @@ public class ItemAuctionInstance _items = new ArrayList<>(); final NamedNodeMap nanode = node.getAttributes(); - final StatsSet generatorConfig = new StatsSet(); + final StatSet generatorConfig = new StatSet(); for (int i = nanode.getLength(); i-- > 0;) { final Node n = nanode.item(i); @@ -115,7 +115,7 @@ public class ItemAuctionInstance throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } - final StatsSet itemExtra = new StatsSet(); + final StatSet itemExtra = new StatSet(); final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Armor.java index d4fd97ef10..bfc90d126d 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Armor.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.type.ArmorType; /** @@ -28,15 +28,15 @@ public class Armor extends Item /** * Constructor for Armor. - * @param set the StatsSet designating the set of couples (key,value) characterizing the armor. + * @param set the StatSet designating the set of couples (key,value) characterizing the armor. */ - public Armor(StatsSet set) + public Armor(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/EtcItem.java index 86d7291595..a902860c0d 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/EtcItem.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -38,15 +38,15 @@ public class EtcItem extends Item /** * Constructor for EtcItem. - * @param set StatsSet designating the set of couples (key,value) for description of the Etc + * @param set StatSet designating the set of couples (key,value) for description of the Etc */ - public EtcItem(StatsSet set) + public EtcItem(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Henna.java index c669b86eec..c4c32e7cda 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -21,7 +21,7 @@ import java.util.EnumMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; @@ -45,7 +45,7 @@ public class Henna private final List _skills; private final List _wear_class; - public Henna(StatsSet set) + public Henna(StatSet set) { _dyeId = set.getInt("dyeId"); _dyeItemId = set.getInt("dyeItemId"); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Item.java index fdc89a5483..16536c3e17 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Item.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.enums.ItemGrade; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; @@ -180,14 +180,14 @@ public abstract class Item extends ListenersContainer implements IIdentifiable /** * Constructor of the Item that fill class variables.
*
- * @param set : StatsSet corresponding to a set of couples (key,value) for description of the item + * @param set : StatSet corresponding to a set of couples (key,value) for description of the item */ - protected Item(StatsSet set) + protected Item(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { _itemId = set.getInt("item_id"); _displayId = set.getInt("displayId", _itemId); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java index ab196007a8..3ca228cbe5 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -29,7 +29,7 @@ public class PlayerItemTemplate extends ItemHolder /** * @param set the set containing the values for this object */ - public PlayerItemTemplate(StatsSet set) + public PlayerItemTemplate(StatSet set) { super(set.getInt("id"), set.getInt("count")); _equipped = set.getBoolean("equipped", false); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Weapon.java index 16f0c47287..5f9f8507bd 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Weapon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.items; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ItemSkillType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -58,15 +58,15 @@ public class Weapon extends Item /** * Constructor for Weapon. - * @param set the StatsSet designating the set of couples (key,value) characterizing the weapon. + * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. */ - public Weapon(StatsSet set) + public Weapon(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java index 7bdd968d90..6d05c20ff3 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java @@ -23,7 +23,7 @@ import java.util.List; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -54,7 +54,7 @@ public class AppearanceStone private List _racesNot; private List _allVisualIds; - public AppearanceStone(StatsSet set) + public AppearanceStone(StatSet set) { _id = set.getInt("id"); _visualId = set.getInt("visualId", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java index f3b53f1a67..a2897ba911 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.items.combination; import java.util.EnumMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -31,7 +31,7 @@ public class CombinationItem private final int _chance; private final Map _rewards = new EnumMap<>(CombinationItemType.class); - public CombinationItem(StatsSet set) + public CombinationItem(StatSet set) { _itemOne = set.getInt("one"); _itemTwo = set.getInt("two"); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java index 1cde38a6d6..a7f1326bd8 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.CrystalType; @@ -59,7 +59,7 @@ public abstract class AbstractEnchantItem private final int _maxEnchantLevel; private final double _bonusRate; - public AbstractEnchantItem(StatsSet set) + public AbstractEnchantItem(StatSet set) { _id = set.getInt("id"); if (getItem() == null) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java index 36ccf3a5a4..310a7643ec 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -40,7 +40,7 @@ public class EnchantScroll extends AbstractEnchantItem private final int _scrollGroupId; private Set _items; - public EnchantScroll(StatsSet set) + public EnchantScroll(StatSet set) { super(set); _scrollGroupId = set.getInt("scrollGroupId", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java index c02095428b..978e38d533 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items.enchant; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.items.type.ItemType; @@ -30,7 +30,7 @@ public class EnchantSupportItem extends AbstractEnchantItem private final boolean _isGiant; private final ItemType type; - public EnchantSupportItem(StatsSet set) + public EnchantSupportItem(StatSet set) { super(set); type = getItem().getItemType(); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index d15d179719..0a67dd54f0 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.data.xml.impl.CategoryData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.entity.Hero; @@ -61,7 +61,7 @@ public class Olympiad extends ListenersContainer protected static final Logger LOGGER = Logger.getLogger(Olympiad.class.getName()); protected static final Logger LOGGER_OLYMPIAD = Logger.getLogger("olympiad"); - private static final Map NOBLES = new ConcurrentHashMap<>(); + private static final Map NOBLES = new ConcurrentHashMap<>(); private static final Map NOBLES_RANK = new HashMap<>(); public static final String OLYMPIAD_HTML_PATH = "data/html/olympiad/"; @@ -226,10 +226,10 @@ public class Olympiad extends ListenersContainer PreparedStatement statement = con.prepareStatement(OLYMPIAD_LOAD_NOBLES); ResultSet rset = statement.executeQuery()) { - StatsSet statData; + StatSet statData; while (rset.next()) { - statData = new StatsSet(); + statData = new StatSet(); statData.set(CLASS_ID, rset.getInt(CLASS_ID)); statData.set(CHAR_NAME, rset.getString(CHAR_NAME)); statData.set(POINTS, rset.getInt(POINTS)); @@ -452,7 +452,7 @@ public class Olympiad extends ListenersContainer saveNobleData(); _period = 1; - final List heroesToBe = sortHerosToBe(); + final List heroesToBe = sortHerosToBe(); Hero.getInstance().resetData(); Hero.getInstance().computeNewHeroes(heroesToBe); @@ -486,7 +486,7 @@ public class Olympiad extends ListenersContainer return NOBLES.size(); } - public static StatsSet getNobleStats(int playerId) + public static StatSet getNobleStats(int playerId) { return NOBLES.get(playerId); } @@ -785,7 +785,7 @@ public class Olympiad extends ListenersContainer } int currentPoints; - for (StatsSet nobleInfo : NOBLES.values()) + for (StatSet nobleInfo : NOBLES.values()) { currentPoints = nobleInfo.getInt(POINTS); currentPoints += WEEKLY_POINTS; @@ -803,7 +803,7 @@ public class Olympiad extends ListenersContainer return; } - for (StatsSet nobleInfo : NOBLES.values()) + for (StatSet nobleInfo : NOBLES.values()) { nobleInfo.set(COMP_DONE_WEEK, 0); } @@ -836,9 +836,9 @@ public class Olympiad extends ListenersContainer try (Connection con = DatabaseFactory.getConnection()) { - for (Entry entry : NOBLES.entrySet()) + for (Entry entry : NOBLES.entrySet()) { - final StatsSet nobleInfo = entry.getValue(); + final StatSet nobleInfo = entry.getValue(); if (nobleInfo == null) { @@ -951,7 +951,7 @@ public class Olympiad extends ListenersContainer } } - protected List sortHerosToBe() + protected List sortHerosToBe() { if (_period != 1) { @@ -961,8 +961,8 @@ public class Olympiad extends ListenersContainer if (NOBLES != null) { LOGGER_OLYMPIAD.info("Noble,charid,classid,compDone,points"); - StatsSet nobleInfo; - for (Entry entry : NOBLES.entrySet()) + StatSet nobleInfo; + for (Entry entry : NOBLES.entrySet()) { nobleInfo = entry.getValue(); if (nobleInfo == null) @@ -980,12 +980,12 @@ public class Olympiad extends ListenersContainer } } - final List heroesToBe = new LinkedList<>(); + final List heroesToBe = new LinkedList<>(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(OLYMPIAD_GET_HEROS)) { - StatsSet hero; + StatSet hero; for (int element : HERO_IDS) { statement.setInt(1, element); @@ -994,7 +994,7 @@ public class Olympiad extends ListenersContainer { if (rset.next()) { - hero = new StatsSet(); + hero = new StatSet(); hero.set(CLASS_ID, element); hero.set(CHAR_ID, rset.getInt(CHAR_ID)); hero.set(CHAR_NAME, rset.getString(CHAR_NAME)); @@ -1048,7 +1048,7 @@ public class Olympiad extends ListenersContainer return 0; } - final StatsSet noble = NOBLES.get(objectId); + final StatSet noble = NOBLES.get(objectId); if ((noble == null) || (noble.getInt(POINTS) == 0)) { return 0; @@ -1098,7 +1098,7 @@ public class Olympiad extends ListenersContainer { if (!NOBLES.containsKey(player.getObjectId())) { - final StatsSet statDat = new StatsSet(); + final StatSet statDat = new StatSet(); statDat.set(CLASS_ID, player.getBaseClass()); statDat.set(CHAR_NAME, player.getName()); statDat.set(POINTS, DEFAULT_POINTS); @@ -1205,7 +1205,7 @@ public class Olympiad extends ListenersContainer * @param data the stats set data to add. * @return the old stats set if the noble is already present, null otherwise. */ - public static StatsSet addNobleStats(int charId, StatsSet data) + public static StatSet addNobleStats(int charId, StatSet data) { return NOBLES.put(charId, data); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/Participant.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/Participant.java index 670066ac32..b6d879b902 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/Participant.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/Participant.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.olympiad; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class Participant private final int baseClass; private boolean disconnected = false; private boolean defaulted = false; - private final StatsSet stats; + private final StatSet stats; public String clanName; public int clanId; @@ -125,7 +125,7 @@ public class Participant /** * @return the stats */ - public StatsSet getStats() + public StatSet getStats() { return stats; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java index 4d5231ca5d..c1fb0f88f6 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.primeshop; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -49,7 +49,7 @@ public class PrimeShopGroup private final int _availableCount; private final List _items; - public PrimeShopGroup(StatsSet set, List items) + public PrimeShopGroup(StatSet set, List items) { _brId = set.getInt("id"); _category = set.getInt("cat", 0); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java index d150ec98cd..88795e0721 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.residences; import java.time.Duration; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -33,7 +33,7 @@ public class ResidenceFunctionTemplate private final Duration _duration; private final double _value; - public ResidenceFunctionTemplate(StatsSet set) + public ResidenceFunctionTemplate(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java index 4f15efda0b..b19f8e59d5 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; /** @@ -34,7 +34,7 @@ public class ShuttleDataHolder private final List _stops = new ArrayList<>(2); private final List _routes = new ArrayList<>(2); - public ShuttleDataHolder(StatsSet set) + public ShuttleDataHolder(StatSet set) { _id = set.getInt("id"); _loc = new Location(set); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/Skill.java index c44b45a781..0e97466a3a 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.handler.IAffectScopeHandler; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.CubicInstance; @@ -210,7 +210,7 @@ public class Skill implements IIdentifiable private final SkillBuffType _buffType; private final boolean _displayInList; - public Skill(StatsSet set) + public Skill(StatSet set) { _id = set.getInt(".id"); _level = set.getInt(".level"); @@ -391,7 +391,7 @@ public class Skill implements IIdentifiable _toggleGroupId = set.getInt("toggleGroupId", -1); _attachToggleGroupId = set.getInt("attachToggleGroupId", -1); - _attachSkills = set.getList("attachSkillList", StatsSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatsSet).collect(Collectors.toList()); + _attachSkills = set.getList("attachSkillList", StatSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatSet).collect(Collectors.toList()); final String abnormalResist = set.getString("abnormalResists", null); if (abnormalResist != null) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java index bfc25bddde..39b738dbca 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.ChanceLocation; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory; /** * @author UnAfraid */ -public class NpcSpawnTemplate implements Cloneable, IParameterized +public class NpcSpawnTemplate implements Cloneable, IParameterized { private static final Logger LOGGER = Logger.getLogger(NpcSpawnTemplate.class.getName()); @@ -56,7 +56,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized private final Duration _respawnTimeRandom; private List _locations; private SpawnTerritory _zone; - private StatsSet _parameters; + private StatSet _parameters; private final boolean _spawnAnimation; private final boolean _saveInDB; private final String _dbName; @@ -82,7 +82,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized _minions = template._minions; } - public NpcSpawnTemplate(SpawnTemplate spawnTemplate, SpawnGroup group, StatsSet set) + public NpcSpawnTemplate(SpawnTemplate spawnTemplate, SpawnGroup group, StatSet set) { _spawnTemplate = spawnTemplate; _group = group; @@ -128,14 +128,14 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized mergeParameters(spawnTemplate, group); } - private StatsSet mergeParameters(SpawnTemplate spawnTemplate, SpawnGroup group) + private StatSet mergeParameters(SpawnTemplate spawnTemplate, SpawnGroup group) { if ((_parameters == null) && (spawnTemplate.getParameters() == null) && (group.getParameters() == null)) { return null; } - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); if (spawnTemplate.getParameters() != null) { set.merge(spawnTemplate.getParameters()); @@ -206,13 +206,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized } @Override - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } @Override - public void setParameters(StatsSet parameters) + public void setParameters(StatSet parameters) { if (_parameters == null) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java index 6723863c93..7ceb2d46af 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IParameterized; import org.l2jmobius.gameserver.model.interfaces.ITerritorized; @@ -31,16 +31,16 @@ import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory; /** * @author UnAfraid */ -public class SpawnGroup implements Cloneable, ITerritorized, IParameterized +public class SpawnGroup implements Cloneable, ITerritorized, IParameterized { private final String _name; private final boolean _spawnByDefault; private List _territories; private List _bannedTerritories; private final List _spawns = new ArrayList<>(); - private StatsSet _parameters; + private StatSet _parameters; - public SpawnGroup(StatsSet set) + public SpawnGroup(StatSet set) { this(set.getString("name", null), set.getBoolean("spawnByDefault", true)); } @@ -104,13 +104,13 @@ public class SpawnGroup implements Cloneable, ITerritorized, IParameterized +public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized { private final String _name; private final String _ai; @@ -45,9 +45,9 @@ public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized _territories; private List _bannedTerritories; private final List _groups = new ArrayList<>(); - private StatsSet _parameters; + private StatSet _parameters; - public SpawnTemplate(StatsSet set, File file) + public SpawnTemplate(StatSet set, File file) { this(set.getString("name", null), set.getString("ai", null), set.getBoolean("spawnByDefault", true), file); } @@ -128,13 +128,13 @@ public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized _castleId; - public TeleportLocation(int id, StatsSet set) + public TeleportLocation(int id, StatSet set) { super(set); _id = id; diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java index 916ae0790c..33cf6ac3bc 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.variables; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.IRestorable; import org.l2jmobius.gameserver.model.interfaces.IStorable; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.interfaces.IStorable; /** * @author UnAfraid */ -public abstract class AbstractVariables extends StatsSet implements IRestorable, IStorable, IDeletable +public abstract class AbstractVariables extends StatSet implements IRestorable, IStorable, IDeletable { private final AtomicBoolean _hasChanges = new AtomicBoolean(false); @@ -41,42 +41,42 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, */ @Override - public StatsSet set(String name, boolean value) + public StatSet set(String name, boolean value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, double value) + public StatSet set(String name, double value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, Enum value) + public StatSet set(String name, Enum value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, int value) + public StatSet set(String name, int value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, long value) + public StatSet set(String name, long value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, String value) + public StatSet set(String name, String value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); @@ -89,7 +89,7 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, * @param markAsChanged * @return */ - public StatsSet set(String name, String value, boolean markAsChanged) + public StatSet set(String name, String value, boolean markAsChanged) { if (markAsChanged) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index 5c03122a62..4d97f0017a 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExHeroList implements IClientOutgoingPacket { - private final Map _heroList; + private final Map _heroList; public ExHeroList() { @@ -42,7 +42,7 @@ public class ExHeroList implements IClientOutgoingPacket OutgoingPackets.EX_HERO_LIST.writeId(packet); packet.writeD(_heroList.size()); - for (StatsSet hero : _heroList.values()) + for (StatSet hero : _heroList.values()) { packet.writeS(hero.getString(Olympiad.CHAR_NAME)); packet.writeD(hero.getInt(Olympiad.CLASS_ID)); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/BypassParser.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/BypassParser.java index 414125bdeb..a80323ba1f 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/BypassParser.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/BypassParser.java @@ -20,12 +20,12 @@ import java.util.LinkedHashMap; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid */ -public class BypassParser extends StatsSet +public class BypassParser extends StatSet { private static final String ALLOWED_CHARS = "a-zA-Z0-9-_`!@#%^&*()\\[\\]|\\\\/"; private static final Pattern PATTERN = Pattern.compile(String.format("([%s]*)=('([%s ]*)'|[%s]*)", ALLOWED_CHARS, ALLOWED_CHARS, ALLOWED_CHARS)); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java index 2ceebc156a..a3f07a6ad5 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java @@ -18,7 +18,7 @@ package ai.areas.BeastFarm; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -133,7 +133,7 @@ public class ImprovedBabyPets extends AbstractNpcAI private boolean castBuff(Summon summon, int stepNumber, int buffNumber) { final PlayerInstance owner = summon.getOwner(); - final StatsSet parameters = summon.getTemplate().getParameters(); + final StatSet parameters = summon.getTemplate().getParameters(); final SkillHolder skill = parameters.getObject("step" + stepNumber + "_buff0" + buffNumber, SkillHolder.class); if ((skill != null) && (owner != null)) @@ -174,7 +174,7 @@ public class ImprovedBabyPets extends AbstractNpcAI { final boolean previousFollowStatus = summon.getFollowStatus(); final PlayerInstance owner = summon.getOwner(); - final StatsSet parameters = summon.getTemplate().getParameters(); + final StatSet parameters = summon.getTemplate().getParameters(); final SkillHolder skill = parameters.getObject("step" + stepNumber + "_heal0" + healNumber, SkillHolder.class); final int targetType = parameters.getInt("step" + stepNumber + "_heal_target0" + healNumber, 0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java index efdbdd4460..9ff1875b62 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java @@ -18,7 +18,7 @@ package ai.areas.FairySettlement; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -50,11 +50,11 @@ public class Wisp extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("DELETE_NPC")) { - params = new StatsSet(); + params = new StatSet(); params.set("LOCATION_OBJECT", npc.getLocation()); getTimers().addTimer("RESPAWN_WISP_" + npc.getObjectId(), params, getRandom(RESPAWN_MIN, RESPAWN_MAX), null, null); npc.deleteMe(); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java index 5cd6622513..b52be69c96 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java @@ -19,7 +19,7 @@ package ai.areas.Parnassus.EntrancePortalToCrystalCaverns; import java.util.Calendar; import org.l2jmobius.gameserver.instancemanager.QuestManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -107,7 +107,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("LOOP_TIMER")) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/SeedOfHellfire/Zofan.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/SeedOfHellfire/Zofan.java index b6c122da75..03f451c9fd 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/SeedOfHellfire/Zofan.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/SeedOfHellfire/Zofan.java @@ -16,7 +16,7 @@ */ package ai.areas.SeedOfHellfire; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -61,7 +61,7 @@ public class Zofan extends AbstractNpcAI { if ((npc.getInstanceWorld() == null) && (npc.getSpawn() != null)) { - final StatsSet params = npc.getParameters(); + final StatSet params = npc.getParameters(); if (params.getInt("i_childrengarden_guard", 0) == 0) { for (String param : MINION_PARAMS) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Allada.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Allada.java index 5ccca8c99a..4291aeb5ec 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Allada.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Allada.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -45,7 +45,7 @@ public class Allada extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Mei.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Mei.java index 015ee0bc9a..7ad9623ec2 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Mei.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Mei.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -40,7 +40,7 @@ public class Mei extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SHOUT")) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Remons.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Remons.java index 41ec3c1bff..a1ea6ba90c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Remons.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Remons.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -43,7 +43,7 @@ public class Remons extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rinne.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rinne.java index 55ab4fc1a7..1d6eafa48a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rinne.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rinne.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -42,7 +42,7 @@ public class Rinne extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rotina.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rotina.java index 24ad1b6041..d0c8f2a81b 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rotina.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rotina.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -45,7 +45,7 @@ public class Rotina extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Soros.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Soros.java index d7862030aa..632d1a78a8 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Soros.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Soros.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -40,7 +40,7 @@ public class Soros extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java index cbe7cc9ac9..4a2aaf21c4 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java @@ -17,7 +17,7 @@ package ai.areas.WallOfArgos.ElmoredenServantsGhost; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -58,7 +58,7 @@ public class ElmoredenServantsGhost extends AbstractNpcAI takeItems(player, USED_GRAVE_PASS, 1); final Location loc; - final StatsSet npcParameters = npc.getParameters(); + final StatSet npcParameters = npc.getParameters(); if (event.equals("teleport1")) { loc = new Location(npcParameters.getInt("TelPos_X1", 0), npcParameters.getInt("TelPos_Y1", 0), npcParameters.getInt("TelPos_Z1", 0)); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java index 4f490b5dc1..ca47a79cfe 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -315,7 +315,7 @@ public class Anakim extends AbstractNpcAI addSkillSeeId(ALL_MOBS); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANAKIM); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM); final int status = GrandBossManager.getInstance().getBossStatus(ANAKIM); if (status == DEAD) { @@ -586,9 +586,9 @@ public class Anakim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(ANAKIM, DEAD); final long respawnTime = getRespawnTime(); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANAKIM); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(ANAKIM, info); + GrandBossManager.getInstance().setStatSet(ANAKIM, info); startQuestTimer("unlock_anakim", respawnTime, null, null); startQuestTimer("end_anakim", 900000, null, null); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index b837d839d8..d12c29d422 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -138,7 +138,7 @@ public class Antharas extends AbstractNpcAI addAttackId(ANTHARAS, BOMBER, BEHEMOTH, TERASQUE); addKillId(ANTHARAS, TERASQUE, BEHEMOTH); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANTHARAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANTHARAS); final double curr_hp = info.getDouble("currentHP"); final double curr_mp = info.getDouble("currentMP"); final int loc_x = info.getInt("loc_x"); @@ -761,7 +761,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(PlayerInstance attacker, int damage) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Baium/Baium.java index ee6655da4d..bca22cc6a6 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -112,7 +112,7 @@ public class Baium extends AbstractNpcAI addSeeCreatureId(BAIUM); addSpellFinishedId(BAIUM); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(BAIUM); + final StatSet info = GrandBossManager.getInstance().getStatSet(BAIUM); switch (getStatus()) { @@ -666,7 +666,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java index 768ebbc11d..ebf5e78a5a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -122,7 +122,7 @@ public class BalokWarzone extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (isInInstance(world)) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java index 9919e58ce5..e8a2e67509 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java @@ -17,7 +17,7 @@ package ai.bosses.Baylor; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -77,7 +77,7 @@ public class BaylorWarzone extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (isInInstance(world)) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java index 1e80c81840..e8e9fa8756 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; @@ -104,7 +104,7 @@ public class Beleth extends AbstractNpcAI addStartNpc(STONE_COFFIN); addTalkId(STONE_COFFIN); addFirstTalkId(ELF); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(REAL_BELETH); + final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH); if (status == DEAD) { @@ -750,9 +750,9 @@ public class Beleth extends AbstractNpcAI setBelethKiller(killer); GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD); final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(REAL_BELETH); + final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(REAL_BELETH, info); + GrandBossManager.getInstance().setStatSet(REAL_BELETH, info); startQuestTimer("BELETH_UNLOCK", respawnTime, null, null); deleteAll(); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Core/Core.java index bfa7212b8c..c1452bf9de 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; @@ -85,7 +85,7 @@ public class Core extends AbstractNpcAI registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR); _firstAttacked = false; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. @@ -205,9 +205,9 @@ public class Core extends AbstractNpcAI final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000; startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(CORE, info); + GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java index 1665670429..0643041b54 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java @@ -22,7 +22,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -60,7 +60,7 @@ public class Fafurion extends AbstractNpcAI addFirstTalkId(HEART_OF_TSUNAMI); addKillId(FAFURION_FINAL_FORM); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(FAFURION_GRANDBOSS_ID); + final StatSet info = GrandBossManager.getInstance().getStatSet(FAFURION_GRANDBOSS_ID); final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID); if (status == DEAD) { @@ -200,9 +200,9 @@ public class Fafurion extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, DEAD); final long respawnTime = (Config.FAFURION_SPAWN_INTERVAL + getRandom(-Config.FAFURION_SPAWN_RANDOM, Config.FAFURION_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(FAFURION_GRANDBOSS_ID); + final StatSet info = GrandBossManager.getInstance().getStatSet(FAFURION_GRANDBOSS_ID); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(FAFURION_GRANDBOSS_ID, info); + GrandBossManager.getInstance().setStatSet(FAFURION_GRANDBOSS_ID, info); startQuestTimer("unlock_fafurion", respawnTime, null, null); return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java index 6ef025304c..764df30625 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -175,7 +175,7 @@ public class IceQueensCastleBattle extends AbstractInstance final Instance world = npc.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); final Npc controller = params.getObject("controller", Npc.class); final Npc freya = params.getObject("freya", Npc.class); switch (event) @@ -734,7 +734,7 @@ public class IceQueensCastleBattle extends AbstractInstance final Instance world = npc.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); switch (npc.getId()) { case FREYA_THRONE: @@ -1069,7 +1069,7 @@ public class IceQueensCastleBattle extends AbstractInstance final Instance world = npc.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); final Npc controller = params.getObject("controller", Npc.class); switch (npc.getId()) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Helios/Helios.java index 7faa1d8823..0f70177f83 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Helios/Helios.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Helios/Helios.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.zone.type.NoSummonFriendZone; @@ -58,7 +58,7 @@ public class Helios extends AbstractNpcAI // Zone bossZone = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(HELIOS3); + final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3); final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3); if (status == DEAD) { @@ -136,9 +136,9 @@ public class Helios extends AbstractNpcAI bossZone.broadcastPacket(new ExShowScreenMessage(NpcStringId.HELIOS_DEFEATED_TAKES_FLIGHT_DEEP_IN_TO_THE_SUPERION_FORT_HIS_THRONE_IS_RENDERED_INACTIVE, ExShowScreenMessage.TOP_CENTER, 10000, true)); GrandBossManager.getInstance().setBossStatus(HELIOS3, DEAD); final long respawnTime = (Config.HELIOS_SPAWN_INTERVAL + getRandom(-Config.HELIOS_SPAWN_RANDOM, Config.HELIOS_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(HELIOS3); + final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(HELIOS3, info); + GrandBossManager.getInstance().setStatSet(HELIOS3, info); startQuestTimer("unlock_helios", respawnTime, null, null); break; } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java index dc6e826093..b863874cd2 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.AggroInfo; import org.l2jmobius.gameserver.model.DamageDoneInfo; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -153,13 +153,13 @@ public class IstinaCavern extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); - final StatsSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); switch (event) { case "DEATH_TIMER": @@ -391,7 +391,7 @@ public class IstinaCavern extends AbstractInstance } else { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); if (skillId == npcParams.getSkillHolder("Istina_Death_Skill01").getSkillId()) { @@ -440,7 +440,7 @@ public class IstinaCavern extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int stage = npcVars.getInt("ISTINA_STAGE", -1); if (npc.getId() == BALLISTA) @@ -657,7 +657,7 @@ public class IstinaCavern extends AbstractInstance private PlayerInstance setPlayerRewardInfo(Npc npc) { final Map rewards = new ConcurrentHashMap<>(); - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); PlayerInstance maxDealer = null; long maxDamage = 0; int totalDamage = 0; diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index 61b663a0f3..7aebfa337d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -116,7 +116,7 @@ public class Kelbim extends AbstractNpcAI addKillId(KELBIM); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(KELBIM); + final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM); final int status = GrandBossManager.getInstance().getBossStatus(KELBIM); if (status == DEAD) { @@ -429,9 +429,9 @@ public class Kelbim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(KELBIM, DEAD); final long respawnTime = (Config.KELBIM_SPAWN_INTERVAL + getRandom(-Config.KELBIM_SPAWN_RANDOM, Config.KELBIM_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(KELBIM); + final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(KELBIM, info); + GrandBossManager.getInstance().setStatSet(KELBIM, info); startQuestTimer("unlock_kelbim", respawnTime, null, null); startQuestTimer("end_kelbim", 1800000, null, null); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java index 31be0ec32d..f023ad5f8e 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java @@ -19,7 +19,7 @@ package ai.bosses.Kimerian; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -83,7 +83,7 @@ public class KimerianCommon extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) @@ -345,8 +345,8 @@ public class KimerianCommon extends AbstractInstance { final Creature creature = event.getSeen(); final Npc npc = (Npc) event.getSeer(); - final StatsSet npcParams = npc.getParameters(); - final StatsSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java index 1cfd2b47c9..2fbe5b0109 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -337,7 +337,7 @@ public class Lilith extends AbstractNpcAI addSkillSeeId(ALL_MOBS); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LILITH); + final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH); final int status = GrandBossManager.getInstance().getBossStatus(LILITH); if (status == DEAD) { @@ -598,9 +598,9 @@ public class Lilith extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LILITH, DEAD); final long respawnTime = getRespawnTime(); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LILITH); + final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(LILITH, info); + GrandBossManager.getInstance().setStatSet(LILITH, info); startQuestTimer("unlock_lilith", respawnTime, null, null); startQuestTimer("end_lilith", 900000, null, null); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index 9ef473069d..cc00a33356 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -244,7 +244,7 @@ public class Lindvior extends AbstractNpcAI addSeeCreatureId(INVISIBLE); _zoneLair = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LINDVIOR_RAID); + final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID); final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID); if (status == DEAD) { @@ -821,9 +821,9 @@ public class Lindvior extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD); final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LINDVIOR_RAID); + final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(LINDVIOR_RAID, info); + GrandBossManager.getInstance().setStatSet(LINDVIOR_RAID, info); startQuestTimer("unlock_lindvior", respawnTime, null, null); } else if (npc.getId() == NPC_GENERATOR) @@ -867,7 +867,7 @@ public class Lindvior extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SHOUT") && (npc != null) && !npc.isDead()) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/LionelHunter.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/LionelHunter.java index e02f478232..0677792823 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/LionelHunter.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/LionelHunter.java @@ -18,7 +18,7 @@ package ai.bosses.Lindvior; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.WalkingManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -43,7 +43,7 @@ public class LionelHunter extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SHOUT") && (npc != null)) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java index b9c19644c4..c5c62c8f2f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -152,13 +152,13 @@ public class OctavisWarzone extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (isInInstance(world)) { - final StatsSet npcVars = npc.getVariables(); - final StatsSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); switch (event) { @@ -378,7 +378,7 @@ public class OctavisWarzone extends AbstractInstance } else if (CommonUtil.contains(OCTAVIS_STAGE_2, npc.getId())) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); if (npcVars.getBoolean("START_TIMERS", true)) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index d6ea2d3e51..4fd8bd3761 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -90,7 +90,7 @@ public class Orfen extends AbstractNpcAI registerMobs(mobs); _IsTeleported = false; ZONE = ZoneManager.getInstance().getZoneById(12013); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); final int status = GrandBossManager.getInstance().getBossStatus(ORFEN); if (status == DEAD) { @@ -325,9 +325,9 @@ public class Orfen extends AbstractNpcAI respawnTime *= 3600000; startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(ORFEN, info); + GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); startQuestTimer("despawn_minions", 20000, null, null); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index c2564917c7..b9fdddaaf7 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; @@ -91,7 +91,7 @@ public class QueenAnt extends AbstractNpcAI addFactionCallId(NURSE); _zone = ZoneManager.getInstance().getZoneById(12012); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); final int status = GrandBossManager.getInstance().getBossStatus(QUEEN); if (status == DEAD) { @@ -367,9 +367,9 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("action", npc, null); cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(QUEEN, info); + GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); _larva.deleteMe(); _larva = null; diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java index 58d5b9d3a8..577a99ad9d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java @@ -19,7 +19,7 @@ package ai.bosses.Spezion.Cannon; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -170,7 +170,7 @@ public class Cannon extends AbstractNpcAI { if (skill.getId() == PRESENT_SKILL.getSkillId()) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); npc.broadcastPacket(new Earthquake(npc, 10, 5)); npc.broadcastPacket(new OnEventTrigger(npcParams.getInt("TRIGGER_ID"), true)); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java index 086615be42..4af559d521 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -105,13 +105,13 @@ public class TeredorWarzone extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); - final StatsSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); switch (event) { @@ -236,7 +236,7 @@ public class TeredorWarzone extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); switch (npc.getId()) { @@ -292,7 +292,7 @@ public class TeredorWarzone extends AbstractInstance if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); switch (npc.getId()) { @@ -472,7 +472,7 @@ public class TeredorWarzone extends AbstractInstance { case TEREDOR: { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int hpPer = npc.getCurrentHpPercent(); int teredorStatus = npcVars.getInt("TEREDOR_STATUS", 1); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java index 9d9a79d53a..1610356a26 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -322,7 +322,7 @@ public class Trasken extends AbstractNpcAI DoorData.getInstance().getDoor(DOOR).openMe(); } // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(TRASKEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN); final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN); if (status == DEAD) { @@ -603,9 +603,9 @@ public class Trasken extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD); final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(TRASKEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(TRASKEN, info); + GrandBossManager.getInstance().setStatSet(TRASKEN, info); startQuestTimer("unlock_trasken", respawnTime, null, null); break; } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java index 9414859da4..7233381898 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; @@ -123,7 +123,7 @@ public class Valakas extends AbstractNpcAI registerMobs(VALAKAS); ZONE = ZoneManager.getInstance().getZoneById(12010); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(VALAKAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); final int status = GrandBossManager.getInstance().getBossStatus(VALAKAS); if (status == DEAD) @@ -446,9 +446,9 @@ public class Valakas extends AbstractNpcAI final long respawnTime = (Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM)) * 3600000; startQuestTimer("valakas_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(VALAKAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(VALAKAS, info); + GrandBossManager.getInstance().setStatSet(VALAKAS, info); return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java index c73ef9d83c..703e55428a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -189,8 +189,8 @@ public class CavernOfThePirateCaptain extends AbstractInstance final Instance world = npc.getInstanceWorld(); if (world != null) { - final StatsSet templParams = world.getTemplateParameters(); - final StatsSet params = world.getParameters(); + final StatSet templParams = world.getTemplateParameters(); + final StatSet params = world.getParameters(); switch (event) { case "BURN_BLUE": diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/AreaSkillNpc.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/AreaSkillNpc.java index 7cc32dc91c..e3dcd68034 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/AreaSkillNpc.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/AreaSkillNpc.java @@ -17,7 +17,7 @@ package ai.others; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -128,7 +128,7 @@ public class AreaSkillNpc extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java index 01b37387a8..ef9e26a221 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -101,7 +101,7 @@ public class CastleTeleporter extends AbstractNpcAI if (st.hasMoreTokens()) { final int unknowInt = Integer.parseInt(st.nextToken()); - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); Location teleLoc = null; switch (unknowInt) { @@ -191,7 +191,7 @@ public class CastleTeleporter extends AbstractNpcAI return htmltext; } - private Location getTeleportLocation(StatsSet npcParams, String paramName1, String paramName2, String paramName3) + private Location getTeleportLocation(StatSet npcParams, String paramName1, String paramName2, String paramName3) { final Location loc; if (getRandom(100) < 33) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java index b1355fa9c5..c05c1b184b 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java @@ -16,7 +16,7 @@ */ package ai.others.NpcBuffers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ class NpcBufferSkillData private final int _scaleToLevel; private final int _initialDelay; - NpcBufferSkillData(StatsSet set) + NpcBufferSkillData(StatSet set) { _skill = new SkillHolder(set.getInt("id"), set.getInt("level")); _scaleToLevel = set.getInt("scaleToLevel", -1); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java index dd7f4187be..ecae9d2861 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -54,7 +54,7 @@ class NpcBuffersData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node attr; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -75,7 +75,7 @@ class NpcBuffersData implements IXmlReader case "skill": { attrs = c.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { attr = attrs.item(i); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/Servitors/ClanFlag.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/Servitors/ClanFlag.java index 558d57b407..b09a5f38e9 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/Servitors/ClanFlag.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/Servitors/ClanFlag.java @@ -17,7 +17,7 @@ package ai.others.Servitors; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -51,7 +51,7 @@ public class ClanFlag extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java index 55c9613eab..a50c042b7f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -68,7 +68,7 @@ public class GateOfUnlimitedSummoning extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java index f19f5dea69..c817501830 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java @@ -17,7 +17,7 @@ package ai.others.Servitors; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -52,7 +52,7 @@ public class TreeOfLife extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (player != null) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java index 3ee8063427..ee96be41d8 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -91,7 +91,7 @@ public class TersisHerald extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("DESPAWN_NPCS")) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index 2e5331f903..55dc363405 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.zone.type.NoRestartZone; @@ -309,7 +309,7 @@ public class AdminGrandBoss implements IAdminCommandHandler } } - final StatsSet info = GrandBossManager.getInstance().getStatsSet(grandBossId); + final StatSet info = GrandBossManager.getInstance().getStatSet(grandBossId); final String bossRespawn = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(info.getLong("respawn_time")); final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java index 075d9d050c..71aeb82ddd 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java @@ -19,7 +19,7 @@ package handlers.admincommandhandlers; import java.util.StringTokenizer; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -114,7 +114,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.getNobleLevel() > 0) { - final StatsSet statDat = getPlayerSet(player); + final StatSet statDat = getPlayerSet(player); final int oldpoints = Olympiad.getInstance().getNoblePoints(player); final int points = Math.max(oldpoints + val, 0); if (points > 1000) @@ -155,7 +155,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.getNobleLevel() > 0) { - final StatsSet playerStat = Olympiad.getNobleStats(player.getObjectId()); + final StatSet playerStat = Olympiad.getNobleStats(player.getObjectId()); if (playerStat == null) { BuilderUtil.sendSysMessage(activeChar, "This player hasn't played on Olympiad yet!"); @@ -197,7 +197,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.getNobleLevel() > 0) { - final StatsSet statDat = getPlayerSet(player); + final StatSet statDat = getPlayerSet(player); final int oldpoints = Olympiad.getInstance().getNoblePoints(player); final int points = oldpoints - val; if ((points < 1) && (points > 1000)) @@ -237,12 +237,12 @@ public class AdminOlympiad implements IAdminCommandHandler return Integer.decode(token); } - private StatsSet getPlayerSet(PlayerInstance player) + private StatSet getPlayerSet(PlayerInstance player) { - StatsSet statDat = Olympiad.getNobleStats(player.getObjectId()); + StatSet statDat = Olympiad.getNobleStats(player.getObjectId()); if (statDat == null) { - statDat = new StatsSet(); + statDat = new StatSet(); statDat.set(Olympiad.CLASS_ID, player.getBaseClass()); statDat.set(Olympiad.CHAR_NAME, player.getName()); statDat.set(Olympiad.POINTS, Olympiad.DEFAULT_POINTS); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java index d8a3d6e5ce..6382651e6c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java @@ -19,7 +19,7 @@ package handlers.conditions; import java.util.List; import org.l2jmobius.gameserver.enums.CategoryType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -31,7 +31,7 @@ public class CategoryTypeCondition implements ICondition { private final List _categoryTypes; - public CategoryTypeCondition(StatsSet params) + public CategoryTypeCondition(StatSet params) { _categoryTypes = params.getEnumList("category", CategoryType.class); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java index b24cfa0f14..9a14cb6fa2 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java @@ -16,7 +16,7 @@ */ package handlers.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -29,7 +29,7 @@ public class NpcLevelCondition implements ICondition private final int _minLevel; private final int _maxLevel; - public NpcLevelCondition(StatsSet params) + public NpcLevelCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java index afffe7a0c5..9e3deaa8ce 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java @@ -16,7 +16,7 @@ */ package handlers.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -29,7 +29,7 @@ public class PlayerLevelCondition implements ICondition private final int _minLevel; private final int _maxLevel; - public PlayerLevelCondition(StatsSet params) + public PlayerLevelCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 09f609dc37..0e81066579 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -32,7 +32,7 @@ public class AbnormalShield extends AbstractEffect { private final int _times; - public AbnormalShield(StatsSet params) + public AbnormalShield(StatSet params) { _times = params.getInt("times", -1); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 0496c9068d..9c508c8c52 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Objects; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class AbnormalTimeChange extends AbstractEffect private final int _time; private final int _mode; - public AbnormalTimeChange(StatsSet params) + public AbnormalTimeChange(StatSet params) { final String abnormals = params.getString("slot", null); if ((abnormals != null) && !abnormals.isEmpty()) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 98f85c7b21..3f9132b8e3 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -37,7 +37,7 @@ public class AbsorbDamage extends AbstractEffect private final double _damage; private static final Map _damageHolder = new ConcurrentHashMap<>(); - public AbsorbDamage(StatsSet params) + public AbsorbDamage(StatSet params) { _damage = params.getDouble("damage", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 26f51d5351..86fef7cf6d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; @@ -38,7 +38,7 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect private final int _hpPercent; private final Map _updates = new ConcurrentHashMap<>(); - protected AbstractConditionalHpEffect(StatsSet params, Stat stat) + protected AbstractConditionalHpEffect(StatSet params, Stat stat) { super(params, stat); _hpPercent = params.getInt("hpPercent", 0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java index 2e40124e39..f010f84271 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AbstractStatAddEffect extends AbstractEffect private final Stat _stat; protected final double _amount; - public AbstractStatAddEffect(StatsSet params, Stat stat) + public AbstractStatAddEffect(StatSet params, Stat stat) { _stat = stat; _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index da6a575c44..29e439684b 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; @@ -42,12 +42,12 @@ public abstract class AbstractStatEffect extends AbstractEffect protected final StatModifierType _mode; protected final List _conditions = new ArrayList<>(); - public AbstractStatEffect(StatsSet params, Stat stat) + public AbstractStatEffect(StatSet params, Stat stat) { this(params, stat, stat); } - public AbstractStatEffect(StatsSet params, Stat mulStat, Stat addStat) + public AbstractStatEffect(StatSet params, Stat mulStat, Stat addStat) { _addStat = addStat; _mulStat = mulStat; diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java index 9811f395aa..33d08bff36 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AbstractStatPercentEffect extends AbstractEffect private final Stat _stat; protected final double _amount; - public AbstractStatPercentEffect(StatsSet params, Stat stat) + public AbstractStatPercentEffect(StatSet params, Stat stat) { _stat = stat; _amount = params.getDouble("amount", 1); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java index 539814ef2a..79c022a23c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class Accuracy extends AbstractStatEffect { - public Accuracy(StatsSet params) + public Accuracy(StatSet params) { super(params, Stat.ACCURACY_COMBAT); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index 0c1fcbd92b..48d69968c5 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddHate extends AbstractEffect private final double _power; private final boolean _affectSummoner; - public AddHate(StatsSet params) + public AddHate(StatSet params) { _power = params.getDouble("power", 0); _affectSummoner = params.getBoolean("affectSummoner", false); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java index e90d5cc7f3..324927947a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddSkillBySkill extends AbstractEffect private final int _existingSkillLevel; private final SkillHolder _addedSkill; - public AddSkillBySkill(StatsSet params) + public AddSkillBySkill(StatSet params) { _existingSkillId = params.getInt("existingSkillId"); _existingSkillLevel = params.getInt("existingSkillLevel"); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index bdd8314dd7..205bc82200 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddTeleportBookmarkSlot extends AbstractEffect { private final int _amount; - public AddTeleportBookmarkSlot(StatsSet params) + public AddTeleportBookmarkSlot(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java index c26ec5442f..658931ecb2 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionCp extends AbstractStatAddEffect { - public AdditionalPotionCp(StatsSet params) + public AdditionalPotionCp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_CP); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java index 6b68e40f32..57d54c7d3b 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionHp extends AbstractStatAddEffect { - public AdditionalPotionHp(StatsSet params) + public AdditionalPotionHp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_HP); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java index c9e1cc237e..007547ebe7 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionMp extends AbstractStatAddEffect { - public AdditionalPotionMp(StatsSet params) + public AdditionalPotionMp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_MP); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AgathionSlot.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AgathionSlot.java index 2d2a3cf6df..b8a91b683f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AgathionSlot.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AgathionSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AgathionSlot extends AbstractStatAddEffect { - public AgathionSlot(StatsSet params) + public AgathionSlot(StatSet params) { super(params, Stat.AGATHION_SLOTS); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index cbbd845e23..c01bdec653 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -22,7 +22,7 @@ import java.util.Map; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -78,7 +78,7 @@ public class AirBind extends AbstractEffect _chainedAirSkills.put(ClassId.AEORE_SHILLIEN_SAINT, 11999); // Heavy Hit } - public AirBind(StatsSet params) + public AirBind(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java index f5cbb63465..9255ba1877 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AreaDamage extends AbstractStatAddEffect { - public AreaDamage(StatsSet params) + public AreaDamage(StatSet params) { super(params, Stat.DAMAGE_ZONE_VULN); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ArtifactSlot.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ArtifactSlot.java index 150e53d14e..0c146fc6a3 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ArtifactSlot.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ArtifactSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ArtifactSlot extends AbstractStatAddEffect { - public ArtifactSlot(StatsSet params) + public ArtifactSlot(StatSet params) { super(params, Stat.ARTIFACT_SLOTS); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java index 2ded14e7ae..a5d56477f5 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AttackAttribute extends AbstractEffect private final AttributeType _attribute; private final double _amount; - public AttackAttribute(StatsSet params) + public AttackAttribute(StatSet params) { _amount = params.getDouble("amount", 0); _attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java index ff58d09cc7..795366850d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class AttackAttributeAdd extends AbstractEffect { private final double _amount; - public AttackAttributeAdd(StatsSet params) + public AttackAttributeAdd(StatSet params) { _amount = params.getDouble("amount", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java index 37bfbf341a..fcd2b48c99 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class AttackBehind extends AbstractEffect { - public AttackBehind(StatsSet params) + public AttackBehind(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index 062c325a55..4136f5d530 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class AttackTrait extends AbstractEffect { private final Map _attackTraits = new EnumMap<>(TraitType.class); - public AttackTrait(StatsSet params) + public AttackTrait(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 02d6a8d78c..8ac42d45c3 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -37,7 +37,7 @@ public class Backstab extends AbstractEffect private final double _criticalChance; private final boolean _overHit; - public Backstab(StatsSet params) + public Backstab(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Betray.java index 32e3c65c55..79e8bd3360 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Betray extends AbstractEffect { - public Betray(StatsSet params) + public Betray(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Blink.java index ba1caed6ac..56d3f628fd 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -52,7 +52,7 @@ public class Blink extends AbstractEffect private final int _flyDelay; private final int _animationSpeed; - public Blink(StatsSet params) + public Blink(StatSet params) { _flyCourse = params.getInt("angle", 0); _flyRadius = params.getInt("range", 0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 8677f72407..596d4b752f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; */ public class BlinkSwap extends AbstractEffect { - public BlinkSwap(StatsSet params) + public BlinkSwap(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 7bec602aef..cea12039d2 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -20,7 +20,7 @@ import java.util.Arrays; import java.util.Set; import java.util.stream.Collectors; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class BlockAbnormalSlot extends AbstractEffect { private final Set _blockAbnormalSlots; - public BlockAbnormalSlot(StatsSet params) + public BlockAbnormalSlot(StatSet params) { _blockAbnormalSlots = Arrays.stream(params.getString("slot").split(";")).map(slot -> Enum.valueOf(AbnormalType.class, slot)).collect(Collectors.toSet()); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index b4839ab322..348881f970 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -21,7 +21,7 @@ import java.util.Set; import org.l2jmobius.gameserver.datatables.BotReportTable; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class BlockAction extends AbstractEffect { private final Set _blockedActions = new HashSet<>(); - public BlockAction(StatsSet params) + public BlockAction(StatSet params) { final String[] actions = params.getString("blockedActions").split(","); for (String action : actions) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index 68f6586e3e..635d2735f9 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -22,7 +22,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class BlockActions extends AbstractEffect { private final Set _allowedSkills; - public BlockActions(StatsSet params) + public BlockActions(StatSet params) { final String[] allowedSkills = params.getString("allowedSkills", "").split(";"); _allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet()); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 99af987208..3502d140d0 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockChat extends AbstractEffect { - public BlockChat(StatsSet params) + public BlockChat(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java index 6160114414..a2b084c918 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; */ public class BlockControl extends AbstractEffect { - public BlockControl(StatsSet params) + public BlockControl(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java index 3d96329b6d..69b390ae8f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BlockEscape extends AbstractEffect { - public BlockEscape(StatsSet params) + public BlockEscape(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index 8bbd7ac018..85d89180e7 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockMove extends AbstractEffect { - public BlockMove(StatsSet params) + public BlockMove(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index 316f82f855..9e28fc403a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockParty extends AbstractEffect { - public BlockParty(StatsSet params) + public BlockParty(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java index ae2ac8b035..d3235fc34f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BlockResurrection extends AbstractEffect { - public BlockResurrection(StatsSet params) + public BlockResurrection(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index f7f119691f..f2cc65b782 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -35,7 +35,7 @@ public class BlockSkill extends AbstractEffect { private final int[] _magicTypes; - public BlockSkill(StatsSet params) + public BlockSkill(StatSet params) { _magicTypes = params.getIntArray("magicTypes", ";"); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index d9b3d3a34d..9f0b7143d2 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockTarget extends AbstractEffect { - public BlockTarget(StatsSet params) + public BlockTarget(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index bc4cbd6320..bef60ad003 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class Bluff extends AbstractEffect { private final int _chance; - public Bluff(StatsSet params) + public Bluff(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java index 2ace40a596..69583d613b 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusDropAmount extends AbstractStatPercentEffect { - public BonusDropAmount(StatsSet params) + public BonusDropAmount(StatSet params) { super(params, Stat.BONUS_DROP_AMOUNT); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java index b81560b040..e63c8f79f4 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusDropRate extends AbstractStatPercentEffect { - public BonusDropRate(StatsSet params) + public BonusDropRate(StatSet params) { super(params, Stat.BONUS_DROP_RATE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java index b984404cb2..e0fb54b162 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusSpoilRate extends AbstractStatPercentEffect { - public BonusSpoilRate(StatsSet params) + public BonusSpoilRate(StatSet params) { super(params, Stat.BONUS_SPOIL_RATE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Breath.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Breath.java index 859f341f3c..4235319f22 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Breath.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Breath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class Breath extends AbstractStatEffect { - public Breath(StatsSet params) + public Breath(StatSet params) { super(params, Stat.BREATH); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java index a6d25f3c36..4102506e6c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BuffBlock extends AbstractEffect { - public BuffBlock(StatsSet params) + public BuffBlock(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index de7497f8bf..4f470b06c7 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class CallLearnedSkill extends AbstractEffect { private final int _skillId; - public CallLearnedSkill(StatsSet params) + public CallLearnedSkill(StatSet params) { _skillId = params.getInt("skillId"); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index e6096be4be..b41daf073c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CallParty extends AbstractEffect { - public CallParty(StatsSet params) + public CallParty(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index 0760fb675e..eb4bdf2349 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class CallPc extends AbstractEffect private final int _itemId; private final int _itemCount; - public CallPc(StatsSet params) + public CallPc(StatSet params) { _itemId = params.getInt("itemId", 0); _itemCount = params.getInt("itemCount", 0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index d6d5cb721d..0da3802665 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -35,7 +35,7 @@ public class CallRandomSkill extends AbstractEffect { private final List _skills = new ArrayList<>(); - public CallRandomSkill(StatsSet params) + public CallRandomSkill(StatSet params) { final String skills = params.getString("skills", null); if (skills != null) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index 99c1494223..f8e4b226c4 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -35,7 +35,7 @@ public class CallSkill extends AbstractEffect private final SkillHolder _skill; private final int _skillLevelScaleTo; - public CallSkill(StatsSet params) + public CallSkill(StatSet params) { _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0)); _skillLevelScaleTo = params.getInt("skillLevelScaleTo", 0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index b340de4ae1..ff98639c37 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.Collections; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ public class CallSkillOnActionTime extends AbstractEffect { private final SkillHolder _skill; - public CallSkillOnActionTime(StatsSet params) + public CallSkillOnActionTime(StatSet params) { _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0)); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index d48eb90fb3..32753a71a0 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CallTargetParty extends AbstractEffect { - public CallTargetParty(StatsSet params) + public CallTargetParty(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index ef01f4a8ed..d4331bf5b7 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ public class ChameleonRest extends AbstractEffect { private final double _power; - public ChameleonRest(StatsSet params) + public ChameleonRest(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index e3b846674d..37054f2fd0 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; @@ -35,9 +35,9 @@ public class ChangeBody extends AbstractEffect { private final Set _transformations = new HashSet<>(); - public ChangeBody(StatsSet params) + public ChangeBody(StatSet params) { - for (StatsSet item : params.getList("templates", StatsSet.class)) + for (StatSet item : params.getList("templates", StatSet.class)) { _transformations.add(new TemplateChanceHolder(item.getInt(".templateId"), item.getInt(".minChance"), item.getInt(".maxChance"))); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 76c6e03aa6..6b6386909e 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeFace extends AbstractEffect { private final int _value; - public ChangeFace(StatsSet params) + public ChangeFace(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java index cee3ac1a6f..304afa821c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; /** @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; */ public class ChangeFishingMastery extends AbstractEffect { - public ChangeFishingMastery(StatsSet params) + public ChangeFishingMastery(StatSet params) { } } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index 0c583cbc13..64ac49f5d5 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeHairColor extends AbstractEffect { private final int _value; - public ChangeHairColor(StatsSet params) + public ChangeHairColor(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index ad2efbe6a0..ae7d6c6da1 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeHairStyle extends AbstractEffect { private final int _value; - public ChangeHairStyle(StatsSet params) + public ChangeHairStyle(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java index 2d536029fd..4d7c380c75 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class CheapShot extends AbstractEffect { - public CheapShot(StatsSet params) + public CheapShot(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index 207b7f0a3e..1a6a44fb31 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.SubclassInfoType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class ClassChange extends AbstractEffect private final int _index; private static final int IDENTITY_CRISIS_SKILL_ID = 1570; - public ClassChange(StatsSet params) + public ClassChange(StatSet params) { _index = params.getInt("index", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index ccf7598eff..e184022afc 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.stats.Formulas; */ public class Compelling extends AbstractEffect { - public Compelling(StatsSet params) + public Compelling(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index b6aa30f604..f164ac6f3f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class Confuse extends AbstractEffect { private final int _chance; - public Confuse(StatsSet params) + public Confuse(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 25e29532eb..78293c1b0f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ConsumeBody extends AbstractEffect { - public ConsumeBody(StatsSet params) + public ConsumeBody(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 6bca38d232..3185c28746 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class ConvertItem extends AbstractEffect { - public ConvertItem(StatsSet params) + public ConvertItem(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java index 9402fdb06d..857df659c0 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CounterPhysicalSkill extends AbstractStatAddEffect { - public CounterPhysicalSkill(StatsSet params) + public CounterPhysicalSkill(StatSet params) { super(params, Stat.VENGEANCE_SKILL_PHYSICAL_DAMAGE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 67bca7fd1b..598682037b 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Cp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Cp(StatsSet params) + public Cp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index e0cd52808e..37303b0e7a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class CpHeal extends AbstractEffect { private final double _power; - public CpHeal(StatsSet params) + public CpHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index e2e8ee3479..54de5adfc6 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class CpHealOverTime extends AbstractEffect { private final double _power; - public CpHealOverTime(StatsSet params) + public CpHealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index 5665e937dc..b4a994d6df 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CpHealPercent extends AbstractEffect { private final double _power; - public CpHealPercent(StatsSet params) + public CpHealPercent(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java index 1cc851b2af..efb020bbd5 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CpRegen extends AbstractStatEffect { - public CpRegen(StatsSet params) + public CpRegen(StatSet params) { super(params, Stat.REGENERATE_CP_RATE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CraftingCritical.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CraftingCritical.java index fb8ef495fb..cb3f2aace2 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CraftingCritical.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CraftingCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CraftingCritical extends AbstractStatAddEffect { - public CraftingCritical(StatsSet params) + public CraftingCritical(StatSet params) { super(params, Stat.CRAFTING_CRITICAL); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java index 37231ac1af..00d3dfbaaa 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class CreateCommonItem extends AbstractEffect { private final int _recipeLevel; - public CreateCommonItem(StatsSet params) + public CreateCommonItem(StatSet params) { _recipeLevel = params.getInt("value"); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java index 99f31fecab..d01d510ba9 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class CreateItem extends AbstractEffect { private final int _recipeLevel; - public CreateItem(StatsSet params) + public CreateItem(StatSet params) { _recipeLevel = params.getInt("value"); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java index 8983497026..0b93eef45e 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CriticalDamage extends AbstractStatEffect { - public CriticalDamage(StatsSet params) + public CriticalDamage(StatSet params) { super(params, Stat.CRITICAL_DAMAGE, Stat.CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 7ef4f0ecb4..0630f087b7 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.Position; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CriticalDamagePosition extends AbstractEffect private final double _amount; private final Position _position; - public CriticalDamagePosition(StatsSet params) + public CriticalDamagePosition(StatSet params) { _amount = params.getDouble("amount", 0); _position = params.getEnum("position", Position.class, Position.FRONT); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java index 01f49380eb..0d4bded60e 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; public class CriticalRate extends AbstractConditionalHpEffect { - public CriticalRate(StatsSet params) + public CriticalRate(StatSet params) { super(params, Stat.CRITICAL_RATE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 863b385ca3..4d65fa84eb 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.Position; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CriticalRatePositionBonus extends AbstractEffect private final double _amount; private final Position _position; - public CriticalRatePositionBonus(StatsSet params) + public CriticalRatePositionBonus(StatSet params) { _amount = params.getDouble("amount", 0); _position = params.getEnum("position", Position.class, Position.FRONT); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index 0d307a3240..33ccbd1de1 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class CrystalGradeModify extends AbstractEffect { private final int _amount; - public CrystalGradeModify(StatsSet params) + public CrystalGradeModify(StatSet params) { _amount = params.getInt("_amount", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java index 5f86f9d343..bd48abf204 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ItemGrade; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class Crystallize extends AbstractEffect { private final ItemGrade _grade; - public Crystallize(StatsSet params) + public Crystallize(StatSet params) { _grade = params.getEnum("grade", ItemGrade.class); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java index 94ff8e64e2..79ee5b994e 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CubicMastery extends AbstractStatAddEffect { - public CubicMastery(StatsSet params) + public CubicMastery(StatSet params) { super(params, Stat.MAX_CUBIC); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index 36abf0accf..e6bb53fdea 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class DamOverTime extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTime(StatsSet params) + public DamOverTime(StatSet params) { _canKill = params.getBoolean("canKill", false); _power = params.getDouble("power"); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 13e57099e0..b5f25db4d8 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class DamOverTimePercent extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTimePercent(StatsSet params) + public DamOverTimePercent(StatSet params) { _canKill = params.getBoolean("canKill", false); _power = params.getDouble("power"); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java index dc7a45198f..c9567ea034 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ public class DamageBlock extends AbstractEffect private final boolean _blockHp; private final boolean _blockMp; - public DamageBlock(StatsSet params) + public DamageBlock(StatSet params) { final String type = params.getString("type", null); _blockHp = type.equalsIgnoreCase("BLOCK_HP"); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java index 5bc9b5fff8..3d8985d1d8 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DamageByAttackType; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -38,7 +38,7 @@ public class DamageByAttack extends AbstractEffect private final double _value; private final DamageByAttackType _type; - public DamageByAttack(StatsSet params) + public DamageByAttack(StatSet params) { _value = params.getDouble("amount"); _type = params.getEnum("type", DamageByAttackType.class, DamageByAttackType.NONE); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java index 5a7629482a..e823a9824a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DamageShield extends AbstractStatAddEffect { - public DamageShield(StatsSet params) + public DamageShield(StatSet params) { super(params, Stat.REFLECT_DAMAGE_PERCENT); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java index db1abe264d..3029a3f0aa 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DamageShieldResist extends AbstractStatAddEffect { - public DamageShieldResist(StatsSet params) + public DamageShieldResist(StatSet params) { super(params, Stat.REFLECT_DAMAGE_PERCENT_DEFENSE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index 8561ff46b0..369bd5483d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class DeathLink extends AbstractEffect { private final double _power; - public DeathLink(StatsSet params) + public DeathLink(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java index b948fad1fc..54261c6229 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class DebuffBlock extends AbstractEffect { - public DebuffBlock(StatsSet params) + public DebuffBlock(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java index 217ef3dfaa..4bc08271fa 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class DefenceAttribute extends AbstractEffect private final AttributeType _attribute; private final double _amount; - public DefenceAttribute(StatsSet params) + public DefenceAttribute(StatSet params) { _amount = params.getDouble("amount", 0); _attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java index 0c0c2e8d6a..daff53d9e1 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceCriticalDamage extends AbstractStatEffect { - public DefenceCriticalDamage(StatsSet params) + public DefenceCriticalDamage(StatSet params) { super(params, Stat.DEFENCE_CRITICAL_DAMAGE, Stat.DEFENCE_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java index 131eb500ea..74a729e38c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceCriticalRate extends AbstractStatEffect { - public DefenceCriticalRate(StatsSet params) + public DefenceCriticalRate(StatSet params) { super(params, Stat.DEFENCE_CRITICAL_RATE, Stat.DEFENCE_CRITICAL_RATE_ADD); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java index 1abee78e08..c664939977 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceMagicCriticalDamage extends AbstractStatEffect { - public DefenceMagicCriticalDamage(StatsSet params) + public DefenceMagicCriticalDamage(StatSet params) { super(params, Stat.DEFENCE_MAGIC_CRITICAL_DAMAGE, Stat.DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java index 2146b89551..6594dda2b3 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceMagicCriticalRate extends AbstractStatEffect { - public DefenceMagicCriticalRate(StatsSet params) + public DefenceMagicCriticalRate(StatSet params) { super(params, Stat.DEFENCE_MAGIC_CRITICAL_RATE, Stat.DEFENCE_MAGIC_CRITICAL_RATE_ADD); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index bd80f690cd..134ed56979 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class DefenceTrait extends AbstractEffect { private final Map _defenceTraits = new EnumMap<>(TraitType.class); - public DefenceTrait(StatsSet params) + public DefenceTrait(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index bab5e1a762..7cee616006 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class DeleteHate extends AbstractEffect { private final int _chance; - public DeleteHate(StatsSet params) + public DeleteHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index 85985653b8..f10f189e68 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class DeleteHateOfMe extends AbstractEffect { private final int _chance; - public DeleteHateOfMe(StatsSet params) + public DeleteHateOfMe(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index d3664ad00f..82833ac79d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class DeleteTopAgro extends AbstractEffect { private final int _chance; - public DeleteTopAgro(StatsSet params) + public DeleteTopAgro(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index ae1f2a5942..ba6dad4698 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DoorOpenType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DetectHiddenObjects extends AbstractEffect { - public DetectHiddenObjects(StatsSet params) + public DetectHiddenObjects(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Detection.java index 078360ff35..a20cbcb348 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Detection extends AbstractEffect { - public Detection(StatsSet params) + public Detection(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java index d679c71919..5227885bb5 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class DisableSkill extends AbstractEffect private final Set disableSkills; private Skill knownSKill; - public DisableSkill(StatsSet params) + public DisableSkill(StatSet params) { final String disable = params.getString("disable"); if ((disable != null) && !disable.isEmpty()) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 8567a94d12..32ee715df7 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DisableTargeting extends AbstractEffect { - public DisableTargeting(StatsSet params) + public DisableTargeting(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index fa06ec7221..5a80971f51 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Disarm extends AbstractEffect { - public Disarm(StatsSet params) + public Disarm(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index 48e357d1f2..eb8d99e41f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class Disarmor extends AbstractEffect private final Map _unequippedItems; // PlayerObjId, ItemObjId private final long _slot; - public Disarmor(StatsSet params) + public Disarmor(StatSet params) { _unequippedItems = new ConcurrentHashMap<>(); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 95de0300bb..a652a023f5 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DispelAll extends AbstractEffect { - public DispelAll(StatsSet params) + public DispelAll(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 88d979a0d9..040271d2a7 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.List; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -38,7 +38,7 @@ public class DispelByCategory extends AbstractEffect private final int _rate; private final int _max; - public DispelByCategory(StatsSet params) + public DispelByCategory(StatSet params) { _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); _rate = params.getInt("rate", 0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index a6e4c7cd19..ab79e046b2 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.EnumMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -37,7 +37,7 @@ public class DispelBySlot extends AbstractEffect private final String _dispel; private final Map _dispelAbnormals; - public DispelBySlot(StatsSet params) + public DispelBySlot(StatSet params) { _dispel = params.getString("dispel"); if ((_dispel != null) && !_dispel.isEmpty()) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 1ba6612e23..d1341d10b9 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class DispelBySlotMyself extends AbstractEffect { private final Set _dispelAbnormals; - public DispelBySlotMyself(StatsSet params) + public DispelBySlotMyself(StatSet params) { final String dispel = params.getString("dispel"); if ((dispel != null) && !dispel.isEmpty()) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 845980e59d..b58723058e 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -37,7 +37,7 @@ public class DispelBySlotProbability extends AbstractEffect private final Set _dispelAbnormals; private final int _rate; - public DispelBySlotProbability(StatsSet params) + public DispelBySlotProbability(StatSet params) { final String[] dispelEffects = params.getString("dispel").split(";"); _rate = params.getInt("rate", 100); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java index e52cabffb1..c0c5b040c9 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class DispelCaster extends AbstractEffect { private final Set _dispelAbnormals; - public DispelCaster(StatsSet params) + public DispelCaster(StatSet params) { final String dispel = params.getString("dispel"); if ((dispel != null) && !dispel.isEmpty()) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index 7acd9c4a6c..688d77a703 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -45,7 +45,7 @@ public class DoubleCast extends AbstractEffect private final Map> _addedToggles; - public DoubleCast(StatsSet params) + public DoubleCast(StatSet params) { _addedToggles = new HashMap<>(); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java index d7f067a2a0..d1e21edeb0 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DuelistFury extends AbstractEffect { - public DuelistFury(StatsSet params) + public DuelistFury(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index 409fed6a23..de397bb5ff 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class EnableCloak extends AbstractEffect { - public EnableCloak(StatsSet params) + public EnableCloak(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index e855c4ba1a..2fe2bef99f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -43,7 +43,7 @@ public class EnergyAttack extends AbstractEffect private final boolean _overHit; private final double _pDefMod; - public EnergyAttack(StatsSet params) + public EnergyAttack(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getInt("criticalChance", 0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index a8f108573f..ae463ef2a4 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class EnlargeAbnormalSlot extends AbstractEffect { private final int _slots; - public EnlargeAbnormalSlot(StatsSet params) + public EnlargeAbnormalSlot(StatSet params) { _slots = params.getInt("slots", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java index c43ea04413..c4073b1a47 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StorageType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class EnlargeSlot extends AbstractEffect private final StorageType _type; private final double _amount; - public EnlargeSlot(StatsSet params) + public EnlargeSlot(StatSet params) { _amount = params.getDouble("amount", 0); _type = params.getEnum("type", StorageType.class, StorageType.INVENTORY_NORMAL); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Escape.java index 936f82d8ce..f3a07c9d15 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class Escape extends AbstractEffect { private final TeleportWhereType _escapeType; - public Escape(StatsSet params) + public Escape(StatSet params) { _escapeType = params.getEnum("escapeType", TeleportWhereType.class, null); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java index 76dbc8171c..eb68d24af8 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ExpModify extends AbstractStatAddEffect { - public ExpModify(StatsSet params) + public ExpModify(StatSet params) { super(params, Stat.BONUS_EXP); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java index bf11db6e4b..1100ca25be 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Faceoff extends AbstractEffect { - public Faceoff(StatsSet params) + public Faceoff(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index e256209e39..79f7b43503 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -34,7 +34,7 @@ public class FakeDeath extends AbstractEffect { private final double _power; - public FakeDeath(StatsSet params) + public FakeDeath(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index a94c75d310..780d5cefba 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -44,7 +44,7 @@ public class FatalBlow extends AbstractEffect private final double _abnormalPower; private final boolean _overHit; - public FatalBlow(StatsSet params) + public FatalBlow(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java index c8ff8f7acb..6e7597e63d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class FatalBlowRate extends AbstractEffect private final double _amount; private final StatModifierType _mode; - public FatalBlowRate(StatsSet params) + public FatalBlowRate(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 9731e75e5d..ec2659ea2c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DefenderInstance; import org.l2jmobius.gameserver.model.actor.instance.FortCommanderInstance; @@ -40,7 +40,7 @@ public class Fear extends AbstractEffect { private static final int FEAR_RANGE = 500; - public Fear(StatsSet params) + public Fear(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 5e04e46d60..94d9912bdf 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.MountType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ public class Feed extends AbstractEffect private final int _ride; private final int _wyvern; - public Feed(StatsSet params) + public Feed(StatSet params) { _normal = params.getInt("normal", 0); _ride = params.getInt("ride", 0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java index 0b22a4d4c9..146e3b73e6 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class FishingExpSpBonus extends AbstractStatPercentEffect { - public FishingExpSpBonus(StatsSet params) + public FishingExpSpBonus(StatSet params) { super(params, Stat.FISHING_EXP_SP_BONUS); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Flag.java index c1469eab19..2442cbdb35 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Flag extends AbstractEffect { - public Flag(StatsSet params) + public Flag(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index 0243f0f543..74a9754a95 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.BlockInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class FlipBlock extends AbstractEffect { - public FlipBlock(StatsSet params) + public FlipBlock(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 7fc7da5fe6..3412e4d36d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class FlyAway extends AbstractEffect { private final int _radius; - public FlyAway(StatsSet params) + public FlyAway(StatSet params) { _radius = params.getInt("radius"); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java index fd3216286d..590fbbcd44 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class FocusEnergy extends AbstractStatAddEffect { - public FocusEnergy(StatsSet params) + public FocusEnergy(StatSet params) { super(params, Stat.MAX_MOMENTUM); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index efbd93f304..19f0163e42 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class FocusMaxMomentum extends AbstractEffect { - public FocusMaxMomentum(StatsSet params) + public FocusMaxMomentum(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index 284d19ee5f..e8c18e9682 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -36,7 +36,7 @@ public class FocusMomentum extends AbstractEffect private final int _amount; private final int _maxCharges; - public FocusMomentum(StatsSet params) + public FocusMomentum(StatSet params) { _amount = params.getInt("amount", 1); _maxCharges = params.getInt("maxCharges", 0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 18a9864bbc..debd491cfe 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class FocusSouls extends AbstractEffect { private final int _charge; - public FocusSouls(StatsSet params) + public FocusSouls(StatSet params) { _charge = params.getInt("charge", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 8540ccd49c..23328db910 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Set; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class GetAgro extends AbstractEffect { - public GetAgro(StatsSet params) + public GetAgro(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java index 1ca8722709..e91002d04b 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class GetDamageLimit extends AbstractStatAddEffect { - public GetDamageLimit(StatsSet params) + public GetDamageLimit(StatSet params) { super(params, Stat.DAMAGE_LIMIT); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 2dfd3bf8c4..439f3e8e3a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class GetMomentum extends AbstractEffect { private static int _ticks; - public GetMomentum(StatsSet params) + public GetMomentum(StatSet params) { _ticks = params.getInt("ticks", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index 7c1c0f3fa2..2c842101ed 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class GiveClanReputation extends AbstractEffect { private final int _reputation; - public GiveClanReputation(StatsSet params) + public GiveClanReputation(StatSet params) { _reputation = params.getInt("reputation", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index fd4d61fa73..9052c63154 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class GiveExpAndSp extends AbstractEffect private final int _xp; private final int _sp; - public GiveExpAndSp(StatsSet params) + public GiveExpAndSp(StatSet params) { _xp = params.getInt("xp", 0); _sp = params.getInt("sp", 0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index 3448e09797..9d41a4395b 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ public class GiveFame extends AbstractEffect { private final int _fame; - public GiveFame(StatsSet params) + public GiveFame(StatSet params) { _fame = params.getInt("fame", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index c948fa0948..617a8ef88a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class GiveRecommendation extends AbstractEffect { private final int _amount; - public GiveRecommendation(StatsSet params) + public GiveRecommendation(StatSet params) { _amount = params.getInt("amount", 0); if (_amount == 0) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index 5fe06566c7..75a16fe828 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class GiveSp extends AbstractEffect { private final int _sp; - public GiveSp(StatsSet params) + public GiveSp(StatSet params) { _sp = params.getInt("sp", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index e32735f4e9..7779c6f413 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class GiveXp extends AbstractEffect { private final long _xp; - public GiveXp(StatsSet params) + public GiveXp(StatSet params) { _xp = params.getLong("xp", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 17095c209a..5cf4994f32 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Grow extends AbstractEffect { - public Grow(StatsSet params) + public Grow(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index a2200e1a2f..350c8e659f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.UserInfoType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class HairAccessorySet extends AbstractEffect { - public HairAccessorySet(StatsSet params) + public HairAccessorySet(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index 04b0b8ac6f..8211e03c01 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Harvesting extends AbstractEffect { - public Harvesting(StatsSet params) + public Harvesting(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java index ac1c9f49d8..097db6604a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HateAttack extends AbstractStatPercentEffect { - public HateAttack(StatsSet params) + public HateAttack(StatSet params) { super(params, Stat.HATE_ATTACK); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index 00f569eb17..9963ff1336 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlagInstance; @@ -34,7 +34,7 @@ public class HeadquarterCreate extends AbstractEffect private static final int HQ_NPC_ID = 35062; private final boolean _isAdvanced; - public HeadquarterCreate(StatsSet params) + public HeadquarterCreate(StatSet params) { _isAdvanced = params.getBoolean("isAdvanced", false); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 6e611144f1..139972a272 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -40,7 +40,7 @@ public class Heal extends AbstractEffect { private final double _power; - public Heal(StatsSet params) + public Heal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java index 5a7457d3df..a9f75ab036 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HealEffect extends AbstractStatEffect { - public HealEffect(StatsSet params) + public HealEffect(StatSet params) { super(params, Stat.HEAL_EFFECT, Stat.HEAL_EFFECT_ADD); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 86e28dc8b4..da76f33058 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class HealOverTime extends AbstractEffect { private final double _power; - public HealOverTime(StatsSet params) + public HealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index 6c9c8986bb..8b1c821a0a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class HealPercent extends AbstractEffect { private final int _power; - public HealPercent(StatsSet params) + public HealPercent(StatSet params) { _power = params.getInt("power", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Hide.java index e431277964..d02898bac5 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Hide extends AbstractEffect { - public Hide(StatsSet params) + public Hide(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index e7e5f3f91b..78fa1c9392 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.GameTimeController; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HitAtNight extends AbstractStatEffect { - public HitAtNight(StatsSet params) + public HitAtNight(StatSet params) { super(params, Stat.HIT_AT_NIGHT); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java index 1fd98e7aa9..f14b922308 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HitNumber extends AbstractStatEffect { - public HitNumber(StatsSet params) + public HitNumber(StatSet params) { super(params, Stat.ATTACK_COUNT_MAX); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 3611fd7d74..c2426f8d11 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Hp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Hp(StatsSet params) + public Hp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index 3d125565fe..6244c76428 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class HpByLevel extends AbstractEffect { private final double _power; - public HpByLevel(StatsSet params) + public HpByLevel(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 3cdb210bba..80b4af9b46 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -40,7 +40,7 @@ public class HpCpHeal extends AbstractEffect { private final double _power; - public HpCpHeal(StatsSet params) + public HpCpHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java index 0394dab996..6f96c2dcb3 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class HpCpHealCritical extends AbstractEffect { - public HpCpHealCritical(StatsSet params) + public HpCpHealCritical(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 554b1cec79..7cf47c3a65 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class HpDrain extends AbstractEffect private final double _power; private final double _percentage; - public HpDrain(StatsSet params) + public HpDrain(StatSet params) { _power = params.getDouble("power", 0); _percentage = params.getDouble("percentage", 0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java index cb1d2bc3a7..b170bc62ba 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HpRegen extends AbstractStatEffect { - public HpRegen(StatsSet params) + public HpRegen(StatSet params) { super(params, Stat.REGENERATE_HP_RATE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 235e89a79b..f346fbaad8 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class HpToOwner extends AbstractEffect private final double _power; private final int _stealAmount; - public HpToOwner(StatsSet params) + public HpToOwner(StatSet params) { _power = params.getDouble("power"); _stealAmount = params.getInt("stealAmount"); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java index 9829519da9..c659684ae8 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class IgnoreDeath extends AbstractEffect { - public IgnoreDeath(StatsSet params) + public IgnoreDeath(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index f7c9baa155..44dceba10e 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ImmobilePetBuff extends AbstractEffect { - public ImmobilePetBuff(StatsSet params) + public ImmobilePetBuff(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java index a60fc45d15..a03eff933a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ public class InstantKillResist extends AbstractEffect { private final int _amount; - public InstantKillResist(StatsSet params) + public InstantKillResist(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java index 7e1fc8abe4..265a9aab97 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class JewelSlot extends AbstractStatAddEffect { - public JewelSlot(StatsSet params) + public JewelSlot(StatSet params) { super(params, Stat.BROOCH_JEWELS); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 3d5ff2dda3..a34d7cc5b3 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class KarmaCount extends AbstractEffect private final int _amount; private final int _mode; - public KarmaCount(StatsSet params) + public KarmaCount(StatSet params) { _amount = params.getInt("amount", 0); switch (params.getString("mode", "DIFF")) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index b6f5b03994..cffa4427c6 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -94,7 +94,7 @@ public class KnockBack extends AbstractEffect _chainKnockSkills.put(ClassId.AEORE_SHILLIEN_SAINT, 12000); // Heavy Hit } - public KnockBack(StatsSet params) + public KnockBack(StatSet params) { _distance = params.getInt("distance", 50); _speed = params.getInt("speed", 0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index 7bfac989cf..1affb1b141 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -38,7 +38,7 @@ public class Lethal extends AbstractEffect private final double _fullLethal; private final double _halfLethal; - public Lethal(StatsSet params) + public Lethal(StatSet params) { _fullLethal = params.getDouble("fullLethal", 0); _halfLethal = params.getDouble("halfLethal", 0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java index aeb42458a6..43b17877ad 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitCp extends AbstractStatEffect { - public LimitCp(StatsSet params) + public LimitCp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_CP); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java index cf76ec482a..45d8f37355 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitHp extends AbstractStatEffect { - public LimitHp(StatsSet params) + public LimitHp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_HP); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java index f5eda36ba6..8d31633d0a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitMp extends AbstractStatEffect { - public LimitMp(StatsSet params) + public LimitMp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_MP); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java index e7832ef5af..e502ad06f3 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class LimitSkill extends AbstractEffect private static final int CELESTIAL_PROTECTION = 11758; private static final int CELESTIAL_PARTY_PROTECTION = 11759; - public LimitSkill(StatsSet params) + public LimitSkill(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Lucky.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Lucky.java index 3775d2361d..4ff5ea9a01 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Lucky.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Lucky.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Lucky extends AbstractEffect { - public Lucky(StatsSet params) + public Lucky(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MAtk.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MAtk.java index 5f9ad5f32b..38c2fc9067 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MAtk.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MAtk.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MAtk extends AbstractStatEffect { - public MAtk(StatsSet params) + public MAtk(StatSet params) { super(params, Stat.MAGIC_ATTACK); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java index 2b9ae2e9e6..393d0d2d30 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicAccuracy extends AbstractStatEffect { - public MagicAccuracy(StatsSet params) + public MagicAccuracy(StatSet params) { super(params, Stat.ACCURACY_MAGIC); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java index 123706eb55..b9a58b09f3 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicCriticalDamage extends AbstractStatEffect { - public MagicCriticalDamage(StatsSet params) + public MagicCriticalDamage(StatSet params) { super(params, Stat.MAGIC_CRITICAL_DAMAGE, Stat.MAGIC_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java index 0c10014e50..c9fa9a4240 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicCriticalRate extends AbstractStatEffect { - public MagicCriticalRate(StatsSet params) + public MagicCriticalRate(StatSet params) { super(params, Stat.MAGIC_CRITICAL_RATE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index e8b6f5e8bf..5281bf8445 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class MagicMpCost extends AbstractEffect private final int _magicType; private final double _amount; - public MagicMpCost(StatsSet params) + public MagicMpCost(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index ed4a3fca8b..283a99176c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class MagicalAbnormalDispelAttack extends AbstractEffect private final double _power; private final AbnormalType _abnormalType; - public MagicalAbnormalDispelAttack(StatsSet params) + public MagicalAbnormalDispelAttack(StatSet params) { _power = params.getDouble("power", 0); _abnormalType = AbnormalType.getAbnormalType(params.getString("abnormalType", null)); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java index 8234db1c43..be6403077c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAbnormalResist extends AbstractStatAddEffect { - public MagicalAbnormalResist(StatsSet params) + public MagicalAbnormalResist(StatSet params) { super(params, Stat.ABNORMAL_RESIST_MAGICAL); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index 4e938809f1..25c7d25954 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -37,7 +37,7 @@ public class MagicalAttack extends AbstractEffect private final boolean _overHit; private final double _debuffModifier; - public MagicalAttack(StatsSet params) + public MagicalAttack(StatSet params) { _power = params.getDouble("power", 0); _overHit = params.getBoolean("overHit", false); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 424480b76c..11c387780e 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class MagicalAttackByAbnormal extends AbstractEffect { private final double _power; - public MagicalAttackByAbnormal(StatsSet params) + public MagicalAttackByAbnormal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9c3e263a05..348e904025 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -40,7 +40,7 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect private final double _power; private final Set _abnormals; - public MagicalAttackByAbnormalSlot(StatsSet params) + public MagicalAttackByAbnormalSlot(StatSet params) { _power = params.getDouble("power", 0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 49dd351046..de55dd0fcd 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -38,7 +38,7 @@ public class MagicalAttackMp extends AbstractEffect private final boolean _critical; private final double _criticalLimit; - public MagicalAttackMp(StatsSet params) + public MagicalAttackMp(StatSet params) { _power = params.getDouble("power"); _critical = params.getBoolean("critical"); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 4414b36fa7..93ac560169 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class MagicalAttackRange extends AbstractEffect private final double _power; private final double _shieldDefPercent; - public MagicalAttackRange(StatsSet params) + public MagicalAttackRange(StatSet params) { _power = params.getDouble("power"); _shieldDefPercent = params.getDouble("shieldDefPercent", 0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java index 2e304e5f8b..1cf39ed501 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAttackSpeed extends AbstractStatEffect { - public MagicalAttackSpeed(StatsSet params) + public MagicalAttackSpeed(StatSet params) { super(params, Stat.MAGIC_ATTACK_SPEED); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 9a3a776e32..880d71f0c5 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class MagicalDamOverTime extends AbstractEffect private final double _power; private final boolean _canKill; - public MagicalDamOverTime(StatsSet params) + public MagicalDamOverTime(StatSet params) { _power = params.getDouble("power", 0); _canKill = params.getBoolean("canKill", false); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java index 80fdf87050..9b4e6061aa 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalDefence extends AbstractStatEffect { - public MagicalDefence(StatsSet params) + public MagicalDefence(StatSet params) { super(params, Stat.MAGICAL_DEFENCE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java index c3c7c404f3..4e83b80e8b 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalEvasion extends AbstractStatEffect { - public MagicalEvasion(StatsSet params) + public MagicalEvasion(StatSet params) { super(params, Stat.MAGIC_EVASION_RATE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java index 6253af7373..bf419a19f7 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalSkillPower extends AbstractStatEffect { - public MagicalSkillPower(StatsSet params) + public MagicalSkillPower(StatSet params) { super(params, Stat.MAGICAL_SKILL_POWER, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index d0047fedef..f4388dc16f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class MagicalSoulAttack extends AbstractEffect { private final double _power; - public MagicalSoulAttack(StatsSet params) + public MagicalSoulAttack(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java index fcc143cd4b..688243d9e1 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ManaCharge extends AbstractStatAddEffect { - public ManaCharge(StatsSet params) + public ManaCharge(StatSet params) { super(params, Stat.MANA_CHARGE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index 0c84b4ab61..b889e6e824 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class ManaDamOverTime extends AbstractEffect { private final double _power; - public ManaDamOverTime(StatsSet params) + public ManaDamOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index f48011c9a2..94286df1c8 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -34,7 +34,7 @@ public class ManaHeal extends AbstractEffect { private final double _power; - public ManaHeal(StatsSet params) + public ManaHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index bfdfa54380..61f15449a0 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -35,7 +35,7 @@ public class ManaHealByLevel extends AbstractEffect { private final double _power; - public ManaHealByLevel(StatsSet params) + public ManaHealByLevel(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 46937a8dd0..e505c9e7a2 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class ManaHealOverTime extends AbstractEffect { private final double _power; - public ManaHealOverTime(StatsSet params) + public ManaHealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 101961d1c4..71085da549 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class ManaHealPercent extends AbstractEffect { private final double _power; - public ManaHealPercent(StatsSet params) + public ManaHealPercent(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 7c9c63e3ad..07d15d826c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxCp extends AbstractStatEffect { private final boolean _heal; - public MaxCp(StatsSet params) + public MaxCp(StatSet params) { super(params, Stat.MAX_CP); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 6d2c3449bd..85867bca96 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxHp extends AbstractStatEffect { private final boolean _heal; - public MaxHp(StatsSet params) + public MaxHp(StatSet params) { super(params, Stat.MAX_HP); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index e554c63055..9ca46fda8d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxMp extends AbstractStatEffect { private final boolean _heal; - public MaxMp(StatsSet params) + public MaxMp(StatSet params) { super(params, Stat.MAX_MP); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 39cf62a95b..c27284e5f6 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -43,7 +43,7 @@ public class ModifyVital extends AbstractEffect private final int _mp; private final int _cp; - public ModifyVital(StatsSet params) + public ModifyVital(StatSet params) { _type = params.getEnum("type", ModifyType.class); if (_type != ModifyType.SET) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 29ee88f805..095d130f7f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Mp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Mp(StatsSet params) + public Mp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index 76d858ad8e..b13d7824d0 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class MpConsumePerLevel extends AbstractEffect { private final double _power; - public MpConsumePerLevel(StatsSet params) + public MpConsumePerLevel(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java index 2051009805..ae7bf0c48c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpRegen extends AbstractStatEffect { - public MpRegen(StatsSet params) + public MpRegen(StatSet params) { super(params, Stat.REGENERATE_MP_RATE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MpShield.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MpShield.java index 82e307a562..a4eb3e663f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MpShield.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MpShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpShield extends AbstractStatAddEffect { - public MpShield(StatsSet params) + public MpShield(StatSet params) { super(params, Stat.MANA_SHIELD_PERCENT); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java index af2ce119cc..366e96b18f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpVampiricAttack extends AbstractStatAddEffect { - public MpVampiricAttack(StatsSet params) + public MpVampiricAttack(StatSet params) { super(params, Stat.ABSORB_MANA_DAMAGE_PERCENT); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Mute.java index a7f2f76e23..7e5b5a528f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Mute extends AbstractEffect { - public Mute(StatsSet params) + public Mute(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java index 3cc4cae96f..513dc46ec7 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class NoblesseBless extends AbstractEffect { - public NoblesseBless(StatsSet params) + public NoblesseBless(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index bb0f02af5c..05f8c6a99b 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpenChest extends AbstractEffect { - public OpenChest(StatsSet params) + public OpenChest(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 1b8f7ef59f..a4b09c13ec 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeBookItemList; */ public class OpenCommonRecipeBook extends AbstractEffect { - public OpenCommonRecipeBook(StatsSet params) + public OpenCommonRecipeBook(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 21dd337982..7b5effc6b4 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class OpenDoor extends AbstractEffect private final int _chance; private final boolean _isItem; - public OpenDoor(StatsSet params) + public OpenDoor(StatSet params) { _chance = params.getInt("chance", 0); _isItem = params.getBoolean("isItem", false); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index ebd6c6a668..8842de2ea8 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeBookItemList; */ public class OpenDwarfRecipeBook extends AbstractEffect { - public OpenDwarfRecipeBook(StatsSet params) + public OpenDwarfRecipeBook(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PAtk.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PAtk.java index c353d03a00..7f10b9dcc7 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PAtk.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PAtk.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PAtk extends AbstractConditionalHpEffect { - public PAtk(StatsSet params) + public PAtk(StatSet params) { super(params, Stat.PHYSICAL_ATTACK); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Passive.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Passive.java index cef680ca21..27ce15bb60 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Passive.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Passive.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Passive extends AbstractEffect { - public Passive(StatsSet params) + public Passive(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java index 05f55c7dac..1a9f29424f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAbnormalResist extends AbstractStatAddEffect { - public PhysicalAbnormalResist(StatsSet params) + public PhysicalAbnormalResist(StatSet params) { super(params, Stat.ABNORMAL_RESIST_PHYSICAL); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 098770705b..7e5fb14465 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -52,7 +52,7 @@ public class PhysicalAttack extends AbstractEffect private final Set _abnormals; private final double _abnormalPowerMod; - public PhysicalAttack(StatsSet params) + public PhysicalAttack(StatSet params) { _power = params.getDouble("power", 0); _pAtkMod = params.getDouble("pAtkMod", 1.0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index d325c3d5ed..f191867614 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -38,7 +38,7 @@ public class PhysicalAttackHpLink extends AbstractEffect private final double _criticalChance; private final boolean _overHit; - public PhysicalAttackHpLink(StatsSet params) + public PhysicalAttackHpLink(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index dc575c2c75..fe087a1bcc 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class PhysicalAttackMute extends AbstractEffect { - public PhysicalAttackMute(StatsSet params) + public PhysicalAttackMute(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java index 112b41eb36..2093d45264 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAttackRange extends AbstractStatEffect { - public PhysicalAttackRange(StatsSet params) + public PhysicalAttackRange(StatSet params) { super(params, Stat.PHYSICAL_ATTACK_RANGE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index d3c2dcfaf2..5d66bd4c87 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ public class PhysicalAttackSaveHp extends AbstractEffect private final boolean _overHit; private final double _saveHp; - public PhysicalAttackSaveHp(StatsSet params) + public PhysicalAttackSaveHp(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java index 167b859572..cdf34eb6f6 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAttackSpeed extends AbstractStatEffect { - public PhysicalAttackSpeed(StatsSet params) + public PhysicalAttackSpeed(StatSet params) { super(params, Stat.PHYSICAL_ATTACK_SPEED); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 61bed5561b..a1a6818a00 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class PhysicalAttackWeaponBonus extends AbstractEffect private final Map _weaponBonus = new EnumMap<>(WeaponType.class); - public PhysicalAttackWeaponBonus(StatsSet params) + public PhysicalAttackWeaponBonus(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java index fa3925e725..078c3673b9 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalDefence extends AbstractConditionalHpEffect { - public PhysicalDefence(StatsSet params) + public PhysicalDefence(StatSet params) { super(params, Stat.PHYSICAL_DEFENCE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java index 812c641ac8..9714220e1b 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalEvasion extends AbstractConditionalHpEffect { - public PhysicalEvasion(StatsSet params) + public PhysicalEvasion(StatSet params) { super(params, Stat.EVASION_RATE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index b337fed6cb..fe7cf853c8 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class PhysicalMute extends AbstractEffect { - public PhysicalMute(StatsSet params) + public PhysicalMute(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java index 0fd835f4e3..1b843dda3d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class PhysicalShieldAngleAll extends AbstractEffect { - public PhysicalShieldAngleAll(StatsSet params) + public PhysicalShieldAngleAll(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java index 9d3f051659..507eb57326 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalSkillPower extends AbstractStatEffect { - public PhysicalSkillPower(StatsSet params) + public PhysicalSkillPower(StatSet params) { super(params, Stat.PHYSICAL_SKILL_POWER, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index a958116ff7..9ceccea4cc 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -42,7 +42,7 @@ public class PhysicalSoulAttack extends AbstractEffect private final boolean _ignoreShieldDefence; private final boolean _overHit; - public PhysicalSoulAttack(StatsSet params) + public PhysicalSoulAttack(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index e95e09ab90..fd2b23a2ae 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class PkCount extends AbstractEffect { private final int _amount; - public PkCount(StatsSet params) + public PkCount(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index 2a356bdbc9..18cecfb90e 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class Plunder extends AbstractEffect { - public Plunder(StatsSet params) + public Plunder(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index fd61584af1..3e885274b3 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PolearmSingleTarget extends AbstractEffect { - public PolearmSingleTarget(StatsSet params) + public PolearmSingleTarget(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java index 86f2e2cee8..b2fb920379 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class ProtectDeathPenalty extends AbstractEffect { - public ProtectDeathPenalty(StatsSet params) + public ProtectDeathPenalty(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java index 890b8980bd..6664b36bae 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ProtectionBlessing extends AbstractEffect { - public ProtectionBlessing(StatsSet params) + public ProtectionBlessing(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index 6de78c2c82..62c480716d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class PullBack extends AbstractEffect private final int _animationSpeed; private final FlyType _type; - public PullBack(StatsSet params) + public PullBack(StatSet params) { _speed = params.getInt("speed", 0); _delay = params.getInt("delay", _speed); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java index 1019c56778..84a72299f3 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveMagicalSkillDamageBonus extends AbstractStatPercentEffect { - public PveMagicalSkillDamageBonus(StatsSet params) + public PveMagicalSkillDamageBonus(StatSet params) { super(params, Stat.PVE_MAGICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java index 8da698c746..70870aa45c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveMagicalSkillDefenceBonus(StatsSet params) + public PveMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java index c7a82d4ded..8f60ea025c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalAttackDamageBonus extends AbstractStatPercentEffect { - public PvePhysicalAttackDamageBonus(StatsSet params) + public PvePhysicalAttackDamageBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_ATTACK_DAMAGE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java index 0717fe525b..ea01a4e1d8 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PvePhysicalAttackDefenceBonus(StatsSet params) + public PvePhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java index 878f942877..1e8b9e76c4 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvePhysicalSkillDamageBonus(StatsSet params) + public PvePhysicalSkillDamageBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java index bdfa0dcc67..b1dbb0b217 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvePhysicalSkillDefenceBonus(StatsSet params) + public PvePhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java index 94fdc26015..fbe3119ba8 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveRaidMagicalSkillDefenceBonus(StatsSet params) + public PveRaidMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java index f54d849752..83352e1b2f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidPhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PveRaidPhysicalAttackDefenceBonus(StatsSet params) + public PveRaidPhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java index 0a344f96de..be05bec159 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidPhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveRaidPhysicalSkillDefenceBonus(StatsSet params) + public PveRaidPhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java index 542c019420..2f0153189a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpMagicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvpMagicalSkillDamageBonus(StatsSet params) + public PvpMagicalSkillDamageBonus(StatSet params) { super(params, Stat.PVP_MAGICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java index bb006280fc..41ad3b7749 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvpMagicalSkillDefenceBonus(StatsSet params) + public PvpMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVP_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java index 483d7b02e4..23488ea000 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalAttackDamageBonus extends AbstractStatPercentEffect { - public PvpPhysicalAttackDamageBonus(StatsSet params) + public PvpPhysicalAttackDamageBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_ATTACK_DAMAGE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java index 40c3a22ea2..ff942b3d4d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PvpPhysicalAttackDefenceBonus(StatsSet params) + public PvpPhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java index 225c7c1e39..19a7c96003 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvpPhysicalSkillDamageBonus(StatsSet params) + public PvpPhysicalSkillDamageBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java index ea2d1fa126..211d14c5e3 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvpPhysicalSkillDefenceBonus(StatsSet params) + public PvpPhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 8a01583374..e500b487af 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -36,7 +36,7 @@ public class RandomizeHate extends AbstractEffect { private final int _chance; - public RandomizeHate(StatsSet params) + public RandomizeHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index 8b2801ee6c..18b07bd2d7 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class RealDamage extends AbstractEffect { private final double _power; - public RealDamage(StatsSet params) + public RealDamage(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java index 4372c15bcf..86738fae0f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class RearDamage extends AbstractStatPercentEffect { - public RearDamage(StatsSet params) + public RearDamage(StatSet params) { super(params, Stat.REAR_DAMAGE_RATE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 31c7a4e4b3..82ed18faa1 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RebalanceHP extends AbstractEffect { - public RebalanceHP(StatsSet params) + public RebalanceHP(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index 09d307be02..979809b533 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RebalanceHPSummon extends AbstractEffect { - public RebalanceHPSummon(StatsSet params) + public RebalanceHPSummon(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 7599b691ac..e76328929a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class RecoverVitalityInPeaceZone extends AbstractEffect private final double _amount; private final int _ticks; - public RecoverVitalityInPeaceZone(StatsSet params) + public RecoverVitalityInPeaceZone(StatSet params) { _amount = params.getDouble("amount", 0); _ticks = params.getInt("ticks", 10); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Recovery.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Recovery.java index 35c5cf3af1..30296eec4d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Recovery.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Recovery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Recovery extends AbstractEffect { - public Recovery(StatsSet params) + public Recovery(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java index 824044ae21..e52b5abafb 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ReduceCancel extends AbstractStatEffect { - public ReduceCancel(StatsSet params) + public ReduceCancel(StatSet params) { super(params, Stat.ATTACK_CANCEL); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index ecc7a10d31..be9188f3b0 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -33,7 +33,7 @@ public class ReduceDamage extends AbstractEffect { private final double _amount; - public ReduceDamage(StatsSet params) + public ReduceDamage(StatSet params) { _amount = params.getDouble("amount"); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java index 8534a94fc6..7b8862f608 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ReduceDropType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -32,7 +32,7 @@ public class ReduceDropPenalty extends AbstractEffect private final double _deathPenalty; private final ReduceDropType _type; - public ReduceDropPenalty(StatsSet params) + public ReduceDropPenalty(StatSet params) { _exp = params.getDouble("exp", 0); _deathPenalty = params.getDouble("deathPenalty", 0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java index c15f7301b9..6436b488e0 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ReflectMagic extends AbstractStatAddEffect { - public ReflectMagic(StatsSet params) + public ReflectMagic(StatSet params) { super(params, Stat.VENGEANCE_SKILL_MAGIC_DAMAGE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java index bf1d555351..583191fd4c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.BasicProperty; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ReflectSkill extends AbstractEffect private final Stat _stat; private final double _amount; - public ReflectSkill(StatsSet params) + public ReflectSkill(StatSet params) { _stat = params.getEnum("type", BasicProperty.class, BasicProperty.PHYSICAL) == BasicProperty.PHYSICAL ? Stat.REFLECT_SKILL_PHYSIC : Stat.REFLECT_SKILL_MAGIC; _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index e850ea6be9..77b96e4205 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class RefuelAirship extends AbstractEffect { private final int _value; - public RefuelAirship(StatsSet params) + public RefuelAirship(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Relax.java index c8c61fe47e..e2ba4420db 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ public class Relax extends AbstractEffect { private final double _power; - public Relax(StatsSet params) + public Relax(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java index 0a44550fbf..1600e28444 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class RemoveEquipPenalty extends AbstractEffect { private final CrystalType _grade; - public RemoveEquipPenalty(StatsSet params) + public RemoveEquipPenalty(StatSet params) { _grade = params.getEnum("grade", CrystalType.class); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java index f2c14333a2..1710414a4a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.ShortcutType; import org.l2jmobius.gameserver.model.Shortcut; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -38,7 +38,7 @@ public class ReplaceSkillBySkill extends AbstractEffect private final SkillHolder _existingSkill; private final SkillHolder _replacementSkill; - public ReplaceSkillBySkill(StatsSet params) + public ReplaceSkillBySkill(StatSet params) { _existingSkill = new SkillHolder(params.getInt("existingSkillId"), params.getInt("existingSkillLevel", -1)); _replacementSkill = new SkillHolder(params.getInt("replacementSkillId"), params.getInt("replacementSkillLevel", -1)); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 9678dc1174..0613c17234 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class ResetInstanceEntry extends AbstractEffect { private final Set _instanceId; - public ResetInstanceEntry(StatsSet params) + public ResetInstanceEntry(StatSet params) { final String instanceIds = params.getString("instanceId", null); if ((instanceIds != null) && !instanceIds.isEmpty()) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java index 940c731208..f15ff56189 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ResistAbnormalByCategory extends AbstractEffect private final DispelSlotType _slot; private final double _amount; - public ResistAbnormalByCategory(StatsSet params) + public ResistAbnormalByCategory(StatSet params) { _amount = params.getDouble("amount", 0); _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.DEBUFF); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java index dae38e5246..2e29b5cc8e 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ResistDDMagic extends AbstractStatPercentEffect { - public ResistDDMagic(StatsSet params) + public ResistDDMagic(StatSet params) { super(params, Stat.MAGIC_SUCCESS_RES); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java index af2b203aad..d08fcb262a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ResistDispelByCategory extends AbstractEffect private final DispelSlotType _slot; private final double _amount; - public ResistDispelByCategory(StatsSet params) + public ResistDispelByCategory(StatSet params) { _amount = params.getDouble("amount", 0); _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index af1e40bea8..cd03f1a74a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -34,7 +34,7 @@ public class ResistSkill extends AbstractEffect { private final List _skills = new ArrayList<>(); - public ResistSkill(StatsSet params) + public ResistSkill(StatSet params) { for (int i = 1;; i++) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index feb5885fb0..6f887a07cf 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class Restoration extends AbstractEffect private final int _itemCount; private final int _itemEnchantmentLevel; - public Restoration(StatsSet params) + public Restoration(StatSet params) { _itemId = params.getInt("itemId", 0); _itemCount = params.getInt("itemCount", 0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 37cd974643..0baf0aaae6 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -25,7 +25,7 @@ import java.util.Map.Entry; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.ExtractableProductItem; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,12 +47,12 @@ public class RestorationRandom extends AbstractEffect { private final List _products = new ArrayList<>(); - public RestorationRandom(StatsSet params) + public RestorationRandom(StatSet params) { - for (StatsSet group : params.getList("items", StatsSet.class)) + for (StatSet group : params.getList("items", StatSet.class)) { final List items = new ArrayList<>(); - for (StatsSet item : group.getList(".", StatsSet.class)) + for (StatSet item : group.getList(".", StatSet.class)) { items.add(new RestorationItemHolder(item.getInt(".id"), item.getInt(".count"), item.getInt(".minEnchant", 0), item.getInt(".maxEnchant", 0))); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index f9c10b7ff2..9b287dd419 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class Resurrection extends AbstractEffect { private final int _power; - public Resurrection(StatsSet params) + public Resurrection(StatSet params) { _power = params.getInt("power", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 18d8bdb0bd..6ef063ce91 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -39,7 +39,7 @@ public class ResurrectionSpecial extends AbstractEffect private final int _power; private final Set _instanceId; - public ResurrectionSpecial(StatsSet params) + public ResurrectionSpecial(StatSet params) { _power = params.getInt("power", 0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index e4d66b43d3..0e7391681b 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class Reuse extends AbstractEffect private final int _magicType; private final double _amount; - public Reuse(StatsSet params) + public Reuse(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index 3716fc1922..e17cd7cc25 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ReuseSkillById extends AbstractEffect { private final int _skillId; - public ReuseSkillById(StatsSet params) + public ReuseSkillById(StatSet params) { _skillId = params.getInt("skillId", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Root.java index 1ca3492949..b6876e8e13 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Root extends AbstractEffect { - public Root(StatsSet params) + public Root(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index 66fc8d82c8..4c7ee53239 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class SacrificeSummon extends AbstractEffect { - public SacrificeSummon(StatsSet params) + public SacrificeSummon(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java index d00856c9bd..683f45bb55 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SafeFallHeight extends AbstractStatEffect { - public SafeFallHeight(StatsSet params) + public SafeFallHeight(StatSet params) { super(params, Stat.FALL); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 7f6bf69ee3..797aa95263 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -33,7 +33,7 @@ public class SendSystemMessageToClan extends AbstractEffect { private final SystemMessage _message; - public SendSystemMessageToClan(StatsSet params) + public SendSystemMessageToClan(StatSet params) { final int id = params.getInt("id", 0); _message = new SystemMessage(id); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java index 7acbf846df..a0508d73b1 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class ServitorShare extends AbstractEffect { private final Map _sharedStats = new EnumMap<>(Stat.class); - public ServitorShare(StatsSet params) + public ServitorShare(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 01dfd87c71..6e8187feae 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SetHp extends AbstractEffect private final double _amount; private final StatModifierType _mode; - public SetHp(StatsSet params) + public SetHp(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index 805d18160b..fae21baa51 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SetSkill extends AbstractEffect private final int _skillId; private final int _skillLvl; - public SetSkill(StatsSet params) + public SetSkill(StatSet params) { _skillId = params.getInt("skillId", 0); _skillLvl = params.getInt("skillLvl", 1); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java index a93bb5f253..354cb42b55 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ShieldDefence extends AbstractStatEffect { - public ShieldDefence(StatsSet params) + public ShieldDefence(StatSet params) { super(params, Stat.SHIELD_DEFENCE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java index f28d0e4ad2..1fdee75f69 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ShieldDefenceRate extends AbstractStatEffect { - public ShieldDefenceRate(StatsSet params) + public ShieldDefenceRate(StatSet params) { super(params, Stat.SHIELD_DEFENCE_RATE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java index 1d649082dc..533b631f10 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class SilentMove extends AbstractEffect { - public SilentMove(StatsSet params) + public SilentMove(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java index 89dad85514..7c929a7fe8 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class SkillCritical extends AbstractEffect { private final BaseStat _stat; - public SkillCritical(StatsSet params) + public SkillCritical(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java index 369bef11f5..8f054f973b 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillCriticalDamage extends AbstractStatEffect { - public SkillCriticalDamage(StatsSet params) + public SkillCriticalDamage(StatSet params) { super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java index c91f2d6b49..88ecf69e77 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillCriticalProbability extends AbstractStatPercentEffect { - public SkillCriticalProbability(StatsSet params) + public SkillCriticalProbability(StatSet params) { super(params, Stat.SKILL_CRITICAL_PROBABILITY); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 7b98a9e180..1664ea1827 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class SkillEvasion extends AbstractEffect private final int _magicType; private final double _amount; - public SkillEvasion(StatsSet params) + public SkillEvasion(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java index 9cc62532b4..2880d0ccef 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillPowerAdd extends AbstractStatAddEffect { - public SkillPowerAdd(StatsSet params) + public SkillPowerAdd(StatSet params) { super(params, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 9578c88f91..7156fff2df 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SkillTurning extends AbstractEffect private final int _chance; private final boolean _staticChance; - public SkillTurning(StatsSet params) + public SkillTurning(StatSet params) { _chance = params.getInt("chance", 100); _staticChance = params.getBoolean("staticChance", false); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 45b02206a4..04691304ed 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SkillTurningOverTime extends AbstractEffect private final int _chance; private final boolean _staticChance; - public SkillTurningOverTime(StatsSet params) + public SkillTurningOverTime(StatSet params) { _chance = params.getInt("chance", 100); _staticChance = params.getBoolean("staticChance", false); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index c1dd92cedb..b919c7acac 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -36,7 +36,7 @@ public class SoulBlow extends AbstractEffect private final double _chanceBoost; private final boolean _overHit; - public SoulBlow(StatsSet params) + public SoulBlow(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 8471aa236c..4f63a84081 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; @@ -40,7 +40,7 @@ public class SoulEating extends AbstractEffect private final int _expNeeded; private final int _maxSouls; - public SoulEating(StatsSet params) + public SoulEating(StatSet params) { _expNeeded = params.getInt("expNeeded"); _maxSouls = params.getInt("maxSouls"); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a7d5c2628a..ad261845eb 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Seed; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Sow extends AbstractEffect { - public Sow(StatsSet params) + public Sow(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SpModify.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SpModify.java index 24d124ecce..c3bc6193e9 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SpModify.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SpModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SpModify extends AbstractStatAddEffect { - public SpModify(StatsSet params) + public SpModify(StatSet params) { super(params, Stat.BONUS_SP); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 0718408ca2..890438d65f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.enums.SpeedType; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -36,7 +36,7 @@ public class Speed extends AbstractEffect private final StatModifierType _mode; private List _speedType; - public Speed(StatsSet params) + public Speed(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index 91b91ad05e..db247775f3 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SphericBarrier extends AbstractStatAddEffect { - public SphericBarrier(StatsSet params) + public SphericBarrier(StatSet params) { super(params, Stat.SPHERIC_BARRIER_RANGE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index d13eaf1c2e..385240377f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class Spoil extends AbstractEffect { - public Spoil(StatsSet params) + public Spoil(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index b63c24dc20..22c4132b63 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -36,7 +36,7 @@ public class StatBonusSkillCritical extends AbstractEffect private final BaseStat _stat; private final Condition _armorTypeCondition; - public StatBonusSkillCritical(StatsSet params) + public StatBonusSkillCritical(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.DEX); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index 41a20bfafe..49280eb774 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -36,7 +36,7 @@ public class StatBonusSpeed extends AbstractEffect private final BaseStat _stat; private final Condition _armorTypeCondition; - public StatBonusSpeed(StatsSet params) + public StatBonusSpeed(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.DEX); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index a007b118b2..bcf691e360 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class StatByMoveType extends AbstractEffect private final MoveType _type; private final double _value; - public StatByMoveType(StatsSet params) + public StatByMoveType(StatSet params) { _stat = params.getEnum("stat", Stat.class); _type = params.getEnum("type", MoveType.class); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StatUp.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StatUp.java index a22710ca7a..29d72bb4de 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StatUp.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StatUp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class StatUp extends AbstractEffect private final BaseStat _stat; private final double _amount; - public StatUp(StatsSet params) + public StatUp(StatSet params) { _amount = params.getDouble("amount", 0); _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index 0720057c19..23239887a7 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.List; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -39,7 +39,7 @@ public class StealAbnormal extends AbstractEffect private final int _rate; private final int _max; - public StealAbnormal(StatsSet params) + public StealAbnormal(StatSet params) { _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); _rate = params.getInt("rate", 0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Summon.java index 0f95637961..7ef79d4c39 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.ServitorInstance; @@ -43,7 +43,7 @@ public class Summon extends AbstractEffect private final int _lifeTime; private final int _consumeItemInterval; - public Summon(StatsSet params) + public Summon(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index 8929e1f2b0..50c025e572 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class SummonAgathion extends AbstractEffect { private final int _npcId; - public SummonAgathion(StatsSet params) + public SummonAgathion(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index 7716d58f16..49b816f272 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.CubicData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; @@ -42,7 +42,7 @@ public class SummonCubic extends AbstractEffect private final int _cubicId; private final int _cubicLvl; - public SummonCubic(StatsSet params) + public SummonCubic(StatSet params) { _cubicId = params.getInt("cubicId", -1); _cubicLvl = params.getInt("cubicLvl", 0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index d0a2a82738..13d5a2eac7 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoppelgangerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ public class SummonHallucination extends AbstractEffect private final int _npcId; private final int _npcCount; - public SummonHallucination(StatsSet params) + public SummonHallucination(StatSet params) { _despawnDelay = params.getInt("despawnDelay", 20000); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index bcd050e084..d61a6e5c02 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.ServitorInstance; @@ -43,7 +43,7 @@ public class SummonMulti extends AbstractEffect private final int _consumeItemInterval; private final int _summonPoints; - public SummonMulti(StatsSet params) + public SummonMulti(StatSet params) { _npcId = params.getInt("npcId"); _expMultiplier = params.getFloat("expMultiplier", 1); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index 6f4090eef0..eaff214b7c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DecoyInstance; @@ -48,7 +48,7 @@ public class SummonNpc extends AbstractEffect private final boolean _isSummonSpawn; private final boolean _singleInstance; // Only one instance of this NPC is allowed. - public SummonNpc(StatsSet params) + public SummonNpc(StatSet params) { _despawnDelay = params.getInt("despawnDelay", 20000); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 5ef621819e..534a41ee16 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.data.xml.impl.PetDataTable; import org.l2jmobius.gameserver.model.PetData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PetItemList; */ public class SummonPet extends AbstractEffect { - public SummonPet(StatsSet params) + public SummonPet(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java index 7dd690587c..b1d5ec38cb 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SummonPoints extends AbstractStatAddEffect { - public SummonPoints(StatsSet params) + public SummonPoints(StatSet params) { super(params, Stat.MAX_SUMMON_POINTS); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index d8a47b670f..ac1ddaa16a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; @@ -35,7 +35,7 @@ public class SummonTrap extends AbstractEffect private final int _despawnTime; private final int _npcId; - public SummonTrap(StatsSet params) + public SummonTrap(StatSet params) { _despawnTime = params.getInt("despawnTime", 0); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 84f6d070a8..3196bb949d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Collection; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Sweeper extends AbstractEffect { - public Sweeper(StatsSet params) + public Sweeper(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 1594a8a23b..77dc9b4af7 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ public class Synergy extends AbstractEffect private final int _skillLevelScaleTo; private final int _minSlot; - public Synergy(StatsSet params) + public Synergy(StatSet params) { final String requiredSlots = params.getString("requiredSlots", null); if ((requiredSlots != null) && !requiredSlots.isEmpty()) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index e35516fef5..39ed981bbf 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Castle; @@ -33,7 +33,7 @@ public class TakeCastle extends AbstractEffect { private final CastleSide _side; - public TakeCastle(StatsSet params) + public TakeCastle(StatSet params) { _side = params.getEnum("side", CastleSide.class); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 77fd9ec103..3be2bf5593 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Castle; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TakeCastleStart extends AbstractEffect { - public TakeCastleStart(StatsSet params) + public TakeCastleStart(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 70842191a7..18749c1aef 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Fort; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TakeFort extends AbstractEffect { - public TakeFort(StatsSet params) + public TakeFort(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 0eb23f6733..77355f9683 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TakeFortStart extends AbstractEffect { - public TakeFortStart(StatsSet params) + public TakeFortStart(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index cec32755ed..dd8e09278f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class TalismanSlot extends AbstractEffect { private final int _slots; - public TalismanSlot(StatsSet params) + public TalismanSlot(StatSet params) { _slots = params.getInt("slots", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 281b5322fd..32a126f499 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class TargetCancel extends AbstractEffect { private final int _chance; - public TargetCancel(StatsSet params) + public TargetCancel(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index b4463de391..86ff70c9ca 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMe extends AbstractEffect { - public TargetMe(StatsSet params) + public TargetMe(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index 11e581113e..e68a1e1faf 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class TargetMeProbability extends AbstractEffect { private final int _chance; - public TargetMeProbability(StatsSet params) + public TargetMeProbability(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 6c30519678..9ca01faf50 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -32,7 +32,7 @@ public class Teleport extends AbstractEffect { private final Location _loc; - public Teleport(StatsSet params) + public Teleport(StatSet params) { _loc = new Location(params.getInt("x", 0), params.getInt("y", 0), params.getInt("z", 0)); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index e0e715818c..bdc53208d5 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -38,7 +38,7 @@ public class TeleportToNpc extends AbstractEffect private final int _npcId; private final boolean _party; - public TeleportToNpc(StatsSet params) + public TeleportToNpc(StatSet params) { _npcId = params.getInt("npcId"); _party = params.getBoolean("party", false); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index c84c559322..4f4275fd41 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TeleportToPlayer extends AbstractEffect { - public TeleportToPlayer(StatsSet params) + public TeleportToPlayer(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index 1c9af0f535..b2d6b663de 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class TeleportToSummon extends AbstractEffect { private final double _maxDistance; - public TeleportToSummon(StatsSet params) + public TeleportToSummon(StatSet params) { _maxDistance = params.getDouble("distance", -1); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index e550302b02..c4bf787a10 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class TeleportToTarget extends AbstractEffect { - public TeleportToTarget(StatsSet params) + public TeleportToTarget(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java index 389d6ca266..a072291f5f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.EffectList; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -43,7 +43,7 @@ public class TrackLimitedSkill extends AbstractEffect private int limitSigelLevel = 0; private int limitIssLevel = 0; - public TrackLimitedSkill(StatsSet param) + public TrackLimitedSkill(StatSet param) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index ba1c55c615..ff63eea817 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class TransferDamageToPlayer extends AbstractStatAddEffect { - public TransferDamageToPlayer(StatsSet params) + public TransferDamageToPlayer(StatSet params) { super(params, Stat.TRANSFER_DAMAGE_TO_PLAYER); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java index b084bfc1cb..c87d5f0554 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class TransferDamageToSummon extends AbstractStatAddEffect { - public TransferDamageToSummon(StatsSet params) + public TransferDamageToSummon(StatSet params) { super(params, Stat.TRANSFER_DAMAGE_SUMMON_PERCENT); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index e9f0292113..48bc5e3a1c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -34,7 +34,7 @@ public class TransferHate extends AbstractEffect { private final int _chance; - public TransferHate(StatsSet params) + public TransferHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 2ddf95a4db..bf593eaed8 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Transformation extends AbstractEffect { private final List _id; - public Transformation(StatsSet params) + public Transformation(StatSet params) { final String ids = params.getString("transformationId", null); if ((ids != null) && !ids.isEmpty()) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 103ccdf8ce..2b4af0a1d3 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class TrapDetect extends AbstractEffect { private final int _power; - public TrapDetect(StatsSet params) + public TrapDetect(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index eb7b073b36..c4a6c6aed9 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.TrapAction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class TrapRemove extends AbstractEffect { private final int _power; - public TrapRemove(StatsSet params) + public TrapRemove(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 6df3874ab1..8fb87050b1 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -59,7 +59,7 @@ public class TriggerSkillByAttack extends AbstractEffect * @param params */ - public TriggerSkillByAttack(StatsSet params) + public TriggerSkillByAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index ae6a3bc89f..78366b8047 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillByAvoid extends AbstractEffect /** * @param params */ - public TriggerSkillByAvoid(StatsSet params) + public TriggerSkillByAvoid(StatSet params) { _chance = params.getInt("chance", 100); _skill = new SkillHolder(params.getInt("skillId", 0), params.getInt("skillLevel", 0)); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index c24fb95246..9fe53c0622 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -48,7 +48,7 @@ public class TriggerSkillByDamage extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillByDamage(StatsSet params) + public TriggerSkillByDamage(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c086507336..8b84350293 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillByDeathBlow extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillByDeathBlow(StatsSet params) + public TriggerSkillByDeathBlow(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index a9bfcc320c..11802645f2 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -37,7 +37,7 @@ public class TriggerSkillByKill extends AbstractEffect private final int _chance; private final SkillHolder _skill; - public TriggerSkillByKill(StatsSet params) + public TriggerSkillByKill(StatSet params) { _chance = params.getInt("chance", 100); _skill = new SkillHolder(params.getInt("skillId", 0), params.getInt("skillLevel", 0)); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 2893d46f33..7f2d3f9fa7 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -52,7 +52,7 @@ public class TriggerSkillByMagicType extends AbstractEffect * @param params */ - public TriggerSkillByMagicType(StatsSet params) + public TriggerSkillByMagicType(StatSet params) { _chance = params.getInt("chance", 100); _magicTypes = params.getIntArray("magicTypes", ";"); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 1524e3d4f4..b77da803f5 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillBySkill extends AbstractEffect private final int _skillLevelScaleTo; private final TargetType _targetType; - public TriggerSkillBySkill(StatsSet params) + public TriggerSkillBySkill(StatSet params) { _castSkillId = params.getInt("castSkillId"); _chance = params.getInt("chance", 100); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index ec2124c44e..7bb68baec9 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -53,7 +53,7 @@ public class TriggerSkillBySkillAttack extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillBySkillAttack(StatsSet params) + public TriggerSkillBySkillAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 3f58619f0a..c209decfb3 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -69,7 +69,7 @@ public class TwoHandedBluntBonus extends AbstractEffect private final double _speedAmount; private final StatModifierType _speedMode; - public TwoHandedBluntBonus(StatsSet params) + public TwoHandedBluntBonus(StatSet params) { _pAtkAmount = params.getDouble("pAtkAmount", 0); _pAtkMode = params.getEnum("pAtkMode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index b2c50c4b88..344456a925 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -69,7 +69,7 @@ public class TwoHandedSwordBonus extends AbstractEffect private final double _speedAmount; private final StatModifierType _speedMode; - public TwoHandedSwordBonus(StatsSet params) + public TwoHandedSwordBonus(StatSet params) { _pAtkAmount = params.getDouble("pAtkAmount", 0); _pAtkMode = params.getEnum("pAtkMode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 01ae8122ec..20b418c29b 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ public class Unsummon extends AbstractEffect { private final int _chance; - public Unsummon(StatsSet params) + public Unsummon(StatSet params) { _chance = params.getInt("chance", -1); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 57eb89196d..f73f0f57f0 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; */ public class UnsummonAgathion extends AbstractEffect { - public UnsummonAgathion(StatsSet params) + public UnsummonAgathion(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index a4fdc2c0aa..0779d018cc 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class UnsummonServitors extends AbstractEffect { - public UnsummonServitors(StatsSet params) + public UnsummonServitors(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index dbb0c700b5..ac33fcba0d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Untargetable extends AbstractEffect { - public Untargetable(StatsSet params) + public Untargetable(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java index ac6cae3d05..1c85196fe0 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class VampiricAttack extends AbstractEffect private final double _amount; private final double _sum; - public VampiricAttack(StatsSet params) + public VampiricAttack(StatSet params) { _amount = params.getDouble("amount"); _sum = _amount * params.getDouble("chance"); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java index ab724714e1..571ca55bbe 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ public class VampiricDefence extends AbstractEffect { private final int _amount; - public VampiricDefence(StatsSet params) + public VampiricDefence(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java index f8b9d76f3a..caaa8d02b4 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class VitalityExpRate extends AbstractStatPercentEffect { - public VitalityExpRate(StatsSet params) + public VitalityExpRate(StatSet params) { super(params, Stat.VITALITY_EXP_RATE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index cba2b14c35..385595e03d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class VitalityPointUp extends AbstractEffect { private final int _value; - public VitalityPointUp(StatsSet params) + public VitalityPointUp(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java index 86612955dd..72f78ec177 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class VitalityPointsRate extends AbstractStatPercentEffect { - public VitalityPointsRate(StatsSet params) + public VitalityPointsRate(StatSet params) { super(params, Stat.VITALITY_CONSUME_RATE); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java index 09500b3823..bf20bd5018 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WeightLimit extends AbstractStatEffect { - public WeightLimit(StatsSet params) + public WeightLimit(StatSet params) { super(params, Stat.WEIGHT_LIMIT); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java index f9be68f493..6020399f85 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WeightPenalty extends AbstractStatAddEffect { - public WeightPenalty(StatsSet params) + public WeightPenalty(StatSet params) { super(params, Stat.WEIGHT_PENALTY); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java index bdf9aca48d..81eb9a9688 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WorldChatPoints extends AbstractStatEffect { - public WorldChatPoints(StatsSet params) + public WorldChatPoints(StatSet params) { super(params, Stat.WORLD_CHAT_POINTS); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java index 5a3842921d..127dadf9d2 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class BuildAdvanceBaseSkillCondition implements ISkillCondition { - public BuildAdvanceBaseSkillCondition(StatsSet params) + public BuildAdvanceBaseSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java index a9dd2b9eba..ffb7d13539 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class BuildCampSkillCondition implements ISkillCondition { - public BuildCampSkillCondition(StatsSet params) + public BuildCampSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java index c1220c828a..aca51bafbf 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanAddMaxEntranceInzoneSkillCondition implements ISkillCondition { - public CanAddMaxEntranceInzoneSkillCondition(StatsSet params) + public CanAddMaxEntranceInzoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java index eddd45771c..6ac3c2e199 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ public class CanBookmarkAddSlotSkillCondition implements ISkillCondition { private final int _teleportBookmarkSlots; - public CanBookmarkAddSlotSkillCondition(StatsSet params) + public CanBookmarkAddSlotSkillCondition(StatSet params) { _teleportBookmarkSlots = params.getInt("teleportBookmarkSlots"); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java index 30fdb7f36f..ee1bf96e69 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanChangeVitalItemCountSkillCondition implements ISkillCondition { - public CanChangeVitalItemCountSkillCondition(StatsSet params) + public CanChangeVitalItemCountSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java index da553a6d9f..48e28e7af7 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanEnchantAttributeSkillCondition implements ISkillCondition { - public CanEnchantAttributeSkillCondition(StatsSet params) + public CanEnchantAttributeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java index c14f1ffe64..2908994776 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanMountForEventSkillCondition implements ISkillCondition { - public CanMountForEventSkillCondition(StatsSet params) + public CanMountForEventSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java index d07aa9a622..9dc5f99592 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShipInstance; @@ -31,7 +31,7 @@ public class CanRefuelAirshipSkillCondition implements ISkillCondition { private final int _amount; - public CanRefuelAirshipSkillCondition(StatsSet params) + public CanRefuelAirshipSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java index d451f3c997..67206b47bd 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanRestoreVitalPointSkillCondition implements ISkillCondition { - public CanRestoreVitalPointSkillCondition(StatsSet params) + public CanRestoreVitalPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java index 7e519025b0..49232af88f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CanSummonCubicSkillCondition implements ISkillCondition { - public CanSummonCubicSkillCondition(StatsSet params) + public CanSummonCubicSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java index 23cca508c1..6610f322f1 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class CanSummonMultiSkillCondition implements ISkillCondition { private final int _summonPoints; - public CanSummonMultiSkillCondition(StatsSet params) + public CanSummonMultiSkillCondition(StatSet params) { _summonPoints = params.getInt("summonPoints"); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java index 85419e1e5e..c38566dbdd 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.CharSummonTable; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; */ public class CanSummonPetSkillCondition implements ISkillCondition { - public CanSummonPetSkillCondition(StatsSet params) + public CanSummonPetSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java index ea41a2e22e..3655e158cb 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanSummonSiegeGolemSkillCondition implements ISkillCondition { - public CanSummonSiegeGolemSkillCondition(StatsSet params) + public CanSummonSiegeGolemSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java index 6248c5131f..4d59811c7b 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanSummonSkillCondition implements ISkillCondition { - public CanSummonSkillCondition(StatsSet params) + public CanSummonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java index 309da529c9..bd8838d02f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanTransformInDominionSkillCondition implements ISkillCondition { - public CanTransformInDominionSkillCondition(StatsSet params) + public CanTransformInDominionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java index 81297944f1..2f4d780cab 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class CanTransformSkillCondition implements ISkillCondition // TODO: What to do with this? // private final int _transformId; - public CanTransformSkillCondition(StatsSet params) + public CanTransformSkillCondition(StatSet params) { // _transformId = params.getInt("transformId"); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java index 800d0375be..771873a553 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanUntransformSkillCondition implements ISkillCondition { - public CanUntransformSkillCondition(StatsSet params) + public CanUntransformSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java index e651b3b1d5..ffe2e4a026 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class CanUseInBattlefieldSkillCondition implements ISkillCondition { - public CanUseInBattlefieldSkillCondition(StatsSet params) + public CanUseInBattlefieldSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java index 5ff751abce..ba030b97a4 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanUseInDragonLairSkillCondition implements ISkillCondition { - public CanUseInDragonLairSkillCondition(StatsSet params) + public CanUseInDragonLairSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java index 4d914c28fe..8a0cb18ac7 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class CanUseSwoopCannonSkillCondition implements ISkillCondition { - public CanUseSwoopCannonSkillCondition(StatsSet params) + public CanUseSwoopCannonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java index 6a2d832a4c..e9996580fc 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanUseVitalityConsumeItemSkillCondition implements ISkillCondition { - public CanUseVitalityConsumeItemSkillCondition(StatsSet params) + public CanUseVitalityConsumeItemSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java index f694956e7e..48dafb46c3 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class CannotUseInTransformSkillCondition implements ISkillCondition { private final int _transformId; - public CannotUseInTransformSkillCondition(StatsSet params) + public CannotUseInTransformSkillCondition(StatSet params) { _transformId = params.getInt("transformId", -1); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java index 141c69322f..6591233504 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -32,7 +32,7 @@ public class CheckLevelSkillCondition implements ISkillCondition private final int _maxLevel; private final SkillConditionAffectType _affectType; - public CheckLevelSkillCondition(StatsSet params) + public CheckLevelSkillCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java index 15163a3373..d72f463c4e 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class CheckSexSkillCondition implements ISkillCondition { private final boolean _isFemale; - public CheckSexSkillCondition(StatsSet params) + public CheckSexSkillCondition(StatSet params) { _isFemale = params.getBoolean("isFemale"); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java index 8dee11ef9c..12e49c23a7 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConsumeBodySkillCondition implements ISkillCondition { - public ConsumeBodySkillCondition(StatsSet params) + public ConsumeBodySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java index c24da9ebcd..ba1b1cdd5f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class EnergySavedSkillCondition implements ISkillCondition { private final int _amount; - public EnergySavedSkillCondition(StatsSet params) + public EnergySavedSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 89d705e991..34f76973f0 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -35,7 +35,7 @@ public class EquipArmorSkillCondition implements ISkillCondition { private int _armorTypesMask = 0; - public EquipArmorSkillCondition(StatsSet params) + public EquipArmorSkillCondition(StatSet params) { final List armorTypes = params.getEnumList("armorType", ArmorType.class); if (armorTypes != null) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index e5f22008fa..708b4dd1d4 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class EquipShieldSkillCondition implements ISkillCondition { - public EquipShieldSkillCondition(StatsSet params) + public EquipShieldSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 4561945254..f733f81f62 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -33,7 +33,7 @@ public class EquipWeaponSkillCondition implements ISkillCondition { private int _weaponTypesMask = 0; - public EquipWeaponSkillCondition(StatsSet params) + public EquipWeaponSkillCondition(StatSet params) { final List weaponTypes = params.getEnumList("weaponType", WeaponType.class); if (weaponTypes != null) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java index 5f77215218..e36c06fa11 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class NotFearedSkillCondition implements ISkillCondition { - public NotFearedSkillCondition(StatsSet params) + public NotFearedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java index b9096cc1a9..b6e7bcd826 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class NotInUnderwaterSkillCondition implements ISkillCondition { - public NotInUnderwaterSkillCondition(StatsSet params) + public NotInUnderwaterSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index eee6ec73e9..18d8dc8a11 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -35,7 +35,7 @@ public class Op2hWeaponSkillCondition implements ISkillCondition { private final List _weaponTypes = new ArrayList<>(); - public Op2hWeaponSkillCondition(StatsSet params) + public Op2hWeaponSkillCondition(StatSet params) { final List weaponTypes = params.getList("weaponType", String.class); if (weaponTypes != null) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 3b91f36fe4..6223172dbc 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; - public OpAffectedBySkillSkillCondition(StatsSet params) + public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java index 2eb561291e..3818df4736 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAgathionEnergySkillCondition implements ISkillCondition { - public OpAgathionEnergySkillCondition(StatsSet params) + public OpAgathionEnergySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java index 76a7ebc5a8..ee2b415021 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.enums.SkillConditionAlignment; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -32,7 +32,7 @@ public class OpAlignmentSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final SkillConditionAlignment _alignment; - public OpAlignmentSkillCondition(StatsSet params) + public OpAlignmentSkillCondition(StatSet params) { _affectType = params.getEnum("affectType", SkillConditionAffectType.class); _alignment = params.getEnum("alignment", SkillConditionAlignment.class); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index 1c83d18f4e..bcc6715bb2 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -33,7 +33,7 @@ public class OpBlinkSkillCondition implements ISkillCondition private final int _angle; private final int _range; - public OpBlinkSkillCondition(StatsSet params) + public OpBlinkSkillCondition(StatSet params) { switch (params.getEnum("direction", Position.class)) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java index 5215f86ae6..fde0c7f0f8 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpCallPcSkillCondition implements ISkillCondition { - public OpCallPcSkillCondition(StatsSet params) + public OpCallPcSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java index dddafec6f0..1de2a32550 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCanEscapeSkillCondition implements ISkillCondition { - public OpCanEscapeSkillCondition(StatsSet params) + public OpCanEscapeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java index 3f1685a1e0..a87fd8adb6 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCanNotUseAirshipSkillCondition implements ISkillCondition { - public OpCanNotUseAirshipSkillCondition(StatsSet params) + public OpCanNotUseAirshipSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java index 8eec19a568..ac7a81c015 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCannotUseTargetWithPrivateStoreSkillCondition implements ISkillCondition { - public OpCannotUseTargetWithPrivateStoreSkillCondition(StatsSet params) + public OpCannotUseTargetWithPrivateStoreSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 91de0adc8c..4030b79d00 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Weapon; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpChangeWeaponSkillCondition implements ISkillCondition { - public OpChangeWeaponSkillCondition(StatsSet params) + public OpChangeWeaponSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java index c2de03de1e..3e304e7d9d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.AbnormalType; @@ -34,7 +34,7 @@ public class OpCheckAbnormalSkillCondition implements ISkillCondition private final boolean _hasAbnormal; private final SkillConditionAffectType _affectType; - public OpCheckAbnormalSkillCondition(StatsSet params) + public OpCheckAbnormalSkillCondition(StatSet params) { _type = params.getEnum("type", AbnormalType.class); _level = params.getInt("level"); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java index 65084182b1..c70b58dc50 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCheckAccountTypeSkillCondition implements ISkillCondition { - public OpCheckAccountTypeSkillCondition(StatsSet params) + public OpCheckAccountTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java index 3d4f0a58a0..11eb804274 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpCheckCastRangeSkillCondition implements ISkillCondition { private final int _distance; - public OpCheckCastRangeSkillCondition(StatsSet params) + public OpCheckCastRangeSkillCondition(StatSet params) { _distance = params.getInt("distance"); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java index 7e2e391595..03af1ac63d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.ClassId; @@ -35,7 +35,7 @@ public class OpCheckClassListSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final boolean _isWithin; - public OpCheckClassListSkillCondition(StatsSet params) + public OpCheckClassListSkillCondition(StatSet params) { _classIds = params.getEnumList("classIds", ClassId.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java index 9f779f937a..9702804304 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.ClassId; @@ -33,7 +33,7 @@ public class OpCheckClassSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final boolean _isWithin; - public OpCheckClassSkillCondition(StatsSet params) + public OpCheckClassSkillCondition(StatSet params) { _classId = params.getEnum("classId", ClassId.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java index 3bf6b65dc8..ad997dced7 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckCrtEffectSkillCondition implements ISkillCondition { - public OpCheckCrtEffectSkillCondition(StatsSet params) + public OpCheckCrtEffectSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java index 61c3aa66a4..c0bb54afe0 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class OpCheckFlagSkillCondition implements ISkillCondition { - public OpCheckFlagSkillCondition(StatsSet params) + public OpCheckFlagSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java index 75af2ab89a..2e0c07d040 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckOnGoingEventCampaignSkillCondition implements ISkillCondition { - public OpCheckOnGoingEventCampaignSkillCondition(StatsSet params) + public OpCheckOnGoingEventCampaignSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java index c64f7c6722..f11569f43c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckPcbangPointSkillCondition implements ISkillCondition { - public OpCheckPcbangPointSkillCondition(StatsSet params) + public OpCheckPcbangPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java index 252519f7ff..997a4d0fec 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.data.xml.impl.ClanHallData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -35,7 +35,7 @@ public class OpCheckResidenceSkillCondition implements ISkillCondition private final List _residencesId; private final boolean _isWithin; - public OpCheckResidenceSkillCondition(StatsSet params) + public OpCheckResidenceSkillCondition(StatSet params) { _residencesId = params.getList("residencesId", Integer.class); _isWithin = params.getBoolean("isWithin"); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java index 6abeed7d35..3a1bcf424c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -34,7 +34,7 @@ public class OpCheckSkillListSkillCondition implements ISkillCondition private final List _skillIds; private final SkillConditionAffectType _affectType; - public OpCheckSkillListSkillCondition(StatsSet params) + public OpCheckSkillListSkillCondition(StatSet params) { _skillIds = params.getList("skillIds", Integer.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java index 984338b2c0..af563d983f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpCheckSkillSkillCondition implements ISkillCondition private final int _skillId; private final SkillConditionAffectType _affectType; - public OpCheckSkillSkillCondition(StatsSet params) + public OpCheckSkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java index ea882c3635..5d85a2dbdb 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionCompanionType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpCompanionSkillCondition implements ISkillCondition { private final SkillConditionCompanionType _type; - public OpCompanionSkillCondition(StatsSet params) + public OpCompanionSkillCondition(StatSet params) { _type = params.getEnum("type", SkillConditionCompanionType.class); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java index 069b9d1759..464853c00c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpEnchantRangeSkillCondition implements ISkillCondition { - public OpEnchantRangeSkillCondition(StatsSet params) + public OpEnchantRangeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java index 99f22bb16a..e12f3ae007 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class OpEncumberedSkillCondition implements ISkillCondition private final int _slotsPercent; private final int _weightPercent; - public OpEncumberedSkillCondition(StatsSet params) + public OpEncumberedSkillCondition(StatSet params) { _slotsPercent = params.getInt("slotsPercent"); _weightPercent = params.getInt("weightPercent"); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java index 187dfba744..49cf8e2cb8 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpEnergyMaxSkillCondition implements ISkillCondition { private final int _amount; - public OpEnergyMaxSkillCondition(StatsSet params) + public OpEnergyMaxSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 75bdf465e0..82eb70b770 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class OpEquipItemSkillCondition implements ISkillCondition private final int _itemId; private final SkillConditionAffectType _affectType; - public OpEquipItemSkillCondition(StatsSet params) + public OpEquipItemSkillCondition(StatSet params) { _itemId = params.getInt("itemId"); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java index 2c4576c2fa..fa6e82082b 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ public class OpExistNpcSkillCondition implements ISkillCondition private final int _range; private final boolean _isAround; - public OpExistNpcSkillCondition(StatsSet params) + public OpExistNpcSkillCondition(StatSet params) { _npcIds = params.getList("npcIds", Integer.class); _range = params.getInt("range"); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java index 27cc3e90a9..8299b40047 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingCastSkillCondition implements ISkillCondition { - public OpFishingCastSkillCondition(StatsSet params) + public OpFishingCastSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java index 84cc031a24..4b43eb834e 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingPumpingSkillCondition implements ISkillCondition { - public OpFishingPumpingSkillCondition(StatsSet params) + public OpFishingPumpingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java index 86aa667bee..a6a400f96f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingReelingSkillCondition implements ISkillCondition { - public OpFishingReelingSkillCondition(StatsSet params) + public OpFishingReelingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java index d22733df7e..50e6dafb82 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpHaveSummonSkillCondition implements ISkillCondition { - public OpHaveSummonSkillCondition(StatsSet params) + public OpHaveSummonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 2e854ca2b8..cceb4e937b 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { private final int _npcId; - public OpHaveSummonedNpcSkillCondition(StatsSet params) + public OpHaveSummonedNpcSkillCondition(StatSet params) { _npcId = params.getInt("npcId"); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java index 16932ce531..374a75bfab 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.impl.ClanHallData; import org.l2jmobius.gameserver.enums.ResidenceType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -34,7 +34,7 @@ public class OpHomeSkillCondition implements ISkillCondition { private final ResidenceType _type; - public OpHomeSkillCondition(StatsSet params) + public OpHomeSkillCondition(StatSet params) { _type = params.getEnum("type", ResidenceType.class); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java index 9482a0bf55..62ad48bdcc 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpInSiegeTimeSkillCondition implements ISkillCondition { - public OpInSiegeTimeSkillCondition(StatsSet params) + public OpInSiegeTimeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java index 1bffdacd6c..f2fb298398 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -30,7 +30,7 @@ public class OpInstantzoneSkillCondition implements ISkillCondition { private final int _instanceId; - public OpInstantzoneSkillCondition(StatsSet params) + public OpInstantzoneSkillCondition(StatSet params) { _instanceId = params.getInt("instanceId"); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java index 76703cc53b..7418ef9b64 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpMainjobSkillCondition implements ISkillCondition { - public OpMainjobSkillCondition(StatsSet params) + public OpMainjobSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java index d4c9f1f331..3c81369bbb 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNeedAgathionSkillCondition implements ISkillCondition { - public OpNeedAgathionSkillCondition(StatsSet params) + public OpNeedAgathionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java index 96f6774f25..e7a477b0ee 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; @@ -34,7 +34,7 @@ public class OpNeedSummonOrPetSkillCondition implements ISkillCondition { private final List _npcIds = new ArrayList<>(); - public OpNeedSummonOrPetSkillCondition(StatsSet params) + public OpNeedSummonOrPetSkillCondition(StatSet params) { final List npcIds = params.getList("npcIds", String.class); if (npcIds != null) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java index 9701002065..ae1edfd719 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotCursedSkillCondition implements ISkillCondition { - public OpNotCursedSkillCondition(StatsSet params) + public OpNotCursedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInCeremonyOfChaosSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInCeremonyOfChaosSkillCondition.java index 9549fdc2ac..b5cefc61cc 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInCeremonyOfChaosSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInCeremonyOfChaosSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotInCeremonyOfChaosSkillCondition implements ISkillCondition { - public OpNotInCeremonyOfChaosSkillCondition(StatsSet params) + public OpNotInCeremonyOfChaosSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java index bf909425d8..1de79f388a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpNotInPeacezoneSkillCondition implements ISkillCondition { - public OpNotInPeacezoneSkillCondition(StatsSet params) + public OpNotInPeacezoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java index 0752ba4a6a..0d3e4cb4dd 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotInstantzoneSkillCondition implements ISkillCondition { - public OpNotInstantzoneSkillCondition(StatsSet params) + public OpNotInstantzoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java index 45891cd0ac..7ea02159ba 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotOlympiadSkillCondition implements ISkillCondition { - public OpNotOlympiadSkillCondition(StatsSet params) + public OpNotOlympiadSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java index 5c5d293ae8..2397a68e99 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpNotTerritorySkillCondition implements ISkillCondition { - public OpNotTerritorySkillCondition(StatsSet params) + public OpNotTerritorySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java index 874872bb2e..d9f8c1fa3b 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpPeacezoneSkillCondition implements ISkillCondition { - public OpPeacezoneSkillCondition(StatsSet params) + public OpPeacezoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java index c20c4665bb..08d6bb095a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpPkcountSkillCondition implements ISkillCondition { private final SkillConditionAffectType _affectType; - public OpPkcountSkillCondition(StatsSet params) + public OpPkcountSkillCondition(StatSet params) { _affectType = params.getEnum("affectType", SkillConditionAffectType.class); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java index 879fc88c4c..d393c5ddc3 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -30,7 +30,7 @@ public class OpPledgeSkillCondition implements ISkillCondition { private final int _level; - public OpPledgeSkillCondition(StatsSet params) + public OpPledgeSkillCondition(StatSet params) { _level = params.getInt("level"); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java index 9adc89b98d..adf16f8feb 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpRestartPointSkillCondition implements ISkillCondition { - public OpRestartPointSkillCondition(StatsSet params) + public OpRestartPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java index bbd1d9d7d1..6874091ba2 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class OpResurrectionSkillCondition implements ISkillCondition { - public OpResurrectionSkillCondition(StatsSet params) + public OpResurrectionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java index 8bbf796ad2..566f935a50 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpSiegeHammerSkillCondition implements ISkillCondition { - public OpSiegeHammerSkillCondition(StatsSet params) + public OpSiegeHammerSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java index be3ad18e05..cbfc1a25b2 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition private final int _skillId; private final boolean _hasLearned; - public OpSkillAcquireSkillCondition(StatsSet params) + public OpSkillAcquireSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _hasLearned = params.getBoolean("hasLearned"); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java index c8789d28e4..a8382b83b3 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpSkillSkillCondition implements ISkillCondition private final int _skillLevel; private final boolean _hasLearned; - public OpSkillSkillCondition(StatsSet params) + public OpSkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _skillLevel = params.getInt("skillLevel"); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java index 5127071683..a3d188f3eb 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpSocialClassSkillCondition implements ISkillCondition { private final int _socialClass; - public OpSocialClassSkillCondition(StatsSet params) + public OpSocialClassSkillCondition(StatSet params) { _socialClass = params.getInt("socialClass"); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java index b9d37d18c0..c86984a218 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class OpSoulMaxSkillCondition implements ISkillCondition { - public OpSoulMaxSkillCondition(StatsSet params) + public OpSoulMaxSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java index 4780c13a58..0faa676bbe 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpSubjobSkillCondition implements ISkillCondition { - public OpSubjobSkillCondition(StatsSet params) + public OpSubjobSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java index 17a9a1a9e3..a14192847a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.concurrent.atomic.AtomicBoolean; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpSweeperSkillCondition implements ISkillCondition { - public OpSweeperSkillCondition(StatsSet params) + public OpSweeperSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java index b36585bf00..c4b3923e92 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTargetAllItemTypeSkillCondition implements ISkillCondition { - public OpTargetAllItemTypeSkillCondition(StatsSet params) + public OpTargetAllItemTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 6b85389d62..5492e96e1a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTargetArmorTypeSkillCondition implements ISkillCondition { - public OpTargetArmorTypeSkillCondition(StatsSet params) + public OpTargetArmorTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java index 0c0090fbc4..97e07a1822 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpTargetDoorSkillCondition implements ISkillCondition { private final List _doorIds; - public OpTargetDoorSkillCondition(StatsSet params) + public OpTargetDoorSkillCondition(StatSet params) { _doorIds = params.getList("doorIds", Integer.class); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java index 6fbc3cda10..eaabf4a73d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpTargetMyPledgeAcademySkillCondition implements ISkillCondition { - public OpTargetMyPledgeAcademySkillCondition(StatsSet params) + public OpTargetMyPledgeAcademySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java index d5820600dd..14a744613d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpTargetNpcSkillCondition implements ISkillCondition { private final List _npcId; - public OpTargetNpcSkillCondition(StatsSet params) + public OpTargetNpcSkillCondition(StatSet params) { _npcId = params.getList("npcIds", Integer.class); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java index 854225a75a..b0c5e50ae3 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpTargetPcSkillCondition implements ISkillCondition { - public OpTargetPcSkillCondition(StatsSet params) + public OpTargetPcSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index 7faecb2ffd..62fd4b365f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Weapon; @@ -34,7 +34,7 @@ public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition { private final List _weaponTypes = new ArrayList<>(); - public OpTargetWeaponAttackTypeSkillCondition(StatsSet params) + public OpTargetWeaponAttackTypeSkillCondition(StatSet params) { final List weaponTypes = params.getList("weaponType", String.class); if (weaponTypes != null) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java index 8451365885..e114c03412 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTerritorySkillCondition implements ISkillCondition { - public OpTerritorySkillCondition(StatsSet params) + public OpTerritorySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java index 13f287687e..fde1293086 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpUnlockSkillCondition implements ISkillCondition { - public OpUnlockSkillCondition(StatsSet params) + public OpUnlockSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java index 8cc76a34bb..46dea5bbcb 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpUseFirecrackerSkillCondition implements ISkillCondition { - public OpUseFirecrackerSkillCondition(StatsSet params) + public OpUseFirecrackerSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java index f3b54bbad7..651dade274 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpUsePraseedSkillCondition implements ISkillCondition { - public OpUsePraseedSkillCondition(StatsSet params) + public OpUsePraseedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java index 890b0fcd5f..dd57df0e13 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.MountType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpWyvernSkillCondition implements ISkillCondition { - public OpWyvernSkillCondition(StatsSet params) + public OpWyvernSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java index 8a4c974840..5ac80d3e62 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class PossessHolythingSkillCondition implements ISkillCondition { - public PossessHolythingSkillCondition(StatsSet params) + public PossessHolythingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java index 8b0fb55554..38b5644fb1 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class RemainCpPerSkillCondition implements ISkillCondition private final int _amount; private final SkillConditionPercentType _percentType; - public RemainCpPerSkillCondition(StatsSet params) + public RemainCpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java index 612367a233..1ad96100ad 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -33,7 +33,7 @@ public class RemainHpPerSkillCondition implements ISkillCondition private final SkillConditionPercentType _percentType; private final SkillConditionAffectType _affectType; - public RemainHpPerSkillCondition(StatsSet params) + public RemainHpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java index 5455c1587a..39085349d9 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class RemainMpPerSkillCondition implements ISkillCondition private final int _amount; private final SkillConditionPercentType _percentType; - public RemainMpPerSkillCondition(StatsSet params) + public RemainMpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java index 7de47f103f..6e9e5ad821 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class SoulSavedSkillCondition implements ISkillCondition { private final int _amount; - public SoulSavedSkillCondition(StatsSet params) + public SoulSavedSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java index 0b75a5a623..f4bdbaaecb 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class TargetItemCrystalTypeSkillCondition implements ISkillCondition { - public TargetItemCrystalTypeSkillCondition(StatsSet params) + public TargetItemCrystalTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java index 51502ff209..604a41f904 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.MentorManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMyMenteeSkillCondition implements ISkillCondition { - public TargetMyMenteeSkillCondition(StatsSet params) + public TargetMyMenteeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java index fc621365a9..4bfb496634 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class TargetMyPartySkillCondition implements ISkillCondition { private final boolean _includeMe; - public TargetMyPartySkillCondition(StatsSet params) + public TargetMyPartySkillCondition(StatSet params) { _includeMe = params.getBoolean("includeMe"); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java index 9ebec0e691..d44a1bc8a9 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMyPledgeSkillCondition implements ISkillCondition { - public TargetMyPledgeSkillCondition(StatsSet params) + public TargetMyPledgeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java index f4da8d6079..5045aa3848 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class TargetRaceSkillCondition implements ISkillCondition { private final Race _race; - public TargetRaceSkillCondition(StatsSet params) + public TargetRaceSkillCondition(StatSet params) { _race = params.getEnum("race", Race.class); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java index 55734b03bb..d1aac35879 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -350,7 +350,7 @@ public class ChamberOfDelusion extends AbstractInstance protected void changeRoom(Instance world) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); final List locations = world.getEnterLocations(); int newRoom = params.getInt("currentRoom", 0); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java index 95a96bb16e..bef23aa88c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java @@ -19,7 +19,7 @@ package instances.CrystalCaverns; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -64,12 +64,12 @@ public class CrystalCavernsCoralGarden extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (event) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java index d977f82481..5d6a8dda61 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java @@ -17,7 +17,7 @@ package instances.CrystalCaverns; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -90,13 +90,13 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); - final StatsSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); final int baseId = npcParams.getInt("base_id", -1); switch (event) @@ -156,7 +156,7 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (npc.getId()) { @@ -205,7 +205,7 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); final int baseId = npcParams.getInt("base_id", -1); switch (npc.getId()) @@ -365,7 +365,7 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance { case WATER_CANNON: { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); final int baseId = npcParams.getInt("base_id", -1); if (baseId != 1) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java index b9662a5d06..7624504082 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java @@ -19,7 +19,7 @@ package instances.CrystalCaverns; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -83,12 +83,12 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (event) { @@ -180,7 +180,7 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); switch (npc.getId()) { @@ -224,7 +224,7 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance final Instance instance = receiver.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = receiver.getParameters(); + final StatSet npcParams = receiver.getParameters(); if (eventName.equals(String.valueOf(24220005 + npcParams.getInt("Terri_ID", 0)))) { @@ -265,7 +265,7 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); final int killTarget = instance.getParameters().getInt("KILL_TARGET", 5); int currentKillCount = instance.getParameters().getInt("KILL_COUNT", 0); @@ -377,7 +377,7 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance if (isInInstance(instance) && creature.isPlayer()) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); switch (npc.getId()) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java index 0d9724e766..1245a89ed0 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -404,7 +404,7 @@ public class DarkCloudMansion extends AbstractInstance { if (CommonUtil.contains(BELETH_SAMPLE, npc.getId())) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); if (!params.getBoolean("blocked", false)) { if (npc.isScriptValue(1)) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java index f8dec3de6e..31d966f9b2 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java @@ -18,7 +18,7 @@ package instances.FaeronTrainingGrounds1; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -273,7 +273,7 @@ public class FaeronTrainingGrounds1 extends AbstractInstance final Instance world = player.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); for (int i = 0; i < MOB_SPAWNS.length; i++) { if (params.getObject("Mob" + i, Npc.class) == null) @@ -295,7 +295,7 @@ public class FaeronTrainingGrounds1 extends AbstractInstance final Instance world = player.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); for (int i = 0; i < MOB_SPAWNS.length; i++) { final Npc mob = params.getObject("Mob" + i, Npc.class); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java index f3ae23d301..60e902fb43 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java @@ -18,7 +18,7 @@ package instances.FaeronTrainingGrounds2; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -270,7 +270,7 @@ public class FaeronTrainingGrounds2 extends AbstractInstance final Instance world = player.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); for (int i = 0; i < MOB_SPAWNS.length; i++) { if (params.getObject("Mob" + i, Npc.class) == null) @@ -292,7 +292,7 @@ public class FaeronTrainingGrounds2 extends AbstractInstance final Instance world = player.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); for (int i = 0; i < MOB_SPAWNS.length; i++) { final Npc mob = params.getObject("Mob" + i, Npc.class); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java index 20046a664b..54b93c8ccb 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -566,7 +566,7 @@ public class HarnakUndergroundRuins extends AbstractInstance } case 2: { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); final int waveNpc = params.getInt("waveNpcId"); if (world.getAliveNpcs(waveNpc).isEmpty()) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaBoss.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaBoss.java index 181f892fbe..3ef76e5f72 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaBoss.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaBoss.java @@ -17,7 +17,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureAttacked; @@ -70,7 +70,7 @@ public class KartiaBoss extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SAY") && npc.isTargetable()) { @@ -107,7 +107,7 @@ public class KartiaBoss extends AbstractNpcAI public void spawnMinions(Npc npc) { - final StatsSet param = npc.getParameters(); + final StatSet param = npc.getParameters(); final int kartiaLevel = param.getInt("cartia_level", 0); final boolean isParty = param.getInt("party_type", 0) == 1; diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java index bd312c7fe6..721a32deb0 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -97,12 +97,12 @@ public class KartiaHelperAdolph extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if ((instance != null) && event.equals("CHECK_ACTION")) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final PlayerInstance plr = npcVars.getObject("PLAYER_OBJECT", PlayerInstance.class); if (plr != null) { @@ -159,7 +159,7 @@ public class KartiaHelperAdolph extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder skill_01 = instParams.getSkillHolder("adolphHate"); final SkillHolder skill_02 = instParams.getSkillHolder("adolphPunish"); final SkillHolder skill_03 = instParams.getSkillHolder("adolphShield"); @@ -256,7 +256,7 @@ public class KartiaHelperAdolph extends AbstractNpcAI { npc.setTarget(event.getAttacker()); addAttackDesire(npc, (Creature) npc.getTarget()); - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder hateSkill = instParams.getSkillHolder("adolphHate"); if ((hateSkill != null) && SkillCaster.checkUseConditions(npc, hateSkill.getSkill())) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java index e9aada8d07..c87c49ae5b 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java @@ -19,7 +19,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -92,7 +92,7 @@ public class KartiaHelperBarton extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if ((instance != null) && event.equals("CHECK_ACTION")) @@ -170,7 +170,7 @@ public class KartiaHelperBarton extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder skill01 = instParams.getSkillHolder("bartonInfinity"); final SkillHolder skill02 = instParams.getSkillHolder("bartonBerserker"); final SkillHolder skill03 = instParams.getSkillHolder("bartonHurricane"); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java index e383a62d49..01edde0bd4 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java @@ -26,7 +26,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -115,12 +115,12 @@ public class KartiaHelperElise extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if ((instance != null) && event.equals("CHECK_ACTION")) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final FriendlyNpcInstance adolph = npcVars.getObject("ADOLPH_OBJECT", FriendlyNpcInstance.class); if (!npc.isCastingNow()) { @@ -153,8 +153,8 @@ public class KartiaHelperElise extends AbstractNpcAI final Instance instance = npc.getInstanceWorld(); if (instance != null) { - final StatsSet npcVars = npc.getVariables(); - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet npcVars = npc.getVariables(); + final StatSet instParams = instance.getTemplateParameters(); if (!npc.isCastingNow()) { final PlayerInstance plr = npcVars.getObject("PLAYER_OBJECT", PlayerInstance.class); @@ -248,7 +248,7 @@ public class KartiaHelperElise extends AbstractNpcAI { if (creature.isPlayer() || (creature instanceof FriendlyNpcInstance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); if (creature.isPlayer()) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperEliyah.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperEliyah.java index 244110429c..cb3013c46c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperEliyah.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperEliyah.java @@ -18,7 +18,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance; @@ -87,7 +87,7 @@ public class KartiaHelperEliyah extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if ((instance != null) && event.equals("CHECK_ACTION")) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java index 07fe730289..123414862a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java @@ -18,7 +18,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -96,7 +96,7 @@ public class KartiaHelperGuardian extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (instance == null) @@ -183,7 +183,7 @@ public class KartiaHelperGuardian extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder skill01 = instParams.getSkillHolder("guardianSpiritsBlow"); final SkillHolder skill02 = instParams.getSkillHolder("guardianSpiritsWrath"); final int numberOfActiveSkills = 2; diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java index 1541261bac..45fdfece27 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java @@ -19,7 +19,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -93,7 +93,7 @@ public class KartiaHelperHayuk extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (instance == null) @@ -176,7 +176,7 @@ public class KartiaHelperHayuk extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder skill01 = instParams.getSkillHolder("hayukPinpointShot"); final SkillHolder skill02 = instParams.getSkillHolder("hayukRecoilShot"); final SkillHolder skill03 = instParams.getSkillHolder("hayukMultipleArrow"); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaSupportTroop.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaSupportTroop.java index bfdc9b4cd3..d17653b8e3 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaSupportTroop.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaSupportTroop.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -49,7 +49,7 @@ public class KartiaSupportTroop extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SAY") && !npc.isDead()) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java index 0bf65e9c9b..01d0a1ab7a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -273,7 +273,7 @@ public class KartiasLabyrinth extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = (npc != null) ? npc.getInstanceWorld() : player.getInstanceWorld(); if (instance != null) @@ -363,7 +363,7 @@ public class KartiasLabyrinth extends AbstractInstance if (instance != null) { - final StatsSet param = instance.getParameters(); + final StatSet param = instance.getParameters(); if (param.getBoolean("BOSS_KILL_OPEN_DOOR", false) && CommonUtil.contains(MINI_BOSSES, npc.getId())) { instance.setParameter("BOSS_KILL_OPEN_DOOR", true); @@ -562,7 +562,7 @@ public class KartiasLabyrinth extends AbstractInstance private void manageProgressInInstance(Instance instance) { - final StatsSet param = instance.getParameters(); + final StatSet param = instance.getParameters(); final int room = param.getInt("ROOM", 1); final int stage = param.getInt("STAGE", 1); final int wave = param.getInt("WAVE", 1); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java index 5b0129dc4b..e3ab6bdbed 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -451,7 +451,7 @@ public class LabyrinthOfBelis extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (world != null) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java index f9c6c2b1af..7cd9254745 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -445,7 +445,7 @@ public class MemoryOfDisaster extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java index c5ebb7aa47..f1981550e1 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java @@ -19,7 +19,7 @@ package instances.MuseumDungeon; import java.util.List; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -161,7 +161,7 @@ public class MuseumDungeon extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); final Attackable toyron = (Attackable) instance.getNpc(TOYRON); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/Nursery/Nursery.java index 4e85e49c12..ff1ff2587e 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/Nursery/Nursery.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/Nursery/Nursery.java @@ -19,7 +19,7 @@ package instances.Nursery; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -80,12 +80,12 @@ public class Nursery extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int gameStage = npcVars.getInt("GAME_STAGE", 0); switch (event) @@ -142,7 +142,7 @@ public class Nursery extends AbstractInstance if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int gameStage = npcVars.getInt("GAME_STAGE", 0); switch (gameStage) @@ -200,7 +200,7 @@ public class Nursery extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int gameStage = npcVars.getInt("GAME_STAGE", 0); switch (event) @@ -281,7 +281,7 @@ public class Nursery extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int maguenStatus = npcVars.getInt("MAGUEN_STATUS", 0); switch (maguenStatus) @@ -407,8 +407,8 @@ public class Nursery extends AbstractInstance final Npc gameManager = instance.getNpc(TIE); if (gameManager != null) { - final StatsSet managerVars = gameManager.getVariables(); - final StatsSet npcVars = npc.getVariables(); + final StatSet managerVars = gameManager.getVariables(); + final StatSet npcVars = npc.getVariables(); final int gamePoints = managerVars.getInt("GAME_POINTS", 0); if (gamePoints > 0) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java index 501ea07ad2..1d546871e9 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/PailakaInjuredDragon/PailakaInjuredDragon.java @@ -19,7 +19,7 @@ package instances.PailakaInjuredDragon; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -172,7 +172,7 @@ public class PailakaInjuredDragon extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (isInInstance(world)) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java index 8de90bca71..cd31666b75 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java @@ -19,7 +19,7 @@ package instances.PrisonOfDarkness; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -122,12 +122,12 @@ public class PrisonOfDarkness extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (event) { @@ -187,7 +187,7 @@ public class PrisonOfDarkness extends AbstractInstance if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (event) { @@ -327,7 +327,7 @@ public class PrisonOfDarkness extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (npc.getId()) { @@ -360,7 +360,7 @@ public class PrisonOfDarkness extends AbstractInstance if (isInInstance(instance) && (npc.getId() == EXIT_PORTAL)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (npcVars.getInt("PORTAL_STATE", 0)) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java index 415395c724..7d06cdeb54 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/TaintedDimension/TaintedDimension.java @@ -18,7 +18,7 @@ package instances.TaintedDimension; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -97,7 +97,7 @@ public class TaintedDimension extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java index c8eda180d5..cfb333a649 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java @@ -18,7 +18,7 @@ package quests.Q10771_VolatilePower; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.quest.Quest; @@ -177,7 +177,7 @@ public class Q10771_VolatilePower extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java index 252229c5ba..7e7db63238 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java @@ -19,7 +19,7 @@ package quests.Q10772_ReportsFromCrumaTowerPart1; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -157,7 +157,7 @@ public class Q10772_ReportsFromCrumaTowerPart1 extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("DESPAWN_OWL") && (npc != null) && (npc.getId() == MAGIC_OWL)) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java index bfa9e949a7..17d390b01d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java @@ -19,7 +19,7 @@ package quests.Q10776_TheWrathOfTheGiants; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.quest.Quest; @@ -236,7 +236,7 @@ public class Q10776_TheWrathOfTheGiants extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java index 9f86ed0ad5..3effebfd33 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java @@ -19,7 +19,7 @@ package quests.Q10777_ReportsFromCrumaTowerPart2; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -159,7 +159,7 @@ public class Q10777_ReportsFromCrumaTowerPart2 extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if ((npc != null) && (npc.getId() == MAGIC_OWL) && event.equals("DESPAWN_OWL")) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java index 8322b9ae14..4e1b7e0133 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java @@ -17,7 +17,7 @@ package quests.Q10787_ASpyMission; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -154,7 +154,7 @@ public class Q10787_ASpyMission extends Quest } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if ((npc != null) && (npc.getId() == SUSPICIOUS_BOX) && event.equals("DESPAWN")) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java index b1d0ec8553..7e9236b634 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.ActionDataHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -57,7 +57,7 @@ public class ActionData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "action", actionNode -> { - final ActionDataHolder holder = new ActionDataHolder(new StatsSet(parseAttributes(actionNode))); + final ActionDataHolder holder = new ActionDataHolder(new StatSet(parseAttributes(actionNode))); _actionData.put(holder.getId(), holder); })); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java index 36002572b0..f7762ab07b 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java @@ -32,7 +32,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.AdminCommandAccessRight; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -72,7 +72,7 @@ public class AdminData implements IXmlReader { NamedNodeMap attrs; Node attr; - StatsSet set; + StatSet set; AccessLevel level; AdminCommandAccessRight command; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -83,7 +83,7 @@ public class AdminData implements IXmlReader { if ("access".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -99,7 +99,7 @@ public class AdminData implements IXmlReader } else if ("admin".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java index b425296a19..6a14a867fc 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java @@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.alchemy.AlchemyCraftData; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -55,7 +55,7 @@ public class AlchemyData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node att; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -67,7 +67,7 @@ public class AlchemyData implements IXmlReader if ("skill".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index a5de47d07c..c31f2ea750 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; @@ -83,7 +83,7 @@ public class AppearanceItemData implements IXmlReader { if ("appearance_stone".equalsIgnoreCase(d.getNodeName())) { - final AppearanceStone stone = new AppearanceStone(new StatsSet(parseAttributes(d))); + final AppearanceStone stone = new AppearanceStone(new StatSet(parseAttributes(d))); for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) { switch (c.getNodeName()) @@ -120,7 +120,7 @@ public class AppearanceItemData implements IXmlReader } case "visual": { - stone.addVisualId(new AppearanceHolder(new StatsSet(parseAttributes(c)))); + stone.addVisualId(new AppearanceHolder(new StatSet(parseAttributes(c)))); } } } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java index 6c96d3874a..6eac3240e7 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -64,7 +64,7 @@ public class AttendanceRewardData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "item", rewardNode -> { - final StatsSet set = new StatsSet(parseAttributes(rewardNode)); + final StatSet set = new StatSet(parseAttributes(rewardNode)); final int itemId = set.getInt("id"); final int itemCount = set.getInt("count"); if (ItemTable.getInstance().getTemplate(itemId) == null) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java index 891d19fcf2..3054b0e7ef 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.beautyshop.BeautyData; import org.l2jmobius.gameserver.model.beautyshop.BeautyItem; @@ -56,7 +56,7 @@ public class BeautyShopData implements IXmlReader public void parseDocument(Document doc, File f) { NamedNodeMap attrs; - StatsSet set; + StatSet set; Node att; Race race = null; Sex sex = null; @@ -92,7 +92,7 @@ public class BeautyShopData implements IXmlReader if ("hair".equalsIgnoreCase(a.getNodeName())) { attrs = a.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -105,7 +105,7 @@ public class BeautyShopData implements IXmlReader if ("color".equalsIgnoreCase(g.getNodeName())) { attrs = g.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -119,7 +119,7 @@ public class BeautyShopData implements IXmlReader else if ("face".equalsIgnoreCase(a.getNodeName())) { attrs = a.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java index 37e977c51e..530a5d975a 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java @@ -34,7 +34,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.entity.ClanHall; @@ -66,7 +66,7 @@ public class ClanHallData implements IXmlReader final List doors = new ArrayList<>(); final List npcs = new ArrayList<>(); final List teleports = new ArrayList<>(); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); for (Node listNode = doc.getFirstChild(); listNode != null; listNode = listNode.getNextSibling()) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ClanMasteryData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ClanMasteryData.java index fabd6f919e..36eaf42552 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ClanMasteryData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ClanMasteryData.java @@ -25,7 +25,7 @@ import java.util.logging.Logger; import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ClanMasteryHolder; import org.l2jmobius.gameserver.model.skills.Skill; @@ -57,7 +57,7 @@ public class ClanMasteryData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "clan", clanNode -> { - final StatsSet set = new StatsSet(parseAttributes(clanNode)); + final StatSet set = new StatSet(parseAttributes(clanNode)); final int id = set.getInt("mastery"); final int skill1Id = set.getInt("skill1Id"); final int skill1Level = set.getInt("skill1Level"); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ClanShopData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ClanShopData.java index 2ba5a1c504..092216b96d 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ClanShopData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ClanShopData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ClanShopProductHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -57,7 +57,7 @@ public class ClanShopData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "clan", productNode -> { - final StatsSet set = new StatsSet(parseAttributes(productNode)); + final StatSet set = new StatSet(parseAttributes(productNode)); final int clanLevel = set.getInt("level"); final int itemId = set.getInt("item"); final int count = set.getInt("count"); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java index ae608cefb6..f1a23734e0 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.combination.CombinationItem; import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; @@ -57,7 +57,7 @@ public class CombinationItemsData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "item", itemNode -> { - final CombinationItem item = new CombinationItem(new StatsSet(parseAttributes(itemNode))); + final CombinationItem item = new CombinationItem(new StatSet(parseAttributes(itemNode))); forEach(itemNode, "reward", rewardNode -> { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java index 038738b138..4af039b48d 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.CubicSkill; import org.l2jmobius.gameserver.model.cubic.ICubicConditionHolder; @@ -61,7 +61,7 @@ public class CubicData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - forEach(doc, "list", listNode -> forEach(listNode, "cubic", cubicNode -> parseTemplate(cubicNode, new CubicTemplate(new StatsSet(parseAttributes(cubicNode)))))); + forEach(doc, "list", listNode -> forEach(listNode, "cubic", cubicNode -> parseTemplate(cubicNode, new CubicTemplate(new StatSet(parseAttributes(cubicNode)))))); } /** @@ -137,7 +137,7 @@ public class CubicData implements IXmlReader { forEach(cubicNode, "skill", skillNode -> { - final CubicSkill skill = new CubicSkill(new StatsSet(parseAttributes(skillNode))); + final CubicSkill skill = new CubicSkill(new StatSet(parseAttributes(skillNode))); forEach(cubicNode, "conditions", conditionNode -> parseConditions(cubicNode, template, skill)); template.getSkills().add(skill); }); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java index 3d19bee079..ede9b72202 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -62,7 +62,7 @@ public class DailyMissionData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "reward", rewardNode -> { - final StatsSet set = new StatsSet(parseAttributes(rewardNode)); + final StatSet set = new StatSet(parseAttributes(rewardNode)); final List items = new ArrayList<>(1); forEach(rewardNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> @@ -80,14 +80,14 @@ public class DailyMissionData implements IXmlReader // Initial values in case handler doesn't exists set.set("handler", ""); - set.set("params", StatsSet.EMPTY_STATSET); + set.set("params", StatSet.EMPTY_STATSET); // Parse handler and parameters forEach(rewardNode, "handler", handlerNode -> { set.set("handler", parseString(handlerNode.getAttributes(), "name")); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); set.set("params", params); forEach(handlerNode, "param", paramNode -> params.set(parseString(paramNode.getAttributes(), "name"), paramNode.getTextContent())); }); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java index 835eab4fe9..53248de524 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java @@ -35,7 +35,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -51,7 +51,7 @@ public class DoorData implements IXmlReader // Info holders private final Map> _groups = new HashMap<>(); private final Map _doors = new HashMap<>(); - private final Map _templates = new HashMap<>(); + private final Map _templates = new HashMap<>(); private final Map> _regions = new HashMap<>(); protected DoorData() @@ -75,9 +75,9 @@ public class DoorData implements IXmlReader LOGGER.info(getClass().getSimpleName() + ": Loaded " + _doors.size() + " Door Templates for " + _regions.size() + " regions."); } - public StatsSet parseDoor(Node doorNode) + public StatSet parseDoor(Node doorNode) { - final StatsSet params = new StatsSet(parseAttributes(doorNode)); + final StatSet params = new StatSet(parseAttributes(doorNode)); params.set("baseHpMax", 1); // Avoid doors without HP value created dead due to default value 0 in CreatureTemplate forEach(doorNode, IXmlReader::isNode, innerDoorNode -> @@ -115,7 +115,7 @@ public class DoorData implements IXmlReader /** * @param set */ - private void applyCollisions(StatsSet set) + private void applyCollisions(StatSet set) { // Insert Collision data if (set.contains("nodeX_0") && set.contains("nodeY_0") && set.contains("nodeX_1") && set.contains("nodeY_1")) @@ -142,7 +142,7 @@ public class DoorData implements IXmlReader * @param set * @return */ - public DoorInstance spawnDoor(StatsSet set) + public DoorInstance spawnDoor(StatSet set) { // Create door template + door instance final DoorTemplate template = new DoorTemplate(set); @@ -183,7 +183,7 @@ public class DoorData implements IXmlReader return door; } - public StatsSet getDoorTemplate(int doorId) + public StatSet getDoorTemplate(int doorId) { return _templates.get(doorId); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java index eca42a9a34..637ef1e953 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -64,7 +64,7 @@ public class EnchantItemData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node att; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -76,7 +76,7 @@ public class EnchantItemData implements IXmlReader if ("enchant".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -107,7 +107,7 @@ public class EnchantItemData implements IXmlReader else if ("support".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java index 46701fd777..bb1e8026b7 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.SkillEnchantType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.EnchantSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -69,10 +69,10 @@ public class EnchantSkillGroupsData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "enchant", enchantNode -> { - final EnchantSkillHolder enchantSkillHolder = new EnchantSkillHolder(new StatsSet(parseAttributes(enchantNode))); + final EnchantSkillHolder enchantSkillHolder = new EnchantSkillHolder(new StatSet(parseAttributes(enchantNode))); forEach(enchantNode, "sps", spsNode -> forEach(spsNode, "sp", spNode -> enchantSkillHolder.addSp(parseEnum(spNode.getAttributes(), SkillEnchantType.class, "type"), parseInteger(spNode.getAttributes(), "amount")))); forEach(enchantNode, "chances", chancesNode -> forEach(chancesNode, "chance", chanceNode -> enchantSkillHolder.addChance(parseEnum(chanceNode.getAttributes(), SkillEnchantType.class, "type"), parseInteger(chanceNode.getAttributes(), "value")))); - forEach(enchantNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> enchantSkillHolder.addRequiredItem(parseEnum(itemNode.getAttributes(), SkillEnchantType.class, "type"), new ItemHolder(new StatsSet(parseAttributes(itemNode)))))); + forEach(enchantNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> enchantSkillHolder.addRequiredItem(parseEnum(itemNode.getAttributes(), SkillEnchantType.class, "type"), new ItemHolder(new StatSet(parseAttributes(itemNode)))))); _enchantSkillHolders.put(parseInteger(enchantNode.getAttributes(), "level"), enchantSkillHolder); })); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/EquipmentUpgradeData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/EquipmentUpgradeData.java index 4700307bd0..c6745249f6 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/EquipmentUpgradeData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/EquipmentUpgradeData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.EquipmentUpgradeHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -57,7 +57,7 @@ public class EquipmentUpgradeData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "upgrade", upgradeNode -> { - final StatsSet set = new StatsSet(parseAttributes(upgradeNode)); + final StatSet set = new StatSet(parseAttributes(upgradeNode)); final int id = set.getInt("id"); final String[] item = set.getString("item").split(","); final int requiredItemId = Integer.parseInt(item[0]); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java index a8bb0397ac..037af7e1ae 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java @@ -34,7 +34,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.eventengine.AbstractEventManager; import org.l2jmobius.gameserver.model.eventengine.EventMethodNotification; import org.l2jmobius.gameserver.model.eventengine.EventScheduler; @@ -156,7 +156,7 @@ public class EventEngineData implements IXmlReader */ private void parseVariables(AbstractEventManager eventManager, Node innerNode) { - final StatsSet variables = new StatsSet(LinkedHashMap::new); + final StatSet variables = new StatSet(LinkedHashMap::new); for (Node variableNode = innerNode.getFirstChild(); variableNode != null; variableNode = variableNode.getNextSibling()) { if ("variable".equals(variableNode.getNodeName())) @@ -188,7 +188,7 @@ public class EventEngineData implements IXmlReader { if ("schedule".equals(scheduleNode.getNodeName())) { - final StatsSet params = new StatsSet(LinkedHashMap::new); + final StatSet params = new StatSet(LinkedHashMap::new); final NamedNodeMap attrs = scheduleNode.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -235,7 +235,7 @@ public class EventEngineData implements IXmlReader } else if ("conditionalSchedule".equals(scheduleNode.getNodeName())) { - final StatsSet params = new StatsSet(LinkedHashMap::new); + final StatSet params = new StatSet(LinkedHashMap::new); final NamedNodeMap attrs = scheduleNode.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -346,7 +346,7 @@ public class EventEngineData implements IXmlReader * @param variableNode */ @SuppressWarnings("unchecked") - private void parseListVariables(AbstractEventManager eventManager, StatsSet variables, Node variableNode) + private void parseListVariables(AbstractEventManager eventManager, StatSet variables, Node variableNode) { final String name = parseString(variableNode.getAttributes(), "name"); final String type = parseString(variableNode.getAttributes(), "type"); @@ -419,7 +419,7 @@ public class EventEngineData implements IXmlReader * @param variableNode */ @SuppressWarnings("unchecked") - private void parseMapVariables(AbstractEventManager eventManager, StatsSet variables, Node variableNode) + private void parseMapVariables(AbstractEventManager eventManager, StatSet variables, Node variableNode) { final String name = parseString(variableNode.getAttributes(), "name"); final String keyType = parseString(variableNode.getAttributes(), "keyType"); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java index db19c5fdff..0724877d9d 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.ConditionHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.ICondition; import org.l2jmobius.gameserver.model.holders.ExtendDropDataHolder; import org.l2jmobius.gameserver.model.holders.ExtendDropItemHolder; @@ -62,7 +62,7 @@ public class ExtendDropData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "drop", dropNode -> { - final StatsSet set = new StatsSet(parseAttributes(dropNode)); + final StatSet set = new StatSet(parseAttributes(dropNode)); final List items = new ArrayList<>(1); forEach(dropNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> @@ -80,8 +80,8 @@ public class ExtendDropData implements IXmlReader forEach(dropNode, "conditions", conditionsNode -> forEach(conditionsNode, "condition", conditionNode -> { final String conditionName = parseString(conditionNode.getAttributes(), "name"); - final StatsSet params = (StatsSet) parseValue(conditionNode); - final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); + final StatSet params = (StatSet) parseValue(conditionNode); + final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); if (conditionFunction != null) { conditions.add(conditionFunction.apply(params)); @@ -109,7 +109,7 @@ public class ExtendDropData implements IXmlReader private Object parseValue(Node node) { - StatsSet statsSet = null; + StatSet statSet = null; List list = null; Object text = null; for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) @@ -145,12 +145,12 @@ public class ExtendDropData implements IXmlReader final Object value = parseValue(node); if (value != null) { - if (statsSet == null) + if (statSet == null) { - statsSet = new StatsSet(); + statSet = new StatSet(); } - statsSet.set(nodeName, value); + statSet.set(nodeName, value); } } } @@ -161,9 +161,9 @@ public class ExtendDropData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", list); + statSet.set(".", list); } else { @@ -176,16 +176,16 @@ public class ExtendDropData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", text); + statSet.set(".", text); } else { return text; } } - return statsSet; + return statSet; } public ExtendDropDataHolder getExtendDropById(int id) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java index 57a16d6390..608f4702b8 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.FakePlayerHolder; @@ -72,7 +72,7 @@ public class FakePlayerData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayer", fakePlayerNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerNode)); final int npcId = set.getInt("npcId"); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); final String name = template.getName(); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java index 18cc499b71..a5ade27c03 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.FenceState; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldRegion; import org.l2jmobius.gameserver.model.actor.instance.FenceInstance; @@ -79,7 +79,7 @@ public class FenceData implements IXmlReader private void spawnFence(Node fenceNode) { - final StatsSet set = new StatsSet(parseAttributes(fenceNode)); + final StatSet set = new StatSet(parseAttributes(fenceNode)); spawnFence(set.getInt("x"), set.getInt("y"), set.getInt("z"), set.getString("name"), set.getInt("width"), set.getInt("length"), set.getInt("height"), 0, set.getEnum("state", FenceState.class, FenceState.CLOSED)); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java index 67dd4e396b..02efb756f2 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.Henna; import org.l2jmobius.gameserver.model.skills.Skill; @@ -86,7 +86,7 @@ public class HennaData implements IXmlReader */ private void parseHenna(Node d) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final List wearClassIds = new ArrayList<>(); final List skills = new ArrayList<>(); NamedNodeMap attrs = d.getAttributes(); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java index 03ad8ab79e..d81e85948d 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; @@ -93,7 +93,7 @@ public class InitialEquipmentData implements IXmlReader { if ("item".equalsIgnoreCase(c.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java index 72080aa4ac..54b1909d60 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemPointHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; @@ -55,17 +55,17 @@ public class LuckyGameData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "luckygame", rewardNode -> { - final LuckyGameDataHolder holder = new LuckyGameDataHolder(new StatsSet(parseAttributes(rewardNode))); + final LuckyGameDataHolder holder = new LuckyGameDataHolder(new StatSet(parseAttributes(rewardNode))); forEach(rewardNode, "common_reward", commonRewardNode -> forEach(commonRewardNode, "item", itemNode -> { - final StatsSet stats = new StatsSet(parseAttributes(itemNode)); + final StatSet stats = new StatSet(parseAttributes(itemNode)); holder.addCommonReward(new ItemChanceHolder(stats.getInt("id"), stats.getDouble("chance"), stats.getLong("count"))); })); forEach(rewardNode, "unique_reward", uniqueRewardNode -> forEach(uniqueRewardNode, "item", itemNode -> { - holder.addUniqueReward(new ItemPointHolder(new StatsSet(parseAttributes(itemNode)))); + holder.addUniqueReward(new ItemPointHolder(new StatSet(parseAttributes(itemNode)))); })); forEach(rewardNode, "modify_reward", uniqueRewardNode -> @@ -74,7 +74,7 @@ public class LuckyGameData implements IXmlReader holder.setMaxModifyRewardGame(parseInteger(uniqueRewardNode.getAttributes(), "max_game")); forEach(uniqueRewardNode, "item", itemNode -> { - final StatsSet stats = new StatsSet(parseAttributes(itemNode)); + final StatSet stats = new StatSet(parseAttributes(itemNode)); holder.addModifyReward(new ItemChanceHolder(stats.getInt("id"), stats.getDouble("chance"), stats.getLong("count"))); }); }); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java index 75bb48ed37..190653cdec 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java @@ -35,7 +35,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.SpecialItemType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; @@ -90,7 +90,7 @@ public class MultisellData implements IXmlReader { forEach(doc, "list", listNode -> { - final StatsSet set = new StatsSet(parseAttributes(listNode)); + final StatSet set = new StatSet(parseAttributes(listNode)); final int listId = Integer.parseInt(f.getName().substring(0, f.getName().length() - 4)); final List entries = new ArrayList<>(listNode.getChildNodes().getLength()); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java index 12ad0f9f0e..de0567af09 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.enums.AISkillScope; import org.l2jmobius.gameserver.enums.DropType; import org.l2jmobius.gameserver.enums.MpRewardAffectType; import org.l2jmobius.gameserver.enums.MpRewardType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.DropHolder; @@ -95,7 +95,7 @@ public class NpcData implements IXmlReader if ("npc".equalsIgnoreCase(listNode.getNodeName())) { NamedNodeMap attrs = listNode.getAttributes(); - final StatsSet set = new StatsSet(new HashMap<>()); + final StatSet set = new StatSet(new HashMap<>()); final int npcId = parseInteger(attrs, "id"); Map parameters = null; Map skills = null; @@ -511,11 +511,11 @@ public class NpcData implements IXmlReader if (parameters != null) { // Using unmodifiable map parameters of template are not meant to be changed at runtime. - template.setParameters(new StatsSet(Collections.unmodifiableMap(parameters))); + template.setParameters(new StatSet(Collections.unmodifiableMap(parameters))); } else { - template.setParameters(StatsSet.EMPTY_STATSET); + template.setParameters(StatSet.EMPTY_STATSET); } if (skills != null) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java index 3712cca6af..373f87ecfc 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -79,7 +79,7 @@ public class NpcNameLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); NPC_NAME_LOCALISATIONS.get(_lang).put(set.getInt("id"), new String[] { set.getString("name"), diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 55dcd539aa..36c5897ecd 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.EffectHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; @@ -71,7 +71,7 @@ public class OptionData implements IXmlReader forEach(innerNode, "effect", effectNode -> { final String name = parseString(effectNode.getAttributes(), "name"); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); forEach(effectNode, IXmlReader::isNode, paramNode -> params.set(paramNode.getNodeName(), SkillData.getInstance().parseValue(paramNode, true, false, Collections.emptyMap()))); option.addEffect(EffectHandler.getInstance().getHandlerFactory(name).apply(params)); }); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java index b1bb74baf6..c893725bc3 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.PetLevelData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * This class parse and hold all pet parameters.
@@ -116,7 +116,7 @@ public class PetDataTable implements IXmlReader if (s.getNodeName().equals("stat")) { final int level = Integer.parseInt(s.getAttributes().getNamedItem("level").getNodeValue()); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (Node bean = s.getFirstChild(); bean != null; bean = bean.getNextSibling()) { if (bean.getNodeName().equals("set")) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java index ab1cb3b257..b646782547 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.base.ClassId; @@ -83,7 +83,7 @@ public class PlayerTemplateData implements IXmlReader } else if ("staticData".equalsIgnoreCase(d.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.set("classId", classId); final List creationPoints = new ArrayList<>(); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java index 34a04edd9b..35b879e73f 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; @@ -83,7 +83,7 @@ public class PrimeShopData implements IXmlReader { NamedNodeMap attrs = d.getAttributes(); Node att; - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java index 0158b153c6..9aa87a1f9f 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java @@ -31,7 +31,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.StatusUpdateType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.RecipeHolder; @@ -61,7 +61,7 @@ public class RecipeData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node att; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -73,7 +73,7 @@ public class RecipeData implements IXmlReader if ("recipe".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java index 796f5ae085..9a8397e085 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java @@ -29,7 +29,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate; /** @@ -60,7 +60,7 @@ public class ResidenceFunctionsData implements IXmlReader forEach(doc, "list", list -> forEach(list, "function", func -> { final NamedNodeMap attrs = func.getAttributes(); - final StatsSet set = new StatsSet(HashMap::new); + final StatSet set = new StatSet(HashMap::new); for (int i = 0; i < attrs.getLength(); i++) { final Node node = attrs.item(i); @@ -69,7 +69,7 @@ public class ResidenceFunctionsData implements IXmlReader forEach(func, "function", levelNode -> { final NamedNodeMap levelAttrs = levelNode.getAttributes(); - final StatsSet levelSet = new StatsSet(HashMap::new); + final StatSet levelSet = new StatSet(HashMap::new); levelSet.merge(set); for (int i = 0; i < levelAttrs.getLength(); i++) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java index 053d9089ce..d6b28a5962 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; /** @@ -82,7 +82,7 @@ public class SendMessageLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); SEND_MESSAGE_LOCALISATIONS.get(_lang).put(set.getString("message").split(SPLIT_STRING), set.getString("translation").split(SPLIT_STRING)); })); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java index e473030c56..c3eda1f3b8 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.actor.instance.ShuttleInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; @@ -72,7 +72,7 @@ public class ShuttleData implements IXmlReader public void parseDocument(Document doc, File f) { NamedNodeMap attrs; - StatsSet set; + StatSet set; Node att; ShuttleDataHolder data; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -84,7 +84,7 @@ public class ShuttleData implements IXmlReader if ("shuttle".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -164,7 +164,7 @@ public class ShuttleData implements IXmlReader { for (ShuttleDataHolder data : _shuttles.values()) { - final ShuttleInstance shuttle = new ShuttleInstance(new CreatureTemplate(new StatsSet())); + final ShuttleInstance shuttle = new ShuttleInstance(new CreatureTemplate(new StatSet())); shuttle.setData(data); shuttle.setHeading(data.getLocation().getHeading()); shuttle.setLocationInvisible(data.getLocation()); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java index 9db0b5f64b..ba000649f2 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.SiegeScheduleDate; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.util.Util; /** @@ -54,7 +54,7 @@ public class SiegeScheduleData implements IXmlReader LOGGER.info(getClass().getSimpleName() + ": Loaded " + _scheduleData.size() + " siege schedulers."); if (_scheduleData.isEmpty()) { - _scheduleData.add(new SiegeScheduleDate(new StatsSet())); + _scheduleData.add(new SiegeScheduleDate(new StatSet())); LOGGER.info(getClass().getSimpleName() + ": Emergency loaded " + _scheduleData.size() + " default siege schedulers."); } } @@ -72,7 +72,7 @@ public class SiegeScheduleData implements IXmlReader { case "schedule": { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final NamedNodeMap attrs = cd.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java index cc019c4dbb..2592b3ed97 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java @@ -40,7 +40,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.EffectHandler; import org.l2jmobius.gameserver.handler.SkillConditionHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.EffectScope; @@ -67,9 +67,9 @@ public class SkillData implements IXmlReader private final Integer _toLevel; private final Integer _fromSubLevel; private final Integer _toSubLevel; - private final Map> _info; + private final Map> _info; - public NamedParamInfo(String name, Integer fromLevel, Integer toLevel, Integer fromSubLevel, Integer toSubLevel, Map> info) + public NamedParamInfo(String name, Integer fromLevel, Integer toLevel, Integer fromSubLevel, Integer toSubLevel, Map> info) { _name = name; _fromLevel = fromLevel; @@ -104,7 +104,7 @@ public class SkillData implements IXmlReader return _toSubLevel; } - public Map> getInfo() + public Map> getInfo() { return _info; } @@ -241,8 +241,8 @@ public class SkillData implements IXmlReader { NamedNodeMap attributes = listNode.getAttributes(); final Map> levels = new HashMap<>(); - final Map> skillInfo = new HashMap<>(); - final StatsSet generalSkillInfo = skillInfo.computeIfAbsent(-1, k -> new HashMap<>()).computeIfAbsent(-1, k -> new StatsSet()); + final Map> skillInfo = new HashMap<>(); + final StatSet generalSkillInfo = skillInfo.computeIfAbsent(-1, k -> new HashMap<>()).computeIfAbsent(-1, k -> new StatSet()); parseAttributes(attributes, "", generalSkillInfo); @@ -321,7 +321,7 @@ public class SkillData implements IXmlReader { return; } - subLevelMap.forEach((subLevel, statsSet) -> + subLevelMap.forEach((subLevel, statSet) -> { if (subLevel == -1) { @@ -339,7 +339,7 @@ public class SkillData implements IXmlReader { return; } - subLevelMap.forEach((subLevel, statsSet) -> + subLevelMap.forEach((subLevel, statSet) -> { if (subLevel == -1) { @@ -371,31 +371,31 @@ public class SkillData implements IXmlReader levels.forEach((level, subLevels) -> subLevels.forEach(subLevel -> { - final StatsSet statsSet = Optional.ofNullable(skillInfo.getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatsSet::new); - skillInfo.getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(statsSet.getSet()::putIfAbsent); - skillInfo.getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(statsSet.getSet()::putIfAbsent); - statsSet.set(".level", level); - statsSet.set(".subLevel", subLevel); - final Skill skill = new Skill(statsSet); + final StatSet statSet = Optional.ofNullable(skillInfo.getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatSet::new); + skillInfo.getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(statSet.getSet()::putIfAbsent); + skillInfo.getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(statSet.getSet()::putIfAbsent); + statSet.set(".level", level); + statSet.set(".subLevel", subLevel); + final Skill skill = new Skill(statSet); forEachNamedParamInfoParam(effectParamInfo, level, subLevel, ((effectScope, params) -> { final String effectName = params.getString(".name"); params.remove(".name"); try { - final Function effectFunction = EffectHandler.getInstance().getHandlerFactory(effectName); + final Function effectFunction = EffectHandler.getInstance().getHandlerFactory(effectName); if (effectFunction != null) { skill.addEffect(effectScope, effectFunction.apply(params)); } else { - LOGGER.warning(getClass().getSimpleName() + ": Missing effect for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]"); + LOGGER.warning(getClass().getSimpleName() + ": Missing effect for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]"); } } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading effect for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading effect for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]", e); } })); @@ -405,19 +405,19 @@ public class SkillData implements IXmlReader params.remove(".name"); try { - final Function conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName); + final Function conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName); if (conditionFunction != null) { skill.addCondition(skillConditionScope, conditionFunction.apply(params)); } else { - LOGGER.warning(getClass().getSimpleName() + ": Missing condition for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + skillConditionScope + "] Effect Name[" + conditionName + "]"); + LOGGER.warning(getClass().getSimpleName() + ": Missing condition for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + skillConditionScope + "] Effect Name[" + conditionName + "]"); } } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading condition for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Condition Scope[" + skillConditionScope + "] Condition Name[" + conditionName + "]", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading condition for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Condition Scope[" + skillConditionScope + "] Condition Name[" + conditionName + "]", e); } })); @@ -434,16 +434,16 @@ public class SkillData implements IXmlReader } } - private void forEachNamedParamInfoParam(Map> paramInfo, int level, int subLevel, BiConsumer consumer) + private void forEachNamedParamInfoParam(Map> paramInfo, int level, int subLevel, BiConsumer consumer) { paramInfo.forEach((scope, namedParamInfos) -> namedParamInfos.forEach(namedParamInfo -> { if ((((namedParamInfo.getFromLevel() == null) && (namedParamInfo.getToLevel() == null)) || ((namedParamInfo.getFromLevel() <= level) && (namedParamInfo.getToLevel() >= level))) // && (((namedParamInfo.getFromSubLevel() == null) && (namedParamInfo.getToSubLevel() == null)) || ((namedParamInfo.getFromSubLevel() <= subLevel) && (namedParamInfo.getToSubLevel() >= subLevel)))) { - final StatsSet params = Optional.ofNullable(namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatsSet::new); - namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); - namedParamInfo.getInfo().getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); + final StatSet params = Optional.ofNullable(namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatSet::new); + namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); + namedParamInfo.getInfo().getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); params.set(".name", namedParamInfo.getName()); consumer.accept(scope, params); } @@ -460,7 +460,7 @@ public class SkillData implements IXmlReader final Integer subLevel = parseInteger(attributes, "subLevel"); final Integer fromSubLevel = parseInteger(attributes, "fromSubLevel", subLevel); final Integer toSubLevel = parseInteger(attributes, "toSubLevel", subLevel); - final Map> info = new HashMap<>(); + final Map> info = new HashMap<>(); for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) { if (!node.getNodeName().equals("#text")) @@ -471,7 +471,7 @@ public class SkillData implements IXmlReader return new NamedParamInfo(name, fromLevel, toLevel, fromSubLevel, toSubLevel, info); } - private void parseInfo(Node node, Map>> variableValues, Map> info) + private void parseInfo(Node node, Map>> variableValues, Map> info) { Map> values = parseValues(node); final Object generalValue = values.getOrDefault(-1, Collections.emptyMap()).get(-1); @@ -492,7 +492,7 @@ public class SkillData implements IXmlReader } } - values.forEach((level, subLevelMap) -> subLevelMap.forEach((subLevel, value) -> info.computeIfAbsent(level, k -> new HashMap<>()).computeIfAbsent(subLevel, k -> new StatsSet()).set(node.getNodeName(), value))); + values.forEach((level, subLevelMap) -> subLevelMap.forEach((subLevel, value) -> info.computeIfAbsent(level, k -> new HashMap<>()).computeIfAbsent(subLevel, k -> new StatSet()).set(node.getNodeName(), value))); } private Map> parseValues(Node node) @@ -535,7 +535,7 @@ public class SkillData implements IXmlReader variables.put("index", (i - fromLevel) + 1d); variables.put("subIndex", (j - fromSubLevel) + 1d); final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1); - if ((base != null) && !(base instanceof StatsSet)) + if ((base != null) && !(base instanceof StatSet)) { variables.put("base", Double.parseDouble(String.valueOf(base))); } @@ -555,13 +555,13 @@ public class SkillData implements IXmlReader Object parseValue(Node node, boolean blockValue, boolean parseAttributes, Map variables) { - StatsSet statsSet = null; + StatSet statSet = null; List list = null; Object text = null; if (parseAttributes && (!node.getNodeName().equals("value") || !blockValue) && (node.getAttributes().getLength() > 0)) { - statsSet = new StatsSet(); - parseAttributes(node.getAttributes(), "", statsSet, variables); + statSet = new StatSet(); + parseAttributes(node.getAttributes(), "", statSet, variables); } for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) { @@ -604,12 +604,12 @@ public class SkillData implements IXmlReader final Object value = parseValue(node, false, true, variables); if (value != null) { - if (statsSet == null) + if (statSet == null) { - statsSet = new StatsSet(); + statSet = new StatSet(); } - statsSet.set(nodeName, value); + statSet.set(nodeName, value); } } } @@ -620,9 +620,9 @@ public class SkillData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", list); + statSet.set(".", list); } else { @@ -635,30 +635,30 @@ public class SkillData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", text); + statSet.set(".", text); } else { return text; } } - return statsSet; + return statSet; } - private void parseAttributes(NamedNodeMap attributes, String prefix, StatsSet statsSet, Map variables) + private void parseAttributes(NamedNodeMap attributes, String prefix, StatSet statSet, Map variables) { for (int i = 0; i < attributes.getLength(); i++) { final Node attributeNode = attributes.item(i); - statsSet.set(prefix + "." + attributeNode.getNodeName(), parseNodeValue(attributeNode.getNodeValue(), variables)); + statSet.set(prefix + "." + attributeNode.getNodeName(), parseNodeValue(attributeNode.getNodeValue(), variables)); } } - private void parseAttributes(NamedNodeMap attributes, String prefix, StatsSet statsSet) + private void parseAttributes(NamedNodeMap attributes, String prefix, StatSet statSet) { - parseAttributes(attributes, prefix, statsSet, Collections.emptyMap()); + parseAttributes(attributes, prefix, statSet, Collections.emptyMap()); } private Object parseNodeValue(String value, Map variables) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java index fa5823a695..8a740feb0c 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.SubclassType; import org.l2jmobius.gameserver.model.SkillLearn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.base.ClassId; @@ -229,7 +229,7 @@ public class SkillTreesData implements IXmlReader { if ("skill".equalsIgnoreCase(c.getNodeName())) { - final StatsSet learnSkillSet = new StatsSet(); + final StatSet learnSkillSet = new StatSet(); attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java index 87915d89eb..78c22d1e7d 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java @@ -36,7 +36,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.ChanceLocation; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.MinionHolder; import org.l2jmobius.gameserver.model.interfaces.IParameterized; @@ -169,7 +169,7 @@ public class SpawnsData implements IXmlReader public void parseSpawn(Node spawnsNode, File file, Collection spawns) { - final SpawnTemplate spawnTemplate = new SpawnTemplate(new StatsSet(parseAttributes(spawnsNode)), file); + final SpawnTemplate spawnTemplate = new SpawnTemplate(new StatSet(parseAttributes(spawnsNode)), file); SpawnGroup defaultGroup = null; for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling()) { @@ -185,7 +185,7 @@ public class SpawnsData implements IXmlReader { if (defaultGroup == null) { - defaultGroup = new SpawnGroup(StatsSet.EMPTY_STATSET); + defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET); } parseNpc(innerNode, spawnTemplate, defaultGroup); } @@ -244,7 +244,7 @@ public class SpawnsData implements IXmlReader private void parseGroup(Node n, SpawnTemplate spawnTemplate) { - final SpawnGroup group = new SpawnGroup(new StatsSet(parseAttributes(n))); + final SpawnGroup group = new SpawnGroup(new StatSet(parseAttributes(n))); forEach(n, IXmlReader::isNode, npcNode -> { switch (npcNode.getNodeName()) @@ -271,7 +271,7 @@ public class SpawnsData implements IXmlReader */ private void parseNpc(Node n, SpawnTemplate spawnTemplate, SpawnGroup group) { - final NpcSpawnTemplate npcTemplate = new NpcSpawnTemplate(spawnTemplate, group, new StatsSet(parseAttributes(n))); + final NpcSpawnTemplate npcTemplate = new NpcSpawnTemplate(spawnTemplate, group, new StatSet(parseAttributes(n))); final NpcTemplate template = NpcData.getInstance().getTemplate(npcTemplate.getId()); if (template == null) { @@ -332,10 +332,10 @@ public class SpawnsData implements IXmlReader * @param n * @param npcTemplate */ - private void parseParameters(Node n, IParameterized npcTemplate) + private void parseParameters(Node n, IParameterized npcTemplate) { final Map params = parseParameters(n); - npcTemplate.setParameters(!params.isEmpty() ? new StatsSet(Collections.unmodifiableMap(params)) : StatsSet.EMPTY_STATSET); + npcTemplate.setParameters(!params.isEmpty() ? new StatSet(Collections.unmodifiableMap(params)) : StatSet.EMPTY_STATSET); } /** @@ -344,7 +344,7 @@ public class SpawnsData implements IXmlReader */ private void parseMinions(Node n, NpcSpawnTemplate npcTemplate) { - forEach(n, "minion", minionNode -> npcTemplate.addMinion(new MinionHolder(new StatsSet(parseAttributes(minionNode))))); + forEach(n, "minion", minionNode -> npcTemplate.addMinion(new MinionHolder(new StatSet(parseAttributes(minionNode))))); } /** diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java index 98d333446c..ef93935404 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; @@ -69,7 +69,7 @@ public class StaticObjectData implements IXmlReader if ("object".equalsIgnoreCase(d.getNodeName())) { final NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -86,9 +86,9 @@ public class StaticObjectData implements IXmlReader * Initialize an static object based on the stats set and add it to the map. * @param set the stats set to add. */ - private void addObject(StatsSet set) + private void addObject(StatSet set) { - final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatsSet()), set.getInt("id")); + final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatSet()), set.getInt("id")); obj.setType(set.getInt("type", 0)); obj.setName(set.getString("name")); obj.setMap(set.getString("texture", "none"), set.getInt("map_x", 0), set.getInt("map_y", 0)); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java index 7c8c9a538d..487bae9dea 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.TeleportType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.teleporter.TeleportHolder; /** @@ -74,7 +74,7 @@ public class TeleportersData implements IXmlReader final String name = parseString(nodeAttrs, "name", type.name()); // Parse locations final TeleportHolder holder = new TeleportHolder(name, type); - forEach(node, "location", location -> holder.registerLocation(new StatsSet(parseAttributes(location)))); + forEach(node, "location", location -> holder.registerLocation(new StatSet(parseAttributes(location)))); // Register holder if (teleList.putIfAbsent(name, holder) != null) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java index b6b3bf2e90..c2f5f94adb 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java @@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.transform.Transform; import org.l2jmobius.gameserver.model.actor.transform.TransformLevelData; import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate; @@ -70,7 +70,7 @@ public class TransformData implements IXmlReader if ("transform".equalsIgnoreCase(d.getNodeName())) { NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -192,7 +192,7 @@ public class TransformData implements IXmlReader transform.setTemplate(isMale, templateData); } - final StatsSet levelsSet = new StatsSet(); + final StatSet levelsSet = new StatSet(); for (Node s = z.getFirstChild(); s != null; s = s.getNextSibling()) { if ("level".equals(s.getNodeName())) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/engines/DocumentBase.java index 376aeccaa5..126f472492 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/engines/DocumentBase.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/engines/DocumentBase.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.PlayerState; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionCategoryType; @@ -177,7 +177,7 @@ public abstract class DocumentBase protected abstract void parseDocument(Document doc); - protected abstract StatsSet getStatsSet(); + protected abstract StatSet getStatSet(); protected abstract String getTableValue(String name); @@ -1238,7 +1238,7 @@ public abstract class DocumentBase setTable(name, array.toArray(new String[array.size()])); } - protected void parseBeanSet(Node n, StatsSet set, Integer level) + protected void parseBeanSet(Node n, StatSet set, Integer level) { final String name = n.getAttributes().getNamedItem("name").getNodeValue().trim(); final String value = n.getAttributes().getNamedItem("val").getNodeValue().trim(); @@ -1253,7 +1253,7 @@ public abstract class DocumentBase } } - protected void setExtractableSkillData(StatsSet set, String value) + protected void setExtractableSkillData(StatSet set, String value) { set.set("capsuled_items_skill", value); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java index e8c77b206e..46f8f9be1f 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java @@ -21,7 +21,7 @@ import java.io.File; import org.w3c.dom.Document; import org.w3c.dom.Node; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; /** @@ -41,7 +41,7 @@ public class DocumentBaseGeneral extends DocumentBase } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return null; } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java index 3ea7f41bb6..419552cf68 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.engines.DocumentBase; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -57,7 +57,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return _currentItem.set; } @@ -111,7 +111,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader _currentItem.id = itemId; _currentItem.name = itemName; _currentItem.type = className; - _currentItem.set = new StatsSet(); + _currentItem.set = new StatSet(); _currentItem.set.set("item_id", itemId); _currentItem.set.set("name", itemName); _currentItem.set.set("additionalName", additionalName); @@ -218,7 +218,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatsSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (Item) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java index 56e5b21a9f..967c1fc34d 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.engines.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; public class ItemDataHolder @@ -24,7 +24,7 @@ public class ItemDataHolder int id; String type; String name; - StatsSet set; + StatSet set; int currentLevel; Item item; } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/handler/ConditionHandler.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/handler/ConditionHandler.java index 47f24d690d..b53f170fb3 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/handler/ConditionHandler.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/handler/ConditionHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.ICondition; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class ConditionHandler { - private final Map> _conditionHandlerFactories = new HashMap<>(); + private final Map> _conditionHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _conditionHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _conditionHandlerFactories.get(name); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/handler/EffectHandler.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/handler/EffectHandler.java index a58de8efb4..328265d9db 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/handler/EffectHandler.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/handler/EffectHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class EffectHandler { - private final Map> _effectHandlerFactories = new HashMap<>(); + private final Map> _effectHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _effectHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _effectHandlerFactories.get(name); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java index a6e2275d04..32438040e0 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class SkillConditionHandler { - private final Map> _skillConditionHandlerFactories = new HashMap<>(); + private final Map> _skillConditionHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _skillConditionHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _skillConditionHandlerFactories.get(name); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java index 6992dd5366..65a8c52d7e 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.model.AirShipTeleportList; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShipInstance; @@ -45,13 +45,13 @@ public class AirShipManager private static final String UPDATE_DB = "UPDATE airships SET fuel=? WHERE owner_id=?"; private CreatureTemplate _airShipTemplate = null; - private final Map _airShipsInfo = new HashMap<>(); + private final Map _airShipsInfo = new HashMap<>(); private final Map _airShips = new HashMap<>(); private final Map _teleports = new HashMap<>(); protected AirShipManager() { - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", 9); npcDat.set("level", 0); npcDat.set("jClass", "boat"); @@ -113,7 +113,7 @@ public class AirShipManager public AirShipInstance getNewAirShip(int x, int y, int z, int heading, int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return null; @@ -147,7 +147,7 @@ public class AirShipManager if (ship.getOwnerId() != 0) { storeInDb(ship.getOwnerId()); - final StatsSet info = _airShipsInfo.get(ship.getOwnerId()); + final StatSet info = _airShipsInfo.get(ship.getOwnerId()); if (info != null) { info.set("fuel", ship.getFuel()); @@ -164,7 +164,7 @@ public class AirShipManager { if (!_airShipsInfo.containsKey(ownerId)) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("fuel", 600); _airShipsInfo.put(ownerId, info); @@ -264,10 +264,10 @@ public class AirShipManager Statement s = con.createStatement(); ResultSet rs = s.executeQuery(LOAD_DB)) { - StatsSet info; + StatSet info; while (rs.next()) { - info = new StatsSet(); + info = new StatSet(); info.set("fuel", rs.getInt("fuel")); _airShipsInfo.put(rs.getInt("owner_id"), info); } @@ -285,7 +285,7 @@ public class AirShipManager private void storeInDb(int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return; diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java index 2db10dd045..e5c610b3f2 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.BoatInstance; @@ -57,7 +57,7 @@ public class BoatManager return null; } - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", boatId); npcDat.set("level", 0); npcDat.set("jClass", "boat"); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 99a9678ece..56f08422cd 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.enums.ManorMode; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; import org.l2jmobius.gameserver.model.SeedProduction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.entity.Castle; @@ -126,7 +126,7 @@ public class CastleManorManager implements IXmlReader, IStorable @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; NamedNodeMap attrs; Node att; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -142,7 +142,7 @@ public class CastleManorManager implements IXmlReader, IStorable { if ("crop".equalsIgnoreCase(c.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); set.set("castleId", castleId); attrs = c.getAttributes(); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java index 2ad7e1d5fe..bf30080665 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java @@ -27,7 +27,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosState; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -181,7 +181,7 @@ public class CeremonyOfChaosManager extends AbstractEventManager _npcs = new ConcurrentHashMap<>(); protected final Map _spawns = new ConcurrentHashMap<>(); - protected final Map _storedInfo = new ConcurrentHashMap<>(); + protected final Map _storedInfo = new ConcurrentHashMap<>(); protected final Map> _schedules = new ConcurrentHashMap<>(); /** @@ -161,7 +161,7 @@ public class DBSpawnManager { npc.setDBStatus(RaidBossStatus.ALIVE); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getCurrentHp()); info.set("currentMP", npc.getCurrentMp()); info.set("respawnTime", 0); @@ -181,7 +181,7 @@ public class DBSpawnManager */ public void updateStatus(Npc npc, boolean isNpcDead) { - final StatsSet info = _storedInfo.get(npc.getId()); + final StatSet info = _storedInfo.get(npc.getId()); if (info == null) { return; @@ -254,7 +254,7 @@ public class DBSpawnManager _npcs.put(npcId, npc); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", currentHP); info.set("currentMP", currentMP); info.set("respawnTime", 0); @@ -316,7 +316,7 @@ public class DBSpawnManager } npc.setDBStatus(RaidBossStatus.ALIVE); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", 0); @@ -401,7 +401,7 @@ public class DBSpawnManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("UPDATE npc_respawns SET respawnTime = ?, currentHP = ?, currentMP = ? WHERE id = ?")) { - for (Entry entry : _storedInfo.entrySet()) + for (Entry entry : _storedInfo.entrySet()) { final Integer npcId = entry.getKey(); if (npcId == null) @@ -420,7 +420,7 @@ public class DBSpawnManager updateStatus(npc, false); } - final StatsSet info = entry.getValue(); + final StatSet info = entry.getValue(); if (info == null) { continue; @@ -529,7 +529,7 @@ public class DBSpawnManager */ public void notifySpawnNightNpc(Npc npc) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getCurrentHp()); info.set("currentMP", npc.getCurrentMp()); info.set("respawnTime", 0); @@ -572,7 +572,7 @@ public class DBSpawnManager * Gets the stored info. * @return the stored info */ - public Map getStoredInfo() + public Map getStoredInfo() { return _storedInfo; } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index 3dd4e3f652..767bed6954 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.datatables.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.FakePlayerChatHolder; @@ -73,7 +73,7 @@ public class FakePlayerChatManager implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayerChat", fakePlayerChatNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerChatNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerChatNode)); MESSAGES.add(new FakePlayerChatHolder(set.getString("fpcName"), set.getString("searchMethod"), set.getString("searchText"), set.getString("answers"))); })); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java index 07c111065e..52bab09349 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java @@ -33,7 +33,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.tasks.GrandBossManagerStoreTask; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; import org.l2jmobius.gameserver.model.interfaces.IStorable; @@ -51,7 +51,7 @@ public class GrandBossManager implements IStorable protected static Map _bosses = new ConcurrentHashMap<>(); - protected static Map _storedInfo = new HashMap<>(); + protected static Map _storedInfo = new HashMap<>(); private final Map _bossStatus = new HashMap<>(); @@ -72,7 +72,7 @@ public class GrandBossManager implements IStorable final int bossId = rs.getInt("boss_id"); if (NpcData.getInstance().getTemplate(bossId) != null) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("loc_x", rs.getInt("loc_x")); info.set("loc_y", rs.getInt("loc_y")); info.set("loc_z", rs.getInt("loc_z")); @@ -140,12 +140,12 @@ public class GrandBossManager implements IStorable return _bosses.get(bossId); } - public StatsSet getStatsSet(int bossId) + public StatSet getStatSet(int bossId) { return _storedInfo.get(bossId); } - public void setStatsSet(int bossId, StatsSet info) + public void setStatSet(int bossId, StatSet info) { _storedInfo.put(bossId, info); updateDb(bossId, false); @@ -156,10 +156,10 @@ public class GrandBossManager implements IStorable { try (Connection con = DatabaseFactory.getConnection()) { - for (Entry e : _storedInfo.entrySet()) + for (Entry e : _storedInfo.entrySet()) { final GrandBossInstance boss = _bosses.get(e.getKey()); - final StatsSet info = e.getValue(); + final StatSet info = e.getValue(); if ((boss == null) || (info == null)) { try (PreparedStatement update = con.prepareStatement(UPDATE_GRAND_BOSS_DATA2)) @@ -209,7 +209,7 @@ public class GrandBossManager implements IStorable try (Connection con = DatabaseFactory.getConnection()) { final GrandBossInstance boss = _bosses.get(bossId); - final StatsSet info = _storedInfo.get(bossId); + final StatSet info = _storedInfo.get(bossId); if (statusOnly || (boss == null) || (info == null)) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index d77642378f..29e517b0cd 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.enums.InstanceReenterType; import org.l2jmobius.gameserver.enums.InstanceRemoveBuffType; import org.l2jmobius.gameserver.enums.InstanceTeleportType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.holders.InstanceReenterTimeHolder; @@ -151,7 +151,7 @@ public class InstanceManager implements IXmlReader return; } - final InstanceTemplate template = new InstanceTemplate(new StatsSet(parseAttributes(instanceNode))); + final InstanceTemplate template = new InstanceTemplate(new StatSet(parseAttributes(instanceNode))); // Update name if wasn't provided if (template.getName() == null) @@ -241,10 +241,10 @@ public class InstanceManager implements IXmlReader { if (doorNode.getNodeName().equals("door")) { - final StatsSet parsedSet = DoorData.getInstance().parseDoor(doorNode); - final StatsSet mergedSet = new StatsSet(); + final StatSet parsedSet = DoorData.getInstance().parseDoor(doorNode); + final StatSet mergedSet = new StatSet(); final int doorId = parsedSet.getInt("id"); - final StatsSet templateSet = DoorData.getInstance().getDoorTemplate(doorId); + final StatSet templateSet = DoorData.getInstance().getDoorTemplate(doorId); if (templateSet != null) { mergedSet.merge(templateSet); @@ -324,14 +324,14 @@ public class InstanceManager implements IXmlReader final boolean onlyLeader = parseBoolean(attrs, "onlyLeader", false); final boolean showMessageAndHtml = parseBoolean(attrs, "showMessageAndHtml", false); // Load parameters - StatsSet params = null; + StatSet params = null; for (Node f = conditionNode.getFirstChild(); f != null; f = f.getNextSibling()) { if (f.getNodeName().equals("param")) { if (params == null) { - params = new StatsSet(); + params = new StatSet(); } params.set(parseString(f.getAttributes(), "name"), parseString(f.getAttributes(), "value")); @@ -341,14 +341,14 @@ public class InstanceManager implements IXmlReader // If none parameters found then set empty StatSet if (params == null) { - params = StatsSet.EMPTY_STATSET; + params = StatSet.EMPTY_STATSET; } // Now when everything is loaded register condition to template try { final Class clazz = Class.forName("org.l2jmobius.gameserver.model.instancezone.conditions.Condition" + type); - final Constructor constructor = clazz.getConstructor(InstanceTemplate.class, StatsSet.class, boolean.class, boolean.class); + final Constructor constructor = clazz.getConstructor(InstanceTemplate.class, StatSet.class, boolean.class, boolean.class); conditions.add((Condition) constructor.newInstance(template, params, onlyLeader, showMessageAndHtml)); } catch (Exception ex) @@ -378,7 +378,7 @@ public class InstanceManager implements IXmlReader */ public Instance createInstance() { - return new Instance(getNewInstanceId(), new InstanceTemplate(StatsSet.EMPTY_STATSET), null); + return new Instance(getNewInstanceId(), new InstanceTemplate(StatSet.EMPTY_STATSET), null); } /** diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/AccessLevel.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/AccessLevel.java index 772c1fe77e..72b77905e1 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/AccessLevel.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/AccessLevel.java @@ -52,7 +52,7 @@ public class AccessLevel /** Flag to gain exp in party */ private boolean _gainExp = false; - public AccessLevel(StatsSet set) + public AccessLevel(StatSet set) { _accessLevel = set.getInt("level"); _name = set.getString("name"); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ActionDataHolder.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ActionDataHolder.java index 4887bedba8..ca6d9ee685 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ActionDataHolder.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ActionDataHolder.java @@ -25,7 +25,7 @@ public class ActionDataHolder private final String _handler; private final int _optionId; - public ActionDataHolder(StatsSet set) + public ActionDataHolder(StatSet set) { _id = set.getInt("id"); _handler = set.getString("handler"); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java index 656119098e..3f88e455d7 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java @@ -27,7 +27,7 @@ public class AdminCommandAccessRight private final int _accessLevel; private final boolean _requireConfirm; - public AdminCommandAccessRight(StatsSet set) + public AdminCommandAccessRight(StatSet set) { _adminCommand = set.getString("command"); _requireConfirm = set.getBoolean("confirmDlg", false); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index f1c86b8469..f9889f27cf 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -36,7 +36,7 @@ public class DailyMissionDataHolder private final List _rewardsItems; private final List _classRestriction; private final int _requiredCompletions; - private final StatsSet _params; + private final StatSet _params; private final boolean _dailyReset; private final boolean _isOneTime; private final boolean _isMainClassOnly; @@ -44,7 +44,7 @@ public class DailyMissionDataHolder private final boolean _isDisplayedWhenNotAvailable; private final AbstractDailyMissionHandler _handler; - public DailyMissionDataHolder(StatsSet set) + public DailyMissionDataHolder(StatSet set) { final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); @@ -53,7 +53,7 @@ public class DailyMissionDataHolder _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); - _params = set.getObject("params", StatsSet.class); + _params = set.getObject("params", StatSet.class); _dailyReset = set.getBoolean("dailyReset", true); _isOneTime = set.getBoolean("isOneTime", true); _isMainClassOnly = set.getBoolean("isMainClassOnly", true); @@ -87,7 +87,7 @@ public class DailyMissionDataHolder return _requiredCompletions; } - public StatsSet getParams() + public StatSet getParams() { return _params; } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Location.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Location.java index 1c61740e4d..024c71075f 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Location.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Location.java @@ -49,7 +49,7 @@ public class Location implements IPositionable this(obj.getX(), obj.getY(), obj.getZ(), obj.getHeading()); } - public Location(StatsSet set) + public Location(StatSet set) { _x = set.getInt("x"); _y = set.getInt("y"); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/PetLevelData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/PetLevelData.java index e46b215b5f..7cad1a225a 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/PetLevelData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/PetLevelData.java @@ -46,7 +46,7 @@ public class PetLevelData private final double _slowFlySpeedOnRide; private final double _fastFlySpeedOnRide; - public PetLevelData(StatsSet set) + public PetLevelData(StatSet set) { _ownerExpTaken = set.getInt("get_exp_type"); _petMaxExp = set.getLong("exp"); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Seed.java index 4307849cf5..dd756c82e2 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Seed.java @@ -35,7 +35,7 @@ public class Seed private final long _seedReferencePrice; private final long _cropReferencePrice; - public Seed(StatsSet set) + public Seed(StatSet set) { _cropId = set.getInt("id"); _seedId = set.getInt("seedId"); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java index 78897cf4f1..4de77df228 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java @@ -27,7 +27,7 @@ public class SiegeScheduleDate private final int _hour; private final int _maxConcurrent; - public SiegeScheduleDate(StatsSet set) + public SiegeScheduleDate(StatSet set) { _day = set.getInt("day", Calendar.SUNDAY); _hour = set.getInt("hour", 16); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/SkillLearn.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/SkillLearn.java index e2ccdd6331..00f53c0cb9 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/SkillLearn.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/SkillLearn.java @@ -58,7 +58,7 @@ public class SkillLearn * Constructor for SkillLearn. * @param set the set with the SkillLearn data. */ - public SkillLearn(StatsSet set) + public SkillLearn(StatSet set) { _skillName = set.getString("skillName"); _skillId = set.getInt("skillId"); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/StatSet.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/StatSet.java new file mode 100644 index 0000000000..3c824d9fa4 --- /dev/null +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/StatSet.java @@ -0,0 +1,968 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Supplier; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.stream.Collectors; + +import org.l2jmobius.commons.util.TimeUtil; +import org.l2jmobius.gameserver.model.holders.MinionHolder; +import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.interfaces.IParserAdvUtils; +import org.l2jmobius.gameserver.util.Util; + +/** + * This class is meant to hold a set of (key,value) pairs.
+ * They are stored as object but can be retrieved in any type wanted. As long as cast is available.
+ * @author mkizub + */ +public class StatSet implements IParserAdvUtils +{ + private static final Logger LOGGER = Logger.getLogger(StatSet.class.getName()); + /** Static empty immutable map, used to avoid multiple null checks over the source. */ + public static final StatSet EMPTY_STATSET = new StatSet(Collections.emptyMap()); + + private final Map _set; + + public StatSet() + { + this(ConcurrentHashMap::new); + } + + public StatSet(Supplier> mapFactory) + { + this(mapFactory.get()); + } + + public StatSet(Map map) + { + _set = map; + } + + /** + * Returns the set of values + * @return HashMap + */ + public Map getSet() + { + return _set; + } + + /** + * Add a set of couple values in the current set + * @param newSet : StatSet pointing out the list of couples to add in the current set + */ + public void merge(StatSet newSet) + { + _set.putAll(newSet.getSet()); + } + + /** + * Verifies if the stat set is empty. + * @return {@code true} if the stat set is empty, {@code false} otherwise + */ + public boolean isEmpty() + { + return _set.isEmpty(); + } + + /** + * Return the boolean value associated with key. + * @param key : String designating the key in the set + * @return boolean : value associated to the key + * @throws IllegalArgumentException : If value is not set or value is not boolean + */ + @Override + public boolean getBoolean(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Boolean value required, but not specified"); + } + if (val instanceof Boolean) + { + return ((Boolean) val).booleanValue(); + } + try + { + return Boolean.parseBoolean((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Boolean value required, but found: " + val); + } + } + + /** + * Return the boolean value associated with key.
+ * If no value is associated with key, or type of value is wrong, returns defaultValue. + * @param key : String designating the key in the entry set + * @return boolean : value associated to the key + */ + @Override + public boolean getBoolean(String key, boolean defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Boolean) + { + return ((Boolean) val).booleanValue(); + } + try + { + return Boolean.parseBoolean((String) val); + } + catch (Exception e) + { + return defaultValue; + } + } + + @Override + public byte getByte(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Byte value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).byteValue(); + } + try + { + return Byte.parseByte((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + + @Override + public byte getByte(String key, byte defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).byteValue(); + } + try + { + return Byte.parseByte((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + + public short increaseByte(String key, byte increaseWith) + { + final byte newValue = (byte) (getByte(key) + increaseWith); + set(key, newValue); + return newValue; + } + + public short increaseByte(String key, byte defaultValue, byte increaseWith) + { + final byte newValue = (byte) (getByte(key, defaultValue) + increaseWith); + set(key, newValue); + return newValue; + } + + public byte[] getByteArray(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Byte value required, but not specified"); + } + if (val instanceof Number) + { + return new byte[] + { + ((Number) val).byteValue() + }; + } + int c = 0; + final String[] vals = ((String) val).split(splitOn); + final byte[] result = new byte[vals.length]; + for (String v : vals) + { + try + { + result[c++] = Byte.parseByte(v); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + return result; + } + + public List getByteList(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final List result = new ArrayList<>(); + for (Byte i : getByteArray(key, splitOn)) + { + result.add(i); + } + return result; + } + + @Override + public short getShort(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Short value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).shortValue(); + } + try + { + return Short.parseShort((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Short value required, but found: " + val); + } + } + + @Override + public short getShort(String key, short defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).shortValue(); + } + try + { + return Short.parseShort((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Short value required, but found: " + val); + } + } + + public short increaseShort(String key, short increaseWith) + { + final short newValue = (short) (getShort(key) + increaseWith); + set(key, newValue); + return newValue; + } + + public short increaseShort(String key, short defaultValue, short increaseWith) + { + final short newValue = (short) (getShort(key, defaultValue) + increaseWith); + set(key, newValue); + return newValue; + } + + @Override + public int getInt(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Integer value required, but not specified: " + key + "!"); + } + + if (val instanceof Number) + { + return ((Number) val).intValue(); + } + + try + { + return Integer.parseInt((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val + "!"); + } + } + + @Override + public int getInt(String key, int defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).intValue(); + } + try + { + return Integer.parseInt((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val); + } + } + + public int increaseInt(String key, int increaseWith) + { + final int newValue = getInt(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public int increaseInt(String key, int defaultValue, int increaseWith) + { + final int newValue = getInt(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + public int[] getIntArray(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Integer value required, but not specified"); + } + if (val instanceof Number) + { + return new int[] + { + ((Number) val).intValue() + }; + } + int c = 0; + final String[] vals = ((String) val).split(splitOn); + final int[] result = new int[vals.length]; + for (String v : vals) + { + try + { + result[c++] = Integer.parseInt(v); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val); + } + } + return result; + } + + public List getIntegerList(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final List result = new ArrayList<>(); + for (int i : getIntArray(key, splitOn)) + { + result.add(i); + } + return result; + } + + @Override + public long getLong(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Long value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).longValue(); + } + try + { + return Long.parseLong((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Long value required, but found: " + val); + } + } + + @Override + public long getLong(String key, long defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).longValue(); + } + try + { + return Long.parseLong((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Long value required, but found: " + val); + } + } + + public long increaseLong(String key, long increaseWith) + { + final long newValue = getLong(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public long increaseLong(String key, long defaultValue, long increaseWith) + { + final long newValue = getLong(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public float getFloat(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Float value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).floatValue(); + } + try + { + return Float.parseFloat((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Float value required, but found: " + val); + } + } + + @Override + public float getFloat(String key, float defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).floatValue(); + } + try + { + return Float.parseFloat((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Float value required, but found: " + val); + } + } + + public float increaseFloat(String key, float increaseWith) + { + final float newValue = getFloat(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public float increaseFloat(String key, float defaultValue, float increaseWith) + { + final float newValue = getFloat(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public double getDouble(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Double value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).doubleValue(); + } + try + { + return Double.parseDouble((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Double value required, but found: " + val); + } + } + + @Override + public double getDouble(String key, double defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).doubleValue(); + } + try + { + return Double.parseDouble((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Double value required, but found: " + val); + } + } + + public double increaseDouble(String key, double increaseWith) + { + final double newValue = getDouble(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public double increaseDouble(String key, double defaultValue, double increaseWith) + { + final double newValue = getDouble(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public String getString(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("String value required, but not specified"); + } + return String.valueOf(val); + } + + @Override + public String getString(String key, String defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + return String.valueOf(val); + } + + @Override + public Duration getDuration(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("String value required, but not specified"); + } + return TimeUtil.parseDuration(String.valueOf(val)); + } + + @Override + public Duration getDuration(String key, Duration defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + return TimeUtil.parseDuration(String.valueOf(val)); + } + + @Override + @SuppressWarnings("unchecked") + public > T getEnum(String key, Class enumClass) + { + Objects.requireNonNull(key); + Objects.requireNonNull(enumClass); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but not specified"); + } + if (enumClass.isInstance(val)) + { + return (T) val; + } + try + { + return Enum.valueOf(enumClass, String.valueOf(val)); + } + catch (Exception e) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); + } + } + + @Override + @SuppressWarnings("unchecked") + public > T getEnum(String key, Class enumClass, T defaultValue) + { + Objects.requireNonNull(key); + Objects.requireNonNull(enumClass); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (enumClass.isInstance(val)) + { + return (T) val; + } + try + { + return Enum.valueOf(enumClass, String.valueOf(val)); + } + catch (Exception e) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); + } + } + + @SuppressWarnings("unchecked") + public A getObject(String name, Class type) + { + Objects.requireNonNull(name); + Objects.requireNonNull(type); + final Object obj = _set.get(name); + if ((obj == null) || !type.isAssignableFrom(obj.getClass())) + { + return null; + } + + return (A) obj; + } + + @SuppressWarnings("unchecked") + public A getObject(String name, Class type, A defaultValue) + { + Objects.requireNonNull(name); + Objects.requireNonNull(type); + final Object obj = _set.get(name); + if ((obj == null) || !type.isAssignableFrom(obj.getClass())) + { + return defaultValue; + } + + return (A) obj; + } + + public SkillHolder getSkillHolder(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof SkillHolder)) + { + return null; + } + + return (SkillHolder) obj; + } + + public Location getLocation(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof Location)) + { + return null; + } + return (Location) obj; + } + + @SuppressWarnings("unchecked") + public List getMinionList(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return Collections.emptyList(); + } + + return (List) obj; + } + + @SuppressWarnings("unchecked") + public List getList(String key, Class clazz) + { + Objects.requireNonNull(key); + Objects.requireNonNull(clazz); + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return null; + } + + final List originalList = (List) obj; + if (!originalList.isEmpty() && !originalList.stream().allMatch(clazz::isInstance)) + { + if (clazz.getSuperclass() == Enum.class) + { + throw new IllegalAccessError("Please use getEnumList if you want to get list of Enums!"); + } + + // Attempt to convert the list + final List convertedList = convertList(originalList, clazz); + if (convertedList == null) + { + LOGGER.log(Level.WARNING, "getList(\"" + key + "\", " + clazz.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); + return null; + } + + // Overwrite the existing list with proper generic type + _set.put(key, convertedList); + return convertedList; + } + return (List) obj; + } + + public List getList(String key, Class clazz, List defaultValue) + { + final List list = getList(key, clazz); + return list == null ? defaultValue : list; + } + + @SuppressWarnings("unchecked") + public > List getEnumList(String key, Class clazz) + { + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return null; + } + + final List originalList = (List) obj; + if (!originalList.isEmpty() && (obj.getClass().getGenericInterfaces()[0] != clazz) && originalList.stream().allMatch(name -> Util.isEnum(name.toString(), clazz))) + { + final List convertedList = originalList.stream().map(Object::toString).map(name -> Enum.valueOf(clazz, name)).map(clazz::cast).collect(Collectors.toList()); + + // Overwrite the existing list with proper generic type + _set.put(key, convertedList); + return convertedList; + } + return (List) obj; + } + + /** + * @param + * @param originalList + * @param clazz + * @return + */ + private List convertList(List originalList, Class clazz) + { + if (clazz == Integer.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isInteger)) + { + return originalList.stream().map(Object::toString).map(Integer::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + else if (clazz == Float.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isFloat)) + { + return originalList.stream().map(Object::toString).map(Float::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + else if (clazz == Double.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isDouble)) + { + return originalList.stream().map(Object::toString).map(Double::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + return null; + } + + @SuppressWarnings("unchecked") + public Map getMap(String key, Class keyClass, Class valueClass) + { + final Object obj = _set.get(key); + if (!(obj instanceof Map)) + { + return null; + } + + final Map originalList = (Map) obj; + if (!originalList.isEmpty() && ((!originalList.keySet().stream().allMatch(keyClass::isInstance)) || (!originalList.values().stream().allMatch(valueClass::isInstance)))) + { + LOGGER.log(Level.WARNING, "getMap(\"" + key + "\", " + keyClass.getSimpleName() + ", " + valueClass.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); + } + return (Map) obj; + } + + public StatSet set(String name, Object value) + { + if (value == null) + { + return this; + } + _set.put(name, value); + return this; + } + + public StatSet set(String key, boolean value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, byte value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, short value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, int value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, long value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, float value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, double value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, String value) + { + if (value == null) + { + return this; + } + _set.put(key, value); + return this; + } + + public StatSet set(String key, Enum value) + { + if (value == null) + { + return this; + } + _set.put(key, value); + return this; + } + + public static StatSet valueOf(String key, Object value) + { + final StatSet set = new StatSet(); + set.set(key, value); + return set; + } + + public void remove(String key) + { + _set.remove(key); + } + + public boolean contains(String name) + { + return _set.containsKey(name); + } + + @Override + public String toString() + { + return "StatSet{_set=" + _set + '}'; + } +} diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/StatsSet.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/StatsSet.java deleted file mode 100644 index 5ce013ebd2..0000000000 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/StatsSet.java +++ /dev/null @@ -1,968 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.ConcurrentHashMap; -import java.util.function.Supplier; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.stream.Collectors; - -import org.l2jmobius.commons.util.TimeUtil; -import org.l2jmobius.gameserver.model.holders.MinionHolder; -import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.interfaces.IParserAdvUtils; -import org.l2jmobius.gameserver.util.Util; - -/** - * This class is meant to hold a set of (key,value) pairs.
- * They are stored as object but can be retrieved in any type wanted. As long as cast is available.
- * @author mkizub - */ -public class StatsSet implements IParserAdvUtils -{ - private static final Logger LOGGER = Logger.getLogger(StatsSet.class.getName()); - /** Static empty immutable map, used to avoid multiple null checks over the source. */ - public static final StatsSet EMPTY_STATSET = new StatsSet(Collections.emptyMap()); - - private final Map _set; - - public StatsSet() - { - this(ConcurrentHashMap::new); - } - - public StatsSet(Supplier> mapFactory) - { - this(mapFactory.get()); - } - - public StatsSet(Map map) - { - _set = map; - } - - /** - * Returns the set of values - * @return HashMap - */ - public Map getSet() - { - return _set; - } - - /** - * Add a set of couple values in the current set - * @param newSet : StatsSet pointing out the list of couples to add in the current set - */ - public void merge(StatsSet newSet) - { - _set.putAll(newSet.getSet()); - } - - /** - * Verifies if the stat set is empty. - * @return {@code true} if the stat set is empty, {@code false} otherwise - */ - public boolean isEmpty() - { - return _set.isEmpty(); - } - - /** - * Return the boolean value associated with key. - * @param key : String designating the key in the set - * @return boolean : value associated to the key - * @throws IllegalArgumentException : If value is not set or value is not boolean - */ - @Override - public boolean getBoolean(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Boolean value required, but not specified"); - } - if (val instanceof Boolean) - { - return ((Boolean) val).booleanValue(); - } - try - { - return Boolean.parseBoolean((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Boolean value required, but found: " + val); - } - } - - /** - * Return the boolean value associated with key.
- * If no value is associated with key, or type of value is wrong, returns defaultValue. - * @param key : String designating the key in the entry set - * @return boolean : value associated to the key - */ - @Override - public boolean getBoolean(String key, boolean defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Boolean) - { - return ((Boolean) val).booleanValue(); - } - try - { - return Boolean.parseBoolean((String) val); - } - catch (Exception e) - { - return defaultValue; - } - } - - @Override - public byte getByte(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Byte value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).byteValue(); - } - try - { - return Byte.parseByte((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - - @Override - public byte getByte(String key, byte defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).byteValue(); - } - try - { - return Byte.parseByte((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - - public short increaseByte(String key, byte increaseWith) - { - final byte newValue = (byte) (getByte(key) + increaseWith); - set(key, newValue); - return newValue; - } - - public short increaseByte(String key, byte defaultValue, byte increaseWith) - { - final byte newValue = (byte) (getByte(key, defaultValue) + increaseWith); - set(key, newValue); - return newValue; - } - - public byte[] getByteArray(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Byte value required, but not specified"); - } - if (val instanceof Number) - { - return new byte[] - { - ((Number) val).byteValue() - }; - } - int c = 0; - final String[] vals = ((String) val).split(splitOn); - final byte[] result = new byte[vals.length]; - for (String v : vals) - { - try - { - result[c++] = Byte.parseByte(v); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - return result; - } - - public List getByteList(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final List result = new ArrayList<>(); - for (Byte i : getByteArray(key, splitOn)) - { - result.add(i); - } - return result; - } - - @Override - public short getShort(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Short value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).shortValue(); - } - try - { - return Short.parseShort((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Short value required, but found: " + val); - } - } - - @Override - public short getShort(String key, short defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).shortValue(); - } - try - { - return Short.parseShort((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Short value required, but found: " + val); - } - } - - public short increaseShort(String key, short increaseWith) - { - final short newValue = (short) (getShort(key) + increaseWith); - set(key, newValue); - return newValue; - } - - public short increaseShort(String key, short defaultValue, short increaseWith) - { - final short newValue = (short) (getShort(key, defaultValue) + increaseWith); - set(key, newValue); - return newValue; - } - - @Override - public int getInt(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Integer value required, but not specified: " + key + "!"); - } - - if (val instanceof Number) - { - return ((Number) val).intValue(); - } - - try - { - return Integer.parseInt((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val + "!"); - } - } - - @Override - public int getInt(String key, int defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).intValue(); - } - try - { - return Integer.parseInt((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val); - } - } - - public int increaseInt(String key, int increaseWith) - { - final int newValue = getInt(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public int increaseInt(String key, int defaultValue, int increaseWith) - { - final int newValue = getInt(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - public int[] getIntArray(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Integer value required, but not specified"); - } - if (val instanceof Number) - { - return new int[] - { - ((Number) val).intValue() - }; - } - int c = 0; - final String[] vals = ((String) val).split(splitOn); - final int[] result = new int[vals.length]; - for (String v : vals) - { - try - { - result[c++] = Integer.parseInt(v); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val); - } - } - return result; - } - - public List getIntegerList(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final List result = new ArrayList<>(); - for (int i : getIntArray(key, splitOn)) - { - result.add(i); - } - return result; - } - - @Override - public long getLong(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Long value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).longValue(); - } - try - { - return Long.parseLong((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Long value required, but found: " + val); - } - } - - @Override - public long getLong(String key, long defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).longValue(); - } - try - { - return Long.parseLong((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Long value required, but found: " + val); - } - } - - public long increaseLong(String key, long increaseWith) - { - final long newValue = getLong(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public long increaseLong(String key, long defaultValue, long increaseWith) - { - final long newValue = getLong(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public float getFloat(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Float value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).floatValue(); - } - try - { - return Float.parseFloat((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Float value required, but found: " + val); - } - } - - @Override - public float getFloat(String key, float defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).floatValue(); - } - try - { - return Float.parseFloat((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Float value required, but found: " + val); - } - } - - public float increaseFloat(String key, float increaseWith) - { - final float newValue = getFloat(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public float increaseFloat(String key, float defaultValue, float increaseWith) - { - final float newValue = getFloat(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public double getDouble(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Double value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).doubleValue(); - } - try - { - return Double.parseDouble((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Double value required, but found: " + val); - } - } - - @Override - public double getDouble(String key, double defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).doubleValue(); - } - try - { - return Double.parseDouble((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Double value required, but found: " + val); - } - } - - public double increaseDouble(String key, double increaseWith) - { - final double newValue = getDouble(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public double increaseDouble(String key, double defaultValue, double increaseWith) - { - final double newValue = getDouble(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public String getString(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("String value required, but not specified"); - } - return String.valueOf(val); - } - - @Override - public String getString(String key, String defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - return String.valueOf(val); - } - - @Override - public Duration getDuration(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("String value required, but not specified"); - } - return TimeUtil.parseDuration(String.valueOf(val)); - } - - @Override - public Duration getDuration(String key, Duration defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - return TimeUtil.parseDuration(String.valueOf(val)); - } - - @Override - @SuppressWarnings("unchecked") - public > T getEnum(String key, Class enumClass) - { - Objects.requireNonNull(key); - Objects.requireNonNull(enumClass); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but not specified"); - } - if (enumClass.isInstance(val)) - { - return (T) val; - } - try - { - return Enum.valueOf(enumClass, String.valueOf(val)); - } - catch (Exception e) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); - } - } - - @Override - @SuppressWarnings("unchecked") - public > T getEnum(String key, Class enumClass, T defaultValue) - { - Objects.requireNonNull(key); - Objects.requireNonNull(enumClass); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (enumClass.isInstance(val)) - { - return (T) val; - } - try - { - return Enum.valueOf(enumClass, String.valueOf(val)); - } - catch (Exception e) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); - } - } - - @SuppressWarnings("unchecked") - public A getObject(String name, Class type) - { - Objects.requireNonNull(name); - Objects.requireNonNull(type); - final Object obj = _set.get(name); - if ((obj == null) || !type.isAssignableFrom(obj.getClass())) - { - return null; - } - - return (A) obj; - } - - @SuppressWarnings("unchecked") - public A getObject(String name, Class type, A defaultValue) - { - Objects.requireNonNull(name); - Objects.requireNonNull(type); - final Object obj = _set.get(name); - if ((obj == null) || !type.isAssignableFrom(obj.getClass())) - { - return defaultValue; - } - - return (A) obj; - } - - public SkillHolder getSkillHolder(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof SkillHolder)) - { - return null; - } - - return (SkillHolder) obj; - } - - public Location getLocation(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof Location)) - { - return null; - } - return (Location) obj; - } - - @SuppressWarnings("unchecked") - public List getMinionList(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return Collections.emptyList(); - } - - return (List) obj; - } - - @SuppressWarnings("unchecked") - public List getList(String key, Class clazz) - { - Objects.requireNonNull(key); - Objects.requireNonNull(clazz); - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return null; - } - - final List originalList = (List) obj; - if (!originalList.isEmpty() && !originalList.stream().allMatch(clazz::isInstance)) - { - if (clazz.getSuperclass() == Enum.class) - { - throw new IllegalAccessError("Please use getEnumList if you want to get list of Enums!"); - } - - // Attempt to convert the list - final List convertedList = convertList(originalList, clazz); - if (convertedList == null) - { - LOGGER.log(Level.WARNING, "getList(\"" + key + "\", " + clazz.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); - return null; - } - - // Overwrite the existing list with proper generic type - _set.put(key, convertedList); - return convertedList; - } - return (List) obj; - } - - public List getList(String key, Class clazz, List defaultValue) - { - final List list = getList(key, clazz); - return list == null ? defaultValue : list; - } - - @SuppressWarnings("unchecked") - public > List getEnumList(String key, Class clazz) - { - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return null; - } - - final List originalList = (List) obj; - if (!originalList.isEmpty() && (obj.getClass().getGenericInterfaces()[0] != clazz) && originalList.stream().allMatch(name -> Util.isEnum(name.toString(), clazz))) - { - final List convertedList = originalList.stream().map(Object::toString).map(name -> Enum.valueOf(clazz, name)).map(clazz::cast).collect(Collectors.toList()); - - // Overwrite the existing list with proper generic type - _set.put(key, convertedList); - return convertedList; - } - return (List) obj; - } - - /** - * @param - * @param originalList - * @param clazz - * @return - */ - private List convertList(List originalList, Class clazz) - { - if (clazz == Integer.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isInteger)) - { - return originalList.stream().map(Object::toString).map(Integer::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - else if (clazz == Float.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isFloat)) - { - return originalList.stream().map(Object::toString).map(Float::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - else if (clazz == Double.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isDouble)) - { - return originalList.stream().map(Object::toString).map(Double::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - return null; - } - - @SuppressWarnings("unchecked") - public Map getMap(String key, Class keyClass, Class valueClass) - { - final Object obj = _set.get(key); - if (!(obj instanceof Map)) - { - return null; - } - - final Map originalList = (Map) obj; - if (!originalList.isEmpty() && ((!originalList.keySet().stream().allMatch(keyClass::isInstance)) || (!originalList.values().stream().allMatch(valueClass::isInstance)))) - { - LOGGER.log(Level.WARNING, "getMap(\"" + key + "\", " + keyClass.getSimpleName() + ", " + valueClass.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); - } - return (Map) obj; - } - - public StatsSet set(String name, Object value) - { - if (value == null) - { - return this; - } - _set.put(name, value); - return this; - } - - public StatsSet set(String key, boolean value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, byte value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, short value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, int value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, long value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, float value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, double value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, String value) - { - if (value == null) - { - return this; - } - _set.put(key, value); - return this; - } - - public StatsSet set(String key, Enum value) - { - if (value == null) - { - return this; - } - _set.put(key, value); - return this; - } - - public static StatsSet valueOf(String key, Object value) - { - final StatsSet set = new StatsSet(); - set.set(key, value); - return set; - } - - public void remove(String key) - { - _set.remove(key); - } - - public boolean contains(String name) - { - return _set.containsKey(name); - } - - @Override - public String toString() - { - return "StatsSet{_set=" + _set + '}'; - } -} diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Npc.java index a1a7e98aba..2b90533cc5 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.MpRewardTask; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.FishermanInstance; @@ -148,7 +148,7 @@ public class Npc extends Creature private NpcStringId _titleString; private NpcStringId _nameString; - private StatsSet _params; + private StatSet _params; private RaidBossStatus _raidStatus; /** Contains information about local tax payments. */ @@ -1756,7 +1756,7 @@ public class Npc extends Creature /** * @return the parameters of the npc merged with the spawn parameters (if there are any) */ - public StatsSet getParameters() + public StatSet getParameters() { if (_params != null) { @@ -1768,10 +1768,10 @@ public class Npc extends Creature final NpcSpawnTemplate npcSpawnTemplate = _spawn.getNpcSpawnTemplate(); if ((npcSpawnTemplate != null) && (npcSpawnTemplate.getParameters() != null) && !npcSpawnTemplate.getParameters().isEmpty()) { - final StatsSet params = getTemplate().getParameters(); + final StatSet params = getTemplate().getParameters(); if ((params != null) && !params.getSet().isEmpty()) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.merge(params); set.merge(npcSpawnTemplate.getParameters()); _params = set; diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 82f429bc18..4cb0835220 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -21,7 +21,7 @@ import java.util.EnumMap; import java.util.Map; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; @@ -49,12 +49,12 @@ public class CreatureTemplate extends ListenersContainer /** The creature's race. */ private Race _race; - public CreatureTemplate(StatsSet set) + public CreatureTemplate(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { // Base stats _baseValues.put(Stat.STAT_STR, set.getDouble("baseSTR", 0)); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java index 86441c678c..14f0e9cae8 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.CubicInstance; @@ -46,7 +46,7 @@ public class CubicTemplate implements ICubicConditionHolder private final List _conditions = new ArrayList<>(); public List _skills = new ArrayList<>(); - public CubicTemplate(StatsSet set) + public CubicTemplate(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java index c40883ac75..410040bc86 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.templates; import org.l2jmobius.gameserver.enums.DoorOpenType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -57,7 +57,7 @@ public class DoorTemplate extends CreatureTemplate implements IIdentifiable private final boolean _stealth; private final boolean _isInverted; - public DoorTemplate(StatsSet set) + public DoorTemplate(StatSet set) { super(set); _doorId = set.getInt("id"); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 767743de2e..8ab41c70e3 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.enums.MpRewardAffectType; import org.l2jmobius.gameserver.enums.MpRewardType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -63,7 +63,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private boolean _usingServerSideName; private String _title; private boolean _usingServerSideTitle; - private StatsSet _parameters; + private StatSet _parameters; private Sex _sex; private int _chestId; private int _rhandId; @@ -123,15 +123,15 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable /** * Constructor of Creature. - * @param set The StatsSet object to transfer data to the method + * @param set The StatSet object to transfer data to the method */ - public NpcTemplate(StatsSet set) + public NpcTemplate(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _id = set.getInt("id"); @@ -320,12 +320,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _usingServerSideTitle; } - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } - public void setParameters(StatsSet set) + public void setParameters(StatSet set) { _parameters = set; } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 50292b8bc8..28458aa09e 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -50,7 +50,7 @@ public class PlayerTemplate extends CreatureTemplate private final List _creationPoints; private final Map _baseSlotDef; - public PlayerTemplate(StatsSet set, List creationPoints) + public PlayerTemplate(StatSet set, List creationPoints) { super(set); _classId = ClassId.getClassId(set.getInt("classId")); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index aa28a0f648..260da48365 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -23,7 +23,7 @@ import java.util.Objects; import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import org.l2jmobius.gameserver.enums.InventoryBlockType; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -57,7 +57,7 @@ public class Transform implements IIdentifiable private TransformTemplate _maleTemplate; private TransformTemplate _femaleTemplate; - public Transform(StatsSet set) + public Transform(StatSet set) { _id = set.getInt("id"); _displayId = set.getInt("displayId", _id); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java index 5660852a01..729998503f 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.actor.transform; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -31,7 +31,7 @@ public class TransformLevelData private final double _levelMod; private Map _stats; - public TransformLevelData(StatsSet set) + public TransformLevelData(StatSet set) { _level = set.getInt("val"); _levelMod = set.getDouble("levelMod"); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 4de84b8bdc..7aca059f91 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -23,7 +23,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -49,7 +49,7 @@ public class TransformTemplate private ExBasicActionList _list; private final Map _data = new LinkedHashMap<>(100); - public TransformTemplate(StatsSet set) + public TransformTemplate(StatSet set) { _collisionRadius = set.contains("radius") ? set.getDouble("radius") : null; _collisionHeight = set.contains("height") ? set.getDouble("height") : null; diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java index d808a6b8bf..02550d2818 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -36,7 +36,7 @@ public class AlchemyCraftData private ItemHolder _productionSuccess; private ItemHolder _productionFailure; - public AlchemyCraftData(StatsSet set) + public AlchemyCraftData(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java index 0bd061d3c4..79dd6c0207 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.beautyshop; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -32,7 +32,7 @@ public class BeautyItem private final int _beautyShopTicket; private final Map _colors = new HashMap<>(); - public BeautyItem(StatsSet set) + public BeautyItem(StatSet set) { _id = set.getInt("id"); _adena = set.getInt("adena", 0); @@ -60,7 +60,7 @@ public class BeautyItem return _beautyShopTicket; } - public void addColor(StatsSet set) + public void addColor(StatSet set) { final BeautyItem color = new BeautyItem(set); _colors.put(set.getInt("id"), color); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index 689a61464d..8b32364c1a 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party.MessageType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.appearance.PlayerAppearance; @@ -244,7 +244,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent player.teleToLocation(_instance.getEnterLocations().get(index++), 0, _instance); } - getTimers().addTimer("match_start_countdown", StatsSet.valueOf("time", 60), 100, null, null); + getTimers().addTimer("match_start_countdown", StatSet.valueOf("time", 60), 100, null, null); getTimers().addTimer("teleport_message1", 10000, null, null); getTimers().addTimer("teleport_message2", 14000, null, null); @@ -400,7 +400,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent } } getTimers().cancelTimer("update", null, null); - getTimers().addTimer("match_end_countdown", StatsSet.valueOf("time", 30), 30 * 1000, null, null); + getTimers().addTimer("match_end_countdown", StatSet.valueOf("time", 30), 30 * 1000, null, null); EventDispatcher.getInstance().notifyEvent(new OnCeremonyOfChaosMatchResult(winners, members)); } @@ -493,7 +493,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java index 39f9196d93..371f8dc459 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.conditions.ICubicCondition; @@ -38,7 +38,7 @@ public class CubicSkill extends SkillHolder implements ICubicConditionHolder private final List _conditions = new ArrayList<>(); private final boolean _targetDebuff; - public CubicSkill(StatsSet set) + public CubicSkill(StatSet set) { super(set.getInt("id"), set.getInt("level")); _triggerRate = set.getInt("triggerRate", 100); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/ClanHall.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/ClanHall.java index 8da77477fd..22af370709 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/ClanHall.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/ClanHall.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -75,7 +75,7 @@ public class ClanHall extends AbstractResidence private static final String LOAD_CLANHALL = "SELECT * FROM clanhall WHERE id=?"; private static final String UPDATE_CLANHALL = "UPDATE clanhall SET ownerId=?,paidUntil=? WHERE id=?"; - public ClanHall(StatsSet params) + public ClanHall(StatSet params) { super(params.getInt("id")); // Set static parameters diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/Hero.java index ef005ff325..aee8b019ee 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/Hero.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/Hero.java @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.data.xml.impl.ClassListData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -74,13 +74,13 @@ public class Hero // delete hero items private static final String DELETE_ITEMS = "DELETE FROM items WHERE item_id IN (30392, 30393, 30394, 30395, 30396, 30397, 30398, 30399, 30400, 30401, 30402, 30403, 30404, 30405, 30372, 30373, 6842, 6611, 6612, 6613, 6614, 6615, 6616, 6617, 6618, 6619, 6620, 6621, 9388, 9389, 9390) AND owner_id NOT IN (SELECT charId FROM characters WHERE accesslevel > 0)"; - private static final Map HEROES = new ConcurrentHashMap<>(); - private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); + private static final Map HEROES = new ConcurrentHashMap<>(); + private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); - private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); - private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); + private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); + private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); - private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); + private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); private static final Map HERO_MESSAGE = new ConcurrentHashMap<>(); public static final String COUNT = "count"; @@ -118,7 +118,7 @@ public class Hero { while (rset.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset.getInt(Olympiad.CLASS_ID)); @@ -137,7 +137,7 @@ public class Hero while (rset2.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset2.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset2.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset2.getInt(Olympiad.CLASS_ID)); @@ -159,7 +159,7 @@ public class Hero LOGGER.info("Hero System: Loaded " + COMPLETE_HEROS.size() + " all time Heroes."); } - private void processHeros(PreparedStatement ps, int charId, StatsSet hero) throws SQLException + private void processHeros(PreparedStatement ps, int charId, StatSet hero) throws SQLException { ps.setInt(1, charId); try (ResultSet rs = ps.executeQuery()) @@ -224,7 +224,7 @@ public class Hero public void loadDiary(int charId) { - final List diary = new ArrayList<>(); + final List diary = new ArrayList<>(); int diaryentries = 0; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement("SELECT * FROM heroes_diary WHERE charId=? ORDER BY time ASC")) @@ -234,7 +234,7 @@ public class Hero { while (rset.next()) { - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final long time = rset.getLong("time"); final int action = rset.getInt("action"); @@ -279,8 +279,8 @@ public class Hero public void loadFights(int charId) { - final List fights = new ArrayList<>(); - final StatsSet heroCountData = new StatsSet(); + final List fights = new ArrayList<>(); + final StatSet heroCountData = new StatSet(); final Calendar data = Calendar.getInstance(); data.set(Calendar.DAY_OF_MONTH, 1); data.set(Calendar.HOUR_OF_DAY, 0); @@ -326,7 +326,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charTwoClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -362,7 +362,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charOneClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -410,14 +410,14 @@ public class Hero } } - public Map getHeroes() + public Map getHeroes() { return HEROES; } public int getHeroByClass(int classid) { - for (Entry e : HEROES.entrySet()) + for (Entry e : HEROES.entrySet()) { if (e.getValue().getInt(Olympiad.CLASS_ID) == classid) { @@ -438,7 +438,7 @@ public class Hero public void showHeroDiary(PlayerInstance player, int heroclass, int charid, int page) { final int perpage = 10; - final List mainList = HERO_DIARY.get(charid); + final List mainList = HERO_DIARY.get(charid); if (mainList != null) { final NpcHtmlMessage diaryReply = new NpcHtmlMessage(); @@ -453,7 +453,7 @@ public class Hero if (!mainList.isEmpty()) { - final List list = new ArrayList<>(mainList); + final List list = new ArrayList<>(mainList); Collections.reverse(list); boolean color = true; @@ -463,7 +463,7 @@ public class Hero for (int i = (page - 1) * perpage; i < list.size(); i++) { breakat = i; - final StatsSet diaryEntry = list.get(i); + final StatSet diaryEntry = list.get(i); fList.append(""); if (color) { @@ -524,7 +524,7 @@ public class Hero int loss = 0; int draw = 0; - final List heroFights = HERO_FIGHTS.get(charid); + final List heroFights = HERO_FIGHTS.get(charid); if (heroFights != null) { final NpcHtmlMessage fightReply = new NpcHtmlMessage(); @@ -536,7 +536,7 @@ public class Hero if (!heroFights.isEmpty()) { - final StatsSet heroCount = HERO_COUNTS.get(charid); + final StatSet heroCount = HERO_COUNTS.get(charid); if (heroCount != null) { win = heroCount.getInt("victory"); @@ -551,7 +551,7 @@ public class Hero for (int i = (page - 1) * perpage; i < heroFights.size(); i++) { breakat = i; - final StatsSet fight = heroFights.get(i); + final StatSet fight = heroFights.get(i); fList.append(""); if (color) { @@ -609,7 +609,7 @@ public class Hero } } - public synchronized void computeNewHeroes(List newHeroes) + public synchronized void computeNewHeroes(List newHeroes) { updateHeroes(true); @@ -659,13 +659,13 @@ public class Hero return; } - for (StatsSet hero : newHeroes) + for (StatSet hero : newHeroes) { final int charId = hero.getInt(Olympiad.CHAR_ID); if (COMPLETE_HEROS.containsKey(charId)) { - final StatsSet oldHero = COMPLETE_HEROS.get(charId); + final StatSet oldHero = COMPLETE_HEROS.get(charId); final int count = oldHero.getInt(COUNT); oldHero.set(COUNT, count + 1); oldHero.set(PLAYED, 1); @@ -674,7 +674,7 @@ public class Hero } else { - final StatsSet newHero = new StatsSet(); + final StatSet newHero = new StatSet(); newHero.set(Olympiad.CHAR_NAME, hero.getString(Olympiad.CHAR_NAME)); newHero.set(Olympiad.CLASS_ID, hero.getInt(Olympiad.CLASS_ID)); newHero.set(COUNT, 1); @@ -700,9 +700,9 @@ public class Hero } else { - StatsSet hero; + StatSet hero; int heroId; - for (Entry entry : HEROES.entrySet()) + for (Entry entry : HEROES.entrySet()) { hero = entry.getValue(); heroId = entry.getKey(); @@ -787,13 +787,13 @@ public class Hero setDiaryData(charId, ACTION_RAID_KILLED, npcId); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (template == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -806,13 +806,13 @@ public class Hero setDiaryData(charId, ACTION_CASTLE_TAKEN, castleId); final Castle castle = CastleManager.getInstance().getCastleById(castleId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (castle == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -922,10 +922,10 @@ public class Hero */ public void claimHero(PlayerInstance player) { - StatsSet hero = HEROES.get(player.getObjectId()); + StatSet hero = HEROES.get(player.getObjectId()); if (hero == null) { - hero = new StatsSet(); + hero = new StatSet(); HEROES.put(player.getObjectId(), hero); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java index f1263e8d44..c52f487402 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java @@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.atomic.AtomicReference; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.eventengine.drop.IEventDrop; import org.l2jmobius.gameserver.model.events.AbstractScript; @@ -42,7 +42,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout public abstract class AbstractEventManager>extends AbstractScript { private String _name; - private StatsSet _variables = StatsSet.EMPTY_STATSET; + private StatSet _variables = StatSet.EMPTY_STATSET; private Set _schedulers = Collections.emptySet(); private Set _conditionalSchedulers = Collections.emptySet(); private Map _rewards = Collections.emptyMap(); @@ -67,14 +67,14 @@ public abstract class AbstractEventManager>extends Ab /* ********************** */ - public StatsSet getVariables() + public StatSet getVariables() { return _variables; } - public void setVariables(StatsSet variables) + public void setVariables(StatSet variables) { - _variables = new StatsSet(Collections.unmodifiableMap(variables.getSet())); + _variables = new StatSet(Collections.unmodifiableMap(variables.getSet())); } /* ********************** */ diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java index 59c64b812c..e41af41d1a 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.util.cron4j.PastPredictor; import org.l2jmobius.gameserver.util.cron4j.Predictor; @@ -45,7 +45,7 @@ public class EventScheduler private List _notifications; private ScheduledFuture _task; - public EventScheduler(AbstractEventManager manager, StatsSet set) + public EventScheduler(AbstractEventManager manager, StatSet set) { _eventManager = manager; _name = set.getString("name", ""); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 1189dc9aa4..ca9d08a337 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -51,7 +51,7 @@ import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -183,12 +183,12 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime onTimerCancel(holder.getEvent(), holder.getParams(), holder.getNpc(), holder.getPlayer()); } - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { LOGGER.warning("[" + getClass().getSimpleName() + "]: Timer event arrived at non overriden onTimerEvent method event: " + event + " npc: " + npc + " player: " + player); } - public void onTimerCancel(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerCancel(String event, StatSet params, Npc npc, PlayerInstance player) { } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java index 400fb64b6e..861c4a9b31 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java @@ -24,7 +24,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.timers.IEventTimerCancel; @@ -69,7 +69,7 @@ public class TimerExecutor * @param eventTimer * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - public boolean addTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) + public boolean addTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) { return addTimer(new TimerHolder<>(event, params, time, npc, player, false, eventTimer, _cancelListener, this)); } @@ -95,7 +95,7 @@ public class TimerExecutor * @param player * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - public boolean addTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player) + public boolean addTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player) { return addTimer(event, params, time, npc, player, _eventListener); } @@ -123,7 +123,7 @@ public class TimerExecutor * @param eventTimer * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - private boolean addRepeatingTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) + private boolean addRepeatingTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) { return addTimer(new TimerHolder<>(event, params, time, npc, player, true, eventTimer, _cancelListener, this)); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java index ab8fa150ca..0fcafba759 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java @@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.gameserver.instancemanager.TimersManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.TimerExecutor; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.events.TimerExecutor; public class TimerHolder implements Runnable { private final T _event; - private final StatsSet _params; + private final StatSet _params; private final long _time; private final Npc _npc; private final PlayerInstance _player; @@ -44,7 +44,7 @@ public class TimerHolder implements Runnable private final TimerExecutor _postExecutor; private final ScheduledFuture _task; - public TimerHolder(T event, StatsSet params, long time, Npc npc, PlayerInstance player, boolean isRepeating, IEventTimerEvent eventScript, IEventTimerCancel cancelScript, TimerExecutor postExecutor) + public TimerHolder(T event, StatSet params, long time, Npc npc, PlayerInstance player, boolean isRepeating, IEventTimerEvent eventScript, IEventTimerCancel cancelScript, TimerExecutor postExecutor) { Objects.requireNonNull(event, getClass().getSimpleName() + ": \"event\" cannot be null!"); Objects.requireNonNull(eventScript, getClass().getSimpleName() + ": \"script\" cannot be null!"); @@ -73,7 +73,7 @@ public class TimerHolder implements Runnable /** * @return the parameters of this timer */ - public StatsSet getParams() + public StatSet getParams() { return _params; } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index db95bd7dbc..df52427f29 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; @@ -37,7 +37,7 @@ public class AppearanceHolder private final AppearanceTargetType _targetType; private final long _bodyPart; - public AppearanceHolder(StatsSet set) + public AppearanceHolder(StatSet set) { _visualId = set.getInt("id", 0); _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java index 29740873cd..0f9488448d 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Nik @@ -43,7 +43,7 @@ public class AttachSkillHolder extends SkillHolder return _requiredSkillLevel; } - public static AttachSkillHolder fromStatsSet(StatsSet set) + public static AttachSkillHolder fromStatSet(StatSet set) { return new AttachSkillHolder(set.getInt("skillId"), set.getInt("skillLevel", 1), set.getInt("requiredSkillId"), set.getInt("requiredSkillLevel", 1)); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java index cc41724532..57b6d47c40 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Set; import org.l2jmobius.gameserver.enums.SkillEnchantType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -36,7 +36,7 @@ public class EnchantSkillHolder private final Map _chance = new EnumMap<>(SkillEnchantType.class); private final Map> _requiredItems = new EnumMap<>(SkillEnchantType.class); - public EnchantSkillHolder(StatsSet set) + public EnchantSkillHolder(StatSet set) { _level = set.getInt("level"); _enchantFailLevel = set.getInt("enchantFailLevel"); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java index e6706c8467..33d14e4345 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Map; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -36,7 +36,7 @@ public class ExtendDropDataHolder private final List _conditions; private final Map _systemMessages; - public ExtendDropDataHolder(StatsSet set) + public ExtendDropDataHolder(StatSet set) { _id = set.getInt("id"); _items = set.getList("items", ExtendDropItemHolder.class); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java index 16454d764a..d63d4eb775 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -52,7 +52,7 @@ public class FakePlayerHolder private final int _clanId; private final int _pledgeStatus; - public FakePlayerHolder(StatsSet set) + public FakePlayerHolder(StatSet set) { _classId = set.getInt("classId", 182); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java index a9c72776cd..86af0c1405 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -29,7 +29,7 @@ public class ItemHolder implements IIdentifiable private final int _id; private final long _count; - public ItemHolder(StatsSet set) + public ItemHolder(StatSet set) { _id = set.getInt("id"); _count = set.getLong("count"); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java index 5f7bb2008b..1c6f7b506b 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -25,7 +25,7 @@ public class ItemPointHolder extends ItemHolder { private final int _points; - public ItemPointHolder(StatsSet params) + public ItemPointHolder(StatSet params) { this(params.getInt("id"), params.getLong("count"), params.getInt("points")); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java index 71d4f56eea..1b65c8912f 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.holders; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -34,7 +34,7 @@ public class LuckyGameDataHolder private int _minModifyRewardGame; private int _maxModifyRewardGame; - public LuckyGameDataHolder(StatsSet params) + public LuckyGameDataHolder(StatSet params) { _index = params.getInt("index"); _turningPoints = params.getInt("turning_point"); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java index f77e380e8d..9fa8c99654 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.holders; import java.time.Duration; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -32,7 +32,7 @@ public class MinionHolder implements IIdentifiable private final long _respawnTime; private final int _weightPoint; - public MinionHolder(StatsSet set) + public MinionHolder(StatSet set) { _id = set.getInt("id"); _count = set.getInt("count", 1); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java index f4173594d1..36ac70176d 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -52,7 +52,7 @@ public class MultisellListHolder implements IIdentifiable } @SuppressWarnings("unchecked") - public MultisellListHolder(StatsSet set) + public MultisellListHolder(StatSet set) { _listId = set.getInt("listId"); _isChanceMultisell = set.getBoolean("isChanceMultisell", false); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java index cef1e13e8f..5e9c55ea74 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.StatusUpdateType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -56,7 +56,7 @@ public class RecipeHolder implements IIdentifiable private final double _maxOfferingBonus; private final long _maxOffering; - public RecipeHolder(StatsSet set, List ingredients, List productGroup, List npcFee, Map statUse) + public RecipeHolder(StatSet set, List ingredients, List productGroup, List npcFee, Map statUse) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index f1b98ee9ac..ecd1069283 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -45,7 +45,7 @@ import org.l2jmobius.gameserver.enums.InstanceReenterType; import org.l2jmobius.gameserver.enums.InstanceTeleportType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -87,7 +87,7 @@ public class Instance implements IIdentifiable, INamable private final Set _players = ConcurrentHashMap.newKeySet(); // Players inside instance private final Set _npcs = ConcurrentHashMap.newKeySet(); // Spawned NPCs inside instance private final Map _doors = new HashMap<>(); // Spawned doors inside instance - private final StatsSet _parameters = new StatsSet(); + private final StatSet _parameters = new StatSet(); // Timers private final Map> _ejectDeadTasks = new ConcurrentHashMap<>(); private ScheduledFuture _cleanUpTask = null; @@ -171,7 +171,7 @@ public class Instance implements IIdentifiable, INamable * Get instance world parameters. * @return instance parameters */ - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } @@ -1020,7 +1020,7 @@ public class Instance implements IIdentifiable, INamable * Get parameters from instance template.
* @return template parameters */ - public StatsSet getTemplateParameters() + public StatSet getTemplateParameters() { return _template.getParameters(); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 2a196f73ef..b53b0a819d 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.AbstractPlayerGroup; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -71,7 +71,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl private float _spRate = Config.RATE_INSTANCE_SP; private float _expPartyRate = Config.RATE_INSTANCE_PARTY_XP; private float _spPartyRate = Config.RATE_INSTANCE_PARTY_SP; - private StatsSet _parameters = StatsSet.EMPTY_STATSET; + private StatSet _parameters = StatSet.EMPTY_STATSET; private final Map _doors = new HashMap<>(); private final List _spawns = new ArrayList<>(); // Locations @@ -92,7 +92,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl /** * @param set */ - public InstanceTemplate(StatsSet set) + public InstanceTemplate(StatSet set) { _templateId = set.getInt("id", 0); _name = set.getString("name", null); @@ -178,7 +178,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (!set.isEmpty()) { - _parameters = new StatsSet(Collections.unmodifiableMap(set)); + _parameters = new StatSet(Collections.unmodifiableMap(set)); } } @@ -469,7 +469,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl * Get instance template parameters. * @return parameters of template */ - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java index 3b67ff72f4..3627959662 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; import java.util.function.BiConsumer; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public abstract class Condition { private final InstanceTemplate _template; - private final StatsSet _parameters; + private final StatSet _parameters; private final boolean _leaderOnly; private final boolean _showMessageAndHtml; private SystemMessageId _systemMsg = null; @@ -46,7 +46,7 @@ public abstract class Condition * @param onlyLeader flag which means if only leader should be affected (leader means player who wants to enter not group leader!) * @param showMessageAndHtml if {@code true} and HTML message is defined then both are send, otherwise only HTML or message is send */ - public Condition(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public Condition(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { _template = template; _parameters = parameters; @@ -58,7 +58,7 @@ public abstract class Condition * Gets parameters of condition. * @return set of parameters */ - protected final StatsSet getParameters() + protected final StatSet getParameters() { return _parameters; } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java index e379741b59..c27d92d662 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionCommandChannel extends Condition { - public ConditionCommandChannel(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionCommandChannel(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_CANNOT_ENTER_BECAUSE_YOU_ARE_NOT_ASSOCIATED_WITH_THE_CURRENT_COMMAND_CHANNEL); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java index ed434e3524..a828dcceae 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.model.AbstractPlayerGroup; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionCommandChannelLeader extends Condition { - public ConditionCommandChannelLeader(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionCommandChannelLeader(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java index d2a60816d0..423a37a94e 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionDistance extends Condition { - public ConditionDistance(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionDistance(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); setSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED, (message, player) -> message.addString(player.getName())); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java index 3dc78a98c7..8aa68b7e08 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionGroupMax extends Condition { - public ConditionGroupMax(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionGroupMax(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_CANNOT_ENTER_DUE_TO_THE_PARTY_HAVING_EXCEEDED_THE_LIMIT); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java index f7930b1d8c..fde9d13439 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionGroupMin extends Condition { - public ConditionGroupMin(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionGroupMin(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_MUST_HAVE_A_MINIMUM_OF_S1_PEOPLE_TO_ENTER_THIS_INSTANCED_ZONE, (msg, player) -> msg.addInt(getLimit())); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 3088d8ae64..53fee609aa 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.enums.ResidenceType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; */ public class ConditionHasResidence extends Condition { - public ConditionHasResidence(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionHasResidence(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); } @@ -43,7 +43,7 @@ public class ConditionHasResidence extends Condition return false; } - final StatsSet params = getParameters(); + final StatSet params = getParameters(); final int id = params.getInt("id"); boolean test = false; switch (params.getEnum("type", ResidenceType.class)) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java index 4e1c407325..eed350db38 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -32,7 +32,7 @@ public class ConditionItem extends Condition private final long _count; private final boolean _take; - public ConditionItem(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionItem(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Load params diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java index 7d509a20c7..b38f8c0e2c 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -32,7 +32,7 @@ public class ConditionLevel extends Condition private final int _min; private final int _max; - public ConditionLevel(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionLevel(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Load params diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java index b91deeffdb..d71e6d0a39 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; */ public class ConditionNoParty extends Condition { - public ConditionNoParty(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionNoParty(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java index dd31bf3ca5..5bf768a03e 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionParty extends Condition { - public ConditionParty(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionParty(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java index 524a59675a..0363715536 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionPartyLeader extends Condition { - public ConditionPartyLeader(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionPartyLeader(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java index 481cb251ce..48d7fc7981 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.instancemanager.QuestManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionQuest extends Condition { - public ConditionQuest(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionQuest(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Set message diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 899b17aff9..a073129734 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionReenter extends Condition { - public ConditionReenter(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionReenter(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); setSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET, (message, player) -> message.addString(player.getName())); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java index ec255025c3..fafafe5604 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.itemauction; import java.util.Calendar; import java.util.concurrent.TimeUnit; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Forsaiken @@ -40,7 +40,7 @@ public class AuctionDateGenerator private int _hour_of_day; private int _minute_of_hour; - public AuctionDateGenerator(StatsSet config) + public AuctionDateGenerator(StatSet config) { _calendar = Calendar.getInstance(); _interval = config.getInt(FIELD_INTERVAL, -1); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 64bf0a6ff1..cb554e4dce 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.itemauction; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.idfactory.IdFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,9 +34,9 @@ public class AuctionItem private final int _itemId; private final long _itemCount; @SuppressWarnings("unused") - private final StatsSet _itemExtra; + private final StatSet _itemExtra; - public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatsSet itemExtra) + public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatSet itemExtra) { _auctionItemId = auctionItemId; _auctionLength = auctionLength; diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 6dff6e3a4d..dc3a7f6f6b 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -44,7 +44,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -84,7 +84,7 @@ public class ItemAuctionInstance _items = new ArrayList<>(); final NamedNodeMap nanode = node.getAttributes(); - final StatsSet generatorConfig = new StatsSet(); + final StatSet generatorConfig = new StatSet(); for (int i = nanode.getLength(); i-- > 0;) { final Node n = nanode.item(i); @@ -115,7 +115,7 @@ public class ItemAuctionInstance throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } - final StatsSet itemExtra = new StatsSet(); + final StatSet itemExtra = new StatSet(); final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Armor.java index d4fd97ef10..bfc90d126d 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Armor.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.type.ArmorType; /** @@ -28,15 +28,15 @@ public class Armor extends Item /** * Constructor for Armor. - * @param set the StatsSet designating the set of couples (key,value) characterizing the armor. + * @param set the StatSet designating the set of couples (key,value) characterizing the armor. */ - public Armor(StatsSet set) + public Armor(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/EtcItem.java index 86d7291595..a902860c0d 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/EtcItem.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -38,15 +38,15 @@ public class EtcItem extends Item /** * Constructor for EtcItem. - * @param set StatsSet designating the set of couples (key,value) for description of the Etc + * @param set StatSet designating the set of couples (key,value) for description of the Etc */ - public EtcItem(StatsSet set) + public EtcItem(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Henna.java index c669b86eec..c4c32e7cda 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -21,7 +21,7 @@ import java.util.EnumMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; @@ -45,7 +45,7 @@ public class Henna private final List _skills; private final List _wear_class; - public Henna(StatsSet set) + public Henna(StatSet set) { _dyeId = set.getInt("dyeId"); _dyeItemId = set.getInt("dyeItemId"); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Item.java index 85df3f7449..95b6a9ebdc 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Item.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.enums.ItemGrade; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; @@ -180,14 +180,14 @@ public abstract class Item extends ListenersContainer implements IIdentifiable /** * Constructor of the Item that fill class variables.
*
- * @param set : StatsSet corresponding to a set of couples (key,value) for description of the item + * @param set : StatSet corresponding to a set of couples (key,value) for description of the item */ - protected Item(StatsSet set) + protected Item(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { _itemId = set.getInt("item_id"); _displayId = set.getInt("displayId", _itemId); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java index ab196007a8..3ca228cbe5 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -29,7 +29,7 @@ public class PlayerItemTemplate extends ItemHolder /** * @param set the set containing the values for this object */ - public PlayerItemTemplate(StatsSet set) + public PlayerItemTemplate(StatSet set) { super(set.getInt("id"), set.getInt("count")); _equipped = set.getBoolean("equipped", false); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Weapon.java index 16f0c47287..5f9f8507bd 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Weapon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.items; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ItemSkillType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -58,15 +58,15 @@ public class Weapon extends Item /** * Constructor for Weapon. - * @param set the StatsSet designating the set of couples (key,value) characterizing the weapon. + * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. */ - public Weapon(StatsSet set) + public Weapon(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java index 7bdd968d90..6d05c20ff3 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java @@ -23,7 +23,7 @@ import java.util.List; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -54,7 +54,7 @@ public class AppearanceStone private List _racesNot; private List _allVisualIds; - public AppearanceStone(StatsSet set) + public AppearanceStone(StatSet set) { _id = set.getInt("id"); _visualId = set.getInt("visualId", 0); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java index f3b53f1a67..a2897ba911 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.items.combination; import java.util.EnumMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -31,7 +31,7 @@ public class CombinationItem private final int _chance; private final Map _rewards = new EnumMap<>(CombinationItemType.class); - public CombinationItem(StatsSet set) + public CombinationItem(StatSet set) { _itemOne = set.getInt("one"); _itemTwo = set.getInt("two"); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java index 1cde38a6d6..a7f1326bd8 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.CrystalType; @@ -59,7 +59,7 @@ public abstract class AbstractEnchantItem private final int _maxEnchantLevel; private final double _bonusRate; - public AbstractEnchantItem(StatsSet set) + public AbstractEnchantItem(StatSet set) { _id = set.getInt("id"); if (getItem() == null) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java index 36ccf3a5a4..310a7643ec 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -40,7 +40,7 @@ public class EnchantScroll extends AbstractEnchantItem private final int _scrollGroupId; private Set _items; - public EnchantScroll(StatsSet set) + public EnchantScroll(StatSet set) { super(set); _scrollGroupId = set.getInt("scrollGroupId", 0); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java index c02095428b..978e38d533 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items.enchant; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.items.type.ItemType; @@ -30,7 +30,7 @@ public class EnchantSupportItem extends AbstractEnchantItem private final boolean _isGiant; private final ItemType type; - public EnchantSupportItem(StatsSet set) + public EnchantSupportItem(StatSet set) { super(set); type = getItem().getItemType(); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index d15d179719..0a67dd54f0 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.data.xml.impl.CategoryData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.entity.Hero; @@ -61,7 +61,7 @@ public class Olympiad extends ListenersContainer protected static final Logger LOGGER = Logger.getLogger(Olympiad.class.getName()); protected static final Logger LOGGER_OLYMPIAD = Logger.getLogger("olympiad"); - private static final Map NOBLES = new ConcurrentHashMap<>(); + private static final Map NOBLES = new ConcurrentHashMap<>(); private static final Map NOBLES_RANK = new HashMap<>(); public static final String OLYMPIAD_HTML_PATH = "data/html/olympiad/"; @@ -226,10 +226,10 @@ public class Olympiad extends ListenersContainer PreparedStatement statement = con.prepareStatement(OLYMPIAD_LOAD_NOBLES); ResultSet rset = statement.executeQuery()) { - StatsSet statData; + StatSet statData; while (rset.next()) { - statData = new StatsSet(); + statData = new StatSet(); statData.set(CLASS_ID, rset.getInt(CLASS_ID)); statData.set(CHAR_NAME, rset.getString(CHAR_NAME)); statData.set(POINTS, rset.getInt(POINTS)); @@ -452,7 +452,7 @@ public class Olympiad extends ListenersContainer saveNobleData(); _period = 1; - final List heroesToBe = sortHerosToBe(); + final List heroesToBe = sortHerosToBe(); Hero.getInstance().resetData(); Hero.getInstance().computeNewHeroes(heroesToBe); @@ -486,7 +486,7 @@ public class Olympiad extends ListenersContainer return NOBLES.size(); } - public static StatsSet getNobleStats(int playerId) + public static StatSet getNobleStats(int playerId) { return NOBLES.get(playerId); } @@ -785,7 +785,7 @@ public class Olympiad extends ListenersContainer } int currentPoints; - for (StatsSet nobleInfo : NOBLES.values()) + for (StatSet nobleInfo : NOBLES.values()) { currentPoints = nobleInfo.getInt(POINTS); currentPoints += WEEKLY_POINTS; @@ -803,7 +803,7 @@ public class Olympiad extends ListenersContainer return; } - for (StatsSet nobleInfo : NOBLES.values()) + for (StatSet nobleInfo : NOBLES.values()) { nobleInfo.set(COMP_DONE_WEEK, 0); } @@ -836,9 +836,9 @@ public class Olympiad extends ListenersContainer try (Connection con = DatabaseFactory.getConnection()) { - for (Entry entry : NOBLES.entrySet()) + for (Entry entry : NOBLES.entrySet()) { - final StatsSet nobleInfo = entry.getValue(); + final StatSet nobleInfo = entry.getValue(); if (nobleInfo == null) { @@ -951,7 +951,7 @@ public class Olympiad extends ListenersContainer } } - protected List sortHerosToBe() + protected List sortHerosToBe() { if (_period != 1) { @@ -961,8 +961,8 @@ public class Olympiad extends ListenersContainer if (NOBLES != null) { LOGGER_OLYMPIAD.info("Noble,charid,classid,compDone,points"); - StatsSet nobleInfo; - for (Entry entry : NOBLES.entrySet()) + StatSet nobleInfo; + for (Entry entry : NOBLES.entrySet()) { nobleInfo = entry.getValue(); if (nobleInfo == null) @@ -980,12 +980,12 @@ public class Olympiad extends ListenersContainer } } - final List heroesToBe = new LinkedList<>(); + final List heroesToBe = new LinkedList<>(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(OLYMPIAD_GET_HEROS)) { - StatsSet hero; + StatSet hero; for (int element : HERO_IDS) { statement.setInt(1, element); @@ -994,7 +994,7 @@ public class Olympiad extends ListenersContainer { if (rset.next()) { - hero = new StatsSet(); + hero = new StatSet(); hero.set(CLASS_ID, element); hero.set(CHAR_ID, rset.getInt(CHAR_ID)); hero.set(CHAR_NAME, rset.getString(CHAR_NAME)); @@ -1048,7 +1048,7 @@ public class Olympiad extends ListenersContainer return 0; } - final StatsSet noble = NOBLES.get(objectId); + final StatSet noble = NOBLES.get(objectId); if ((noble == null) || (noble.getInt(POINTS) == 0)) { return 0; @@ -1098,7 +1098,7 @@ public class Olympiad extends ListenersContainer { if (!NOBLES.containsKey(player.getObjectId())) { - final StatsSet statDat = new StatsSet(); + final StatSet statDat = new StatSet(); statDat.set(CLASS_ID, player.getBaseClass()); statDat.set(CHAR_NAME, player.getName()); statDat.set(POINTS, DEFAULT_POINTS); @@ -1205,7 +1205,7 @@ public class Olympiad extends ListenersContainer * @param data the stats set data to add. * @return the old stats set if the noble is already present, null otherwise. */ - public static StatsSet addNobleStats(int charId, StatsSet data) + public static StatSet addNobleStats(int charId, StatSet data) { return NOBLES.put(charId, data); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/Participant.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/Participant.java index 670066ac32..b6d879b902 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/Participant.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/Participant.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.olympiad; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class Participant private final int baseClass; private boolean disconnected = false; private boolean defaulted = false; - private final StatsSet stats; + private final StatSet stats; public String clanName; public int clanId; @@ -125,7 +125,7 @@ public class Participant /** * @return the stats */ - public StatsSet getStats() + public StatSet getStats() { return stats; } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java index 4d5231ca5d..c1fb0f88f6 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.primeshop; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -49,7 +49,7 @@ public class PrimeShopGroup private final int _availableCount; private final List _items; - public PrimeShopGroup(StatsSet set, List items) + public PrimeShopGroup(StatSet set, List items) { _brId = set.getInt("id"); _category = set.getInt("cat", 0); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java index d150ec98cd..88795e0721 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.residences; import java.time.Duration; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -33,7 +33,7 @@ public class ResidenceFunctionTemplate private final Duration _duration; private final double _value; - public ResidenceFunctionTemplate(StatsSet set) + public ResidenceFunctionTemplate(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java index 4f15efda0b..b19f8e59d5 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; /** @@ -34,7 +34,7 @@ public class ShuttleDataHolder private final List _stops = new ArrayList<>(2); private final List _routes = new ArrayList<>(2); - public ShuttleDataHolder(StatsSet set) + public ShuttleDataHolder(StatSet set) { _id = set.getInt("id"); _loc = new Location(set); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/Skill.java index c44b45a781..0e97466a3a 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.handler.IAffectScopeHandler; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.CubicInstance; @@ -210,7 +210,7 @@ public class Skill implements IIdentifiable private final SkillBuffType _buffType; private final boolean _displayInList; - public Skill(StatsSet set) + public Skill(StatSet set) { _id = set.getInt(".id"); _level = set.getInt(".level"); @@ -391,7 +391,7 @@ public class Skill implements IIdentifiable _toggleGroupId = set.getInt("toggleGroupId", -1); _attachToggleGroupId = set.getInt("attachToggleGroupId", -1); - _attachSkills = set.getList("attachSkillList", StatsSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatsSet).collect(Collectors.toList()); + _attachSkills = set.getList("attachSkillList", StatSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatSet).collect(Collectors.toList()); final String abnormalResist = set.getString("abnormalResists", null); if (abnormalResist != null) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java index bfc25bddde..39b738dbca 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.ChanceLocation; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory; /** * @author UnAfraid */ -public class NpcSpawnTemplate implements Cloneable, IParameterized +public class NpcSpawnTemplate implements Cloneable, IParameterized { private static final Logger LOGGER = Logger.getLogger(NpcSpawnTemplate.class.getName()); @@ -56,7 +56,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized private final Duration _respawnTimeRandom; private List _locations; private SpawnTerritory _zone; - private StatsSet _parameters; + private StatSet _parameters; private final boolean _spawnAnimation; private final boolean _saveInDB; private final String _dbName; @@ -82,7 +82,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized _minions = template._minions; } - public NpcSpawnTemplate(SpawnTemplate spawnTemplate, SpawnGroup group, StatsSet set) + public NpcSpawnTemplate(SpawnTemplate spawnTemplate, SpawnGroup group, StatSet set) { _spawnTemplate = spawnTemplate; _group = group; @@ -128,14 +128,14 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized mergeParameters(spawnTemplate, group); } - private StatsSet mergeParameters(SpawnTemplate spawnTemplate, SpawnGroup group) + private StatSet mergeParameters(SpawnTemplate spawnTemplate, SpawnGroup group) { if ((_parameters == null) && (spawnTemplate.getParameters() == null) && (group.getParameters() == null)) { return null; } - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); if (spawnTemplate.getParameters() != null) { set.merge(spawnTemplate.getParameters()); @@ -206,13 +206,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized } @Override - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } @Override - public void setParameters(StatsSet parameters) + public void setParameters(StatSet parameters) { if (_parameters == null) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java index 6723863c93..7ceb2d46af 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IParameterized; import org.l2jmobius.gameserver.model.interfaces.ITerritorized; @@ -31,16 +31,16 @@ import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory; /** * @author UnAfraid */ -public class SpawnGroup implements Cloneable, ITerritorized, IParameterized +public class SpawnGroup implements Cloneable, ITerritorized, IParameterized { private final String _name; private final boolean _spawnByDefault; private List _territories; private List _bannedTerritories; private final List _spawns = new ArrayList<>(); - private StatsSet _parameters; + private StatSet _parameters; - public SpawnGroup(StatsSet set) + public SpawnGroup(StatSet set) { this(set.getString("name", null), set.getBoolean("spawnByDefault", true)); } @@ -104,13 +104,13 @@ public class SpawnGroup implements Cloneable, ITerritorized, IParameterized +public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized { private final String _name; private final String _ai; @@ -45,9 +45,9 @@ public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized _territories; private List _bannedTerritories; private final List _groups = new ArrayList<>(); - private StatsSet _parameters; + private StatSet _parameters; - public SpawnTemplate(StatsSet set, File file) + public SpawnTemplate(StatSet set, File file) { this(set.getString("name", null), set.getString("ai", null), set.getBoolean("spawnByDefault", true), file); } @@ -128,13 +128,13 @@ public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized _castleId; - public TeleportLocation(int id, StatsSet set) + public TeleportLocation(int id, StatSet set) { super(set); _id = id; diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java index 916ae0790c..33cf6ac3bc 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.variables; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.IRestorable; import org.l2jmobius.gameserver.model.interfaces.IStorable; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.interfaces.IStorable; /** * @author UnAfraid */ -public abstract class AbstractVariables extends StatsSet implements IRestorable, IStorable, IDeletable +public abstract class AbstractVariables extends StatSet implements IRestorable, IStorable, IDeletable { private final AtomicBoolean _hasChanges = new AtomicBoolean(false); @@ -41,42 +41,42 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, */ @Override - public StatsSet set(String name, boolean value) + public StatSet set(String name, boolean value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, double value) + public StatSet set(String name, double value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, Enum value) + public StatSet set(String name, Enum value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, int value) + public StatSet set(String name, int value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, long value) + public StatSet set(String name, long value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, String value) + public StatSet set(String name, String value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); @@ -89,7 +89,7 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, * @param markAsChanged * @return */ - public StatsSet set(String name, String value, boolean markAsChanged) + public StatSet set(String name, String value, boolean markAsChanged) { if (markAsChanged) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index 5c03122a62..4d97f0017a 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExHeroList implements IClientOutgoingPacket { - private final Map _heroList; + private final Map _heroList; public ExHeroList() { @@ -42,7 +42,7 @@ public class ExHeroList implements IClientOutgoingPacket OutgoingPackets.EX_HERO_LIST.writeId(packet); packet.writeD(_heroList.size()); - for (StatsSet hero : _heroList.values()) + for (StatSet hero : _heroList.values()) { packet.writeS(hero.getString(Olympiad.CHAR_NAME)); packet.writeD(hero.getInt(Olympiad.CLASS_ID)); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/BypassParser.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/BypassParser.java index 414125bdeb..a80323ba1f 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/BypassParser.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/BypassParser.java @@ -20,12 +20,12 @@ import java.util.LinkedHashMap; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid */ -public class BypassParser extends StatsSet +public class BypassParser extends StatSet { private static final String ALLOWED_CHARS = "a-zA-Z0-9-_`!@#%^&*()\\[\\]|\\\\/"; private static final Pattern PATTERN = Pattern.compile(String.format("([%s]*)=('([%s ]*)'|[%s]*)", ALLOWED_CHARS, ALLOWED_CHARS, ALLOWED_CHARS)); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java index 2ceebc156a..a3f07a6ad5 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java @@ -18,7 +18,7 @@ package ai.areas.BeastFarm; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -133,7 +133,7 @@ public class ImprovedBabyPets extends AbstractNpcAI private boolean castBuff(Summon summon, int stepNumber, int buffNumber) { final PlayerInstance owner = summon.getOwner(); - final StatsSet parameters = summon.getTemplate().getParameters(); + final StatSet parameters = summon.getTemplate().getParameters(); final SkillHolder skill = parameters.getObject("step" + stepNumber + "_buff0" + buffNumber, SkillHolder.class); if ((skill != null) && (owner != null)) @@ -174,7 +174,7 @@ public class ImprovedBabyPets extends AbstractNpcAI { final boolean previousFollowStatus = summon.getFollowStatus(); final PlayerInstance owner = summon.getOwner(); - final StatsSet parameters = summon.getTemplate().getParameters(); + final StatSet parameters = summon.getTemplate().getParameters(); final SkillHolder skill = parameters.getObject("step" + stepNumber + "_heal0" + healNumber, SkillHolder.class); final int targetType = parameters.getInt("step" + stepNumber + "_heal_target0" + healNumber, 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java index efdbdd4460..9ff1875b62 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java @@ -18,7 +18,7 @@ package ai.areas.FairySettlement; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -50,11 +50,11 @@ public class Wisp extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("DELETE_NPC")) { - params = new StatsSet(); + params = new StatSet(); params.set("LOCATION_OBJECT", npc.getLocation()); getTimers().addTimer("RESPAWN_WISP_" + npc.getObjectId(), params, getRandom(RESPAWN_MIN, RESPAWN_MAX), null, null); npc.deleteMe(); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java index 5cd6622513..b52be69c96 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Parnassus/EntrancePortalToCrystalCaverns/EntrancePortalToCrystalCaverns.java @@ -19,7 +19,7 @@ package ai.areas.Parnassus.EntrancePortalToCrystalCaverns; import java.util.Calendar; import org.l2jmobius.gameserver.instancemanager.QuestManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -107,7 +107,7 @@ public class EntrancePortalToCrystalCaverns extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("LOOP_TIMER")) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SeedOfHellfire/Zofan.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SeedOfHellfire/Zofan.java index b6c122da75..03f451c9fd 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SeedOfHellfire/Zofan.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SeedOfHellfire/Zofan.java @@ -16,7 +16,7 @@ */ package ai.areas.SeedOfHellfire; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -61,7 +61,7 @@ public class Zofan extends AbstractNpcAI { if ((npc.getInstanceWorld() == null) && (npc.getSpawn() != null)) { - final StatsSet params = npc.getParameters(); + final StatSet params = npc.getParameters(); if (params.getInt("i_childrengarden_guard", 0) == 0) { for (String param : MINION_PARAMS) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Allada.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Allada.java index 5ccca8c99a..4291aeb5ec 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Allada.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Allada.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -45,7 +45,7 @@ public class Allada extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Mei.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Mei.java index 015ee0bc9a..7ad9623ec2 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Mei.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Mei.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -40,7 +40,7 @@ public class Mei extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SHOUT")) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Remons.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Remons.java index 41ec3c1bff..a1ea6ba90c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Remons.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Remons.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -43,7 +43,7 @@ public class Remons extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rinne.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rinne.java index 55ab4fc1a7..1d6eafa48a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rinne.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rinne.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -42,7 +42,7 @@ public class Rinne extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rotina.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rotina.java index 24ad1b6041..d0c8f2a81b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rotina.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Rotina.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -45,7 +45,7 @@ public class Rotina extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Soros.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Soros.java index d7862030aa..632d1a78a8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Soros.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Walkers/Soros.java @@ -17,7 +17,7 @@ package ai.areas.TalkingIsland.Walkers; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -40,7 +40,7 @@ public class Soros extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java index cbe7cc9ac9..4a2aaf21c4 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/WallOfArgos/ElmoredenServantsGhost/ElmoredenServantsGhost.java @@ -17,7 +17,7 @@ package ai.areas.WallOfArgos.ElmoredenServantsGhost; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -58,7 +58,7 @@ public class ElmoredenServantsGhost extends AbstractNpcAI takeItems(player, USED_GRAVE_PASS, 1); final Location loc; - final StatsSet npcParameters = npc.getParameters(); + final StatSet npcParameters = npc.getParameters(); if (event.equals("teleport1")) { loc = new Location(npcParameters.getInt("TelPos_X1", 0), npcParameters.getInt("TelPos_Y1", 0), npcParameters.getInt("TelPos_Z1", 0)); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java index 4f490b5dc1..ca47a79cfe 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -315,7 +315,7 @@ public class Anakim extends AbstractNpcAI addSkillSeeId(ALL_MOBS); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANAKIM); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM); final int status = GrandBossManager.getInstance().getBossStatus(ANAKIM); if (status == DEAD) { @@ -586,9 +586,9 @@ public class Anakim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(ANAKIM, DEAD); final long respawnTime = getRespawnTime(); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANAKIM); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(ANAKIM, info); + GrandBossManager.getInstance().setStatSet(ANAKIM, info); startQuestTimer("unlock_anakim", respawnTime, null, null); startQuestTimer("end_anakim", 900000, null, null); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index b837d839d8..d12c29d422 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -138,7 +138,7 @@ public class Antharas extends AbstractNpcAI addAttackId(ANTHARAS, BOMBER, BEHEMOTH, TERASQUE); addKillId(ANTHARAS, TERASQUE, BEHEMOTH); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANTHARAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANTHARAS); final double curr_hp = info.getDouble("currentHP"); final double curr_mp = info.getDouble("currentMP"); final int loc_x = info.getInt("loc_x"); @@ -761,7 +761,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(PlayerInstance attacker, int damage) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Baium/Baium.java index 621f683f75..f30ab9626d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -111,7 +111,7 @@ public class Baium extends AbstractNpcAI addSeeCreatureId(BAIUM); addSpellFinishedId(BAIUM); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(BAIUM); + final StatSet info = GrandBossManager.getInstance().getStatSet(BAIUM); switch (getStatus()) { @@ -660,7 +660,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java index 768ebbc11d..ebf5e78a5a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Balok/BalokWarzone.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -122,7 +122,7 @@ public class BalokWarzone extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (isInInstance(world)) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java index 9919e58ce5..e8a2e67509 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java @@ -17,7 +17,7 @@ package ai.bosses.Baylor; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -77,7 +77,7 @@ public class BaylorWarzone extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (isInInstance(world)) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java index 1e80c81840..e8e9fa8756 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; @@ -104,7 +104,7 @@ public class Beleth extends AbstractNpcAI addStartNpc(STONE_COFFIN); addTalkId(STONE_COFFIN); addFirstTalkId(ELF); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(REAL_BELETH); + final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH); if (status == DEAD) { @@ -750,9 +750,9 @@ public class Beleth extends AbstractNpcAI setBelethKiller(killer); GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD); final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(REAL_BELETH); + final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(REAL_BELETH, info); + GrandBossManager.getInstance().setStatSet(REAL_BELETH, info); startQuestTimer("BELETH_UNLOCK", respawnTime, null, null); deleteAll(); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Core/Core.java index bfa7212b8c..c1452bf9de 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; @@ -85,7 +85,7 @@ public class Core extends AbstractNpcAI registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR); _firstAttacked = false; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. @@ -205,9 +205,9 @@ public class Core extends AbstractNpcAI final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000; startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(CORE, info); + GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java index e8cadb241f..e258f4d09d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java @@ -22,7 +22,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -60,7 +60,7 @@ public class Fafurion extends AbstractNpcAI addFirstTalkId(HEART_OF_TSUNAMI); addKillId(FAFURION_FINAL_FORM); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(FAFURION_GRANDBOSS_ID); + final StatSet info = GrandBossManager.getInstance().getStatSet(FAFURION_GRANDBOSS_ID); final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID); if (status == DEAD) { @@ -200,9 +200,9 @@ public class Fafurion extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, DEAD); final long respawnTime = (Config.FAFURION_SPAWN_INTERVAL + getRandom(-Config.FAFURION_SPAWN_RANDOM, Config.FAFURION_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(FAFURION_GRANDBOSS_ID); + final StatSet info = GrandBossManager.getInstance().getStatSet(FAFURION_GRANDBOSS_ID); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(FAFURION_GRANDBOSS_ID, info); + GrandBossManager.getInstance().setStatSet(FAFURION_GRANDBOSS_ID, info); startQuestTimer("unlock_fafurion", respawnTime, null, null); return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java index 6ef025304c..764df30625 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -175,7 +175,7 @@ public class IceQueensCastleBattle extends AbstractInstance final Instance world = npc.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); final Npc controller = params.getObject("controller", Npc.class); final Npc freya = params.getObject("freya", Npc.class); switch (event) @@ -734,7 +734,7 @@ public class IceQueensCastleBattle extends AbstractInstance final Instance world = npc.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); switch (npc.getId()) { case FREYA_THRONE: @@ -1069,7 +1069,7 @@ public class IceQueensCastleBattle extends AbstractInstance final Instance world = npc.getInstanceWorld(); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); final Npc controller = params.getObject("controller", Npc.class); switch (npc.getId()) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Helios/Helios.java index 7faa1d8823..0f70177f83 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Helios/Helios.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Helios/Helios.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.zone.type.NoSummonFriendZone; @@ -58,7 +58,7 @@ public class Helios extends AbstractNpcAI // Zone bossZone = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(HELIOS3); + final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3); final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3); if (status == DEAD) { @@ -136,9 +136,9 @@ public class Helios extends AbstractNpcAI bossZone.broadcastPacket(new ExShowScreenMessage(NpcStringId.HELIOS_DEFEATED_TAKES_FLIGHT_DEEP_IN_TO_THE_SUPERION_FORT_HIS_THRONE_IS_RENDERED_INACTIVE, ExShowScreenMessage.TOP_CENTER, 10000, true)); GrandBossManager.getInstance().setBossStatus(HELIOS3, DEAD); final long respawnTime = (Config.HELIOS_SPAWN_INTERVAL + getRandom(-Config.HELIOS_SPAWN_RANDOM, Config.HELIOS_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(HELIOS3); + final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(HELIOS3, info); + GrandBossManager.getInstance().setStatSet(HELIOS3, info); startQuestTimer("unlock_helios", respawnTime, null, null); break; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java index dc6e826093..b863874cd2 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.AggroInfo; import org.l2jmobius.gameserver.model.DamageDoneInfo; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -153,13 +153,13 @@ public class IstinaCavern extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); - final StatsSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); switch (event) { case "DEATH_TIMER": @@ -391,7 +391,7 @@ public class IstinaCavern extends AbstractInstance } else { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); if (skillId == npcParams.getSkillHolder("Istina_Death_Skill01").getSkillId()) { @@ -440,7 +440,7 @@ public class IstinaCavern extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int stage = npcVars.getInt("ISTINA_STAGE", -1); if (npc.getId() == BALLISTA) @@ -657,7 +657,7 @@ public class IstinaCavern extends AbstractInstance private PlayerInstance setPlayerRewardInfo(Npc npc) { final Map rewards = new ConcurrentHashMap<>(); - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); PlayerInstance maxDealer = null; long maxDamage = 0; int totalDamage = 0; diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index 61b663a0f3..7aebfa337d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -116,7 +116,7 @@ public class Kelbim extends AbstractNpcAI addKillId(KELBIM); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(KELBIM); + final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM); final int status = GrandBossManager.getInstance().getBossStatus(KELBIM); if (status == DEAD) { @@ -429,9 +429,9 @@ public class Kelbim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(KELBIM, DEAD); final long respawnTime = (Config.KELBIM_SPAWN_INTERVAL + getRandom(-Config.KELBIM_SPAWN_RANDOM, Config.KELBIM_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(KELBIM); + final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(KELBIM, info); + GrandBossManager.getInstance().setStatSet(KELBIM, info); startQuestTimer("unlock_kelbim", respawnTime, null, null); startQuestTimer("end_kelbim", 1800000, null, null); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java index 31be0ec32d..f023ad5f8e 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java @@ -19,7 +19,7 @@ package ai.bosses.Kimerian; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -83,7 +83,7 @@ public class KimerianCommon extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) @@ -345,8 +345,8 @@ public class KimerianCommon extends AbstractInstance { final Creature creature = event.getSeen(); final Npc npc = (Npc) event.getSeer(); - final StatsSet npcParams = npc.getParameters(); - final StatsSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java index 1cfd2b47c9..2fbe5b0109 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -337,7 +337,7 @@ public class Lilith extends AbstractNpcAI addSkillSeeId(ALL_MOBS); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LILITH); + final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH); final int status = GrandBossManager.getInstance().getBossStatus(LILITH); if (status == DEAD) { @@ -598,9 +598,9 @@ public class Lilith extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LILITH, DEAD); final long respawnTime = getRespawnTime(); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LILITH); + final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(LILITH, info); + GrandBossManager.getInstance().setStatSet(LILITH, info); startQuestTimer("unlock_lilith", respawnTime, null, null); startQuestTimer("end_lilith", 900000, null, null); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index 9ef473069d..cc00a33356 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -244,7 +244,7 @@ public class Lindvior extends AbstractNpcAI addSeeCreatureId(INVISIBLE); _zoneLair = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class); // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LINDVIOR_RAID); + final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID); final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID); if (status == DEAD) { @@ -821,9 +821,9 @@ public class Lindvior extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD); final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LINDVIOR_RAID); + final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(LINDVIOR_RAID, info); + GrandBossManager.getInstance().setStatSet(LINDVIOR_RAID, info); startQuestTimer("unlock_lindvior", respawnTime, null, null); } else if (npc.getId() == NPC_GENERATOR) @@ -867,7 +867,7 @@ public class Lindvior extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SHOUT") && (npc != null) && !npc.isDead()) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/LionelHunter.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/LionelHunter.java index e02f478232..0677792823 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/LionelHunter.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/LionelHunter.java @@ -18,7 +18,7 @@ package ai.bosses.Lindvior; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.WalkingManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; @@ -43,7 +43,7 @@ public class LionelHunter extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SHOUT") && (npc != null)) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java index b9c19644c4..c5c62c8f2f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -152,13 +152,13 @@ public class OctavisWarzone extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance world = npc.getInstanceWorld(); if (isInInstance(world)) { - final StatsSet npcVars = npc.getVariables(); - final StatsSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); switch (event) { @@ -378,7 +378,7 @@ public class OctavisWarzone extends AbstractInstance } else if (CommonUtil.contains(OCTAVIS_STAGE_2, npc.getId())) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); if (npcVars.getBoolean("START_TIMERS", true)) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index d6ea2d3e51..4fd8bd3761 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -90,7 +90,7 @@ public class Orfen extends AbstractNpcAI registerMobs(mobs); _IsTeleported = false; ZONE = ZoneManager.getInstance().getZoneById(12013); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); final int status = GrandBossManager.getInstance().getBossStatus(ORFEN); if (status == DEAD) { @@ -325,9 +325,9 @@ public class Orfen extends AbstractNpcAI respawnTime *= 3600000; startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(ORFEN, info); + GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); startQuestTimer("despawn_minions", 20000, null, null); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index c2564917c7..b9fdddaaf7 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; @@ -91,7 +91,7 @@ public class QueenAnt extends AbstractNpcAI addFactionCallId(NURSE); _zone = ZoneManager.getInstance().getZoneById(12012); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); final int status = GrandBossManager.getInstance().getBossStatus(QUEEN); if (status == DEAD) { @@ -367,9 +367,9 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("action", npc, null); cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(QUEEN, info); + GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); _larva.deleteMe(); _larva = null; diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java index 58d5b9d3a8..577a99ad9d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Spezion/Cannon/Cannon.java @@ -19,7 +19,7 @@ package ai.bosses.Spezion.Cannon; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -170,7 +170,7 @@ public class Cannon extends AbstractNpcAI { if (skill.getId() == PRESENT_SKILL.getSkillId()) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); npc.broadcastPacket(new Earthquake(npc, 10, 5)); npc.broadcastPacket(new OnEventTrigger(npcParams.getInt("TRIGGER_ID"), true)); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java index 086615be42..4af559d521 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -105,13 +105,13 @@ public class TeredorWarzone extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); - final StatsSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); switch (event) { @@ -236,7 +236,7 @@ public class TeredorWarzone extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); switch (npc.getId()) { @@ -292,7 +292,7 @@ public class TeredorWarzone extends AbstractInstance if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); switch (npc.getId()) { @@ -472,7 +472,7 @@ public class TeredorWarzone extends AbstractInstance { case TEREDOR: { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int hpPer = npc.getCurrentHpPercent(); int teredorStatus = npcVars.getInt("TEREDOR_STATUS", 1); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java index 9d9a79d53a..1610356a26 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -322,7 +322,7 @@ public class Trasken extends AbstractNpcAI DoorData.getInstance().getDoor(DOOR).openMe(); } // Unlock - final StatsSet info = GrandBossManager.getInstance().getStatsSet(TRASKEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN); final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN); if (status == DEAD) { @@ -603,9 +603,9 @@ public class Trasken extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD); final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(TRASKEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(TRASKEN, info); + GrandBossManager.getInstance().setStatSet(TRASKEN, info); startQuestTimer("unlock_trasken", respawnTime, null, null); break; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java index 9414859da4..7233381898 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; @@ -123,7 +123,7 @@ public class Valakas extends AbstractNpcAI registerMobs(VALAKAS); ZONE = ZoneManager.getInstance().getZoneById(12010); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(VALAKAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); final int status = GrandBossManager.getInstance().getBossStatus(VALAKAS); if (status == DEAD) @@ -446,9 +446,9 @@ public class Valakas extends AbstractNpcAI final long respawnTime = (Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM)) * 3600000; startQuestTimer("valakas_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(VALAKAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(VALAKAS, info); + GrandBossManager.getInstance().setStatSet(VALAKAS, info); return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java index c73ef9d83c..703e55428a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -189,8 +189,8 @@ public class CavernOfThePirateCaptain extends AbstractInstance final Instance world = npc.getInstanceWorld(); if (world != null) { - final StatsSet templParams = world.getTemplateParameters(); - final StatsSet params = world.getParameters(); + final StatSet templParams = world.getTemplateParameters(); + final StatSet params = world.getParameters(); switch (event) { case "BURN_BLUE": diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/AreaSkillNpc.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/AreaSkillNpc.java index 7cc32dc91c..e3dcd68034 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/AreaSkillNpc.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/AreaSkillNpc.java @@ -17,7 +17,7 @@ package ai.others; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -128,7 +128,7 @@ public class AreaSkillNpc extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java index 01b37387a8..ef9e26a221 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -101,7 +101,7 @@ public class CastleTeleporter extends AbstractNpcAI if (st.hasMoreTokens()) { final int unknowInt = Integer.parseInt(st.nextToken()); - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); Location teleLoc = null; switch (unknowInt) { @@ -191,7 +191,7 @@ public class CastleTeleporter extends AbstractNpcAI return htmltext; } - private Location getTeleportLocation(StatsSet npcParams, String paramName1, String paramName2, String paramName3) + private Location getTeleportLocation(StatSet npcParams, String paramName1, String paramName2, String paramName3) { final Location loc; if (getRandom(100) < 33) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java index b1355fa9c5..c05c1b184b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java @@ -16,7 +16,7 @@ */ package ai.others.NpcBuffers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ class NpcBufferSkillData private final int _scaleToLevel; private final int _initialDelay; - NpcBufferSkillData(StatsSet set) + NpcBufferSkillData(StatSet set) { _skill = new SkillHolder(set.getInt("id"), set.getInt("level")); _scaleToLevel = set.getInt("scaleToLevel", -1); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java index dd7f4187be..ecae9d2861 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -54,7 +54,7 @@ class NpcBuffersData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node attr; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -75,7 +75,7 @@ class NpcBuffersData implements IXmlReader case "skill": { attrs = c.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { attr = attrs.item(i); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/Servitors/ClanFlag.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/Servitors/ClanFlag.java index 558d57b407..b09a5f38e9 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/Servitors/ClanFlag.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/Servitors/ClanFlag.java @@ -17,7 +17,7 @@ package ai.others.Servitors; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -51,7 +51,7 @@ public class ClanFlag extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java index 55c9613eab..a50c042b7f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -68,7 +68,7 @@ public class GateOfUnlimitedSummoning extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java index f19f5dea69..c817501830 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java @@ -17,7 +17,7 @@ package ai.others.Servitors; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -52,7 +52,7 @@ public class TreeOfLife extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (player != null) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java index 3ee8063427..ee96be41d8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/TersisHerald/TersisHerald.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -91,7 +91,7 @@ public class TersisHerald extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("DESPAWN_NPCS")) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index 2e5331f903..55dc363405 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.zone.type.NoRestartZone; @@ -309,7 +309,7 @@ public class AdminGrandBoss implements IAdminCommandHandler } } - final StatsSet info = GrandBossManager.getInstance().getStatsSet(grandBossId); + final StatSet info = GrandBossManager.getInstance().getStatSet(grandBossId); final String bossRespawn = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(info.getLong("respawn_time")); final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java index 075d9d050c..71aeb82ddd 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java @@ -19,7 +19,7 @@ package handlers.admincommandhandlers; import java.util.StringTokenizer; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -114,7 +114,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.getNobleLevel() > 0) { - final StatsSet statDat = getPlayerSet(player); + final StatSet statDat = getPlayerSet(player); final int oldpoints = Olympiad.getInstance().getNoblePoints(player); final int points = Math.max(oldpoints + val, 0); if (points > 1000) @@ -155,7 +155,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.getNobleLevel() > 0) { - final StatsSet playerStat = Olympiad.getNobleStats(player.getObjectId()); + final StatSet playerStat = Olympiad.getNobleStats(player.getObjectId()); if (playerStat == null) { BuilderUtil.sendSysMessage(activeChar, "This player hasn't played on Olympiad yet!"); @@ -197,7 +197,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.getNobleLevel() > 0) { - final StatsSet statDat = getPlayerSet(player); + final StatSet statDat = getPlayerSet(player); final int oldpoints = Olympiad.getInstance().getNoblePoints(player); final int points = oldpoints - val; if ((points < 1) && (points > 1000)) @@ -237,12 +237,12 @@ public class AdminOlympiad implements IAdminCommandHandler return Integer.decode(token); } - private StatsSet getPlayerSet(PlayerInstance player) + private StatSet getPlayerSet(PlayerInstance player) { - StatsSet statDat = Olympiad.getNobleStats(player.getObjectId()); + StatSet statDat = Olympiad.getNobleStats(player.getObjectId()); if (statDat == null) { - statDat = new StatsSet(); + statDat = new StatSet(); statDat.set(Olympiad.CLASS_ID, player.getBaseClass()); statDat.set(Olympiad.CHAR_NAME, player.getName()); statDat.set(Olympiad.POINTS, Olympiad.DEFAULT_POINTS); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java index d8a3d6e5ce..6382651e6c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java @@ -19,7 +19,7 @@ package handlers.conditions; import java.util.List; import org.l2jmobius.gameserver.enums.CategoryType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -31,7 +31,7 @@ public class CategoryTypeCondition implements ICondition { private final List _categoryTypes; - public CategoryTypeCondition(StatsSet params) + public CategoryTypeCondition(StatSet params) { _categoryTypes = params.getEnumList("category", CategoryType.class); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java index b24cfa0f14..9a14cb6fa2 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java @@ -16,7 +16,7 @@ */ package handlers.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -29,7 +29,7 @@ public class NpcLevelCondition implements ICondition private final int _minLevel; private final int _maxLevel; - public NpcLevelCondition(StatsSet params) + public NpcLevelCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java index afffe7a0c5..9e3deaa8ce 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java @@ -16,7 +16,7 @@ */ package handlers.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -29,7 +29,7 @@ public class PlayerLevelCondition implements ICondition private final int _minLevel; private final int _maxLevel; - public PlayerLevelCondition(StatsSet params) + public PlayerLevelCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 09f609dc37..0e81066579 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -32,7 +32,7 @@ public class AbnormalShield extends AbstractEffect { private final int _times; - public AbnormalShield(StatsSet params) + public AbnormalShield(StatSet params) { _times = params.getInt("times", -1); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 0496c9068d..9c508c8c52 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Objects; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class AbnormalTimeChange extends AbstractEffect private final int _time; private final int _mode; - public AbnormalTimeChange(StatsSet params) + public AbnormalTimeChange(StatSet params) { final String abnormals = params.getString("slot", null); if ((abnormals != null) && !abnormals.isEmpty()) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 98f85c7b21..3f9132b8e3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -37,7 +37,7 @@ public class AbsorbDamage extends AbstractEffect private final double _damage; private static final Map _damageHolder = new ConcurrentHashMap<>(); - public AbsorbDamage(StatsSet params) + public AbsorbDamage(StatSet params) { _damage = params.getDouble("damage", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 26f51d5351..86fef7cf6d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; @@ -38,7 +38,7 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect private final int _hpPercent; private final Map _updates = new ConcurrentHashMap<>(); - protected AbstractConditionalHpEffect(StatsSet params, Stat stat) + protected AbstractConditionalHpEffect(StatSet params, Stat stat) { super(params, stat); _hpPercent = params.getInt("hpPercent", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java index 2e40124e39..f010f84271 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AbstractStatAddEffect extends AbstractEffect private final Stat _stat; protected final double _amount; - public AbstractStatAddEffect(StatsSet params, Stat stat) + public AbstractStatAddEffect(StatSet params, Stat stat) { _stat = stat; _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index da6a575c44..29e439684b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; @@ -42,12 +42,12 @@ public abstract class AbstractStatEffect extends AbstractEffect protected final StatModifierType _mode; protected final List _conditions = new ArrayList<>(); - public AbstractStatEffect(StatsSet params, Stat stat) + public AbstractStatEffect(StatSet params, Stat stat) { this(params, stat, stat); } - public AbstractStatEffect(StatsSet params, Stat mulStat, Stat addStat) + public AbstractStatEffect(StatSet params, Stat mulStat, Stat addStat) { _addStat = addStat; _mulStat = mulStat; diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java index 9811f395aa..33d08bff36 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AbstractStatPercentEffect extends AbstractEffect private final Stat _stat; protected final double _amount; - public AbstractStatPercentEffect(StatsSet params, Stat stat) + public AbstractStatPercentEffect(StatSet params, Stat stat) { _stat = stat; _amount = params.getDouble("amount", 1); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java index 539814ef2a..79c022a23c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class Accuracy extends AbstractStatEffect { - public Accuracy(StatsSet params) + public Accuracy(StatSet params) { super(params, Stat.ACCURACY_COMBAT); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index 0c1fcbd92b..48d69968c5 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddHate extends AbstractEffect private final double _power; private final boolean _affectSummoner; - public AddHate(StatsSet params) + public AddHate(StatSet params) { _power = params.getDouble("power", 0); _affectSummoner = params.getBoolean("affectSummoner", false); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java index 274699d44b..486b330824 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class AddHuntingTime extends AbstractEffect private final int _zoneId; private final long _time; - public AddHuntingTime(StatsSet params) + public AddHuntingTime(StatSet params) { _zoneId = params.getInt("zoneId", 0); _time = params.getLong("time", 3600000); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java index e90d5cc7f3..324927947a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddSkillBySkill extends AbstractEffect private final int _existingSkillLevel; private final SkillHolder _addedSkill; - public AddSkillBySkill(StatsSet params) + public AddSkillBySkill(StatSet params) { _existingSkillId = params.getInt("existingSkillId"); _existingSkillLevel = params.getInt("existingSkillLevel"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index bdd8314dd7..205bc82200 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddTeleportBookmarkSlot extends AbstractEffect { private final int _amount; - public AddTeleportBookmarkSlot(StatsSet params) + public AddTeleportBookmarkSlot(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java index c26ec5442f..658931ecb2 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionCp extends AbstractStatAddEffect { - public AdditionalPotionCp(StatsSet params) + public AdditionalPotionCp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_CP); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java index 6b68e40f32..57d54c7d3b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionHp extends AbstractStatAddEffect { - public AdditionalPotionHp(StatsSet params) + public AdditionalPotionHp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_HP); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java index c9e1cc237e..007547ebe7 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionMp extends AbstractStatAddEffect { - public AdditionalPotionMp(StatsSet params) + public AdditionalPotionMp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_MP); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AgathionSlot.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AgathionSlot.java index 2d2a3cf6df..b8a91b683f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AgathionSlot.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AgathionSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AgathionSlot extends AbstractStatAddEffect { - public AgathionSlot(StatsSet params) + public AgathionSlot(StatSet params) { super(params, Stat.AGATHION_SLOTS); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index cbbd845e23..c01bdec653 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -22,7 +22,7 @@ import java.util.Map; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -78,7 +78,7 @@ public class AirBind extends AbstractEffect _chainedAirSkills.put(ClassId.AEORE_SHILLIEN_SAINT, 11999); // Heavy Hit } - public AirBind(StatsSet params) + public AirBind(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java index f5cbb63465..9255ba1877 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AreaDamage extends AbstractStatAddEffect { - public AreaDamage(StatsSet params) + public AreaDamage(StatSet params) { super(params, Stat.DAMAGE_ZONE_VULN); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ArtifactSlot.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ArtifactSlot.java index 150e53d14e..0c146fc6a3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ArtifactSlot.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ArtifactSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ArtifactSlot extends AbstractStatAddEffect { - public ArtifactSlot(StatsSet params) + public ArtifactSlot(StatSet params) { super(params, Stat.ARTIFACT_SLOTS); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java index 2ded14e7ae..a5d56477f5 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AttackAttribute extends AbstractEffect private final AttributeType _attribute; private final double _amount; - public AttackAttribute(StatsSet params) + public AttackAttribute(StatSet params) { _amount = params.getDouble("amount", 0); _attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java index ff58d09cc7..795366850d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class AttackAttributeAdd extends AbstractEffect { private final double _amount; - public AttackAttributeAdd(StatsSet params) + public AttackAttributeAdd(StatSet params) { _amount = params.getDouble("amount", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java index 37bfbf341a..fcd2b48c99 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class AttackBehind extends AbstractEffect { - public AttackBehind(StatsSet params) + public AttackBehind(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index 062c325a55..4136f5d530 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class AttackTrait extends AbstractEffect { private final Map _attackTraits = new EnumMap<>(TraitType.class); - public AttackTrait(StatsSet params) + public AttackTrait(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 02d6a8d78c..8ac42d45c3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -37,7 +37,7 @@ public class Backstab extends AbstractEffect private final double _criticalChance; private final boolean _overHit; - public Backstab(StatsSet params) + public Backstab(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Betray.java index 32e3c65c55..79e8bd3360 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Betray extends AbstractEffect { - public Betray(StatsSet params) + public Betray(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Blink.java index ba1caed6ac..56d3f628fd 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -52,7 +52,7 @@ public class Blink extends AbstractEffect private final int _flyDelay; private final int _animationSpeed; - public Blink(StatsSet params) + public Blink(StatSet params) { _flyCourse = params.getInt("angle", 0); _flyRadius = params.getInt("range", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 8677f72407..596d4b752f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; */ public class BlinkSwap extends AbstractEffect { - public BlinkSwap(StatsSet params) + public BlinkSwap(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 7bec602aef..cea12039d2 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -20,7 +20,7 @@ import java.util.Arrays; import java.util.Set; import java.util.stream.Collectors; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class BlockAbnormalSlot extends AbstractEffect { private final Set _blockAbnormalSlots; - public BlockAbnormalSlot(StatsSet params) + public BlockAbnormalSlot(StatSet params) { _blockAbnormalSlots = Arrays.stream(params.getString("slot").split(";")).map(slot -> Enum.valueOf(AbnormalType.class, slot)).collect(Collectors.toSet()); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index b4839ab322..348881f970 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -21,7 +21,7 @@ import java.util.Set; import org.l2jmobius.gameserver.datatables.BotReportTable; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class BlockAction extends AbstractEffect { private final Set _blockedActions = new HashSet<>(); - public BlockAction(StatsSet params) + public BlockAction(StatSet params) { final String[] actions = params.getString("blockedActions").split(","); for (String action : actions) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index 68f6586e3e..635d2735f9 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -22,7 +22,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class BlockActions extends AbstractEffect { private final Set _allowedSkills; - public BlockActions(StatsSet params) + public BlockActions(StatSet params) { final String[] allowedSkills = params.getString("allowedSkills", "").split(";"); _allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet()); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 99af987208..3502d140d0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockChat extends AbstractEffect { - public BlockChat(StatsSet params) + public BlockChat(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java index 6160114414..a2b084c918 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; */ public class BlockControl extends AbstractEffect { - public BlockControl(StatsSet params) + public BlockControl(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java index 3d96329b6d..69b390ae8f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BlockEscape extends AbstractEffect { - public BlockEscape(StatsSet params) + public BlockEscape(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index 8bbd7ac018..85d89180e7 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockMove extends AbstractEffect { - public BlockMove(StatsSet params) + public BlockMove(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index 316f82f855..9e28fc403a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockParty extends AbstractEffect { - public BlockParty(StatsSet params) + public BlockParty(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java index ae2ac8b035..d3235fc34f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BlockResurrection extends AbstractEffect { - public BlockResurrection(StatsSet params) + public BlockResurrection(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index f7f119691f..f2cc65b782 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -35,7 +35,7 @@ public class BlockSkill extends AbstractEffect { private final int[] _magicTypes; - public BlockSkill(StatsSet params) + public BlockSkill(StatSet params) { _magicTypes = params.getIntArray("magicTypes", ";"); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index d9b3d3a34d..9f0b7143d2 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockTarget extends AbstractEffect { - public BlockTarget(StatsSet params) + public BlockTarget(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index bc4cbd6320..bef60ad003 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class Bluff extends AbstractEffect { private final int _chance; - public Bluff(StatsSet params) + public Bluff(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java index 2ace40a596..69583d613b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusDropAmount extends AbstractStatPercentEffect { - public BonusDropAmount(StatsSet params) + public BonusDropAmount(StatSet params) { super(params, Stat.BONUS_DROP_AMOUNT); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java index b81560b040..e63c8f79f4 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusDropRate extends AbstractStatPercentEffect { - public BonusDropRate(StatsSet params) + public BonusDropRate(StatSet params) { super(params, Stat.BONUS_DROP_RATE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java index b984404cb2..e0fb54b162 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusSpoilRate extends AbstractStatPercentEffect { - public BonusSpoilRate(StatsSet params) + public BonusSpoilRate(StatSet params) { super(params, Stat.BONUS_SPOIL_RATE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Breath.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Breath.java index 859f341f3c..4235319f22 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Breath.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Breath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class Breath extends AbstractStatEffect { - public Breath(StatsSet params) + public Breath(StatSet params) { super(params, Stat.BREATH); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java index a6d25f3c36..4102506e6c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BuffBlock extends AbstractEffect { - public BuffBlock(StatsSet params) + public BuffBlock(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index de7497f8bf..4f470b06c7 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class CallLearnedSkill extends AbstractEffect { private final int _skillId; - public CallLearnedSkill(StatsSet params) + public CallLearnedSkill(StatSet params) { _skillId = params.getInt("skillId"); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index e6096be4be..b41daf073c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CallParty extends AbstractEffect { - public CallParty(StatsSet params) + public CallParty(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index f6e51392b7..f425c6030f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class CallPc extends AbstractEffect private final int _itemId; private final int _itemCount; - public CallPc(StatsSet params) + public CallPc(StatSet params) { _itemId = params.getInt("itemId", 0); _itemCount = params.getInt("itemCount", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index d6d5cb721d..0da3802665 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -35,7 +35,7 @@ public class CallRandomSkill extends AbstractEffect { private final List _skills = new ArrayList<>(); - public CallRandomSkill(StatsSet params) + public CallRandomSkill(StatSet params) { final String skills = params.getString("skills", null); if (skills != null) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index 99c1494223..f8e4b226c4 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -35,7 +35,7 @@ public class CallSkill extends AbstractEffect private final SkillHolder _skill; private final int _skillLevelScaleTo; - public CallSkill(StatsSet params) + public CallSkill(StatSet params) { _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0)); _skillLevelScaleTo = params.getInt("skillLevelScaleTo", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index b340de4ae1..ff98639c37 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.Collections; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ public class CallSkillOnActionTime extends AbstractEffect { private final SkillHolder _skill; - public CallSkillOnActionTime(StatsSet params) + public CallSkillOnActionTime(StatSet params) { _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0)); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index 6d5d7eacfc..3d2d03151f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CallTargetParty extends AbstractEffect { - public CallTargetParty(StatsSet params) + public CallTargetParty(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index ef01f4a8ed..d4331bf5b7 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ public class ChameleonRest extends AbstractEffect { private final double _power; - public ChameleonRest(StatsSet params) + public ChameleonRest(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index e3b846674d..37054f2fd0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; @@ -35,9 +35,9 @@ public class ChangeBody extends AbstractEffect { private final Set _transformations = new HashSet<>(); - public ChangeBody(StatsSet params) + public ChangeBody(StatSet params) { - for (StatsSet item : params.getList("templates", StatsSet.class)) + for (StatSet item : params.getList("templates", StatSet.class)) { _transformations.add(new TemplateChanceHolder(item.getInt(".templateId"), item.getInt(".minChance"), item.getInt(".maxChance"))); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 76c6e03aa6..6b6386909e 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeFace extends AbstractEffect { private final int _value; - public ChangeFace(StatsSet params) + public ChangeFace(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java index cee3ac1a6f..304afa821c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; /** @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; */ public class ChangeFishingMastery extends AbstractEffect { - public ChangeFishingMastery(StatsSet params) + public ChangeFishingMastery(StatSet params) { } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index 0c583cbc13..64ac49f5d5 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeHairColor extends AbstractEffect { private final int _value; - public ChangeHairColor(StatsSet params) + public ChangeHairColor(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index ad2efbe6a0..ae7d6c6da1 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeHairStyle extends AbstractEffect { private final int _value; - public ChangeHairStyle(StatsSet params) + public ChangeHairStyle(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java index 2d536029fd..4d7c380c75 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class CheapShot extends AbstractEffect { - public CheapShot(StatsSet params) + public CheapShot(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index c6ec8a1c8b..a80740180f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.SubclassInfoType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class ClassChange extends AbstractEffect private final int _index; private static final int IDENTITY_CRISIS_SKILL_ID = 1570; - public ClassChange(StatsSet params) + public ClassChange(StatSet params) { _index = params.getInt("index", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index ccf7598eff..e184022afc 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.stats.Formulas; */ public class Compelling extends AbstractEffect { - public Compelling(StatsSet params) + public Compelling(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index b6aa30f604..f164ac6f3f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class Confuse extends AbstractEffect { private final int _chance; - public Confuse(StatsSet params) + public Confuse(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 25e29532eb..78293c1b0f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ConsumeBody extends AbstractEffect { - public ConsumeBody(StatsSet params) + public ConsumeBody(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 0cf786c656..da47135afd 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class ConvertItem extends AbstractEffect { - public ConvertItem(StatsSet params) + public ConvertItem(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java index 9402fdb06d..857df659c0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CounterPhysicalSkill extends AbstractStatAddEffect { - public CounterPhysicalSkill(StatsSet params) + public CounterPhysicalSkill(StatSet params) { super(params, Stat.VENGEANCE_SKILL_PHYSICAL_DAMAGE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 67bca7fd1b..598682037b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Cp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Cp(StatsSet params) + public Cp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index e0cd52808e..37303b0e7a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class CpHeal extends AbstractEffect { private final double _power; - public CpHeal(StatsSet params) + public CpHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index e2e8ee3479..54de5adfc6 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class CpHealOverTime extends AbstractEffect { private final double _power; - public CpHealOverTime(StatsSet params) + public CpHealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index 5665e937dc..b4a994d6df 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CpHealPercent extends AbstractEffect { private final double _power; - public CpHealPercent(StatsSet params) + public CpHealPercent(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java index 1cc851b2af..efb020bbd5 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CpRegen extends AbstractStatEffect { - public CpRegen(StatsSet params) + public CpRegen(StatSet params) { super(params, Stat.REGENERATE_CP_RATE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CraftingCritical.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CraftingCritical.java index fb8ef495fb..cb3f2aace2 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CraftingCritical.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CraftingCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CraftingCritical extends AbstractStatAddEffect { - public CraftingCritical(StatsSet params) + public CraftingCritical(StatSet params) { super(params, Stat.CRAFTING_CRITICAL); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java index 37231ac1af..00d3dfbaaa 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class CreateCommonItem extends AbstractEffect { private final int _recipeLevel; - public CreateCommonItem(StatsSet params) + public CreateCommonItem(StatSet params) { _recipeLevel = params.getInt("value"); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java index 99f31fecab..d01d510ba9 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class CreateItem extends AbstractEffect { private final int _recipeLevel; - public CreateItem(StatsSet params) + public CreateItem(StatSet params) { _recipeLevel = params.getInt("value"); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java index 8983497026..0b93eef45e 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CriticalDamage extends AbstractStatEffect { - public CriticalDamage(StatsSet params) + public CriticalDamage(StatSet params) { super(params, Stat.CRITICAL_DAMAGE, Stat.CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 7ef4f0ecb4..0630f087b7 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.Position; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CriticalDamagePosition extends AbstractEffect private final double _amount; private final Position _position; - public CriticalDamagePosition(StatsSet params) + public CriticalDamagePosition(StatSet params) { _amount = params.getDouble("amount", 0); _position = params.getEnum("position", Position.class, Position.FRONT); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java index 01f49380eb..0d4bded60e 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; public class CriticalRate extends AbstractConditionalHpEffect { - public CriticalRate(StatsSet params) + public CriticalRate(StatSet params) { super(params, Stat.CRITICAL_RATE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 863b385ca3..4d65fa84eb 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.Position; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CriticalRatePositionBonus extends AbstractEffect private final double _amount; private final Position _position; - public CriticalRatePositionBonus(StatsSet params) + public CriticalRatePositionBonus(StatSet params) { _amount = params.getDouble("amount", 0); _position = params.getEnum("position", Position.class, Position.FRONT); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java index 5f86f9d343..bd48abf204 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ItemGrade; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class Crystallize extends AbstractEffect { private final ItemGrade _grade; - public Crystallize(StatsSet params) + public Crystallize(StatSet params) { _grade = params.getEnum("grade", ItemGrade.class); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java index 94ff8e64e2..79ee5b994e 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CubicMastery extends AbstractStatAddEffect { - public CubicMastery(StatsSet params) + public CubicMastery(StatSet params) { super(params, Stat.MAX_CUBIC); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index 36abf0accf..e6bb53fdea 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class DamOverTime extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTime(StatsSet params) + public DamOverTime(StatSet params) { _canKill = params.getBoolean("canKill", false); _power = params.getDouble("power"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 13e57099e0..b5f25db4d8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class DamOverTimePercent extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTimePercent(StatsSet params) + public DamOverTimePercent(StatSet params) { _canKill = params.getBoolean("canKill", false); _power = params.getDouble("power"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java index dc7a45198f..c9567ea034 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ public class DamageBlock extends AbstractEffect private final boolean _blockHp; private final boolean _blockMp; - public DamageBlock(StatsSet params) + public DamageBlock(StatSet params) { final String type = params.getString("type", null); _blockHp = type.equalsIgnoreCase("BLOCK_HP"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java index 5bc9b5fff8..3d8985d1d8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DamageByAttackType; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -38,7 +38,7 @@ public class DamageByAttack extends AbstractEffect private final double _value; private final DamageByAttackType _type; - public DamageByAttack(StatsSet params) + public DamageByAttack(StatSet params) { _value = params.getDouble("amount"); _type = params.getEnum("type", DamageByAttackType.class, DamageByAttackType.NONE); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java index 5a7629482a..e823a9824a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DamageShield extends AbstractStatAddEffect { - public DamageShield(StatsSet params) + public DamageShield(StatSet params) { super(params, Stat.REFLECT_DAMAGE_PERCENT); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java index db1abe264d..3029a3f0aa 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DamageShieldResist extends AbstractStatAddEffect { - public DamageShieldResist(StatsSet params) + public DamageShieldResist(StatSet params) { super(params, Stat.REFLECT_DAMAGE_PERCENT_DEFENSE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index 8561ff46b0..369bd5483d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class DeathLink extends AbstractEffect { private final double _power; - public DeathLink(StatsSet params) + public DeathLink(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java index b948fad1fc..54261c6229 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class DebuffBlock extends AbstractEffect { - public DebuffBlock(StatsSet params) + public DebuffBlock(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java index 217ef3dfaa..4bc08271fa 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class DefenceAttribute extends AbstractEffect private final AttributeType _attribute; private final double _amount; - public DefenceAttribute(StatsSet params) + public DefenceAttribute(StatSet params) { _amount = params.getDouble("amount", 0); _attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java index 0c0c2e8d6a..daff53d9e1 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceCriticalDamage extends AbstractStatEffect { - public DefenceCriticalDamage(StatsSet params) + public DefenceCriticalDamage(StatSet params) { super(params, Stat.DEFENCE_CRITICAL_DAMAGE, Stat.DEFENCE_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java index 131eb500ea..74a729e38c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceCriticalRate extends AbstractStatEffect { - public DefenceCriticalRate(StatsSet params) + public DefenceCriticalRate(StatSet params) { super(params, Stat.DEFENCE_CRITICAL_RATE, Stat.DEFENCE_CRITICAL_RATE_ADD); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java index 1abee78e08..c664939977 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceMagicCriticalDamage extends AbstractStatEffect { - public DefenceMagicCriticalDamage(StatsSet params) + public DefenceMagicCriticalDamage(StatSet params) { super(params, Stat.DEFENCE_MAGIC_CRITICAL_DAMAGE, Stat.DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java index 2146b89551..6594dda2b3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceMagicCriticalRate extends AbstractStatEffect { - public DefenceMagicCriticalRate(StatsSet params) + public DefenceMagicCriticalRate(StatSet params) { super(params, Stat.DEFENCE_MAGIC_CRITICAL_RATE, Stat.DEFENCE_MAGIC_CRITICAL_RATE_ADD); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index bd80f690cd..134ed56979 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class DefenceTrait extends AbstractEffect { private final Map _defenceTraits = new EnumMap<>(TraitType.class); - public DefenceTrait(StatsSet params) + public DefenceTrait(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index bab5e1a762..7cee616006 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class DeleteHate extends AbstractEffect { private final int _chance; - public DeleteHate(StatsSet params) + public DeleteHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index 85985653b8..f10f189e68 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class DeleteHateOfMe extends AbstractEffect { private final int _chance; - public DeleteHateOfMe(StatsSet params) + public DeleteHateOfMe(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index d3664ad00f..82833ac79d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class DeleteTopAgro extends AbstractEffect { private final int _chance; - public DeleteTopAgro(StatsSet params) + public DeleteTopAgro(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index ae1f2a5942..ba6dad4698 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DoorOpenType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DetectHiddenObjects extends AbstractEffect { - public DetectHiddenObjects(StatsSet params) + public DetectHiddenObjects(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Detection.java index 078360ff35..a20cbcb348 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Detection extends AbstractEffect { - public Detection(StatsSet params) + public Detection(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java index d679c71919..5227885bb5 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class DisableSkill extends AbstractEffect private final Set disableSkills; private Skill knownSKill; - public DisableSkill(StatsSet params) + public DisableSkill(StatSet params) { final String disable = params.getString("disable"); if ((disable != null) && !disable.isEmpty()) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 8567a94d12..32ee715df7 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DisableTargeting extends AbstractEffect { - public DisableTargeting(StatsSet params) + public DisableTargeting(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index fa06ec7221..5a80971f51 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Disarm extends AbstractEffect { - public Disarm(StatsSet params) + public Disarm(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index 7cf0889b57..95d32dd083 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class Disarmor extends AbstractEffect private final Map _unequippedItems; // PlayerObjId, ItemObjId private final long _slot; - public Disarmor(StatsSet params) + public Disarmor(StatSet params) { _unequippedItems = new ConcurrentHashMap<>(); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 95de0300bb..a652a023f5 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DispelAll extends AbstractEffect { - public DispelAll(StatsSet params) + public DispelAll(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 88d979a0d9..040271d2a7 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.List; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -38,7 +38,7 @@ public class DispelByCategory extends AbstractEffect private final int _rate; private final int _max; - public DispelByCategory(StatsSet params) + public DispelByCategory(StatSet params) { _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); _rate = params.getInt("rate", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index a6e4c7cd19..ab79e046b2 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.EnumMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -37,7 +37,7 @@ public class DispelBySlot extends AbstractEffect private final String _dispel; private final Map _dispelAbnormals; - public DispelBySlot(StatsSet params) + public DispelBySlot(StatSet params) { _dispel = params.getString("dispel"); if ((_dispel != null) && !_dispel.isEmpty()) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 1ba6612e23..d1341d10b9 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class DispelBySlotMyself extends AbstractEffect { private final Set _dispelAbnormals; - public DispelBySlotMyself(StatsSet params) + public DispelBySlotMyself(StatSet params) { final String dispel = params.getString("dispel"); if ((dispel != null) && !dispel.isEmpty()) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 845980e59d..b58723058e 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -37,7 +37,7 @@ public class DispelBySlotProbability extends AbstractEffect private final Set _dispelAbnormals; private final int _rate; - public DispelBySlotProbability(StatsSet params) + public DispelBySlotProbability(StatSet params) { final String[] dispelEffects = params.getString("dispel").split(";"); _rate = params.getInt("rate", 100); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java index e52cabffb1..c0c5b040c9 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class DispelCaster extends AbstractEffect { private final Set _dispelAbnormals; - public DispelCaster(StatsSet params) + public DispelCaster(StatSet params) { final String dispel = params.getString("dispel"); if ((dispel != null) && !dispel.isEmpty()) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index 7acd9c4a6c..688d77a703 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -45,7 +45,7 @@ public class DoubleCast extends AbstractEffect private final Map> _addedToggles; - public DoubleCast(StatsSet params) + public DoubleCast(StatSet params) { _addedToggles = new HashMap<>(); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java index d7f067a2a0..d1e21edeb0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DuelistFury extends AbstractEffect { - public DuelistFury(StatsSet params) + public DuelistFury(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index 409fed6a23..de397bb5ff 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class EnableCloak extends AbstractEffect { - public EnableCloak(StatsSet params) + public EnableCloak(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index e855c4ba1a..2fe2bef99f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -43,7 +43,7 @@ public class EnergyAttack extends AbstractEffect private final boolean _overHit; private final double _pDefMod; - public EnergyAttack(StatsSet params) + public EnergyAttack(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getInt("criticalChance", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index a8f108573f..ae463ef2a4 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class EnlargeAbnormalSlot extends AbstractEffect { private final int _slots; - public EnlargeAbnormalSlot(StatsSet params) + public EnlargeAbnormalSlot(StatSet params) { _slots = params.getInt("slots", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java index c43ea04413..c4073b1a47 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StorageType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class EnlargeSlot extends AbstractEffect private final StorageType _type; private final double _amount; - public EnlargeSlot(StatsSet params) + public EnlargeSlot(StatSet params) { _amount = params.getDouble("amount", 0); _type = params.getEnum("type", StorageType.class, StorageType.INVENTORY_NORMAL); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Escape.java index 936f82d8ce..f3a07c9d15 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class Escape extends AbstractEffect { private final TeleportWhereType _escapeType; - public Escape(StatsSet params) + public Escape(StatSet params) { _escapeType = params.getEnum("escapeType", TeleportWhereType.class, null); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java index 76dbc8171c..eb68d24af8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ExpModify extends AbstractStatAddEffect { - public ExpModify(StatsSet params) + public ExpModify(StatSet params) { super(params, Stat.BONUS_EXP); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java index bf11db6e4b..1100ca25be 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Faceoff extends AbstractEffect { - public Faceoff(StatsSet params) + public Faceoff(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index e256209e39..79f7b43503 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -34,7 +34,7 @@ public class FakeDeath extends AbstractEffect { private final double _power; - public FakeDeath(StatsSet params) + public FakeDeath(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index a94c75d310..780d5cefba 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -44,7 +44,7 @@ public class FatalBlow extends AbstractEffect private final double _abnormalPower; private final boolean _overHit; - public FatalBlow(StatsSet params) + public FatalBlow(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java index c8ff8f7acb..6e7597e63d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class FatalBlowRate extends AbstractEffect private final double _amount; private final StatModifierType _mode; - public FatalBlowRate(StatsSet params) + public FatalBlowRate(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 9731e75e5d..ec2659ea2c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DefenderInstance; import org.l2jmobius.gameserver.model.actor.instance.FortCommanderInstance; @@ -40,7 +40,7 @@ public class Fear extends AbstractEffect { private static final int FEAR_RANGE = 500; - public Fear(StatsSet params) + public Fear(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 5e04e46d60..94d9912bdf 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.MountType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ public class Feed extends AbstractEffect private final int _ride; private final int _wyvern; - public Feed(StatsSet params) + public Feed(StatSet params) { _normal = params.getInt("normal", 0); _ride = params.getInt("ride", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java index 0b22a4d4c9..146e3b73e6 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class FishingExpSpBonus extends AbstractStatPercentEffect { - public FishingExpSpBonus(StatsSet params) + public FishingExpSpBonus(StatSet params) { super(params, Stat.FISHING_EXP_SP_BONUS); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Flag.java index c1469eab19..2442cbdb35 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Flag extends AbstractEffect { - public Flag(StatsSet params) + public Flag(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index 0243f0f543..74a9754a95 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.BlockInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class FlipBlock extends AbstractEffect { - public FlipBlock(StatsSet params) + public FlipBlock(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 7fc7da5fe6..3412e4d36d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class FlyAway extends AbstractEffect { private final int _radius; - public FlyAway(StatsSet params) + public FlyAway(StatSet params) { _radius = params.getInt("radius"); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java index fd3216286d..590fbbcd44 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class FocusEnergy extends AbstractStatAddEffect { - public FocusEnergy(StatsSet params) + public FocusEnergy(StatSet params) { super(params, Stat.MAX_MOMENTUM); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index efbd93f304..19f0163e42 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class FocusMaxMomentum extends AbstractEffect { - public FocusMaxMomentum(StatsSet params) + public FocusMaxMomentum(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index 284d19ee5f..e8c18e9682 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -36,7 +36,7 @@ public class FocusMomentum extends AbstractEffect private final int _amount; private final int _maxCharges; - public FocusMomentum(StatsSet params) + public FocusMomentum(StatSet params) { _amount = params.getInt("amount", 1); _maxCharges = params.getInt("maxCharges", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 18a9864bbc..debd491cfe 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class FocusSouls extends AbstractEffect { private final int _charge; - public FocusSouls(StatsSet params) + public FocusSouls(StatSet params) { _charge = params.getInt("charge", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 8540ccd49c..23328db910 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Set; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class GetAgro extends AbstractEffect { - public GetAgro(StatsSet params) + public GetAgro(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java index 1ca8722709..e91002d04b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class GetDamageLimit extends AbstractStatAddEffect { - public GetDamageLimit(StatsSet params) + public GetDamageLimit(StatSet params) { super(params, Stat.DAMAGE_LIMIT); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 2dfd3bf8c4..439f3e8e3a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class GetMomentum extends AbstractEffect { private static int _ticks; - public GetMomentum(StatsSet params) + public GetMomentum(StatSet params) { _ticks = params.getInt("ticks", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index 7c1c0f3fa2..2c842101ed 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class GiveClanReputation extends AbstractEffect { private final int _reputation; - public GiveClanReputation(StatsSet params) + public GiveClanReputation(StatSet params) { _reputation = params.getInt("reputation", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index fd4d61fa73..9052c63154 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class GiveExpAndSp extends AbstractEffect private final int _xp; private final int _sp; - public GiveExpAndSp(StatsSet params) + public GiveExpAndSp(StatSet params) { _xp = params.getInt("xp", 0); _sp = params.getInt("sp", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index 3448e09797..9d41a4395b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ public class GiveFame extends AbstractEffect { private final int _fame; - public GiveFame(StatsSet params) + public GiveFame(StatSet params) { _fame = params.getInt("fame", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index c948fa0948..617a8ef88a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class GiveRecommendation extends AbstractEffect { private final int _amount; - public GiveRecommendation(StatsSet params) + public GiveRecommendation(StatSet params) { _amount = params.getInt("amount", 0); if (_amount == 0) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index 5fe06566c7..75a16fe828 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class GiveSp extends AbstractEffect { private final int _sp; - public GiveSp(StatsSet params) + public GiveSp(StatSet params) { _sp = params.getInt("sp", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index e32735f4e9..7779c6f413 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class GiveXp extends AbstractEffect { private final long _xp; - public GiveXp(StatsSet params) + public GiveXp(StatSet params) { _xp = params.getLong("xp", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 17095c209a..5cf4994f32 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Grow extends AbstractEffect { - public Grow(StatsSet params) + public Grow(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index a2200e1a2f..350c8e659f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.UserInfoType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class HairAccessorySet extends AbstractEffect { - public HairAccessorySet(StatsSet params) + public HairAccessorySet(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index f881ed5027..1654fc650c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Harvesting extends AbstractEffect { - public Harvesting(StatsSet params) + public Harvesting(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java index ac1c9f49d8..097db6604a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HateAttack extends AbstractStatPercentEffect { - public HateAttack(StatsSet params) + public HateAttack(StatSet params) { super(params, Stat.HATE_ATTACK); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index 00f569eb17..9963ff1336 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlagInstance; @@ -34,7 +34,7 @@ public class HeadquarterCreate extends AbstractEffect private static final int HQ_NPC_ID = 35062; private final boolean _isAdvanced; - public HeadquarterCreate(StatsSet params) + public HeadquarterCreate(StatSet params) { _isAdvanced = params.getBoolean("isAdvanced", false); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 6e611144f1..139972a272 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -40,7 +40,7 @@ public class Heal extends AbstractEffect { private final double _power; - public Heal(StatsSet params) + public Heal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java index 5a7457d3df..a9f75ab036 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HealEffect extends AbstractStatEffect { - public HealEffect(StatsSet params) + public HealEffect(StatSet params) { super(params, Stat.HEAL_EFFECT, Stat.HEAL_EFFECT_ADD); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 86e28dc8b4..da76f33058 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class HealOverTime extends AbstractEffect { private final double _power; - public HealOverTime(StatsSet params) + public HealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index 6c9c8986bb..8b1c821a0a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class HealPercent extends AbstractEffect { private final int _power; - public HealPercent(StatsSet params) + public HealPercent(StatSet params) { _power = params.getInt("power", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Hide.java index e431277964..d02898bac5 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Hide extends AbstractEffect { - public Hide(StatsSet params) + public Hide(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index e7e5f3f91b..78fa1c9392 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.GameTimeController; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HitAtNight extends AbstractStatEffect { - public HitAtNight(StatsSet params) + public HitAtNight(StatSet params) { super(params, Stat.HIT_AT_NIGHT); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java index 1fd98e7aa9..f14b922308 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HitNumber extends AbstractStatEffect { - public HitNumber(StatsSet params) + public HitNumber(StatSet params) { super(params, Stat.ATTACK_COUNT_MAX); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 3611fd7d74..c2426f8d11 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Hp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Hp(StatsSet params) + public Hp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index 3d125565fe..6244c76428 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class HpByLevel extends AbstractEffect { private final double _power; - public HpByLevel(StatsSet params) + public HpByLevel(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 3cdb210bba..80b4af9b46 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -40,7 +40,7 @@ public class HpCpHeal extends AbstractEffect { private final double _power; - public HpCpHeal(StatsSet params) + public HpCpHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java index 0394dab996..6f96c2dcb3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class HpCpHealCritical extends AbstractEffect { - public HpCpHealCritical(StatsSet params) + public HpCpHealCritical(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 554b1cec79..7cf47c3a65 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class HpDrain extends AbstractEffect private final double _power; private final double _percentage; - public HpDrain(StatsSet params) + public HpDrain(StatSet params) { _power = params.getDouble("power", 0); _percentage = params.getDouble("percentage", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java index cb1d2bc3a7..b170bc62ba 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HpRegen extends AbstractStatEffect { - public HpRegen(StatsSet params) + public HpRegen(StatSet params) { super(params, Stat.REGENERATE_HP_RATE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 235e89a79b..f346fbaad8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class HpToOwner extends AbstractEffect private final double _power; private final int _stealAmount; - public HpToOwner(StatsSet params) + public HpToOwner(StatSet params) { _power = params.getDouble("power"); _stealAmount = params.getInt("stealAmount"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java index 9829519da9..c659684ae8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class IgnoreDeath extends AbstractEffect { - public IgnoreDeath(StatsSet params) + public IgnoreDeath(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index f7c9baa155..44dceba10e 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ImmobilePetBuff extends AbstractEffect { - public ImmobilePetBuff(StatsSet params) + public ImmobilePetBuff(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java index a60fc45d15..a03eff933a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ public class InstantKillResist extends AbstractEffect { private final int _amount; - public InstantKillResist(StatsSet params) + public InstantKillResist(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java index 7e1fc8abe4..265a9aab97 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class JewelSlot extends AbstractStatAddEffect { - public JewelSlot(StatsSet params) + public JewelSlot(StatSet params) { super(params, Stat.BROOCH_JEWELS); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 3d5ff2dda3..a34d7cc5b3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class KarmaCount extends AbstractEffect private final int _amount; private final int _mode; - public KarmaCount(StatsSet params) + public KarmaCount(StatSet params) { _amount = params.getInt("amount", 0); switch (params.getString("mode", "DIFF")) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index b6f5b03994..cffa4427c6 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -94,7 +94,7 @@ public class KnockBack extends AbstractEffect _chainKnockSkills.put(ClassId.AEORE_SHILLIEN_SAINT, 12000); // Heavy Hit } - public KnockBack(StatsSet params) + public KnockBack(StatSet params) { _distance = params.getInt("distance", 50); _speed = params.getInt("speed", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index 7bfac989cf..1affb1b141 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -38,7 +38,7 @@ public class Lethal extends AbstractEffect private final double _fullLethal; private final double _halfLethal; - public Lethal(StatsSet params) + public Lethal(StatSet params) { _fullLethal = params.getDouble("fullLethal", 0); _halfLethal = params.getDouble("halfLethal", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java index aeb42458a6..43b17877ad 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitCp extends AbstractStatEffect { - public LimitCp(StatsSet params) + public LimitCp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_CP); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java index cf76ec482a..45d8f37355 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitHp extends AbstractStatEffect { - public LimitHp(StatsSet params) + public LimitHp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_HP); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java index f5eda36ba6..8d31633d0a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitMp extends AbstractStatEffect { - public LimitMp(StatsSet params) + public LimitMp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_MP); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java index e7832ef5af..e502ad06f3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class LimitSkill extends AbstractEffect private static final int CELESTIAL_PROTECTION = 11758; private static final int CELESTIAL_PARTY_PROTECTION = 11759; - public LimitSkill(StatsSet params) + public LimitSkill(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Lucky.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Lucky.java index 3775d2361d..4ff5ea9a01 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Lucky.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Lucky.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Lucky extends AbstractEffect { - public Lucky(StatsSet params) + public Lucky(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MAtk.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MAtk.java index 5f9ad5f32b..38c2fc9067 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MAtk.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MAtk.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MAtk extends AbstractStatEffect { - public MAtk(StatsSet params) + public MAtk(StatSet params) { super(params, Stat.MAGIC_ATTACK); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java index 2b9ae2e9e6..393d0d2d30 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicAccuracy extends AbstractStatEffect { - public MagicAccuracy(StatsSet params) + public MagicAccuracy(StatSet params) { super(params, Stat.ACCURACY_MAGIC); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java index 123706eb55..b9a58b09f3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicCriticalDamage extends AbstractStatEffect { - public MagicCriticalDamage(StatsSet params) + public MagicCriticalDamage(StatSet params) { super(params, Stat.MAGIC_CRITICAL_DAMAGE, Stat.MAGIC_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java index 0c10014e50..c9fa9a4240 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicCriticalRate extends AbstractStatEffect { - public MagicCriticalRate(StatsSet params) + public MagicCriticalRate(StatSet params) { super(params, Stat.MAGIC_CRITICAL_RATE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index e8b6f5e8bf..5281bf8445 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class MagicMpCost extends AbstractEffect private final int _magicType; private final double _amount; - public MagicMpCost(StatsSet params) + public MagicMpCost(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index ed4a3fca8b..283a99176c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class MagicalAbnormalDispelAttack extends AbstractEffect private final double _power; private final AbnormalType _abnormalType; - public MagicalAbnormalDispelAttack(StatsSet params) + public MagicalAbnormalDispelAttack(StatSet params) { _power = params.getDouble("power", 0); _abnormalType = AbnormalType.getAbnormalType(params.getString("abnormalType", null)); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java index 8234db1c43..be6403077c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAbnormalResist extends AbstractStatAddEffect { - public MagicalAbnormalResist(StatsSet params) + public MagicalAbnormalResist(StatSet params) { super(params, Stat.ABNORMAL_RESIST_MAGICAL); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index 4e938809f1..25c7d25954 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -37,7 +37,7 @@ public class MagicalAttack extends AbstractEffect private final boolean _overHit; private final double _debuffModifier; - public MagicalAttack(StatsSet params) + public MagicalAttack(StatSet params) { _power = params.getDouble("power", 0); _overHit = params.getBoolean("overHit", false); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 424480b76c..11c387780e 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class MagicalAttackByAbnormal extends AbstractEffect { private final double _power; - public MagicalAttackByAbnormal(StatsSet params) + public MagicalAttackByAbnormal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9c3e263a05..348e904025 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -40,7 +40,7 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect private final double _power; private final Set _abnormals; - public MagicalAttackByAbnormalSlot(StatsSet params) + public MagicalAttackByAbnormalSlot(StatSet params) { _power = params.getDouble("power", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 49dd351046..de55dd0fcd 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -38,7 +38,7 @@ public class MagicalAttackMp extends AbstractEffect private final boolean _critical; private final double _criticalLimit; - public MagicalAttackMp(StatsSet params) + public MagicalAttackMp(StatSet params) { _power = params.getDouble("power"); _critical = params.getBoolean("critical"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 4414b36fa7..93ac560169 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class MagicalAttackRange extends AbstractEffect private final double _power; private final double _shieldDefPercent; - public MagicalAttackRange(StatsSet params) + public MagicalAttackRange(StatSet params) { _power = params.getDouble("power"); _shieldDefPercent = params.getDouble("shieldDefPercent", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java index 2e304e5f8b..1cf39ed501 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAttackSpeed extends AbstractStatEffect { - public MagicalAttackSpeed(StatsSet params) + public MagicalAttackSpeed(StatSet params) { super(params, Stat.MAGIC_ATTACK_SPEED); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 9a3a776e32..880d71f0c5 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class MagicalDamOverTime extends AbstractEffect private final double _power; private final boolean _canKill; - public MagicalDamOverTime(StatsSet params) + public MagicalDamOverTime(StatSet params) { _power = params.getDouble("power", 0); _canKill = params.getBoolean("canKill", false); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java index 80fdf87050..9b4e6061aa 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalDefence extends AbstractStatEffect { - public MagicalDefence(StatsSet params) + public MagicalDefence(StatSet params) { super(params, Stat.MAGICAL_DEFENCE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java index c3c7c404f3..4e83b80e8b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalEvasion extends AbstractStatEffect { - public MagicalEvasion(StatsSet params) + public MagicalEvasion(StatSet params) { super(params, Stat.MAGIC_EVASION_RATE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java index 6253af7373..bf419a19f7 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalSkillPower extends AbstractStatEffect { - public MagicalSkillPower(StatsSet params) + public MagicalSkillPower(StatSet params) { super(params, Stat.MAGICAL_SKILL_POWER, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index d0047fedef..f4388dc16f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class MagicalSoulAttack extends AbstractEffect { private final double _power; - public MagicalSoulAttack(StatsSet params) + public MagicalSoulAttack(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java index fcc143cd4b..688243d9e1 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ManaCharge extends AbstractStatAddEffect { - public ManaCharge(StatsSet params) + public ManaCharge(StatSet params) { super(params, Stat.MANA_CHARGE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index 0c84b4ab61..b889e6e824 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class ManaDamOverTime extends AbstractEffect { private final double _power; - public ManaDamOverTime(StatsSet params) + public ManaDamOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index f48011c9a2..94286df1c8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -34,7 +34,7 @@ public class ManaHeal extends AbstractEffect { private final double _power; - public ManaHeal(StatsSet params) + public ManaHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index bfdfa54380..61f15449a0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -35,7 +35,7 @@ public class ManaHealByLevel extends AbstractEffect { private final double _power; - public ManaHealByLevel(StatsSet params) + public ManaHealByLevel(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 46937a8dd0..e505c9e7a2 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class ManaHealOverTime extends AbstractEffect { private final double _power; - public ManaHealOverTime(StatsSet params) + public ManaHealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 101961d1c4..71085da549 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class ManaHealPercent extends AbstractEffect { private final double _power; - public ManaHealPercent(StatsSet params) + public ManaHealPercent(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 7c9c63e3ad..07d15d826c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxCp extends AbstractStatEffect { private final boolean _heal; - public MaxCp(StatsSet params) + public MaxCp(StatSet params) { super(params, Stat.MAX_CP); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 6d2c3449bd..85867bca96 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxHp extends AbstractStatEffect { private final boolean _heal; - public MaxHp(StatsSet params) + public MaxHp(StatSet params) { super(params, Stat.MAX_HP); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index e554c63055..9ca46fda8d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxMp extends AbstractStatEffect { private final boolean _heal; - public MaxMp(StatsSet params) + public MaxMp(StatSet params) { super(params, Stat.MAX_MP); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 39cf62a95b..c27284e5f6 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -43,7 +43,7 @@ public class ModifyVital extends AbstractEffect private final int _mp; private final int _cp; - public ModifyVital(StatsSet params) + public ModifyVital(StatSet params) { _type = params.getEnum("type", ModifyType.class); if (_type != ModifyType.SET) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 29ee88f805..095d130f7f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Mp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Mp(StatsSet params) + public Mp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index 76d858ad8e..b13d7824d0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class MpConsumePerLevel extends AbstractEffect { private final double _power; - public MpConsumePerLevel(StatsSet params) + public MpConsumePerLevel(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java index 2051009805..ae7bf0c48c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpRegen extends AbstractStatEffect { - public MpRegen(StatsSet params) + public MpRegen(StatSet params) { super(params, Stat.REGENERATE_MP_RATE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MpShield.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MpShield.java index 82e307a562..a4eb3e663f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MpShield.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MpShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpShield extends AbstractStatAddEffect { - public MpShield(StatsSet params) + public MpShield(StatSet params) { super(params, Stat.MANA_SHIELD_PERCENT); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java index af2ce119cc..366e96b18f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpVampiricAttack extends AbstractStatAddEffect { - public MpVampiricAttack(StatsSet params) + public MpVampiricAttack(StatSet params) { super(params, Stat.ABSORB_MANA_DAMAGE_PERCENT); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Mute.java index a7f2f76e23..7e5b5a528f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Mute extends AbstractEffect { - public Mute(StatsSet params) + public Mute(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java index 3cc4cae96f..513dc46ec7 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class NoblesseBless extends AbstractEffect { - public NoblesseBless(StatsSet params) + public NoblesseBless(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index bb0f02af5c..05f8c6a99b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpenChest extends AbstractEffect { - public OpenChest(StatsSet params) + public OpenChest(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 1b8f7ef59f..a4b09c13ec 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeBookItemList; */ public class OpenCommonRecipeBook extends AbstractEffect { - public OpenCommonRecipeBook(StatsSet params) + public OpenCommonRecipeBook(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 21dd337982..7b5effc6b4 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class OpenDoor extends AbstractEffect private final int _chance; private final boolean _isItem; - public OpenDoor(StatsSet params) + public OpenDoor(StatSet params) { _chance = params.getInt("chance", 0); _isItem = params.getBoolean("isItem", false); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index ebd6c6a668..8842de2ea8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeBookItemList; */ public class OpenDwarfRecipeBook extends AbstractEffect { - public OpenDwarfRecipeBook(StatsSet params) + public OpenDwarfRecipeBook(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PAtk.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PAtk.java index c353d03a00..7f10b9dcc7 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PAtk.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PAtk.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PAtk extends AbstractConditionalHpEffect { - public PAtk(StatsSet params) + public PAtk(StatSet params) { super(params, Stat.PHYSICAL_ATTACK); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Passive.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Passive.java index cef680ca21..27ce15bb60 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Passive.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Passive.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Passive extends AbstractEffect { - public Passive(StatsSet params) + public Passive(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java index 05f55c7dac..1a9f29424f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAbnormalResist extends AbstractStatAddEffect { - public PhysicalAbnormalResist(StatsSet params) + public PhysicalAbnormalResist(StatSet params) { super(params, Stat.ABNORMAL_RESIST_PHYSICAL); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 098770705b..7e5fb14465 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -52,7 +52,7 @@ public class PhysicalAttack extends AbstractEffect private final Set _abnormals; private final double _abnormalPowerMod; - public PhysicalAttack(StatsSet params) + public PhysicalAttack(StatSet params) { _power = params.getDouble("power", 0); _pAtkMod = params.getDouble("pAtkMod", 1.0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index d325c3d5ed..f191867614 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -38,7 +38,7 @@ public class PhysicalAttackHpLink extends AbstractEffect private final double _criticalChance; private final boolean _overHit; - public PhysicalAttackHpLink(StatsSet params) + public PhysicalAttackHpLink(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index dc575c2c75..fe087a1bcc 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class PhysicalAttackMute extends AbstractEffect { - public PhysicalAttackMute(StatsSet params) + public PhysicalAttackMute(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java index 112b41eb36..2093d45264 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAttackRange extends AbstractStatEffect { - public PhysicalAttackRange(StatsSet params) + public PhysicalAttackRange(StatSet params) { super(params, Stat.PHYSICAL_ATTACK_RANGE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index d3c2dcfaf2..5d66bd4c87 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ public class PhysicalAttackSaveHp extends AbstractEffect private final boolean _overHit; private final double _saveHp; - public PhysicalAttackSaveHp(StatsSet params) + public PhysicalAttackSaveHp(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java index 167b859572..cdf34eb6f6 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAttackSpeed extends AbstractStatEffect { - public PhysicalAttackSpeed(StatsSet params) + public PhysicalAttackSpeed(StatSet params) { super(params, Stat.PHYSICAL_ATTACK_SPEED); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 61bed5561b..a1a6818a00 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class PhysicalAttackWeaponBonus extends AbstractEffect private final Map _weaponBonus = new EnumMap<>(WeaponType.class); - public PhysicalAttackWeaponBonus(StatsSet params) + public PhysicalAttackWeaponBonus(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java index fa3925e725..078c3673b9 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalDefence extends AbstractConditionalHpEffect { - public PhysicalDefence(StatsSet params) + public PhysicalDefence(StatSet params) { super(params, Stat.PHYSICAL_DEFENCE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java index 812c641ac8..9714220e1b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalEvasion extends AbstractConditionalHpEffect { - public PhysicalEvasion(StatsSet params) + public PhysicalEvasion(StatSet params) { super(params, Stat.EVASION_RATE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index b337fed6cb..fe7cf853c8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class PhysicalMute extends AbstractEffect { - public PhysicalMute(StatsSet params) + public PhysicalMute(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java index 0fd835f4e3..1b843dda3d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class PhysicalShieldAngleAll extends AbstractEffect { - public PhysicalShieldAngleAll(StatsSet params) + public PhysicalShieldAngleAll(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java index 9d3f051659..507eb57326 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalSkillPower extends AbstractStatEffect { - public PhysicalSkillPower(StatsSet params) + public PhysicalSkillPower(StatSet params) { super(params, Stat.PHYSICAL_SKILL_POWER, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index a958116ff7..9ceccea4cc 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -42,7 +42,7 @@ public class PhysicalSoulAttack extends AbstractEffect private final boolean _ignoreShieldDefence; private final boolean _overHit; - public PhysicalSoulAttack(StatsSet params) + public PhysicalSoulAttack(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index e95e09ab90..fd2b23a2ae 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class PkCount extends AbstractEffect { private final int _amount; - public PkCount(StatsSet params) + public PkCount(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index 2a356bdbc9..18cecfb90e 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class Plunder extends AbstractEffect { - public Plunder(StatsSet params) + public Plunder(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index fd61584af1..3e885274b3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PolearmSingleTarget extends AbstractEffect { - public PolearmSingleTarget(StatsSet params) + public PolearmSingleTarget(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java index 86f2e2cee8..b2fb920379 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class ProtectDeathPenalty extends AbstractEffect { - public ProtectDeathPenalty(StatsSet params) + public ProtectDeathPenalty(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java index 890b8980bd..6664b36bae 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ProtectionBlessing extends AbstractEffect { - public ProtectionBlessing(StatsSet params) + public ProtectionBlessing(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index 6de78c2c82..62c480716d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class PullBack extends AbstractEffect private final int _animationSpeed; private final FlyType _type; - public PullBack(StatsSet params) + public PullBack(StatSet params) { _speed = params.getInt("speed", 0); _delay = params.getInt("delay", _speed); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java index 1019c56778..84a72299f3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveMagicalSkillDamageBonus extends AbstractStatPercentEffect { - public PveMagicalSkillDamageBonus(StatsSet params) + public PveMagicalSkillDamageBonus(StatSet params) { super(params, Stat.PVE_MAGICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java index 8da698c746..70870aa45c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveMagicalSkillDefenceBonus(StatsSet params) + public PveMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java index c7a82d4ded..8f60ea025c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalAttackDamageBonus extends AbstractStatPercentEffect { - public PvePhysicalAttackDamageBonus(StatsSet params) + public PvePhysicalAttackDamageBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_ATTACK_DAMAGE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java index 0717fe525b..ea01a4e1d8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PvePhysicalAttackDefenceBonus(StatsSet params) + public PvePhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java index 878f942877..1e8b9e76c4 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvePhysicalSkillDamageBonus(StatsSet params) + public PvePhysicalSkillDamageBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java index bdfa0dcc67..b1dbb0b217 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvePhysicalSkillDefenceBonus(StatsSet params) + public PvePhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java index 94fdc26015..fbe3119ba8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveRaidMagicalSkillDefenceBonus(StatsSet params) + public PveRaidMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java index f54d849752..83352e1b2f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidPhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PveRaidPhysicalAttackDefenceBonus(StatsSet params) + public PveRaidPhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java index 0a344f96de..be05bec159 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidPhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveRaidPhysicalSkillDefenceBonus(StatsSet params) + public PveRaidPhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java index 542c019420..2f0153189a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpMagicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvpMagicalSkillDamageBonus(StatsSet params) + public PvpMagicalSkillDamageBonus(StatSet params) { super(params, Stat.PVP_MAGICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java index bb006280fc..41ad3b7749 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvpMagicalSkillDefenceBonus(StatsSet params) + public PvpMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVP_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java index 483d7b02e4..23488ea000 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalAttackDamageBonus extends AbstractStatPercentEffect { - public PvpPhysicalAttackDamageBonus(StatsSet params) + public PvpPhysicalAttackDamageBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_ATTACK_DAMAGE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java index 40c3a22ea2..ff942b3d4d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PvpPhysicalAttackDefenceBonus(StatsSet params) + public PvpPhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java index 225c7c1e39..19a7c96003 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvpPhysicalSkillDamageBonus(StatsSet params) + public PvpPhysicalSkillDamageBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java index ea2d1fa126..211d14c5e3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvpPhysicalSkillDefenceBonus(StatsSet params) + public PvpPhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 8a01583374..e500b487af 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -36,7 +36,7 @@ public class RandomizeHate extends AbstractEffect { private final int _chance; - public RandomizeHate(StatsSet params) + public RandomizeHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index 8b2801ee6c..18b07bd2d7 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class RealDamage extends AbstractEffect { private final double _power; - public RealDamage(StatsSet params) + public RealDamage(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java index 4372c15bcf..86738fae0f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class RearDamage extends AbstractStatPercentEffect { - public RearDamage(StatsSet params) + public RearDamage(StatSet params) { super(params, Stat.REAR_DAMAGE_RATE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 31c7a4e4b3..82ed18faa1 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RebalanceHP extends AbstractEffect { - public RebalanceHP(StatsSet params) + public RebalanceHP(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index 09d307be02..979809b533 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RebalanceHPSummon extends AbstractEffect { - public RebalanceHPSummon(StatsSet params) + public RebalanceHPSummon(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 7599b691ac..e76328929a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class RecoverVitalityInPeaceZone extends AbstractEffect private final double _amount; private final int _ticks; - public RecoverVitalityInPeaceZone(StatsSet params) + public RecoverVitalityInPeaceZone(StatSet params) { _amount = params.getDouble("amount", 0); _ticks = params.getInt("ticks", 10); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Recovery.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Recovery.java index 35c5cf3af1..30296eec4d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Recovery.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Recovery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Recovery extends AbstractEffect { - public Recovery(StatsSet params) + public Recovery(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java index 824044ae21..e52b5abafb 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ReduceCancel extends AbstractStatEffect { - public ReduceCancel(StatsSet params) + public ReduceCancel(StatSet params) { super(params, Stat.ATTACK_CANCEL); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index ecc7a10d31..be9188f3b0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -33,7 +33,7 @@ public class ReduceDamage extends AbstractEffect { private final double _amount; - public ReduceDamage(StatsSet params) + public ReduceDamage(StatSet params) { _amount = params.getDouble("amount"); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java index 8534a94fc6..7b8862f608 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ReduceDropType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -32,7 +32,7 @@ public class ReduceDropPenalty extends AbstractEffect private final double _deathPenalty; private final ReduceDropType _type; - public ReduceDropPenalty(StatsSet params) + public ReduceDropPenalty(StatSet params) { _exp = params.getDouble("exp", 0); _deathPenalty = params.getDouble("deathPenalty", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java index c15f7301b9..6436b488e0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ReflectMagic extends AbstractStatAddEffect { - public ReflectMagic(StatsSet params) + public ReflectMagic(StatSet params) { super(params, Stat.VENGEANCE_SKILL_MAGIC_DAMAGE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java index bf1d555351..583191fd4c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.BasicProperty; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ReflectSkill extends AbstractEffect private final Stat _stat; private final double _amount; - public ReflectSkill(StatsSet params) + public ReflectSkill(StatSet params) { _stat = params.getEnum("type", BasicProperty.class, BasicProperty.PHYSICAL) == BasicProperty.PHYSICAL ? Stat.REFLECT_SKILL_PHYSIC : Stat.REFLECT_SKILL_MAGIC; _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index e850ea6be9..77b96e4205 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class RefuelAirship extends AbstractEffect { private final int _value; - public RefuelAirship(StatsSet params) + public RefuelAirship(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Relax.java index c8c61fe47e..e2ba4420db 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ public class Relax extends AbstractEffect { private final double _power; - public Relax(StatsSet params) + public Relax(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java index f2c14333a2..1710414a4a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.ShortcutType; import org.l2jmobius.gameserver.model.Shortcut; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -38,7 +38,7 @@ public class ReplaceSkillBySkill extends AbstractEffect private final SkillHolder _existingSkill; private final SkillHolder _replacementSkill; - public ReplaceSkillBySkill(StatsSet params) + public ReplaceSkillBySkill(StatSet params) { _existingSkill = new SkillHolder(params.getInt("existingSkillId"), params.getInt("existingSkillLevel", -1)); _replacementSkill = new SkillHolder(params.getInt("replacementSkillId"), params.getInt("replacementSkillLevel", -1)); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 9678dc1174..0613c17234 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class ResetInstanceEntry extends AbstractEffect { private final Set _instanceId; - public ResetInstanceEntry(StatsSet params) + public ResetInstanceEntry(StatSet params) { final String instanceIds = params.getString("instanceId", null); if ((instanceIds != null) && !instanceIds.isEmpty()) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java index 940c731208..f15ff56189 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ResistAbnormalByCategory extends AbstractEffect private final DispelSlotType _slot; private final double _amount; - public ResistAbnormalByCategory(StatsSet params) + public ResistAbnormalByCategory(StatSet params) { _amount = params.getDouble("amount", 0); _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.DEBUFF); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java index dae38e5246..2e29b5cc8e 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ResistDDMagic extends AbstractStatPercentEffect { - public ResistDDMagic(StatsSet params) + public ResistDDMagic(StatSet params) { super(params, Stat.MAGIC_SUCCESS_RES); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java index af2b203aad..d08fcb262a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ResistDispelByCategory extends AbstractEffect private final DispelSlotType _slot; private final double _amount; - public ResistDispelByCategory(StatsSet params) + public ResistDispelByCategory(StatSet params) { _amount = params.getDouble("amount", 0); _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index af1e40bea8..cd03f1a74a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -34,7 +34,7 @@ public class ResistSkill extends AbstractEffect { private final List _skills = new ArrayList<>(); - public ResistSkill(StatsSet params) + public ResistSkill(StatSet params) { for (int i = 1;; i++) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index feb5885fb0..6f887a07cf 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class Restoration extends AbstractEffect private final int _itemCount; private final int _itemEnchantmentLevel; - public Restoration(StatsSet params) + public Restoration(StatSet params) { _itemId = params.getInt("itemId", 0); _itemCount = params.getInt("itemCount", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index c5b099feef..a2af88a059 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -25,7 +25,7 @@ import java.util.Map.Entry; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.ExtractableProductItem; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,12 +47,12 @@ public class RestorationRandom extends AbstractEffect { private final List _products = new ArrayList<>(); - public RestorationRandom(StatsSet params) + public RestorationRandom(StatSet params) { - for (StatsSet group : params.getList("items", StatsSet.class)) + for (StatSet group : params.getList("items", StatSet.class)) { final List items = new ArrayList<>(); - for (StatsSet item : group.getList(".", StatsSet.class)) + for (StatSet item : group.getList(".", StatSet.class)) { items.add(new RestorationItemHolder(item.getInt(".id"), item.getInt(".count"), item.getInt(".minEnchant", 0), item.getInt(".maxEnchant", 0))); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java index 8d485aae6c..699349e016 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class RestoreSymbolSeal extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public RestoreSymbolSeal(StatsSet params) + public RestoreSymbolSeal(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.PER); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index f9c10b7ff2..9b287dd419 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class Resurrection extends AbstractEffect { private final int _power; - public Resurrection(StatsSet params) + public Resurrection(StatSet params) { _power = params.getInt("power", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 18d8bdb0bd..6ef063ce91 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -39,7 +39,7 @@ public class ResurrectionSpecial extends AbstractEffect private final int _power; private final Set _instanceId; - public ResurrectionSpecial(StatsSet params) + public ResurrectionSpecial(StatSet params) { _power = params.getInt("power", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index e4d66b43d3..0e7391681b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class Reuse extends AbstractEffect private final int _magicType; private final double _amount; - public Reuse(StatsSet params) + public Reuse(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index 3716fc1922..e17cd7cc25 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ReuseSkillById extends AbstractEffect { private final int _skillId; - public ReuseSkillById(StatsSet params) + public ReuseSkillById(StatSet params) { _skillId = params.getInt("skillId", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Root.java index 1ca3492949..b6876e8e13 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Root extends AbstractEffect { - public Root(StatsSet params) + public Root(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index 66fc8d82c8..4c7ee53239 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class SacrificeSummon extends AbstractEffect { - public SacrificeSummon(StatsSet params) + public SacrificeSummon(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java index d00856c9bd..683f45bb55 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SafeFallHeight extends AbstractStatEffect { - public SafeFallHeight(StatsSet params) + public SafeFallHeight(StatSet params) { super(params, Stat.FALL); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 7f6bf69ee3..797aa95263 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -33,7 +33,7 @@ public class SendSystemMessageToClan extends AbstractEffect { private final SystemMessage _message; - public SendSystemMessageToClan(StatsSet params) + public SendSystemMessageToClan(StatSet params) { final int id = params.getInt("id", 0); _message = new SystemMessage(id); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java index 7acbf846df..a0508d73b1 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class ServitorShare extends AbstractEffect { private final Map _sharedStats = new EnumMap<>(Stat.class); - public ServitorShare(StatsSet params) + public ServitorShare(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 01dfd87c71..6e8187feae 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SetHp extends AbstractEffect private final double _amount; private final StatModifierType _mode; - public SetHp(StatsSet params) + public SetHp(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index 805d18160b..fae21baa51 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SetSkill extends AbstractEffect private final int _skillId; private final int _skillLvl; - public SetSkill(StatsSet params) + public SetSkill(StatSet params) { _skillId = params.getInt("skillId", 0); _skillLvl = params.getInt("skillLvl", 1); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java index a93bb5f253..354cb42b55 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ShieldDefence extends AbstractStatEffect { - public ShieldDefence(StatsSet params) + public ShieldDefence(StatSet params) { super(params, Stat.SHIELD_DEFENCE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java index f28d0e4ad2..1fdee75f69 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ShieldDefenceRate extends AbstractStatEffect { - public ShieldDefenceRate(StatsSet params) + public ShieldDefenceRate(StatSet params) { super(params, Stat.SHIELD_DEFENCE_RATE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java index 1d649082dc..533b631f10 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class SilentMove extends AbstractEffect { - public SilentMove(StatsSet params) + public SilentMove(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java index 89dad85514..7c929a7fe8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class SkillCritical extends AbstractEffect { private final BaseStat _stat; - public SkillCritical(StatsSet params) + public SkillCritical(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java index 369bef11f5..8f054f973b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillCriticalDamage extends AbstractStatEffect { - public SkillCriticalDamage(StatsSet params) + public SkillCriticalDamage(StatSet params) { super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java index c91f2d6b49..88ecf69e77 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillCriticalProbability extends AbstractStatPercentEffect { - public SkillCriticalProbability(StatsSet params) + public SkillCriticalProbability(StatSet params) { super(params, Stat.SKILL_CRITICAL_PROBABILITY); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 7b98a9e180..1664ea1827 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class SkillEvasion extends AbstractEffect private final int _magicType; private final double _amount; - public SkillEvasion(StatsSet params) + public SkillEvasion(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java index 9cc62532b4..2880d0ccef 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillPowerAdd extends AbstractStatAddEffect { - public SkillPowerAdd(StatsSet params) + public SkillPowerAdd(StatSet params) { super(params, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 9578c88f91..7156fff2df 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SkillTurning extends AbstractEffect private final int _chance; private final boolean _staticChance; - public SkillTurning(StatsSet params) + public SkillTurning(StatSet params) { _chance = params.getInt("chance", 100); _staticChance = params.getBoolean("staticChance", false); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 45b02206a4..04691304ed 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SkillTurningOverTime extends AbstractEffect private final int _chance; private final boolean _staticChance; - public SkillTurningOverTime(StatsSet params) + public SkillTurningOverTime(StatSet params) { _chance = params.getInt("chance", 100); _staticChance = params.getBoolean("staticChance", false); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index c1dd92cedb..b919c7acac 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -36,7 +36,7 @@ public class SoulBlow extends AbstractEffect private final double _chanceBoost; private final boolean _overHit; - public SoulBlow(StatsSet params) + public SoulBlow(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 8471aa236c..4f63a84081 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; @@ -40,7 +40,7 @@ public class SoulEating extends AbstractEffect private final int _expNeeded; private final int _maxSouls; - public SoulEating(StatsSet params) + public SoulEating(StatSet params) { _expNeeded = params.getInt("expNeeded"); _maxSouls = params.getInt("maxSouls"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a7d5c2628a..ad261845eb 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Seed; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Sow extends AbstractEffect { - public Sow(StatsSet params) + public Sow(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SpModify.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SpModify.java index 24d124ecce..c3bc6193e9 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SpModify.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SpModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SpModify extends AbstractStatAddEffect { - public SpModify(StatsSet params) + public SpModify(StatSet params) { super(params, Stat.BONUS_SP); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 0718408ca2..890438d65f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.enums.SpeedType; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -36,7 +36,7 @@ public class Speed extends AbstractEffect private final StatModifierType _mode; private List _speedType; - public Speed(StatsSet params) + public Speed(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index 91b91ad05e..db247775f3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SphericBarrier extends AbstractStatAddEffect { - public SphericBarrier(StatsSet params) + public SphericBarrier(StatSet params) { super(params, Stat.SPHERIC_BARRIER_RANGE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index d13eaf1c2e..385240377f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class Spoil extends AbstractEffect { - public Spoil(StatsSet params) + public Spoil(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index b63c24dc20..22c4132b63 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -36,7 +36,7 @@ public class StatBonusSkillCritical extends AbstractEffect private final BaseStat _stat; private final Condition _armorTypeCondition; - public StatBonusSkillCritical(StatsSet params) + public StatBonusSkillCritical(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.DEX); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index 41a20bfafe..49280eb774 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -36,7 +36,7 @@ public class StatBonusSpeed extends AbstractEffect private final BaseStat _stat; private final Condition _armorTypeCondition; - public StatBonusSpeed(StatsSet params) + public StatBonusSpeed(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.DEX); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index a007b118b2..bcf691e360 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class StatByMoveType extends AbstractEffect private final MoveType _type; private final double _value; - public StatByMoveType(StatsSet params) + public StatByMoveType(StatSet params) { _stat = params.getEnum("stat", Stat.class); _type = params.getEnum("type", MoveType.class); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StatUp.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StatUp.java index a22710ca7a..29d72bb4de 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StatUp.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StatUp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class StatUp extends AbstractEffect private final BaseStat _stat; private final double _amount; - public StatUp(StatsSet params) + public StatUp(StatSet params) { _amount = params.getDouble("amount", 0); _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index 0720057c19..23239887a7 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.List; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -39,7 +39,7 @@ public class StealAbnormal extends AbstractEffect private final int _rate; private final int _max; - public StealAbnormal(StatsSet params) + public StealAbnormal(StatSet params) { _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); _rate = params.getInt("rate", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Summon.java index 0f95637961..7ef79d4c39 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.ServitorInstance; @@ -43,7 +43,7 @@ public class Summon extends AbstractEffect private final int _lifeTime; private final int _consumeItemInterval; - public Summon(StatsSet params) + public Summon(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index 8929e1f2b0..50c025e572 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class SummonAgathion extends AbstractEffect { private final int _npcId; - public SummonAgathion(StatsSet params) + public SummonAgathion(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index 7716d58f16..49b816f272 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.CubicData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; @@ -42,7 +42,7 @@ public class SummonCubic extends AbstractEffect private final int _cubicId; private final int _cubicLvl; - public SummonCubic(StatsSet params) + public SummonCubic(StatSet params) { _cubicId = params.getInt("cubicId", -1); _cubicLvl = params.getInt("cubicLvl", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index d0a2a82738..13d5a2eac7 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoppelgangerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ public class SummonHallucination extends AbstractEffect private final int _npcId; private final int _npcCount; - public SummonHallucination(StatsSet params) + public SummonHallucination(StatSet params) { _despawnDelay = params.getInt("despawnDelay", 20000); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index bcd050e084..d61a6e5c02 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.ServitorInstance; @@ -43,7 +43,7 @@ public class SummonMulti extends AbstractEffect private final int _consumeItemInterval; private final int _summonPoints; - public SummonMulti(StatsSet params) + public SummonMulti(StatSet params) { _npcId = params.getInt("npcId"); _expMultiplier = params.getFloat("expMultiplier", 1); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index 6f4090eef0..eaff214b7c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DecoyInstance; @@ -48,7 +48,7 @@ public class SummonNpc extends AbstractEffect private final boolean _isSummonSpawn; private final boolean _singleInstance; // Only one instance of this NPC is allowed. - public SummonNpc(StatsSet params) + public SummonNpc(StatSet params) { _despawnDelay = params.getInt("despawnDelay", 20000); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 5ef621819e..534a41ee16 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.data.xml.impl.PetDataTable; import org.l2jmobius.gameserver.model.PetData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PetItemList; */ public class SummonPet extends AbstractEffect { - public SummonPet(StatsSet params) + public SummonPet(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java index 7dd690587c..b1d5ec38cb 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SummonPoints extends AbstractStatAddEffect { - public SummonPoints(StatsSet params) + public SummonPoints(StatSet params) { super(params, Stat.MAX_SUMMON_POINTS); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index d8a47b670f..ac1ddaa16a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; @@ -35,7 +35,7 @@ public class SummonTrap extends AbstractEffect private final int _despawnTime; private final int _npcId; - public SummonTrap(StatsSet params) + public SummonTrap(StatSet params) { _despawnTime = params.getInt("despawnTime", 0); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 84f6d070a8..3196bb949d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Collection; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Sweeper extends AbstractEffect { - public Sweeper(StatsSet params) + public Sweeper(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 1594a8a23b..77dc9b4af7 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ public class Synergy extends AbstractEffect private final int _skillLevelScaleTo; private final int _minSlot; - public Synergy(StatsSet params) + public Synergy(StatSet params) { final String requiredSlots = params.getString("requiredSlots", null); if ((requiredSlots != null) && !requiredSlots.isEmpty()) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index e35516fef5..39ed981bbf 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Castle; @@ -33,7 +33,7 @@ public class TakeCastle extends AbstractEffect { private final CastleSide _side; - public TakeCastle(StatsSet params) + public TakeCastle(StatSet params) { _side = params.getEnum("side", CastleSide.class); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 77fd9ec103..3be2bf5593 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Castle; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TakeCastleStart extends AbstractEffect { - public TakeCastleStart(StatsSet params) + public TakeCastleStart(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 70842191a7..18749c1aef 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Fort; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TakeFort extends AbstractEffect { - public TakeFort(StatsSet params) + public TakeFort(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 0eb23f6733..77355f9683 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TakeFortStart extends AbstractEffect { - public TakeFortStart(StatsSet params) + public TakeFortStart(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index cec32755ed..dd8e09278f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class TalismanSlot extends AbstractEffect { private final int _slots; - public TalismanSlot(StatsSet params) + public TalismanSlot(StatSet params) { _slots = params.getInt("slots", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 281b5322fd..32a126f499 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class TargetCancel extends AbstractEffect { private final int _chance; - public TargetCancel(StatsSet params) + public TargetCancel(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index b4463de391..86ff70c9ca 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMe extends AbstractEffect { - public TargetMe(StatsSet params) + public TargetMe(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index 11e581113e..e68a1e1faf 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class TargetMeProbability extends AbstractEffect { private final int _chance; - public TargetMeProbability(StatsSet params) + public TargetMeProbability(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 6c30519678..9ca01faf50 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -32,7 +32,7 @@ public class Teleport extends AbstractEffect { private final Location _loc; - public Teleport(StatsSet params) + public Teleport(StatSet params) { _loc = new Location(params.getInt("x", 0), params.getInt("y", 0), params.getInt("z", 0)); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index e0e715818c..bdc53208d5 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -38,7 +38,7 @@ public class TeleportToNpc extends AbstractEffect private final int _npcId; private final boolean _party; - public TeleportToNpc(StatsSet params) + public TeleportToNpc(StatSet params) { _npcId = params.getInt("npcId"); _party = params.getBoolean("party", false); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index 029897cdea..ef056d6bb1 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TeleportToPlayer extends AbstractEffect { - public TeleportToPlayer(StatsSet params) + public TeleportToPlayer(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index 1c9af0f535..b2d6b663de 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class TeleportToSummon extends AbstractEffect { private final double _maxDistance; - public TeleportToSummon(StatsSet params) + public TeleportToSummon(StatSet params) { _maxDistance = params.getDouble("distance", -1); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index e550302b02..c4bf787a10 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class TeleportToTarget extends AbstractEffect { - public TeleportToTarget(StatsSet params) + public TeleportToTarget(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java index 389d6ca266..a072291f5f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.EffectList; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -43,7 +43,7 @@ public class TrackLimitedSkill extends AbstractEffect private int limitSigelLevel = 0; private int limitIssLevel = 0; - public TrackLimitedSkill(StatsSet param) + public TrackLimitedSkill(StatSet param) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index ba1c55c615..ff63eea817 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class TransferDamageToPlayer extends AbstractStatAddEffect { - public TransferDamageToPlayer(StatsSet params) + public TransferDamageToPlayer(StatSet params) { super(params, Stat.TRANSFER_DAMAGE_TO_PLAYER); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java index b084bfc1cb..c87d5f0554 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class TransferDamageToSummon extends AbstractStatAddEffect { - public TransferDamageToSummon(StatsSet params) + public TransferDamageToSummon(StatSet params) { super(params, Stat.TRANSFER_DAMAGE_SUMMON_PERCENT); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index e9f0292113..48bc5e3a1c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -34,7 +34,7 @@ public class TransferHate extends AbstractEffect { private final int _chance; - public TransferHate(StatsSet params) + public TransferHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 2ddf95a4db..bf593eaed8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Transformation extends AbstractEffect { private final List _id; - public Transformation(StatsSet params) + public Transformation(StatSet params) { final String ids = params.getString("transformationId", null); if ((ids != null) && !ids.isEmpty()) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 103ccdf8ce..2b4af0a1d3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class TrapDetect extends AbstractEffect { private final int _power; - public TrapDetect(StatsSet params) + public TrapDetect(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index eb7b073b36..c4a6c6aed9 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.TrapAction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class TrapRemove extends AbstractEffect { private final int _power; - public TrapRemove(StatsSet params) + public TrapRemove(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 6df3874ab1..8fb87050b1 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -59,7 +59,7 @@ public class TriggerSkillByAttack extends AbstractEffect * @param params */ - public TriggerSkillByAttack(StatsSet params) + public TriggerSkillByAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index ae6a3bc89f..78366b8047 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillByAvoid extends AbstractEffect /** * @param params */ - public TriggerSkillByAvoid(StatsSet params) + public TriggerSkillByAvoid(StatSet params) { _chance = params.getInt("chance", 100); _skill = new SkillHolder(params.getInt("skillId", 0), params.getInt("skillLevel", 0)); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index c24fb95246..9fe53c0622 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -48,7 +48,7 @@ public class TriggerSkillByDamage extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillByDamage(StatsSet params) + public TriggerSkillByDamage(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c086507336..8b84350293 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillByDeathBlow extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillByDeathBlow(StatsSet params) + public TriggerSkillByDeathBlow(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index a9bfcc320c..11802645f2 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -37,7 +37,7 @@ public class TriggerSkillByKill extends AbstractEffect private final int _chance; private final SkillHolder _skill; - public TriggerSkillByKill(StatsSet params) + public TriggerSkillByKill(StatSet params) { _chance = params.getInt("chance", 100); _skill = new SkillHolder(params.getInt("skillId", 0), params.getInt("skillLevel", 0)); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 2893d46f33..7f2d3f9fa7 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -52,7 +52,7 @@ public class TriggerSkillByMagicType extends AbstractEffect * @param params */ - public TriggerSkillByMagicType(StatsSet params) + public TriggerSkillByMagicType(StatSet params) { _chance = params.getInt("chance", 100); _magicTypes = params.getIntArray("magicTypes", ";"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 1524e3d4f4..b77da803f5 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillBySkill extends AbstractEffect private final int _skillLevelScaleTo; private final TargetType _targetType; - public TriggerSkillBySkill(StatsSet params) + public TriggerSkillBySkill(StatSet params) { _castSkillId = params.getInt("castSkillId"); _chance = params.getInt("chance", 100); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index ec2124c44e..7bb68baec9 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -53,7 +53,7 @@ public class TriggerSkillBySkillAttack extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillBySkillAttack(StatsSet params) + public TriggerSkillBySkillAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 3f58619f0a..c209decfb3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -69,7 +69,7 @@ public class TwoHandedBluntBonus extends AbstractEffect private final double _speedAmount; private final StatModifierType _speedMode; - public TwoHandedBluntBonus(StatsSet params) + public TwoHandedBluntBonus(StatSet params) { _pAtkAmount = params.getDouble("pAtkAmount", 0); _pAtkMode = params.getEnum("pAtkMode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index b2c50c4b88..344456a925 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -69,7 +69,7 @@ public class TwoHandedSwordBonus extends AbstractEffect private final double _speedAmount; private final StatModifierType _speedMode; - public TwoHandedSwordBonus(StatsSet params) + public TwoHandedSwordBonus(StatSet params) { _pAtkAmount = params.getDouble("pAtkAmount", 0); _pAtkMode = params.getEnum("pAtkMode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 01ae8122ec..20b418c29b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ public class Unsummon extends AbstractEffect { private final int _chance; - public Unsummon(StatsSet params) + public Unsummon(StatSet params) { _chance = params.getInt("chance", -1); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 57eb89196d..f73f0f57f0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; */ public class UnsummonAgathion extends AbstractEffect { - public UnsummonAgathion(StatsSet params) + public UnsummonAgathion(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index a4fdc2c0aa..0779d018cc 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class UnsummonServitors extends AbstractEffect { - public UnsummonServitors(StatsSet params) + public UnsummonServitors(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index dbb0c700b5..ac33fcba0d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Untargetable extends AbstractEffect { - public Untargetable(StatsSet params) + public Untargetable(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java index ac6cae3d05..1c85196fe0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class VampiricAttack extends AbstractEffect private final double _amount; private final double _sum; - public VampiricAttack(StatsSet params) + public VampiricAttack(StatSet params) { _amount = params.getDouble("amount"); _sum = _amount * params.getDouble("chance"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java index ab724714e1..571ca55bbe 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ public class VampiricDefence extends AbstractEffect { private final int _amount; - public VampiricDefence(StatsSet params) + public VampiricDefence(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java index f8b9d76f3a..caaa8d02b4 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class VitalityExpRate extends AbstractStatPercentEffect { - public VitalityExpRate(StatsSet params) + public VitalityExpRate(StatSet params) { super(params, Stat.VITALITY_EXP_RATE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index cba2b14c35..385595e03d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class VitalityPointUp extends AbstractEffect { private final int _value; - public VitalityPointUp(StatsSet params) + public VitalityPointUp(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java index 86612955dd..72f78ec177 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class VitalityPointsRate extends AbstractStatPercentEffect { - public VitalityPointsRate(StatsSet params) + public VitalityPointsRate(StatSet params) { super(params, Stat.VITALITY_CONSUME_RATE); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java index 09500b3823..bf20bd5018 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WeightLimit extends AbstractStatEffect { - public WeightLimit(StatsSet params) + public WeightLimit(StatSet params) { super(params, Stat.WEIGHT_LIMIT); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java index f9be68f493..6020399f85 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WeightPenalty extends AbstractStatAddEffect { - public WeightPenalty(StatsSet params) + public WeightPenalty(StatSet params) { super(params, Stat.WEIGHT_PENALTY); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java index bdf9aca48d..81eb9a9688 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WorldChatPoints extends AbstractStatEffect { - public WorldChatPoints(StatsSet params) + public WorldChatPoints(StatSet params) { super(params, Stat.WORLD_CHAT_POINTS); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java index 5a3842921d..127dadf9d2 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class BuildAdvanceBaseSkillCondition implements ISkillCondition { - public BuildAdvanceBaseSkillCondition(StatsSet params) + public BuildAdvanceBaseSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java index a9dd2b9eba..ffb7d13539 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class BuildCampSkillCondition implements ISkillCondition { - public BuildCampSkillCondition(StatsSet params) + public BuildCampSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java index c1220c828a..aca51bafbf 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanAddMaxEntranceInzoneSkillCondition implements ISkillCondition { - public CanAddMaxEntranceInzoneSkillCondition(StatsSet params) + public CanAddMaxEntranceInzoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java index eddd45771c..6ac3c2e199 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ public class CanBookmarkAddSlotSkillCondition implements ISkillCondition { private final int _teleportBookmarkSlots; - public CanBookmarkAddSlotSkillCondition(StatsSet params) + public CanBookmarkAddSlotSkillCondition(StatSet params) { _teleportBookmarkSlots = params.getInt("teleportBookmarkSlots"); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java index 30fdb7f36f..ee1bf96e69 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanChangeVitalItemCountSkillCondition implements ISkillCondition { - public CanChangeVitalItemCountSkillCondition(StatsSet params) + public CanChangeVitalItemCountSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java index da553a6d9f..48e28e7af7 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanEnchantAttributeSkillCondition implements ISkillCondition { - public CanEnchantAttributeSkillCondition(StatsSet params) + public CanEnchantAttributeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java index c14f1ffe64..2908994776 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanMountForEventSkillCondition implements ISkillCondition { - public CanMountForEventSkillCondition(StatsSet params) + public CanMountForEventSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java index d07aa9a622..9dc5f99592 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShipInstance; @@ -31,7 +31,7 @@ public class CanRefuelAirshipSkillCondition implements ISkillCondition { private final int _amount; - public CanRefuelAirshipSkillCondition(StatsSet params) + public CanRefuelAirshipSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java index d451f3c997..67206b47bd 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanRestoreVitalPointSkillCondition implements ISkillCondition { - public CanRestoreVitalPointSkillCondition(StatsSet params) + public CanRestoreVitalPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java index 7e519025b0..49232af88f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CanSummonCubicSkillCondition implements ISkillCondition { - public CanSummonCubicSkillCondition(StatsSet params) + public CanSummonCubicSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java index 8b550d164c..33541e82a8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class CanSummonMultiSkillCondition implements ISkillCondition { private final int _summonPoints; - public CanSummonMultiSkillCondition(StatsSet params) + public CanSummonMultiSkillCondition(StatSet params) { _summonPoints = params.getInt("summonPoints"); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java index aa9579e92a..b06ba00f32 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.CharSummonTable; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; */ public class CanSummonPetSkillCondition implements ISkillCondition { - public CanSummonPetSkillCondition(StatsSet params) + public CanSummonPetSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java index ea41a2e22e..3655e158cb 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanSummonSiegeGolemSkillCondition implements ISkillCondition { - public CanSummonSiegeGolemSkillCondition(StatsSet params) + public CanSummonSiegeGolemSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java index 460d72a743..e07ce75c8f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanSummonSkillCondition implements ISkillCondition { - public CanSummonSkillCondition(StatsSet params) + public CanSummonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java index 309da529c9..bd8838d02f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanTransformInDominionSkillCondition implements ISkillCondition { - public CanTransformInDominionSkillCondition(StatsSet params) + public CanTransformInDominionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java index 81297944f1..2f4d780cab 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class CanTransformSkillCondition implements ISkillCondition // TODO: What to do with this? // private final int _transformId; - public CanTransformSkillCondition(StatsSet params) + public CanTransformSkillCondition(StatSet params) { // _transformId = params.getInt("transformId"); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java index 800d0375be..771873a553 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanUntransformSkillCondition implements ISkillCondition { - public CanUntransformSkillCondition(StatsSet params) + public CanUntransformSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java index e651b3b1d5..ffe2e4a026 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class CanUseInBattlefieldSkillCondition implements ISkillCondition { - public CanUseInBattlefieldSkillCondition(StatsSet params) + public CanUseInBattlefieldSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java index 5ff751abce..ba030b97a4 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanUseInDragonLairSkillCondition implements ISkillCondition { - public CanUseInDragonLairSkillCondition(StatsSet params) + public CanUseInDragonLairSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java index 4d914c28fe..8a0cb18ac7 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class CanUseSwoopCannonSkillCondition implements ISkillCondition { - public CanUseSwoopCannonSkillCondition(StatsSet params) + public CanUseSwoopCannonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java index 6a2d832a4c..e9996580fc 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanUseVitalityConsumeItemSkillCondition implements ISkillCondition { - public CanUseVitalityConsumeItemSkillCondition(StatsSet params) + public CanUseVitalityConsumeItemSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java index f694956e7e..48dafb46c3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class CannotUseInTransformSkillCondition implements ISkillCondition { private final int _transformId; - public CannotUseInTransformSkillCondition(StatsSet params) + public CannotUseInTransformSkillCondition(StatSet params) { _transformId = params.getInt("transformId", -1); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java index 141c69322f..6591233504 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -32,7 +32,7 @@ public class CheckLevelSkillCondition implements ISkillCondition private final int _maxLevel; private final SkillConditionAffectType _affectType; - public CheckLevelSkillCondition(StatsSet params) + public CheckLevelSkillCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java index 15163a3373..d72f463c4e 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class CheckSexSkillCondition implements ISkillCondition { private final boolean _isFemale; - public CheckSexSkillCondition(StatsSet params) + public CheckSexSkillCondition(StatSet params) { _isFemale = params.getBoolean("isFemale"); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java index 8dee11ef9c..12e49c23a7 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConsumeBodySkillCondition implements ISkillCondition { - public ConsumeBodySkillCondition(StatsSet params) + public ConsumeBodySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java index c24da9ebcd..ba1b1cdd5f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class EnergySavedSkillCondition implements ISkillCondition { private final int _amount; - public EnergySavedSkillCondition(StatsSet params) + public EnergySavedSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 89d705e991..34f76973f0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -35,7 +35,7 @@ public class EquipArmorSkillCondition implements ISkillCondition { private int _armorTypesMask = 0; - public EquipArmorSkillCondition(StatsSet params) + public EquipArmorSkillCondition(StatSet params) { final List armorTypes = params.getEnumList("armorType", ArmorType.class); if (armorTypes != null) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index e5f22008fa..708b4dd1d4 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class EquipShieldSkillCondition implements ISkillCondition { - public EquipShieldSkillCondition(StatsSet params) + public EquipShieldSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 4561945254..f733f81f62 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -33,7 +33,7 @@ public class EquipWeaponSkillCondition implements ISkillCondition { private int _weaponTypesMask = 0; - public EquipWeaponSkillCondition(StatsSet params) + public EquipWeaponSkillCondition(StatSet params) { final List weaponTypes = params.getEnumList("weaponType", WeaponType.class); if (weaponTypes != null) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java index 5f77215218..e36c06fa11 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class NotFearedSkillCondition implements ISkillCondition { - public NotFearedSkillCondition(StatsSet params) + public NotFearedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java index b9096cc1a9..b6e7bcd826 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class NotInUnderwaterSkillCondition implements ISkillCondition { - public NotInUnderwaterSkillCondition(StatsSet params) + public NotInUnderwaterSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index eee6ec73e9..18d8dc8a11 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -35,7 +35,7 @@ public class Op2hWeaponSkillCondition implements ISkillCondition { private final List _weaponTypes = new ArrayList<>(); - public Op2hWeaponSkillCondition(StatsSet params) + public Op2hWeaponSkillCondition(StatSet params) { final List weaponTypes = params.getList("weaponType", String.class); if (weaponTypes != null) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 3b91f36fe4..6223172dbc 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; - public OpAffectedBySkillSkillCondition(StatsSet params) + public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java index 2eb561291e..3818df4736 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAgathionEnergySkillCondition implements ISkillCondition { - public OpAgathionEnergySkillCondition(StatsSet params) + public OpAgathionEnergySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java index 76a7ebc5a8..ee2b415021 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.enums.SkillConditionAlignment; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -32,7 +32,7 @@ public class OpAlignmentSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final SkillConditionAlignment _alignment; - public OpAlignmentSkillCondition(StatsSet params) + public OpAlignmentSkillCondition(StatSet params) { _affectType = params.getEnum("affectType", SkillConditionAffectType.class); _alignment = params.getEnum("alignment", SkillConditionAlignment.class); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index 1c83d18f4e..bcc6715bb2 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -33,7 +33,7 @@ public class OpBlinkSkillCondition implements ISkillCondition private final int _angle; private final int _range; - public OpBlinkSkillCondition(StatsSet params) + public OpBlinkSkillCondition(StatSet params) { switch (params.getEnum("direction", Position.class)) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java index 5215f86ae6..fde0c7f0f8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpCallPcSkillCondition implements ISkillCondition { - public OpCallPcSkillCondition(StatsSet params) + public OpCallPcSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java index dddafec6f0..1de2a32550 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCanEscapeSkillCondition implements ISkillCondition { - public OpCanEscapeSkillCondition(StatsSet params) + public OpCanEscapeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java index 3f1685a1e0..a87fd8adb6 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCanNotUseAirshipSkillCondition implements ISkillCondition { - public OpCanNotUseAirshipSkillCondition(StatsSet params) + public OpCanNotUseAirshipSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java index 8eec19a568..ac7a81c015 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCannotUseTargetWithPrivateStoreSkillCondition implements ISkillCondition { - public OpCannotUseTargetWithPrivateStoreSkillCondition(StatsSet params) + public OpCannotUseTargetWithPrivateStoreSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 91de0adc8c..4030b79d00 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Weapon; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpChangeWeaponSkillCondition implements ISkillCondition { - public OpChangeWeaponSkillCondition(StatsSet params) + public OpChangeWeaponSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java index c2de03de1e..3e304e7d9d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.AbnormalType; @@ -34,7 +34,7 @@ public class OpCheckAbnormalSkillCondition implements ISkillCondition private final boolean _hasAbnormal; private final SkillConditionAffectType _affectType; - public OpCheckAbnormalSkillCondition(StatsSet params) + public OpCheckAbnormalSkillCondition(StatSet params) { _type = params.getEnum("type", AbnormalType.class); _level = params.getInt("level"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java index 65084182b1..c70b58dc50 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCheckAccountTypeSkillCondition implements ISkillCondition { - public OpCheckAccountTypeSkillCondition(StatsSet params) + public OpCheckAccountTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java index 3d4f0a58a0..11eb804274 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpCheckCastRangeSkillCondition implements ISkillCondition { private final int _distance; - public OpCheckCastRangeSkillCondition(StatsSet params) + public OpCheckCastRangeSkillCondition(StatSet params) { _distance = params.getInt("distance"); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java index 7e2e391595..03af1ac63d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.ClassId; @@ -35,7 +35,7 @@ public class OpCheckClassListSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final boolean _isWithin; - public OpCheckClassListSkillCondition(StatsSet params) + public OpCheckClassListSkillCondition(StatSet params) { _classIds = params.getEnumList("classIds", ClassId.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java index 9f779f937a..9702804304 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.ClassId; @@ -33,7 +33,7 @@ public class OpCheckClassSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final boolean _isWithin; - public OpCheckClassSkillCondition(StatsSet params) + public OpCheckClassSkillCondition(StatSet params) { _classId = params.getEnum("classId", ClassId.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java index 3bf6b65dc8..ad997dced7 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckCrtEffectSkillCondition implements ISkillCondition { - public OpCheckCrtEffectSkillCondition(StatsSet params) + public OpCheckCrtEffectSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java index 61c3aa66a4..c0bb54afe0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class OpCheckFlagSkillCondition implements ISkillCondition { - public OpCheckFlagSkillCondition(StatsSet params) + public OpCheckFlagSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java index 75af2ab89a..2e0c07d040 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckOnGoingEventCampaignSkillCondition implements ISkillCondition { - public OpCheckOnGoingEventCampaignSkillCondition(StatsSet params) + public OpCheckOnGoingEventCampaignSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java index c64f7c6722..f11569f43c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckPcbangPointSkillCondition implements ISkillCondition { - public OpCheckPcbangPointSkillCondition(StatsSet params) + public OpCheckPcbangPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java index 252519f7ff..997a4d0fec 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.data.xml.impl.ClanHallData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -35,7 +35,7 @@ public class OpCheckResidenceSkillCondition implements ISkillCondition private final List _residencesId; private final boolean _isWithin; - public OpCheckResidenceSkillCondition(StatsSet params) + public OpCheckResidenceSkillCondition(StatSet params) { _residencesId = params.getList("residencesId", Integer.class); _isWithin = params.getBoolean("isWithin"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java index 6abeed7d35..3a1bcf424c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -34,7 +34,7 @@ public class OpCheckSkillListSkillCondition implements ISkillCondition private final List _skillIds; private final SkillConditionAffectType _affectType; - public OpCheckSkillListSkillCondition(StatsSet params) + public OpCheckSkillListSkillCondition(StatSet params) { _skillIds = params.getList("skillIds", Integer.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java index 984338b2c0..af563d983f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpCheckSkillSkillCondition implements ISkillCondition private final int _skillId; private final SkillConditionAffectType _affectType; - public OpCheckSkillSkillCondition(StatsSet params) + public OpCheckSkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java index ea882c3635..5d85a2dbdb 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionCompanionType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpCompanionSkillCondition implements ISkillCondition { private final SkillConditionCompanionType _type; - public OpCompanionSkillCondition(StatsSet params) + public OpCompanionSkillCondition(StatSet params) { _type = params.getEnum("type", SkillConditionCompanionType.class); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java index 069b9d1759..464853c00c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpEnchantRangeSkillCondition implements ISkillCondition { - public OpEnchantRangeSkillCondition(StatsSet params) + public OpEnchantRangeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java index 99f22bb16a..e12f3ae007 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class OpEncumberedSkillCondition implements ISkillCondition private final int _slotsPercent; private final int _weightPercent; - public OpEncumberedSkillCondition(StatsSet params) + public OpEncumberedSkillCondition(StatSet params) { _slotsPercent = params.getInt("slotsPercent"); _weightPercent = params.getInt("weightPercent"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java index 187dfba744..49cf8e2cb8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpEnergyMaxSkillCondition implements ISkillCondition { private final int _amount; - public OpEnergyMaxSkillCondition(StatsSet params) + public OpEnergyMaxSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 75bdf465e0..82eb70b770 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class OpEquipItemSkillCondition implements ISkillCondition private final int _itemId; private final SkillConditionAffectType _affectType; - public OpEquipItemSkillCondition(StatsSet params) + public OpEquipItemSkillCondition(StatSet params) { _itemId = params.getInt("itemId"); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java index 2c4576c2fa..fa6e82082b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ public class OpExistNpcSkillCondition implements ISkillCondition private final int _range; private final boolean _isAround; - public OpExistNpcSkillCondition(StatsSet params) + public OpExistNpcSkillCondition(StatSet params) { _npcIds = params.getList("npcIds", Integer.class); _range = params.getInt("range"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java index 27cc3e90a9..8299b40047 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingCastSkillCondition implements ISkillCondition { - public OpFishingCastSkillCondition(StatsSet params) + public OpFishingCastSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java index 84cc031a24..4b43eb834e 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingPumpingSkillCondition implements ISkillCondition { - public OpFishingPumpingSkillCondition(StatsSet params) + public OpFishingPumpingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java index 86aa667bee..a6a400f96f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingReelingSkillCondition implements ISkillCondition { - public OpFishingReelingSkillCondition(StatsSet params) + public OpFishingReelingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java index d22733df7e..50e6dafb82 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpHaveSummonSkillCondition implements ISkillCondition { - public OpHaveSummonSkillCondition(StatsSet params) + public OpHaveSummonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 2e854ca2b8..cceb4e937b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { private final int _npcId; - public OpHaveSummonedNpcSkillCondition(StatsSet params) + public OpHaveSummonedNpcSkillCondition(StatSet params) { _npcId = params.getInt("npcId"); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java index 16932ce531..374a75bfab 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.impl.ClanHallData; import org.l2jmobius.gameserver.enums.ResidenceType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -34,7 +34,7 @@ public class OpHomeSkillCondition implements ISkillCondition { private final ResidenceType _type; - public OpHomeSkillCondition(StatsSet params) + public OpHomeSkillCondition(StatSet params) { _type = params.getEnum("type", ResidenceType.class); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java index 9482a0bf55..62ad48bdcc 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpInSiegeTimeSkillCondition implements ISkillCondition { - public OpInSiegeTimeSkillCondition(StatsSet params) + public OpInSiegeTimeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java index 1bffdacd6c..f2fb298398 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -30,7 +30,7 @@ public class OpInstantzoneSkillCondition implements ISkillCondition { private final int _instanceId; - public OpInstantzoneSkillCondition(StatsSet params) + public OpInstantzoneSkillCondition(StatSet params) { _instanceId = params.getInt("instanceId"); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java index 76703cc53b..7418ef9b64 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpMainjobSkillCondition implements ISkillCondition { - public OpMainjobSkillCondition(StatsSet params) + public OpMainjobSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java index d4c9f1f331..3c81369bbb 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNeedAgathionSkillCondition implements ISkillCondition { - public OpNeedAgathionSkillCondition(StatsSet params) + public OpNeedAgathionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java index 96f6774f25..e7a477b0ee 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; @@ -34,7 +34,7 @@ public class OpNeedSummonOrPetSkillCondition implements ISkillCondition { private final List _npcIds = new ArrayList<>(); - public OpNeedSummonOrPetSkillCondition(StatsSet params) + public OpNeedSummonOrPetSkillCondition(StatSet params) { final List npcIds = params.getList("npcIds", String.class); if (npcIds != null) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java index 9701002065..ae1edfd719 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotCursedSkillCondition implements ISkillCondition { - public OpNotCursedSkillCondition(StatsSet params) + public OpNotCursedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInCeremonyOfChaosSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInCeremonyOfChaosSkillCondition.java index 9549fdc2ac..b5cefc61cc 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInCeremonyOfChaosSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInCeremonyOfChaosSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotInCeremonyOfChaosSkillCondition implements ISkillCondition { - public OpNotInCeremonyOfChaosSkillCondition(StatsSet params) + public OpNotInCeremonyOfChaosSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java index bf909425d8..1de79f388a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpNotInPeacezoneSkillCondition implements ISkillCondition { - public OpNotInPeacezoneSkillCondition(StatsSet params) + public OpNotInPeacezoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java index 0752ba4a6a..0d3e4cb4dd 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotInstantzoneSkillCondition implements ISkillCondition { - public OpNotInstantzoneSkillCondition(StatsSet params) + public OpNotInstantzoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java index 45891cd0ac..7ea02159ba 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotOlympiadSkillCondition implements ISkillCondition { - public OpNotOlympiadSkillCondition(StatsSet params) + public OpNotOlympiadSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java index 5c5d293ae8..2397a68e99 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpNotTerritorySkillCondition implements ISkillCondition { - public OpNotTerritorySkillCondition(StatsSet params) + public OpNotTerritorySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java index 874872bb2e..d9f8c1fa3b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpPeacezoneSkillCondition implements ISkillCondition { - public OpPeacezoneSkillCondition(StatsSet params) + public OpPeacezoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java index c20c4665bb..08d6bb095a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpPkcountSkillCondition implements ISkillCondition { private final SkillConditionAffectType _affectType; - public OpPkcountSkillCondition(StatsSet params) + public OpPkcountSkillCondition(StatSet params) { _affectType = params.getEnum("affectType", SkillConditionAffectType.class); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java index 879fc88c4c..d393c5ddc3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -30,7 +30,7 @@ public class OpPledgeSkillCondition implements ISkillCondition { private final int _level; - public OpPledgeSkillCondition(StatsSet params) + public OpPledgeSkillCondition(StatSet params) { _level = params.getInt("level"); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java index 9adc89b98d..adf16f8feb 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpRestartPointSkillCondition implements ISkillCondition { - public OpRestartPointSkillCondition(StatsSet params) + public OpRestartPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java index bbd1d9d7d1..6874091ba2 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class OpResurrectionSkillCondition implements ISkillCondition { - public OpResurrectionSkillCondition(StatsSet params) + public OpResurrectionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java index 8bbf796ad2..566f935a50 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpSiegeHammerSkillCondition implements ISkillCondition { - public OpSiegeHammerSkillCondition(StatsSet params) + public OpSiegeHammerSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java index be3ad18e05..cbfc1a25b2 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition private final int _skillId; private final boolean _hasLearned; - public OpSkillAcquireSkillCondition(StatsSet params) + public OpSkillAcquireSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _hasLearned = params.getBoolean("hasLearned"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java index c8789d28e4..a8382b83b3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpSkillSkillCondition implements ISkillCondition private final int _skillLevel; private final boolean _hasLearned; - public OpSkillSkillCondition(StatsSet params) + public OpSkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _skillLevel = params.getInt("skillLevel"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java index 5127071683..a3d188f3eb 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpSocialClassSkillCondition implements ISkillCondition { private final int _socialClass; - public OpSocialClassSkillCondition(StatsSet params) + public OpSocialClassSkillCondition(StatSet params) { _socialClass = params.getInt("socialClass"); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java index b9d37d18c0..c86984a218 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class OpSoulMaxSkillCondition implements ISkillCondition { - public OpSoulMaxSkillCondition(StatsSet params) + public OpSoulMaxSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java index 4780c13a58..0faa676bbe 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpSubjobSkillCondition implements ISkillCondition { - public OpSubjobSkillCondition(StatsSet params) + public OpSubjobSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java index 17a9a1a9e3..a14192847a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.concurrent.atomic.AtomicBoolean; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpSweeperSkillCondition implements ISkillCondition { - public OpSweeperSkillCondition(StatsSet params) + public OpSweeperSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java index b36585bf00..c4b3923e92 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTargetAllItemTypeSkillCondition implements ISkillCondition { - public OpTargetAllItemTypeSkillCondition(StatsSet params) + public OpTargetAllItemTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 6b85389d62..5492e96e1a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTargetArmorTypeSkillCondition implements ISkillCondition { - public OpTargetArmorTypeSkillCondition(StatsSet params) + public OpTargetArmorTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java index 0c0090fbc4..97e07a1822 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpTargetDoorSkillCondition implements ISkillCondition { private final List _doorIds; - public OpTargetDoorSkillCondition(StatsSet params) + public OpTargetDoorSkillCondition(StatSet params) { _doorIds = params.getList("doorIds", Integer.class); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java index 6fbc3cda10..eaabf4a73d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpTargetMyPledgeAcademySkillCondition implements ISkillCondition { - public OpTargetMyPledgeAcademySkillCondition(StatsSet params) + public OpTargetMyPledgeAcademySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java index d5820600dd..14a744613d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpTargetNpcSkillCondition implements ISkillCondition { private final List _npcId; - public OpTargetNpcSkillCondition(StatsSet params) + public OpTargetNpcSkillCondition(StatSet params) { _npcId = params.getList("npcIds", Integer.class); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java index 854225a75a..b0c5e50ae3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpTargetPcSkillCondition implements ISkillCondition { - public OpTargetPcSkillCondition(StatsSet params) + public OpTargetPcSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index 7faecb2ffd..62fd4b365f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Weapon; @@ -34,7 +34,7 @@ public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition { private final List _weaponTypes = new ArrayList<>(); - public OpTargetWeaponAttackTypeSkillCondition(StatsSet params) + public OpTargetWeaponAttackTypeSkillCondition(StatSet params) { final List weaponTypes = params.getList("weaponType", String.class); if (weaponTypes != null) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java index 8451365885..e114c03412 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTerritorySkillCondition implements ISkillCondition { - public OpTerritorySkillCondition(StatsSet params) + public OpTerritorySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java index 13f287687e..fde1293086 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpUnlockSkillCondition implements ISkillCondition { - public OpUnlockSkillCondition(StatsSet params) + public OpUnlockSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java index 8cc76a34bb..46dea5bbcb 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpUseFirecrackerSkillCondition implements ISkillCondition { - public OpUseFirecrackerSkillCondition(StatsSet params) + public OpUseFirecrackerSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java index f3b54bbad7..651dade274 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpUsePraseedSkillCondition implements ISkillCondition { - public OpUsePraseedSkillCondition(StatsSet params) + public OpUsePraseedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java index 890b0fcd5f..dd57df0e13 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.MountType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpWyvernSkillCondition implements ISkillCondition { - public OpWyvernSkillCondition(StatsSet params) + public OpWyvernSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java index 8a4c974840..5ac80d3e62 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class PossessHolythingSkillCondition implements ISkillCondition { - public PossessHolythingSkillCondition(StatsSet params) + public PossessHolythingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java index 8b0fb55554..38b5644fb1 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class RemainCpPerSkillCondition implements ISkillCondition private final int _amount; private final SkillConditionPercentType _percentType; - public RemainCpPerSkillCondition(StatsSet params) + public RemainCpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java index 612367a233..1ad96100ad 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -33,7 +33,7 @@ public class RemainHpPerSkillCondition implements ISkillCondition private final SkillConditionPercentType _percentType; private final SkillConditionAffectType _affectType; - public RemainHpPerSkillCondition(StatsSet params) + public RemainHpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java index 5455c1587a..39085349d9 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class RemainMpPerSkillCondition implements ISkillCondition private final int _amount; private final SkillConditionPercentType _percentType; - public RemainMpPerSkillCondition(StatsSet params) + public RemainMpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java index 7de47f103f..6e9e5ad821 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class SoulSavedSkillCondition implements ISkillCondition { private final int _amount; - public SoulSavedSkillCondition(StatsSet params) + public SoulSavedSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java index 0b75a5a623..f4bdbaaecb 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class TargetItemCrystalTypeSkillCondition implements ISkillCondition { - public TargetItemCrystalTypeSkillCondition(StatsSet params) + public TargetItemCrystalTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java index 51502ff209..604a41f904 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.MentorManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMyMenteeSkillCondition implements ISkillCondition { - public TargetMyMenteeSkillCondition(StatsSet params) + public TargetMyMenteeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java index fc621365a9..4bfb496634 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class TargetMyPartySkillCondition implements ISkillCondition { private final boolean _includeMe; - public TargetMyPartySkillCondition(StatsSet params) + public TargetMyPartySkillCondition(StatSet params) { _includeMe = params.getBoolean("includeMe"); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java index 9ebec0e691..d44a1bc8a9 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMyPledgeSkillCondition implements ISkillCondition { - public TargetMyPledgeSkillCondition(StatsSet params) + public TargetMyPledgeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java index f4da8d6079..5045aa3848 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class TargetRaceSkillCondition implements ISkillCondition { private final Race _race; - public TargetRaceSkillCondition(StatsSet params) + public TargetRaceSkillCondition(StatSet params) { _race = params.getEnum("race", Race.class); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java index 55734b03bb..d1aac35879 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusion.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -350,7 +350,7 @@ public class ChamberOfDelusion extends AbstractInstance protected void changeRoom(Instance world) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); final List locations = world.getEnterLocations(); int newRoom = params.getInt("currentRoom", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java index 95a96bb16e..bef23aa88c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsCoralGarden.java @@ -19,7 +19,7 @@ package instances.CrystalCaverns; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -64,12 +64,12 @@ public class CrystalCavernsCoralGarden extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (event) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java index d977f82481..5d6a8dda61 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsEmeraldSquare.java @@ -17,7 +17,7 @@ package instances.CrystalCaverns; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -90,13 +90,13 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); - final StatsSet npcVars = npc.getVariables(); + final StatSet npcParams = npc.getParameters(); + final StatSet npcVars = npc.getVariables(); final int baseId = npcParams.getInt("base_id", -1); switch (event) @@ -156,7 +156,7 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (npc.getId()) { @@ -205,7 +205,7 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); final int baseId = npcParams.getInt("base_id", -1); switch (npc.getId()) @@ -365,7 +365,7 @@ public class CrystalCavernsEmeraldSquare extends AbstractInstance { case WATER_CANNON: { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); final int baseId = npcParams.getInt("base_id", -1); if (baseId != 1) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java index b9662a5d06..7624504082 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/CrystalCaverns/CrystalCavernsSteamCorridor.java @@ -19,7 +19,7 @@ package instances.CrystalCaverns; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -83,12 +83,12 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (event) { @@ -180,7 +180,7 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); switch (npc.getId()) { @@ -224,7 +224,7 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance final Instance instance = receiver.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = receiver.getParameters(); + final StatSet npcParams = receiver.getParameters(); if (eventName.equals(String.valueOf(24220005 + npcParams.getInt("Terri_ID", 0)))) { @@ -265,7 +265,7 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); final int killTarget = instance.getParameters().getInt("KILL_TARGET", 5); int currentKillCount = instance.getParameters().getInt("KILL_COUNT", 0); @@ -377,7 +377,7 @@ public class CrystalCavernsSteamCorridor extends AbstractInstance if (isInInstance(instance) && creature.isPlayer()) { - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); switch (npc.getId()) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java index 0d9724e766..1245a89ed0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -404,7 +404,7 @@ public class DarkCloudMansion extends AbstractInstance { if (CommonUtil.contains(BELETH_SAMPLE, npc.getId())) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); if (!params.getBoolean("blocked", false)) { if (npc.isScriptValue(1)) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java index 70e48df2de..641eb5c9f9 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; @@ -441,7 +441,7 @@ public class EvilIncubator extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaBoss.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaBoss.java index 181f892fbe..3ef76e5f72 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaBoss.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaBoss.java @@ -17,7 +17,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureAttacked; @@ -70,7 +70,7 @@ public class KartiaBoss extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SAY") && npc.isTargetable()) { @@ -107,7 +107,7 @@ public class KartiaBoss extends AbstractNpcAI public void spawnMinions(Npc npc) { - final StatsSet param = npc.getParameters(); + final StatSet param = npc.getParameters(); final int kartiaLevel = param.getInt("cartia_level", 0); final boolean isParty = param.getInt("party_type", 0) == 1; diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java index 5b21b5e62f..073a4d0de0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -97,12 +97,12 @@ public class KartiaHelperAdolph extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if ((instance != null) && event.equals("CHECK_ACTION")) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final PlayerInstance plr = npcVars.getObject("PLAYER_OBJECT", PlayerInstance.class); if (plr != null) { @@ -159,7 +159,7 @@ public class KartiaHelperAdolph extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder skill_01 = instParams.getSkillHolder("adolphHate"); final SkillHolder skill_02 = instParams.getSkillHolder("adolphPunish"); final SkillHolder skill_03 = instParams.getSkillHolder("adolphShield"); @@ -256,7 +256,7 @@ public class KartiaHelperAdolph extends AbstractNpcAI { npc.setTarget(event.getAttacker()); addAttackDesire(npc, (Creature) npc.getTarget()); - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder hateSkill = instParams.getSkillHolder("adolphHate"); if ((hateSkill != null) && SkillCaster.checkUseConditions(npc, hateSkill.getSkill())) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java index a0a6264eff..61f9ef8062 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java @@ -19,7 +19,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -92,7 +92,7 @@ public class KartiaHelperBarton extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if ((instance != null) && event.equals("CHECK_ACTION")) @@ -173,7 +173,7 @@ public class KartiaHelperBarton extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder skill_01 = instParams.getSkillHolder("bartonInfinity"); final SkillHolder skill_02 = instParams.getSkillHolder("bartonBerserker"); final SkillHolder skill_03 = instParams.getSkillHolder("bartonHurricane"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java index e383a62d49..01edde0bd4 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java @@ -26,7 +26,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -115,12 +115,12 @@ public class KartiaHelperElise extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if ((instance != null) && event.equals("CHECK_ACTION")) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final FriendlyNpcInstance adolph = npcVars.getObject("ADOLPH_OBJECT", FriendlyNpcInstance.class); if (!npc.isCastingNow()) { @@ -153,8 +153,8 @@ public class KartiaHelperElise extends AbstractNpcAI final Instance instance = npc.getInstanceWorld(); if (instance != null) { - final StatsSet npcVars = npc.getVariables(); - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet npcVars = npc.getVariables(); + final StatSet instParams = instance.getTemplateParameters(); if (!npc.isCastingNow()) { final PlayerInstance plr = npcVars.getObject("PLAYER_OBJECT", PlayerInstance.class); @@ -248,7 +248,7 @@ public class KartiaHelperElise extends AbstractNpcAI { if (creature.isPlayer() || (creature instanceof FriendlyNpcInstance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); if (creature.isPlayer()) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperEliyah.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperEliyah.java index 244110429c..cb3013c46c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperEliyah.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperEliyah.java @@ -18,7 +18,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance; @@ -87,7 +87,7 @@ public class KartiaHelperEliyah extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if ((instance != null) && event.equals("CHECK_ACTION")) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java index 07fe730289..123414862a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperGuardian.java @@ -18,7 +18,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -96,7 +96,7 @@ public class KartiaHelperGuardian extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (instance == null) @@ -183,7 +183,7 @@ public class KartiaHelperGuardian extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder skill01 = instParams.getSkillHolder("guardianSpiritsBlow"); final SkillHolder skill02 = instParams.getSkillHolder("guardianSpiritsWrath"); final int numberOfActiveSkills = 2; diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java index 46b630ffe8..f072f72e7c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java @@ -19,7 +19,7 @@ package instances.KartiasLabyrinth; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -93,7 +93,7 @@ public class KartiaHelperHayuk extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if ((instance != null) && event.equals("CHECK_ACTION")) @@ -174,7 +174,7 @@ public class KartiaHelperHayuk extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { - final StatsSet instParams = instance.getTemplateParameters(); + final StatSet instParams = instance.getTemplateParameters(); final SkillHolder skill_01 = instParams.getSkillHolder("hayukPinpointShot"); final SkillHolder skill_02 = instParams.getSkillHolder("hayukRecoilShot"); final SkillHolder skill_03 = instParams.getSkillHolder("hayukMultipleArrow"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaSupportTroop.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaSupportTroop.java index bfdc9b4cd3..d17653b8e3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaSupportTroop.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaSupportTroop.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -49,7 +49,7 @@ public class KartiaSupportTroop extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (event.equals("NPC_SAY") && !npc.isDead()) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java index 0bf65e9c9b..01d0a1ab7a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -273,7 +273,7 @@ public class KartiasLabyrinth extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = (npc != null) ? npc.getInstanceWorld() : player.getInstanceWorld(); if (instance != null) @@ -363,7 +363,7 @@ public class KartiasLabyrinth extends AbstractInstance if (instance != null) { - final StatsSet param = instance.getParameters(); + final StatSet param = instance.getParameters(); if (param.getBoolean("BOSS_KILL_OPEN_DOOR", false) && CommonUtil.contains(MINI_BOSSES, npc.getId())) { instance.setParameter("BOSS_KILL_OPEN_DOOR", true); @@ -562,7 +562,7 @@ public class KartiasLabyrinth extends AbstractInstance private void manageProgressInInstance(Instance instance) { - final StatsSet param = instance.getParameters(); + final StatSet param = instance.getParameters(); final int room = param.getInt("ROOM", 1); final int stage = param.getInt("STAGE", 1); final int wave = param.getInt("WAVE", 1); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/Nursery/Nursery.java index 4e85e49c12..ff1ff2587e 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/Nursery/Nursery.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/Nursery/Nursery.java @@ -19,7 +19,7 @@ package instances.Nursery; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -80,12 +80,12 @@ public class Nursery extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int gameStage = npcVars.getInt("GAME_STAGE", 0); switch (event) @@ -142,7 +142,7 @@ public class Nursery extends AbstractInstance if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int gameStage = npcVars.getInt("GAME_STAGE", 0); switch (gameStage) @@ -200,7 +200,7 @@ public class Nursery extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int gameStage = npcVars.getInt("GAME_STAGE", 0); switch (event) @@ -281,7 +281,7 @@ public class Nursery extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); final int maguenStatus = npcVars.getInt("MAGUEN_STATUS", 0); switch (maguenStatus) @@ -407,8 +407,8 @@ public class Nursery extends AbstractInstance final Npc gameManager = instance.getNpc(TIE); if (gameManager != null) { - final StatsSet managerVars = gameManager.getVariables(); - final StatsSet npcVars = npc.getVariables(); + final StatSet managerVars = gameManager.getVariables(); + final StatSet npcVars = npc.getVariables(); final int gamePoints = managerVars.getInt("GAME_POINTS", 0); if (gamePoints > 0) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java index cb795be586..b1d433d920 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java @@ -19,7 +19,7 @@ package instances.PrisonOfDarkness; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -122,12 +122,12 @@ public class PrisonOfDarkness extends AbstractInstance } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (event) { @@ -187,7 +187,7 @@ public class PrisonOfDarkness extends AbstractInstance if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (event) { @@ -327,7 +327,7 @@ public class PrisonOfDarkness extends AbstractInstance final Instance instance = npc.getInstanceWorld(); if (isInInstance(instance)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (npc.getId()) { @@ -360,7 +360,7 @@ public class PrisonOfDarkness extends AbstractInstance if (isInInstance(instance) && (npc.getId() == EXIT_PORTAL)) { - final StatsSet npcVars = npc.getVariables(); + final StatSet npcVars = npc.getVariables(); switch (npcVars.getInt("PORTAL_STATE", 0)) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java index b1d0ec8553..7e9236b634 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.ActionDataHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -57,7 +57,7 @@ public class ActionData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "action", actionNode -> { - final ActionDataHolder holder = new ActionDataHolder(new StatsSet(parseAttributes(actionNode))); + final ActionDataHolder holder = new ActionDataHolder(new StatSet(parseAttributes(actionNode))); _actionData.put(holder.getId(), holder); })); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java index 36002572b0..f7762ab07b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java @@ -32,7 +32,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.AdminCommandAccessRight; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -72,7 +72,7 @@ public class AdminData implements IXmlReader { NamedNodeMap attrs; Node attr; - StatsSet set; + StatSet set; AccessLevel level; AdminCommandAccessRight command; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -83,7 +83,7 @@ public class AdminData implements IXmlReader { if ("access".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -99,7 +99,7 @@ public class AdminData implements IXmlReader } else if ("admin".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java index b425296a19..6a14a867fc 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/AlchemyData.java @@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.alchemy.AlchemyCraftData; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -55,7 +55,7 @@ public class AlchemyData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node att; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -67,7 +67,7 @@ public class AlchemyData implements IXmlReader if ("skill".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index a5de47d07c..c31f2ea750 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; @@ -83,7 +83,7 @@ public class AppearanceItemData implements IXmlReader { if ("appearance_stone".equalsIgnoreCase(d.getNodeName())) { - final AppearanceStone stone = new AppearanceStone(new StatsSet(parseAttributes(d))); + final AppearanceStone stone = new AppearanceStone(new StatSet(parseAttributes(d))); for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) { switch (c.getNodeName()) @@ -120,7 +120,7 @@ public class AppearanceItemData implements IXmlReader } case "visual": { - stone.addVisualId(new AppearanceHolder(new StatsSet(parseAttributes(c)))); + stone.addVisualId(new AppearanceHolder(new StatSet(parseAttributes(c)))); } } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java index 6c96d3874a..6eac3240e7 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -64,7 +64,7 @@ public class AttendanceRewardData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "item", rewardNode -> { - final StatsSet set = new StatsSet(parseAttributes(rewardNode)); + final StatSet set = new StatSet(parseAttributes(rewardNode)); final int itemId = set.getInt("id"); final int itemCount = set.getInt("count"); if (ItemTable.getInstance().getTemplate(itemId) == null) diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java index 891d19fcf2..3054b0e7ef 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.beautyshop.BeautyData; import org.l2jmobius.gameserver.model.beautyshop.BeautyItem; @@ -56,7 +56,7 @@ public class BeautyShopData implements IXmlReader public void parseDocument(Document doc, File f) { NamedNodeMap attrs; - StatsSet set; + StatSet set; Node att; Race race = null; Sex sex = null; @@ -92,7 +92,7 @@ public class BeautyShopData implements IXmlReader if ("hair".equalsIgnoreCase(a.getNodeName())) { attrs = a.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -105,7 +105,7 @@ public class BeautyShopData implements IXmlReader if ("color".equalsIgnoreCase(g.getNodeName())) { attrs = g.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -119,7 +119,7 @@ public class BeautyShopData implements IXmlReader else if ("face".equalsIgnoreCase(a.getNodeName())) { attrs = a.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java index 37e977c51e..530a5d975a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java @@ -34,7 +34,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.entity.ClanHall; @@ -66,7 +66,7 @@ public class ClanHallData implements IXmlReader final List doors = new ArrayList<>(); final List npcs = new ArrayList<>(); final List teleports = new ArrayList<>(); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); for (Node listNode = doc.getFirstChild(); listNode != null; listNode = listNode.getNextSibling()) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ClanMasteryData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ClanMasteryData.java index fabd6f919e..36eaf42552 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ClanMasteryData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ClanMasteryData.java @@ -25,7 +25,7 @@ import java.util.logging.Logger; import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ClanMasteryHolder; import org.l2jmobius.gameserver.model.skills.Skill; @@ -57,7 +57,7 @@ public class ClanMasteryData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "clan", clanNode -> { - final StatsSet set = new StatsSet(parseAttributes(clanNode)); + final StatSet set = new StatSet(parseAttributes(clanNode)); final int id = set.getInt("mastery"); final int skill1Id = set.getInt("skill1Id"); final int skill1Level = set.getInt("skill1Level"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ClanShopData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ClanShopData.java index 2ba5a1c504..092216b96d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ClanShopData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ClanShopData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ClanShopProductHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -57,7 +57,7 @@ public class ClanShopData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "clan", productNode -> { - final StatsSet set = new StatsSet(parseAttributes(productNode)); + final StatSet set = new StatSet(parseAttributes(productNode)); final int clanLevel = set.getInt("level"); final int itemId = set.getInt("item"); final int count = set.getInt("count"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java index ae608cefb6..f1a23734e0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.combination.CombinationItem; import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; @@ -57,7 +57,7 @@ public class CombinationItemsData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "item", itemNode -> { - final CombinationItem item = new CombinationItem(new StatsSet(parseAttributes(itemNode))); + final CombinationItem item = new CombinationItem(new StatSet(parseAttributes(itemNode))); forEach(itemNode, "reward", rewardNode -> { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java index 038738b138..4af039b48d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.CubicSkill; import org.l2jmobius.gameserver.model.cubic.ICubicConditionHolder; @@ -61,7 +61,7 @@ public class CubicData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - forEach(doc, "list", listNode -> forEach(listNode, "cubic", cubicNode -> parseTemplate(cubicNode, new CubicTemplate(new StatsSet(parseAttributes(cubicNode)))))); + forEach(doc, "list", listNode -> forEach(listNode, "cubic", cubicNode -> parseTemplate(cubicNode, new CubicTemplate(new StatSet(parseAttributes(cubicNode)))))); } /** @@ -137,7 +137,7 @@ public class CubicData implements IXmlReader { forEach(cubicNode, "skill", skillNode -> { - final CubicSkill skill = new CubicSkill(new StatsSet(parseAttributes(skillNode))); + final CubicSkill skill = new CubicSkill(new StatSet(parseAttributes(skillNode))); forEach(cubicNode, "conditions", conditionNode -> parseConditions(cubicNode, template, skill)); template.getSkills().add(skill); }); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java index 3d19bee079..ede9b72202 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -62,7 +62,7 @@ public class DailyMissionData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "reward", rewardNode -> { - final StatsSet set = new StatsSet(parseAttributes(rewardNode)); + final StatSet set = new StatSet(parseAttributes(rewardNode)); final List items = new ArrayList<>(1); forEach(rewardNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> @@ -80,14 +80,14 @@ public class DailyMissionData implements IXmlReader // Initial values in case handler doesn't exists set.set("handler", ""); - set.set("params", StatsSet.EMPTY_STATSET); + set.set("params", StatSet.EMPTY_STATSET); // Parse handler and parameters forEach(rewardNode, "handler", handlerNode -> { set.set("handler", parseString(handlerNode.getAttributes(), "name")); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); set.set("params", params); forEach(handlerNode, "param", paramNode -> params.set(parseString(paramNode.getAttributes(), "name"), paramNode.getTextContent())); }); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java index 835eab4fe9..53248de524 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java @@ -35,7 +35,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -51,7 +51,7 @@ public class DoorData implements IXmlReader // Info holders private final Map> _groups = new HashMap<>(); private final Map _doors = new HashMap<>(); - private final Map _templates = new HashMap<>(); + private final Map _templates = new HashMap<>(); private final Map> _regions = new HashMap<>(); protected DoorData() @@ -75,9 +75,9 @@ public class DoorData implements IXmlReader LOGGER.info(getClass().getSimpleName() + ": Loaded " + _doors.size() + " Door Templates for " + _regions.size() + " regions."); } - public StatsSet parseDoor(Node doorNode) + public StatSet parseDoor(Node doorNode) { - final StatsSet params = new StatsSet(parseAttributes(doorNode)); + final StatSet params = new StatSet(parseAttributes(doorNode)); params.set("baseHpMax", 1); // Avoid doors without HP value created dead due to default value 0 in CreatureTemplate forEach(doorNode, IXmlReader::isNode, innerDoorNode -> @@ -115,7 +115,7 @@ public class DoorData implements IXmlReader /** * @param set */ - private void applyCollisions(StatsSet set) + private void applyCollisions(StatSet set) { // Insert Collision data if (set.contains("nodeX_0") && set.contains("nodeY_0") && set.contains("nodeX_1") && set.contains("nodeY_1")) @@ -142,7 +142,7 @@ public class DoorData implements IXmlReader * @param set * @return */ - public DoorInstance spawnDoor(StatsSet set) + public DoorInstance spawnDoor(StatSet set) { // Create door template + door instance final DoorTemplate template = new DoorTemplate(set); @@ -183,7 +183,7 @@ public class DoorData implements IXmlReader return door; } - public StatsSet getDoorTemplate(int doorId) + public StatSet getDoorTemplate(int doorId) { return _templates.get(doorId); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java index eca42a9a34..637ef1e953 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -64,7 +64,7 @@ public class EnchantItemData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node att; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -76,7 +76,7 @@ public class EnchantItemData implements IXmlReader if ("enchant".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -107,7 +107,7 @@ public class EnchantItemData implements IXmlReader else if ("support".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java index 46701fd777..bb1e8026b7 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.SkillEnchantType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.EnchantSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -69,10 +69,10 @@ public class EnchantSkillGroupsData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "enchant", enchantNode -> { - final EnchantSkillHolder enchantSkillHolder = new EnchantSkillHolder(new StatsSet(parseAttributes(enchantNode))); + final EnchantSkillHolder enchantSkillHolder = new EnchantSkillHolder(new StatSet(parseAttributes(enchantNode))); forEach(enchantNode, "sps", spsNode -> forEach(spsNode, "sp", spNode -> enchantSkillHolder.addSp(parseEnum(spNode.getAttributes(), SkillEnchantType.class, "type"), parseInteger(spNode.getAttributes(), "amount")))); forEach(enchantNode, "chances", chancesNode -> forEach(chancesNode, "chance", chanceNode -> enchantSkillHolder.addChance(parseEnum(chanceNode.getAttributes(), SkillEnchantType.class, "type"), parseInteger(chanceNode.getAttributes(), "value")))); - forEach(enchantNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> enchantSkillHolder.addRequiredItem(parseEnum(itemNode.getAttributes(), SkillEnchantType.class, "type"), new ItemHolder(new StatsSet(parseAttributes(itemNode)))))); + forEach(enchantNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> enchantSkillHolder.addRequiredItem(parseEnum(itemNode.getAttributes(), SkillEnchantType.class, "type"), new ItemHolder(new StatSet(parseAttributes(itemNode)))))); _enchantSkillHolders.put(parseInteger(enchantNode.getAttributes(), "level"), enchantSkillHolder); })); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/EquipmentUpgradeData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/EquipmentUpgradeData.java index 4700307bd0..c6745249f6 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/EquipmentUpgradeData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/EquipmentUpgradeData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.EquipmentUpgradeHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -57,7 +57,7 @@ public class EquipmentUpgradeData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "upgrade", upgradeNode -> { - final StatsSet set = new StatsSet(parseAttributes(upgradeNode)); + final StatSet set = new StatSet(parseAttributes(upgradeNode)); final int id = set.getInt("id"); final String[] item = set.getString("item").split(","); final int requiredItemId = Integer.parseInt(item[0]); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java index a8bb0397ac..037af7e1ae 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java @@ -34,7 +34,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.eventengine.AbstractEventManager; import org.l2jmobius.gameserver.model.eventengine.EventMethodNotification; import org.l2jmobius.gameserver.model.eventengine.EventScheduler; @@ -156,7 +156,7 @@ public class EventEngineData implements IXmlReader */ private void parseVariables(AbstractEventManager eventManager, Node innerNode) { - final StatsSet variables = new StatsSet(LinkedHashMap::new); + final StatSet variables = new StatSet(LinkedHashMap::new); for (Node variableNode = innerNode.getFirstChild(); variableNode != null; variableNode = variableNode.getNextSibling()) { if ("variable".equals(variableNode.getNodeName())) @@ -188,7 +188,7 @@ public class EventEngineData implements IXmlReader { if ("schedule".equals(scheduleNode.getNodeName())) { - final StatsSet params = new StatsSet(LinkedHashMap::new); + final StatSet params = new StatSet(LinkedHashMap::new); final NamedNodeMap attrs = scheduleNode.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -235,7 +235,7 @@ public class EventEngineData implements IXmlReader } else if ("conditionalSchedule".equals(scheduleNode.getNodeName())) { - final StatsSet params = new StatsSet(LinkedHashMap::new); + final StatSet params = new StatSet(LinkedHashMap::new); final NamedNodeMap attrs = scheduleNode.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -346,7 +346,7 @@ public class EventEngineData implements IXmlReader * @param variableNode */ @SuppressWarnings("unchecked") - private void parseListVariables(AbstractEventManager eventManager, StatsSet variables, Node variableNode) + private void parseListVariables(AbstractEventManager eventManager, StatSet variables, Node variableNode) { final String name = parseString(variableNode.getAttributes(), "name"); final String type = parseString(variableNode.getAttributes(), "type"); @@ -419,7 +419,7 @@ public class EventEngineData implements IXmlReader * @param variableNode */ @SuppressWarnings("unchecked") - private void parseMapVariables(AbstractEventManager eventManager, StatsSet variables, Node variableNode) + private void parseMapVariables(AbstractEventManager eventManager, StatSet variables, Node variableNode) { final String name = parseString(variableNode.getAttributes(), "name"); final String keyType = parseString(variableNode.getAttributes(), "keyType"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java index db19c5fdff..0724877d9d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.ConditionHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.ICondition; import org.l2jmobius.gameserver.model.holders.ExtendDropDataHolder; import org.l2jmobius.gameserver.model.holders.ExtendDropItemHolder; @@ -62,7 +62,7 @@ public class ExtendDropData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "drop", dropNode -> { - final StatsSet set = new StatsSet(parseAttributes(dropNode)); + final StatSet set = new StatSet(parseAttributes(dropNode)); final List items = new ArrayList<>(1); forEach(dropNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> @@ -80,8 +80,8 @@ public class ExtendDropData implements IXmlReader forEach(dropNode, "conditions", conditionsNode -> forEach(conditionsNode, "condition", conditionNode -> { final String conditionName = parseString(conditionNode.getAttributes(), "name"); - final StatsSet params = (StatsSet) parseValue(conditionNode); - final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); + final StatSet params = (StatSet) parseValue(conditionNode); + final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); if (conditionFunction != null) { conditions.add(conditionFunction.apply(params)); @@ -109,7 +109,7 @@ public class ExtendDropData implements IXmlReader private Object parseValue(Node node) { - StatsSet statsSet = null; + StatSet statSet = null; List list = null; Object text = null; for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) @@ -145,12 +145,12 @@ public class ExtendDropData implements IXmlReader final Object value = parseValue(node); if (value != null) { - if (statsSet == null) + if (statSet == null) { - statsSet = new StatsSet(); + statSet = new StatSet(); } - statsSet.set(nodeName, value); + statSet.set(nodeName, value); } } } @@ -161,9 +161,9 @@ public class ExtendDropData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", list); + statSet.set(".", list); } else { @@ -176,16 +176,16 @@ public class ExtendDropData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", text); + statSet.set(".", text); } else { return text; } } - return statsSet; + return statSet; } public ExtendDropDataHolder getExtendDropById(int id) diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java index 57a16d6390..608f4702b8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.FakePlayerHolder; @@ -72,7 +72,7 @@ public class FakePlayerData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayer", fakePlayerNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerNode)); final int npcId = set.getInt("npcId"); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); final String name = template.getName(); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java index 18cc499b71..a5ade27c03 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.FenceState; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldRegion; import org.l2jmobius.gameserver.model.actor.instance.FenceInstance; @@ -79,7 +79,7 @@ public class FenceData implements IXmlReader private void spawnFence(Node fenceNode) { - final StatsSet set = new StatsSet(parseAttributes(fenceNode)); + final StatSet set = new StatSet(parseAttributes(fenceNode)); spawnFence(set.getInt("x"), set.getInt("y"), set.getInt("z"), set.getString("name"), set.getInt("width"), set.getInt("length"), set.getInt("height"), 0, set.getEnum("state", FenceState.class, FenceState.CLOSED)); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java index 67dd4e396b..02efb756f2 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.Henna; import org.l2jmobius.gameserver.model.skills.Skill; @@ -86,7 +86,7 @@ public class HennaData implements IXmlReader */ private void parseHenna(Node d) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final List wearClassIds = new ArrayList<>(); final List skills = new ArrayList<>(); NamedNodeMap attrs = d.getAttributes(); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java index 03ad8ab79e..d81e85948d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; @@ -93,7 +93,7 @@ public class InitialEquipmentData implements IXmlReader { if ("item".equalsIgnoreCase(c.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java index 72080aa4ac..54b1909d60 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemPointHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; @@ -55,17 +55,17 @@ public class LuckyGameData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "luckygame", rewardNode -> { - final LuckyGameDataHolder holder = new LuckyGameDataHolder(new StatsSet(parseAttributes(rewardNode))); + final LuckyGameDataHolder holder = new LuckyGameDataHolder(new StatSet(parseAttributes(rewardNode))); forEach(rewardNode, "common_reward", commonRewardNode -> forEach(commonRewardNode, "item", itemNode -> { - final StatsSet stats = new StatsSet(parseAttributes(itemNode)); + final StatSet stats = new StatSet(parseAttributes(itemNode)); holder.addCommonReward(new ItemChanceHolder(stats.getInt("id"), stats.getDouble("chance"), stats.getLong("count"))); })); forEach(rewardNode, "unique_reward", uniqueRewardNode -> forEach(uniqueRewardNode, "item", itemNode -> { - holder.addUniqueReward(new ItemPointHolder(new StatsSet(parseAttributes(itemNode)))); + holder.addUniqueReward(new ItemPointHolder(new StatSet(parseAttributes(itemNode)))); })); forEach(rewardNode, "modify_reward", uniqueRewardNode -> @@ -74,7 +74,7 @@ public class LuckyGameData implements IXmlReader holder.setMaxModifyRewardGame(parseInteger(uniqueRewardNode.getAttributes(), "max_game")); forEach(uniqueRewardNode, "item", itemNode -> { - final StatsSet stats = new StatsSet(parseAttributes(itemNode)); + final StatSet stats = new StatSet(parseAttributes(itemNode)); holder.addModifyReward(new ItemChanceHolder(stats.getInt("id"), stats.getDouble("chance"), stats.getLong("count"))); }); }); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java index 75bb48ed37..190653cdec 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java @@ -35,7 +35,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.SpecialItemType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; @@ -90,7 +90,7 @@ public class MultisellData implements IXmlReader { forEach(doc, "list", listNode -> { - final StatsSet set = new StatsSet(parseAttributes(listNode)); + final StatSet set = new StatSet(parseAttributes(listNode)); final int listId = Integer.parseInt(f.getName().substring(0, f.getName().length() - 4)); final List entries = new ArrayList<>(listNode.getChildNodes().getLength()); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java index 12ad0f9f0e..de0567af09 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.enums.AISkillScope; import org.l2jmobius.gameserver.enums.DropType; import org.l2jmobius.gameserver.enums.MpRewardAffectType; import org.l2jmobius.gameserver.enums.MpRewardType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.DropHolder; @@ -95,7 +95,7 @@ public class NpcData implements IXmlReader if ("npc".equalsIgnoreCase(listNode.getNodeName())) { NamedNodeMap attrs = listNode.getAttributes(); - final StatsSet set = new StatsSet(new HashMap<>()); + final StatSet set = new StatSet(new HashMap<>()); final int npcId = parseInteger(attrs, "id"); Map parameters = null; Map skills = null; @@ -511,11 +511,11 @@ public class NpcData implements IXmlReader if (parameters != null) { // Using unmodifiable map parameters of template are not meant to be changed at runtime. - template.setParameters(new StatsSet(Collections.unmodifiableMap(parameters))); + template.setParameters(new StatSet(Collections.unmodifiableMap(parameters))); } else { - template.setParameters(StatsSet.EMPTY_STATSET); + template.setParameters(StatSet.EMPTY_STATSET); } if (skills != null) diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java index 3712cca6af..373f87ecfc 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -79,7 +79,7 @@ public class NpcNameLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); NPC_NAME_LOCALISATIONS.get(_lang).put(set.getInt("id"), new String[] { set.getString("name"), diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 55dcd539aa..36c5897ecd 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.EffectHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; @@ -71,7 +71,7 @@ public class OptionData implements IXmlReader forEach(innerNode, "effect", effectNode -> { final String name = parseString(effectNode.getAttributes(), "name"); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); forEach(effectNode, IXmlReader::isNode, paramNode -> params.set(paramNode.getNodeName(), SkillData.getInstance().parseValue(paramNode, true, false, Collections.emptyMap()))); option.addEffect(EffectHandler.getInstance().getHandlerFactory(name).apply(params)); }); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java index b1bb74baf6..c893725bc3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.PetLevelData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * This class parse and hold all pet parameters.
@@ -116,7 +116,7 @@ public class PetDataTable implements IXmlReader if (s.getNodeName().equals("stat")) { final int level = Integer.parseInt(s.getAttributes().getNamedItem("level").getNodeValue()); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (Node bean = s.getFirstChild(); bean != null; bean = bean.getNextSibling()) { if (bean.getNodeName().equals("set")) diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java index ab1cb3b257..b646782547 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.base.ClassId; @@ -83,7 +83,7 @@ public class PlayerTemplateData implements IXmlReader } else if ("staticData".equalsIgnoreCase(d.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.set("classId", classId); final List creationPoints = new ArrayList<>(); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java index 34a04edd9b..35b879e73f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; @@ -83,7 +83,7 @@ public class PrimeShopData implements IXmlReader { NamedNodeMap attrs = d.getAttributes(); Node att; - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java index 0158b153c6..9aa87a1f9f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java @@ -31,7 +31,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.StatusUpdateType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.RecipeHolder; @@ -61,7 +61,7 @@ public class RecipeData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node att; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -73,7 +73,7 @@ public class RecipeData implements IXmlReader if ("recipe".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java index 796f5ae085..9a8397e085 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java @@ -29,7 +29,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate; /** @@ -60,7 +60,7 @@ public class ResidenceFunctionsData implements IXmlReader forEach(doc, "list", list -> forEach(list, "function", func -> { final NamedNodeMap attrs = func.getAttributes(); - final StatsSet set = new StatsSet(HashMap::new); + final StatSet set = new StatSet(HashMap::new); for (int i = 0; i < attrs.getLength(); i++) { final Node node = attrs.item(i); @@ -69,7 +69,7 @@ public class ResidenceFunctionsData implements IXmlReader forEach(func, "function", levelNode -> { final NamedNodeMap levelAttrs = levelNode.getAttributes(); - final StatsSet levelSet = new StatsSet(HashMap::new); + final StatSet levelSet = new StatSet(HashMap::new); levelSet.merge(set); for (int i = 0; i < levelAttrs.getLength(); i++) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java index 053d9089ce..d6b28a5962 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; /** @@ -82,7 +82,7 @@ public class SendMessageLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); SEND_MESSAGE_LOCALISATIONS.get(_lang).put(set.getString("message").split(SPLIT_STRING), set.getString("translation").split(SPLIT_STRING)); })); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java index e473030c56..c3eda1f3b8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.actor.instance.ShuttleInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; @@ -72,7 +72,7 @@ public class ShuttleData implements IXmlReader public void parseDocument(Document doc, File f) { NamedNodeMap attrs; - StatsSet set; + StatSet set; Node att; ShuttleDataHolder data; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -84,7 +84,7 @@ public class ShuttleData implements IXmlReader if ("shuttle".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -164,7 +164,7 @@ public class ShuttleData implements IXmlReader { for (ShuttleDataHolder data : _shuttles.values()) { - final ShuttleInstance shuttle = new ShuttleInstance(new CreatureTemplate(new StatsSet())); + final ShuttleInstance shuttle = new ShuttleInstance(new CreatureTemplate(new StatSet())); shuttle.setData(data); shuttle.setHeading(data.getLocation().getHeading()); shuttle.setLocationInvisible(data.getLocation()); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java index 9db0b5f64b..ba000649f2 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.SiegeScheduleDate; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.util.Util; /** @@ -54,7 +54,7 @@ public class SiegeScheduleData implements IXmlReader LOGGER.info(getClass().getSimpleName() + ": Loaded " + _scheduleData.size() + " siege schedulers."); if (_scheduleData.isEmpty()) { - _scheduleData.add(new SiegeScheduleDate(new StatsSet())); + _scheduleData.add(new SiegeScheduleDate(new StatSet())); LOGGER.info(getClass().getSimpleName() + ": Emergency loaded " + _scheduleData.size() + " default siege schedulers."); } } @@ -72,7 +72,7 @@ public class SiegeScheduleData implements IXmlReader { case "schedule": { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final NamedNodeMap attrs = cd.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java index cc019c4dbb..2592b3ed97 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java @@ -40,7 +40,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.EffectHandler; import org.l2jmobius.gameserver.handler.SkillConditionHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.EffectScope; @@ -67,9 +67,9 @@ public class SkillData implements IXmlReader private final Integer _toLevel; private final Integer _fromSubLevel; private final Integer _toSubLevel; - private final Map> _info; + private final Map> _info; - public NamedParamInfo(String name, Integer fromLevel, Integer toLevel, Integer fromSubLevel, Integer toSubLevel, Map> info) + public NamedParamInfo(String name, Integer fromLevel, Integer toLevel, Integer fromSubLevel, Integer toSubLevel, Map> info) { _name = name; _fromLevel = fromLevel; @@ -104,7 +104,7 @@ public class SkillData implements IXmlReader return _toSubLevel; } - public Map> getInfo() + public Map> getInfo() { return _info; } @@ -241,8 +241,8 @@ public class SkillData implements IXmlReader { NamedNodeMap attributes = listNode.getAttributes(); final Map> levels = new HashMap<>(); - final Map> skillInfo = new HashMap<>(); - final StatsSet generalSkillInfo = skillInfo.computeIfAbsent(-1, k -> new HashMap<>()).computeIfAbsent(-1, k -> new StatsSet()); + final Map> skillInfo = new HashMap<>(); + final StatSet generalSkillInfo = skillInfo.computeIfAbsent(-1, k -> new HashMap<>()).computeIfAbsent(-1, k -> new StatSet()); parseAttributes(attributes, "", generalSkillInfo); @@ -321,7 +321,7 @@ public class SkillData implements IXmlReader { return; } - subLevelMap.forEach((subLevel, statsSet) -> + subLevelMap.forEach((subLevel, statSet) -> { if (subLevel == -1) { @@ -339,7 +339,7 @@ public class SkillData implements IXmlReader { return; } - subLevelMap.forEach((subLevel, statsSet) -> + subLevelMap.forEach((subLevel, statSet) -> { if (subLevel == -1) { @@ -371,31 +371,31 @@ public class SkillData implements IXmlReader levels.forEach((level, subLevels) -> subLevels.forEach(subLevel -> { - final StatsSet statsSet = Optional.ofNullable(skillInfo.getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatsSet::new); - skillInfo.getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(statsSet.getSet()::putIfAbsent); - skillInfo.getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(statsSet.getSet()::putIfAbsent); - statsSet.set(".level", level); - statsSet.set(".subLevel", subLevel); - final Skill skill = new Skill(statsSet); + final StatSet statSet = Optional.ofNullable(skillInfo.getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatSet::new); + skillInfo.getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(statSet.getSet()::putIfAbsent); + skillInfo.getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(statSet.getSet()::putIfAbsent); + statSet.set(".level", level); + statSet.set(".subLevel", subLevel); + final Skill skill = new Skill(statSet); forEachNamedParamInfoParam(effectParamInfo, level, subLevel, ((effectScope, params) -> { final String effectName = params.getString(".name"); params.remove(".name"); try { - final Function effectFunction = EffectHandler.getInstance().getHandlerFactory(effectName); + final Function effectFunction = EffectHandler.getInstance().getHandlerFactory(effectName); if (effectFunction != null) { skill.addEffect(effectScope, effectFunction.apply(params)); } else { - LOGGER.warning(getClass().getSimpleName() + ": Missing effect for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]"); + LOGGER.warning(getClass().getSimpleName() + ": Missing effect for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]"); } } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading effect for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading effect for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]", e); } })); @@ -405,19 +405,19 @@ public class SkillData implements IXmlReader params.remove(".name"); try { - final Function conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName); + final Function conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName); if (conditionFunction != null) { skill.addCondition(skillConditionScope, conditionFunction.apply(params)); } else { - LOGGER.warning(getClass().getSimpleName() + ": Missing condition for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + skillConditionScope + "] Effect Name[" + conditionName + "]"); + LOGGER.warning(getClass().getSimpleName() + ": Missing condition for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + skillConditionScope + "] Effect Name[" + conditionName + "]"); } } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading condition for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Condition Scope[" + skillConditionScope + "] Condition Name[" + conditionName + "]", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading condition for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Condition Scope[" + skillConditionScope + "] Condition Name[" + conditionName + "]", e); } })); @@ -434,16 +434,16 @@ public class SkillData implements IXmlReader } } - private void forEachNamedParamInfoParam(Map> paramInfo, int level, int subLevel, BiConsumer consumer) + private void forEachNamedParamInfoParam(Map> paramInfo, int level, int subLevel, BiConsumer consumer) { paramInfo.forEach((scope, namedParamInfos) -> namedParamInfos.forEach(namedParamInfo -> { if ((((namedParamInfo.getFromLevel() == null) && (namedParamInfo.getToLevel() == null)) || ((namedParamInfo.getFromLevel() <= level) && (namedParamInfo.getToLevel() >= level))) // && (((namedParamInfo.getFromSubLevel() == null) && (namedParamInfo.getToSubLevel() == null)) || ((namedParamInfo.getFromSubLevel() <= subLevel) && (namedParamInfo.getToSubLevel() >= subLevel)))) { - final StatsSet params = Optional.ofNullable(namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatsSet::new); - namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); - namedParamInfo.getInfo().getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); + final StatSet params = Optional.ofNullable(namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatSet::new); + namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); + namedParamInfo.getInfo().getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); params.set(".name", namedParamInfo.getName()); consumer.accept(scope, params); } @@ -460,7 +460,7 @@ public class SkillData implements IXmlReader final Integer subLevel = parseInteger(attributes, "subLevel"); final Integer fromSubLevel = parseInteger(attributes, "fromSubLevel", subLevel); final Integer toSubLevel = parseInteger(attributes, "toSubLevel", subLevel); - final Map> info = new HashMap<>(); + final Map> info = new HashMap<>(); for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) { if (!node.getNodeName().equals("#text")) @@ -471,7 +471,7 @@ public class SkillData implements IXmlReader return new NamedParamInfo(name, fromLevel, toLevel, fromSubLevel, toSubLevel, info); } - private void parseInfo(Node node, Map>> variableValues, Map> info) + private void parseInfo(Node node, Map>> variableValues, Map> info) { Map> values = parseValues(node); final Object generalValue = values.getOrDefault(-1, Collections.emptyMap()).get(-1); @@ -492,7 +492,7 @@ public class SkillData implements IXmlReader } } - values.forEach((level, subLevelMap) -> subLevelMap.forEach((subLevel, value) -> info.computeIfAbsent(level, k -> new HashMap<>()).computeIfAbsent(subLevel, k -> new StatsSet()).set(node.getNodeName(), value))); + values.forEach((level, subLevelMap) -> subLevelMap.forEach((subLevel, value) -> info.computeIfAbsent(level, k -> new HashMap<>()).computeIfAbsent(subLevel, k -> new StatSet()).set(node.getNodeName(), value))); } private Map> parseValues(Node node) @@ -535,7 +535,7 @@ public class SkillData implements IXmlReader variables.put("index", (i - fromLevel) + 1d); variables.put("subIndex", (j - fromSubLevel) + 1d); final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1); - if ((base != null) && !(base instanceof StatsSet)) + if ((base != null) && !(base instanceof StatSet)) { variables.put("base", Double.parseDouble(String.valueOf(base))); } @@ -555,13 +555,13 @@ public class SkillData implements IXmlReader Object parseValue(Node node, boolean blockValue, boolean parseAttributes, Map variables) { - StatsSet statsSet = null; + StatSet statSet = null; List list = null; Object text = null; if (parseAttributes && (!node.getNodeName().equals("value") || !blockValue) && (node.getAttributes().getLength() > 0)) { - statsSet = new StatsSet(); - parseAttributes(node.getAttributes(), "", statsSet, variables); + statSet = new StatSet(); + parseAttributes(node.getAttributes(), "", statSet, variables); } for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) { @@ -604,12 +604,12 @@ public class SkillData implements IXmlReader final Object value = parseValue(node, false, true, variables); if (value != null) { - if (statsSet == null) + if (statSet == null) { - statsSet = new StatsSet(); + statSet = new StatSet(); } - statsSet.set(nodeName, value); + statSet.set(nodeName, value); } } } @@ -620,9 +620,9 @@ public class SkillData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", list); + statSet.set(".", list); } else { @@ -635,30 +635,30 @@ public class SkillData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", text); + statSet.set(".", text); } else { return text; } } - return statsSet; + return statSet; } - private void parseAttributes(NamedNodeMap attributes, String prefix, StatsSet statsSet, Map variables) + private void parseAttributes(NamedNodeMap attributes, String prefix, StatSet statSet, Map variables) { for (int i = 0; i < attributes.getLength(); i++) { final Node attributeNode = attributes.item(i); - statsSet.set(prefix + "." + attributeNode.getNodeName(), parseNodeValue(attributeNode.getNodeValue(), variables)); + statSet.set(prefix + "." + attributeNode.getNodeName(), parseNodeValue(attributeNode.getNodeValue(), variables)); } } - private void parseAttributes(NamedNodeMap attributes, String prefix, StatsSet statsSet) + private void parseAttributes(NamedNodeMap attributes, String prefix, StatSet statSet) { - parseAttributes(attributes, prefix, statsSet, Collections.emptyMap()); + parseAttributes(attributes, prefix, statSet, Collections.emptyMap()); } private Object parseNodeValue(String value, Map variables) diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java index 4e1ec457e7..7fa83bbd75 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.SubclassType; import org.l2jmobius.gameserver.model.SkillLearn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.base.ClassId; @@ -229,7 +229,7 @@ public class SkillTreesData implements IXmlReader { if ("skill".equalsIgnoreCase(c.getNodeName())) { - final StatsSet learnSkillSet = new StatsSet(); + final StatSet learnSkillSet = new StatSet(); attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java index 87915d89eb..78c22d1e7d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java @@ -36,7 +36,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.ChanceLocation; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.MinionHolder; import org.l2jmobius.gameserver.model.interfaces.IParameterized; @@ -169,7 +169,7 @@ public class SpawnsData implements IXmlReader public void parseSpawn(Node spawnsNode, File file, Collection spawns) { - final SpawnTemplate spawnTemplate = new SpawnTemplate(new StatsSet(parseAttributes(spawnsNode)), file); + final SpawnTemplate spawnTemplate = new SpawnTemplate(new StatSet(parseAttributes(spawnsNode)), file); SpawnGroup defaultGroup = null; for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling()) { @@ -185,7 +185,7 @@ public class SpawnsData implements IXmlReader { if (defaultGroup == null) { - defaultGroup = new SpawnGroup(StatsSet.EMPTY_STATSET); + defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET); } parseNpc(innerNode, spawnTemplate, defaultGroup); } @@ -244,7 +244,7 @@ public class SpawnsData implements IXmlReader private void parseGroup(Node n, SpawnTemplate spawnTemplate) { - final SpawnGroup group = new SpawnGroup(new StatsSet(parseAttributes(n))); + final SpawnGroup group = new SpawnGroup(new StatSet(parseAttributes(n))); forEach(n, IXmlReader::isNode, npcNode -> { switch (npcNode.getNodeName()) @@ -271,7 +271,7 @@ public class SpawnsData implements IXmlReader */ private void parseNpc(Node n, SpawnTemplate spawnTemplate, SpawnGroup group) { - final NpcSpawnTemplate npcTemplate = new NpcSpawnTemplate(spawnTemplate, group, new StatsSet(parseAttributes(n))); + final NpcSpawnTemplate npcTemplate = new NpcSpawnTemplate(spawnTemplate, group, new StatSet(parseAttributes(n))); final NpcTemplate template = NpcData.getInstance().getTemplate(npcTemplate.getId()); if (template == null) { @@ -332,10 +332,10 @@ public class SpawnsData implements IXmlReader * @param n * @param npcTemplate */ - private void parseParameters(Node n, IParameterized npcTemplate) + private void parseParameters(Node n, IParameterized npcTemplate) { final Map params = parseParameters(n); - npcTemplate.setParameters(!params.isEmpty() ? new StatsSet(Collections.unmodifiableMap(params)) : StatsSet.EMPTY_STATSET); + npcTemplate.setParameters(!params.isEmpty() ? new StatSet(Collections.unmodifiableMap(params)) : StatSet.EMPTY_STATSET); } /** @@ -344,7 +344,7 @@ public class SpawnsData implements IXmlReader */ private void parseMinions(Node n, NpcSpawnTemplate npcTemplate) { - forEach(n, "minion", minionNode -> npcTemplate.addMinion(new MinionHolder(new StatsSet(parseAttributes(minionNode))))); + forEach(n, "minion", minionNode -> npcTemplate.addMinion(new MinionHolder(new StatSet(parseAttributes(minionNode))))); } /** diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java index 98d333446c..ef93935404 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; @@ -69,7 +69,7 @@ public class StaticObjectData implements IXmlReader if ("object".equalsIgnoreCase(d.getNodeName())) { final NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -86,9 +86,9 @@ public class StaticObjectData implements IXmlReader * Initialize an static object based on the stats set and add it to the map. * @param set the stats set to add. */ - private void addObject(StatsSet set) + private void addObject(StatSet set) { - final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatsSet()), set.getInt("id")); + final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatSet()), set.getInt("id")); obj.setType(set.getInt("type", 0)); obj.setName(set.getString("name")); obj.setMap(set.getString("texture", "none"), set.getInt("map_x", 0), set.getInt("map_y", 0)); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/TeleportListData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/TeleportListData.java index 53510c1f1b..698188a3fc 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/TeleportListData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/TeleportListData.java @@ -24,7 +24,7 @@ import java.util.logging.Logger; import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.TeleportListHolder; /** @@ -55,7 +55,7 @@ public class TeleportListData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "teleport", teleportNode -> { - final StatsSet set = new StatsSet(parseAttributes(teleportNode)); + final StatSet set = new StatSet(parseAttributes(teleportNode)); final int tpId = set.getInt("id"); final int x = set.getInt("x"); final int y = set.getInt("y"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java index 7c8c9a538d..487bae9dea 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.TeleportType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.teleporter.TeleportHolder; /** @@ -74,7 +74,7 @@ public class TeleportersData implements IXmlReader final String name = parseString(nodeAttrs, "name", type.name()); // Parse locations final TeleportHolder holder = new TeleportHolder(name, type); - forEach(node, "location", location -> holder.registerLocation(new StatsSet(parseAttributes(location)))); + forEach(node, "location", location -> holder.registerLocation(new StatSet(parseAttributes(location)))); // Register holder if (teleList.putIfAbsent(name, holder) != null) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java index b6b3bf2e90..c2f5f94adb 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java @@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.transform.Transform; import org.l2jmobius.gameserver.model.actor.transform.TransformLevelData; import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate; @@ -70,7 +70,7 @@ public class TransformData implements IXmlReader if ("transform".equalsIgnoreCase(d.getNodeName())) { NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -192,7 +192,7 @@ public class TransformData implements IXmlReader transform.setTemplate(isMale, templateData); } - final StatsSet levelsSet = new StatsSet(); + final StatSet levelsSet = new StatSet(); for (Node s = z.getFirstChild(); s != null; s = s.getNextSibling()) { if ("level".equals(s.getNodeName())) diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/engines/DocumentBase.java index 64e08c2c3b..2aae7c78e1 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/engines/DocumentBase.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/engines/DocumentBase.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.PlayerState; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionCategoryType; @@ -178,7 +178,7 @@ public abstract class DocumentBase protected abstract void parseDocument(Document doc); - protected abstract StatsSet getStatsSet(); + protected abstract StatSet getStatSet(); protected abstract String getTableValue(String name); @@ -1245,7 +1245,7 @@ public abstract class DocumentBase setTable(name, array.toArray(new String[array.size()])); } - protected void parseBeanSet(Node n, StatsSet set, Integer level) + protected void parseBeanSet(Node n, StatSet set, Integer level) { final String name = n.getAttributes().getNamedItem("name").getNodeValue().trim(); final String value = n.getAttributes().getNamedItem("val").getNodeValue().trim(); @@ -1260,7 +1260,7 @@ public abstract class DocumentBase } } - protected void setExtractableSkillData(StatsSet set, String value) + protected void setExtractableSkillData(StatSet set, String value) { set.set("capsuled_items_skill", value); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java index e8c77b206e..46f8f9be1f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java @@ -21,7 +21,7 @@ import java.io.File; import org.w3c.dom.Document; import org.w3c.dom.Node; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; /** @@ -41,7 +41,7 @@ public class DocumentBaseGeneral extends DocumentBase } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return null; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java index 3ea7f41bb6..419552cf68 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.engines.DocumentBase; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -57,7 +57,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return _currentItem.set; } @@ -111,7 +111,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader _currentItem.id = itemId; _currentItem.name = itemName; _currentItem.type = className; - _currentItem.set = new StatsSet(); + _currentItem.set = new StatSet(); _currentItem.set.set("item_id", itemId); _currentItem.set.set("name", itemName); _currentItem.set.set("additionalName", additionalName); @@ -218,7 +218,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatsSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (Item) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java index 56e5b21a9f..967c1fc34d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.engines.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; public class ItemDataHolder @@ -24,7 +24,7 @@ public class ItemDataHolder int id; String type; String name; - StatsSet set; + StatSet set; int currentLevel; Item item; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/ConditionHandler.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/ConditionHandler.java index 47f24d690d..b53f170fb3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/ConditionHandler.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/ConditionHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.ICondition; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class ConditionHandler { - private final Map> _conditionHandlerFactories = new HashMap<>(); + private final Map> _conditionHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _conditionHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _conditionHandlerFactories.get(name); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/EffectHandler.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/EffectHandler.java index a58de8efb4..328265d9db 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/EffectHandler.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/EffectHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class EffectHandler { - private final Map> _effectHandlerFactories = new HashMap<>(); + private final Map> _effectHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _effectHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _effectHandlerFactories.get(name); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java index a6e2275d04..32438040e0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class SkillConditionHandler { - private final Map> _skillConditionHandlerFactories = new HashMap<>(); + private final Map> _skillConditionHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _skillConditionHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _skillConditionHandlerFactories.get(name); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java index 6992dd5366..65a8c52d7e 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.model.AirShipTeleportList; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShipInstance; @@ -45,13 +45,13 @@ public class AirShipManager private static final String UPDATE_DB = "UPDATE airships SET fuel=? WHERE owner_id=?"; private CreatureTemplate _airShipTemplate = null; - private final Map _airShipsInfo = new HashMap<>(); + private final Map _airShipsInfo = new HashMap<>(); private final Map _airShips = new HashMap<>(); private final Map _teleports = new HashMap<>(); protected AirShipManager() { - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", 9); npcDat.set("level", 0); npcDat.set("jClass", "boat"); @@ -113,7 +113,7 @@ public class AirShipManager public AirShipInstance getNewAirShip(int x, int y, int z, int heading, int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return null; @@ -147,7 +147,7 @@ public class AirShipManager if (ship.getOwnerId() != 0) { storeInDb(ship.getOwnerId()); - final StatsSet info = _airShipsInfo.get(ship.getOwnerId()); + final StatSet info = _airShipsInfo.get(ship.getOwnerId()); if (info != null) { info.set("fuel", ship.getFuel()); @@ -164,7 +164,7 @@ public class AirShipManager { if (!_airShipsInfo.containsKey(ownerId)) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("fuel", 600); _airShipsInfo.put(ownerId, info); @@ -264,10 +264,10 @@ public class AirShipManager Statement s = con.createStatement(); ResultSet rs = s.executeQuery(LOAD_DB)) { - StatsSet info; + StatSet info; while (rs.next()) { - info = new StatsSet(); + info = new StatSet(); info.set("fuel", rs.getInt("fuel")); _airShipsInfo.put(rs.getInt("owner_id"), info); } @@ -285,7 +285,7 @@ public class AirShipManager private void storeInDb(int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return; diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java index 2db10dd045..e5c610b3f2 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.BoatInstance; @@ -57,7 +57,7 @@ public class BoatManager return null; } - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", boatId); npcDat.set("level", 0); npcDat.set("jClass", "boat"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 99a9678ece..56f08422cd 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.enums.ManorMode; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; import org.l2jmobius.gameserver.model.SeedProduction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.entity.Castle; @@ -126,7 +126,7 @@ public class CastleManorManager implements IXmlReader, IStorable @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; NamedNodeMap attrs; Node att; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -142,7 +142,7 @@ public class CastleManorManager implements IXmlReader, IStorable { if ("crop".equalsIgnoreCase(c.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); set.set("castleId", castleId); attrs = c.getAttributes(); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java index df24c63799..942dba6dc3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java @@ -27,7 +27,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosState; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -181,7 +181,7 @@ public class CeremonyOfChaosManager extends AbstractEventManager _npcs = new ConcurrentHashMap<>(); protected final Map _spawns = new ConcurrentHashMap<>(); - protected final Map _storedInfo = new ConcurrentHashMap<>(); + protected final Map _storedInfo = new ConcurrentHashMap<>(); protected final Map> _schedules = new ConcurrentHashMap<>(); /** @@ -161,7 +161,7 @@ public class DBSpawnManager { npc.setDBStatus(RaidBossStatus.ALIVE); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getCurrentHp()); info.set("currentMP", npc.getCurrentMp()); info.set("respawnTime", 0); @@ -181,7 +181,7 @@ public class DBSpawnManager */ public void updateStatus(Npc npc, boolean isNpcDead) { - final StatsSet info = _storedInfo.get(npc.getId()); + final StatSet info = _storedInfo.get(npc.getId()); if (info == null) { return; @@ -254,7 +254,7 @@ public class DBSpawnManager _npcs.put(npcId, npc); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", currentHP); info.set("currentMP", currentMP); info.set("respawnTime", 0); @@ -316,7 +316,7 @@ public class DBSpawnManager } npc.setDBStatus(RaidBossStatus.ALIVE); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", 0); @@ -401,7 +401,7 @@ public class DBSpawnManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("UPDATE npc_respawns SET respawnTime = ?, currentHP = ?, currentMP = ? WHERE id = ?")) { - for (Entry entry : _storedInfo.entrySet()) + for (Entry entry : _storedInfo.entrySet()) { final Integer npcId = entry.getKey(); if (npcId == null) @@ -420,7 +420,7 @@ public class DBSpawnManager updateStatus(npc, false); } - final StatsSet info = entry.getValue(); + final StatSet info = entry.getValue(); if (info == null) { continue; @@ -529,7 +529,7 @@ public class DBSpawnManager */ public void notifySpawnNightNpc(Npc npc) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getCurrentHp()); info.set("currentMP", npc.getCurrentMp()); info.set("respawnTime", 0); @@ -572,7 +572,7 @@ public class DBSpawnManager * Gets the stored info. * @return the stored info */ - public Map getStoredInfo() + public Map getStoredInfo() { return _storedInfo; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index 3dd4e3f652..767bed6954 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.datatables.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.FakePlayerChatHolder; @@ -73,7 +73,7 @@ public class FakePlayerChatManager implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayerChat", fakePlayerChatNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerChatNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerChatNode)); MESSAGES.add(new FakePlayerChatHolder(set.getString("fpcName"), set.getString("searchMethod"), set.getString("searchText"), set.getString("answers"))); })); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java index 07c111065e..52bab09349 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java @@ -33,7 +33,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.tasks.GrandBossManagerStoreTask; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; import org.l2jmobius.gameserver.model.interfaces.IStorable; @@ -51,7 +51,7 @@ public class GrandBossManager implements IStorable protected static Map _bosses = new ConcurrentHashMap<>(); - protected static Map _storedInfo = new HashMap<>(); + protected static Map _storedInfo = new HashMap<>(); private final Map _bossStatus = new HashMap<>(); @@ -72,7 +72,7 @@ public class GrandBossManager implements IStorable final int bossId = rs.getInt("boss_id"); if (NpcData.getInstance().getTemplate(bossId) != null) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("loc_x", rs.getInt("loc_x")); info.set("loc_y", rs.getInt("loc_y")); info.set("loc_z", rs.getInt("loc_z")); @@ -140,12 +140,12 @@ public class GrandBossManager implements IStorable return _bosses.get(bossId); } - public StatsSet getStatsSet(int bossId) + public StatSet getStatSet(int bossId) { return _storedInfo.get(bossId); } - public void setStatsSet(int bossId, StatsSet info) + public void setStatSet(int bossId, StatSet info) { _storedInfo.put(bossId, info); updateDb(bossId, false); @@ -156,10 +156,10 @@ public class GrandBossManager implements IStorable { try (Connection con = DatabaseFactory.getConnection()) { - for (Entry e : _storedInfo.entrySet()) + for (Entry e : _storedInfo.entrySet()) { final GrandBossInstance boss = _bosses.get(e.getKey()); - final StatsSet info = e.getValue(); + final StatSet info = e.getValue(); if ((boss == null) || (info == null)) { try (PreparedStatement update = con.prepareStatement(UPDATE_GRAND_BOSS_DATA2)) @@ -209,7 +209,7 @@ public class GrandBossManager implements IStorable try (Connection con = DatabaseFactory.getConnection()) { final GrandBossInstance boss = _bosses.get(bossId); - final StatsSet info = _storedInfo.get(bossId); + final StatSet info = _storedInfo.get(bossId); if (statusOnly || (boss == null) || (info == null)) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index d77642378f..29e517b0cd 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.enums.InstanceReenterType; import org.l2jmobius.gameserver.enums.InstanceRemoveBuffType; import org.l2jmobius.gameserver.enums.InstanceTeleportType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.holders.InstanceReenterTimeHolder; @@ -151,7 +151,7 @@ public class InstanceManager implements IXmlReader return; } - final InstanceTemplate template = new InstanceTemplate(new StatsSet(parseAttributes(instanceNode))); + final InstanceTemplate template = new InstanceTemplate(new StatSet(parseAttributes(instanceNode))); // Update name if wasn't provided if (template.getName() == null) @@ -241,10 +241,10 @@ public class InstanceManager implements IXmlReader { if (doorNode.getNodeName().equals("door")) { - final StatsSet parsedSet = DoorData.getInstance().parseDoor(doorNode); - final StatsSet mergedSet = new StatsSet(); + final StatSet parsedSet = DoorData.getInstance().parseDoor(doorNode); + final StatSet mergedSet = new StatSet(); final int doorId = parsedSet.getInt("id"); - final StatsSet templateSet = DoorData.getInstance().getDoorTemplate(doorId); + final StatSet templateSet = DoorData.getInstance().getDoorTemplate(doorId); if (templateSet != null) { mergedSet.merge(templateSet); @@ -324,14 +324,14 @@ public class InstanceManager implements IXmlReader final boolean onlyLeader = parseBoolean(attrs, "onlyLeader", false); final boolean showMessageAndHtml = parseBoolean(attrs, "showMessageAndHtml", false); // Load parameters - StatsSet params = null; + StatSet params = null; for (Node f = conditionNode.getFirstChild(); f != null; f = f.getNextSibling()) { if (f.getNodeName().equals("param")) { if (params == null) { - params = new StatsSet(); + params = new StatSet(); } params.set(parseString(f.getAttributes(), "name"), parseString(f.getAttributes(), "value")); @@ -341,14 +341,14 @@ public class InstanceManager implements IXmlReader // If none parameters found then set empty StatSet if (params == null) { - params = StatsSet.EMPTY_STATSET; + params = StatSet.EMPTY_STATSET; } // Now when everything is loaded register condition to template try { final Class clazz = Class.forName("org.l2jmobius.gameserver.model.instancezone.conditions.Condition" + type); - final Constructor constructor = clazz.getConstructor(InstanceTemplate.class, StatsSet.class, boolean.class, boolean.class); + final Constructor constructor = clazz.getConstructor(InstanceTemplate.class, StatSet.class, boolean.class, boolean.class); conditions.add((Condition) constructor.newInstance(template, params, onlyLeader, showMessageAndHtml)); } catch (Exception ex) @@ -378,7 +378,7 @@ public class InstanceManager implements IXmlReader */ public Instance createInstance() { - return new Instance(getNewInstanceId(), new InstanceTemplate(StatsSet.EMPTY_STATSET), null); + return new Instance(getNewInstanceId(), new InstanceTemplate(StatSet.EMPTY_STATSET), null); } /** diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/RankManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/RankManager.java index bb6afac13c..11023da661 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/RankManager.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/RankManager.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.sql.impl.ClanTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.entity.Hero; @@ -47,10 +47,10 @@ public class RankManager private static final String GET_CURRENT_CYCLE_DATA = "SELECT characters.char_name, characters.level, characters.base_class, characters.clanid, olympiad_nobles.charId, olympiad_nobles.olympiad_points, olympiad_nobles.competitions_won, olympiad_nobles.competitions_lost FROM characters, olympiad_nobles WHERE characters.charId = olympiad_nobles.charId ORDER BY olympiad_nobles.olympiad_points DESC LIMIT " + PLAYER_LIMIT; private static final String GET_CHARACTERS_BY_CLASS = "SELECT characters.charId, olympiad_nobles.olympiad_points FROM characters, olympiad_nobles WHERE olympiad_nobles.charId = characters.charId AND characters.base_class = ? ORDER BY olympiad_nobles.olympiad_points DESC LIMIT " + PLAYER_LIMIT; - private final Map _mainList = new ConcurrentHashMap<>(); - private Map _snapshotList = new ConcurrentHashMap<>(); - private final Map _mainOlyList = new ConcurrentHashMap<>(); - private Map _snapshotOlyList = new ConcurrentHashMap<>(); + private final Map _mainList = new ConcurrentHashMap<>(); + private Map _snapshotList = new ConcurrentHashMap<>(); + private final Map _mainOlyList = new ConcurrentHashMap<>(); + private Map _snapshotOlyList = new ConcurrentHashMap<>(); protected RankManager() { @@ -73,7 +73,7 @@ public class RankManager int i = 1; while (rset.next()) { - final StatsSet player = new StatsSet(); + final StatSet player = new StatSet(); final int charId = rset.getInt("charId"); player.set("charId", charId); player.set("name", rset.getString("char_name")); @@ -112,7 +112,7 @@ public class RankManager int i = 1; while (rset.next()) { - final StatsSet player = new StatsSet(); + final StatSet player = new StatSet(); final int charId = rset.getInt("charId"); player.set("charId", charId); player.set("name", rset.getString("char_name")); @@ -142,7 +142,7 @@ public class RankManager if (Hero.getInstance().getCompleteHeroes().containsKey(charId)) { - final StatsSet hero = Hero.getInstance().getCompleteHeroes().get(charId); + final StatSet hero = Hero.getInstance().getCompleteHeroes().get(charId); player.set("count", hero.getInt("count")); player.set("legend_count", hero.getInt("legend_count")); } @@ -165,7 +165,7 @@ public class RankManager } } - private void loadClassRank(int charId, int classId, StatsSet player) + private void loadClassRank(int charId, int classId, StatSet player) { try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(GET_CHARACTERS_BY_CLASS)) @@ -194,7 +194,7 @@ public class RankManager } } - private void loadRaceRank(int charId, int race, StatsSet player) + private void loadRaceRank(int charId, int race, StatSet player) { try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(SELECT_CHARACTERS_BY_RACE)) @@ -223,22 +223,22 @@ public class RankManager } } - public Map getRankList() + public Map getRankList() { return _mainList; } - public Map getSnapshotList() + public Map getSnapshotList() { return _snapshotList; } - public Map getOlyRankList() + public Map getOlyRankList() { return _mainOlyList; } - public Map getSnapshotOlyList() + public Map getSnapshotOlyList() { return _snapshotOlyList; } @@ -246,9 +246,9 @@ public class RankManager public int getPlayerGlobalRank(PlayerInstance player) { final int playerOid = player.getObjectId(); - for (Entry entry : _mainList.entrySet()) + for (Entry entry : _mainList.entrySet()) { - final StatsSet stats = entry.getValue(); + final StatSet stats = entry.getValue(); if (stats.getInt("charId") != playerOid) { continue; @@ -261,7 +261,7 @@ public class RankManager public int getPlayerRaceRank(PlayerInstance player) { final int playerOid = player.getObjectId(); - for (StatsSet stats : _mainList.values()) + for (StatSet stats : _mainList.values()) { if (stats.getInt("charId") != playerOid) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/AccessLevel.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/AccessLevel.java index 772c1fe77e..72b77905e1 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/AccessLevel.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/AccessLevel.java @@ -52,7 +52,7 @@ public class AccessLevel /** Flag to gain exp in party */ private boolean _gainExp = false; - public AccessLevel(StatsSet set) + public AccessLevel(StatSet set) { _accessLevel = set.getInt("level"); _name = set.getString("name"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ActionDataHolder.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ActionDataHolder.java index 4887bedba8..ca6d9ee685 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ActionDataHolder.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ActionDataHolder.java @@ -25,7 +25,7 @@ public class ActionDataHolder private final String _handler; private final int _optionId; - public ActionDataHolder(StatsSet set) + public ActionDataHolder(StatSet set) { _id = set.getInt("id"); _handler = set.getString("handler"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java index 656119098e..3f88e455d7 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java @@ -27,7 +27,7 @@ public class AdminCommandAccessRight private final int _accessLevel; private final boolean _requireConfirm; - public AdminCommandAccessRight(StatsSet set) + public AdminCommandAccessRight(StatSet set) { _adminCommand = set.getString("command"); _requireConfirm = set.getBoolean("confirmDlg", false); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index f1c86b8469..f9889f27cf 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -36,7 +36,7 @@ public class DailyMissionDataHolder private final List _rewardsItems; private final List _classRestriction; private final int _requiredCompletions; - private final StatsSet _params; + private final StatSet _params; private final boolean _dailyReset; private final boolean _isOneTime; private final boolean _isMainClassOnly; @@ -44,7 +44,7 @@ public class DailyMissionDataHolder private final boolean _isDisplayedWhenNotAvailable; private final AbstractDailyMissionHandler _handler; - public DailyMissionDataHolder(StatsSet set) + public DailyMissionDataHolder(StatSet set) { final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); @@ -53,7 +53,7 @@ public class DailyMissionDataHolder _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); - _params = set.getObject("params", StatsSet.class); + _params = set.getObject("params", StatSet.class); _dailyReset = set.getBoolean("dailyReset", true); _isOneTime = set.getBoolean("isOneTime", true); _isMainClassOnly = set.getBoolean("isMainClassOnly", true); @@ -87,7 +87,7 @@ public class DailyMissionDataHolder return _requiredCompletions; } - public StatsSet getParams() + public StatSet getParams() { return _params; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Location.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Location.java index 1c61740e4d..024c71075f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Location.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Location.java @@ -49,7 +49,7 @@ public class Location implements IPositionable this(obj.getX(), obj.getY(), obj.getZ(), obj.getHeading()); } - public Location(StatsSet set) + public Location(StatSet set) { _x = set.getInt("x"); _y = set.getInt("y"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/PetLevelData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/PetLevelData.java index e46b215b5f..7cad1a225a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/PetLevelData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/PetLevelData.java @@ -46,7 +46,7 @@ public class PetLevelData private final double _slowFlySpeedOnRide; private final double _fastFlySpeedOnRide; - public PetLevelData(StatsSet set) + public PetLevelData(StatSet set) { _ownerExpTaken = set.getInt("get_exp_type"); _petMaxExp = set.getLong("exp"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Seed.java index 4307849cf5..dd756c82e2 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Seed.java @@ -35,7 +35,7 @@ public class Seed private final long _seedReferencePrice; private final long _cropReferencePrice; - public Seed(StatsSet set) + public Seed(StatSet set) { _cropId = set.getInt("id"); _seedId = set.getInt("seedId"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java index 78897cf4f1..4de77df228 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java @@ -27,7 +27,7 @@ public class SiegeScheduleDate private final int _hour; private final int _maxConcurrent; - public SiegeScheduleDate(StatsSet set) + public SiegeScheduleDate(StatSet set) { _day = set.getInt("day", Calendar.SUNDAY); _hour = set.getInt("hour", 16); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/SkillLearn.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/SkillLearn.java index e2ccdd6331..00f53c0cb9 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/SkillLearn.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/SkillLearn.java @@ -58,7 +58,7 @@ public class SkillLearn * Constructor for SkillLearn. * @param set the set with the SkillLearn data. */ - public SkillLearn(StatsSet set) + public SkillLearn(StatSet set) { _skillName = set.getString("skillName"); _skillId = set.getInt("skillId"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/StatSet.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/StatSet.java new file mode 100644 index 0000000000..3c824d9fa4 --- /dev/null +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/StatSet.java @@ -0,0 +1,968 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Supplier; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.stream.Collectors; + +import org.l2jmobius.commons.util.TimeUtil; +import org.l2jmobius.gameserver.model.holders.MinionHolder; +import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.interfaces.IParserAdvUtils; +import org.l2jmobius.gameserver.util.Util; + +/** + * This class is meant to hold a set of (key,value) pairs.
+ * They are stored as object but can be retrieved in any type wanted. As long as cast is available.
+ * @author mkizub + */ +public class StatSet implements IParserAdvUtils +{ + private static final Logger LOGGER = Logger.getLogger(StatSet.class.getName()); + /** Static empty immutable map, used to avoid multiple null checks over the source. */ + public static final StatSet EMPTY_STATSET = new StatSet(Collections.emptyMap()); + + private final Map _set; + + public StatSet() + { + this(ConcurrentHashMap::new); + } + + public StatSet(Supplier> mapFactory) + { + this(mapFactory.get()); + } + + public StatSet(Map map) + { + _set = map; + } + + /** + * Returns the set of values + * @return HashMap + */ + public Map getSet() + { + return _set; + } + + /** + * Add a set of couple values in the current set + * @param newSet : StatSet pointing out the list of couples to add in the current set + */ + public void merge(StatSet newSet) + { + _set.putAll(newSet.getSet()); + } + + /** + * Verifies if the stat set is empty. + * @return {@code true} if the stat set is empty, {@code false} otherwise + */ + public boolean isEmpty() + { + return _set.isEmpty(); + } + + /** + * Return the boolean value associated with key. + * @param key : String designating the key in the set + * @return boolean : value associated to the key + * @throws IllegalArgumentException : If value is not set or value is not boolean + */ + @Override + public boolean getBoolean(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Boolean value required, but not specified"); + } + if (val instanceof Boolean) + { + return ((Boolean) val).booleanValue(); + } + try + { + return Boolean.parseBoolean((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Boolean value required, but found: " + val); + } + } + + /** + * Return the boolean value associated with key.
+ * If no value is associated with key, or type of value is wrong, returns defaultValue. + * @param key : String designating the key in the entry set + * @return boolean : value associated to the key + */ + @Override + public boolean getBoolean(String key, boolean defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Boolean) + { + return ((Boolean) val).booleanValue(); + } + try + { + return Boolean.parseBoolean((String) val); + } + catch (Exception e) + { + return defaultValue; + } + } + + @Override + public byte getByte(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Byte value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).byteValue(); + } + try + { + return Byte.parseByte((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + + @Override + public byte getByte(String key, byte defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).byteValue(); + } + try + { + return Byte.parseByte((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + + public short increaseByte(String key, byte increaseWith) + { + final byte newValue = (byte) (getByte(key) + increaseWith); + set(key, newValue); + return newValue; + } + + public short increaseByte(String key, byte defaultValue, byte increaseWith) + { + final byte newValue = (byte) (getByte(key, defaultValue) + increaseWith); + set(key, newValue); + return newValue; + } + + public byte[] getByteArray(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Byte value required, but not specified"); + } + if (val instanceof Number) + { + return new byte[] + { + ((Number) val).byteValue() + }; + } + int c = 0; + final String[] vals = ((String) val).split(splitOn); + final byte[] result = new byte[vals.length]; + for (String v : vals) + { + try + { + result[c++] = Byte.parseByte(v); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + return result; + } + + public List getByteList(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final List result = new ArrayList<>(); + for (Byte i : getByteArray(key, splitOn)) + { + result.add(i); + } + return result; + } + + @Override + public short getShort(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Short value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).shortValue(); + } + try + { + return Short.parseShort((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Short value required, but found: " + val); + } + } + + @Override + public short getShort(String key, short defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).shortValue(); + } + try + { + return Short.parseShort((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Short value required, but found: " + val); + } + } + + public short increaseShort(String key, short increaseWith) + { + final short newValue = (short) (getShort(key) + increaseWith); + set(key, newValue); + return newValue; + } + + public short increaseShort(String key, short defaultValue, short increaseWith) + { + final short newValue = (short) (getShort(key, defaultValue) + increaseWith); + set(key, newValue); + return newValue; + } + + @Override + public int getInt(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Integer value required, but not specified: " + key + "!"); + } + + if (val instanceof Number) + { + return ((Number) val).intValue(); + } + + try + { + return Integer.parseInt((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val + "!"); + } + } + + @Override + public int getInt(String key, int defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).intValue(); + } + try + { + return Integer.parseInt((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val); + } + } + + public int increaseInt(String key, int increaseWith) + { + final int newValue = getInt(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public int increaseInt(String key, int defaultValue, int increaseWith) + { + final int newValue = getInt(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + public int[] getIntArray(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Integer value required, but not specified"); + } + if (val instanceof Number) + { + return new int[] + { + ((Number) val).intValue() + }; + } + int c = 0; + final String[] vals = ((String) val).split(splitOn); + final int[] result = new int[vals.length]; + for (String v : vals) + { + try + { + result[c++] = Integer.parseInt(v); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val); + } + } + return result; + } + + public List getIntegerList(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final List result = new ArrayList<>(); + for (int i : getIntArray(key, splitOn)) + { + result.add(i); + } + return result; + } + + @Override + public long getLong(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Long value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).longValue(); + } + try + { + return Long.parseLong((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Long value required, but found: " + val); + } + } + + @Override + public long getLong(String key, long defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).longValue(); + } + try + { + return Long.parseLong((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Long value required, but found: " + val); + } + } + + public long increaseLong(String key, long increaseWith) + { + final long newValue = getLong(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public long increaseLong(String key, long defaultValue, long increaseWith) + { + final long newValue = getLong(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public float getFloat(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Float value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).floatValue(); + } + try + { + return Float.parseFloat((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Float value required, but found: " + val); + } + } + + @Override + public float getFloat(String key, float defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).floatValue(); + } + try + { + return Float.parseFloat((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Float value required, but found: " + val); + } + } + + public float increaseFloat(String key, float increaseWith) + { + final float newValue = getFloat(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public float increaseFloat(String key, float defaultValue, float increaseWith) + { + final float newValue = getFloat(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public double getDouble(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Double value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).doubleValue(); + } + try + { + return Double.parseDouble((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Double value required, but found: " + val); + } + } + + @Override + public double getDouble(String key, double defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).doubleValue(); + } + try + { + return Double.parseDouble((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Double value required, but found: " + val); + } + } + + public double increaseDouble(String key, double increaseWith) + { + final double newValue = getDouble(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public double increaseDouble(String key, double defaultValue, double increaseWith) + { + final double newValue = getDouble(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public String getString(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("String value required, but not specified"); + } + return String.valueOf(val); + } + + @Override + public String getString(String key, String defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + return String.valueOf(val); + } + + @Override + public Duration getDuration(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("String value required, but not specified"); + } + return TimeUtil.parseDuration(String.valueOf(val)); + } + + @Override + public Duration getDuration(String key, Duration defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + return TimeUtil.parseDuration(String.valueOf(val)); + } + + @Override + @SuppressWarnings("unchecked") + public > T getEnum(String key, Class enumClass) + { + Objects.requireNonNull(key); + Objects.requireNonNull(enumClass); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but not specified"); + } + if (enumClass.isInstance(val)) + { + return (T) val; + } + try + { + return Enum.valueOf(enumClass, String.valueOf(val)); + } + catch (Exception e) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); + } + } + + @Override + @SuppressWarnings("unchecked") + public > T getEnum(String key, Class enumClass, T defaultValue) + { + Objects.requireNonNull(key); + Objects.requireNonNull(enumClass); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (enumClass.isInstance(val)) + { + return (T) val; + } + try + { + return Enum.valueOf(enumClass, String.valueOf(val)); + } + catch (Exception e) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); + } + } + + @SuppressWarnings("unchecked") + public A getObject(String name, Class type) + { + Objects.requireNonNull(name); + Objects.requireNonNull(type); + final Object obj = _set.get(name); + if ((obj == null) || !type.isAssignableFrom(obj.getClass())) + { + return null; + } + + return (A) obj; + } + + @SuppressWarnings("unchecked") + public A getObject(String name, Class type, A defaultValue) + { + Objects.requireNonNull(name); + Objects.requireNonNull(type); + final Object obj = _set.get(name); + if ((obj == null) || !type.isAssignableFrom(obj.getClass())) + { + return defaultValue; + } + + return (A) obj; + } + + public SkillHolder getSkillHolder(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof SkillHolder)) + { + return null; + } + + return (SkillHolder) obj; + } + + public Location getLocation(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof Location)) + { + return null; + } + return (Location) obj; + } + + @SuppressWarnings("unchecked") + public List getMinionList(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return Collections.emptyList(); + } + + return (List) obj; + } + + @SuppressWarnings("unchecked") + public List getList(String key, Class clazz) + { + Objects.requireNonNull(key); + Objects.requireNonNull(clazz); + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return null; + } + + final List originalList = (List) obj; + if (!originalList.isEmpty() && !originalList.stream().allMatch(clazz::isInstance)) + { + if (clazz.getSuperclass() == Enum.class) + { + throw new IllegalAccessError("Please use getEnumList if you want to get list of Enums!"); + } + + // Attempt to convert the list + final List convertedList = convertList(originalList, clazz); + if (convertedList == null) + { + LOGGER.log(Level.WARNING, "getList(\"" + key + "\", " + clazz.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); + return null; + } + + // Overwrite the existing list with proper generic type + _set.put(key, convertedList); + return convertedList; + } + return (List) obj; + } + + public List getList(String key, Class clazz, List defaultValue) + { + final List list = getList(key, clazz); + return list == null ? defaultValue : list; + } + + @SuppressWarnings("unchecked") + public > List getEnumList(String key, Class clazz) + { + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return null; + } + + final List originalList = (List) obj; + if (!originalList.isEmpty() && (obj.getClass().getGenericInterfaces()[0] != clazz) && originalList.stream().allMatch(name -> Util.isEnum(name.toString(), clazz))) + { + final List convertedList = originalList.stream().map(Object::toString).map(name -> Enum.valueOf(clazz, name)).map(clazz::cast).collect(Collectors.toList()); + + // Overwrite the existing list with proper generic type + _set.put(key, convertedList); + return convertedList; + } + return (List) obj; + } + + /** + * @param + * @param originalList + * @param clazz + * @return + */ + private List convertList(List originalList, Class clazz) + { + if (clazz == Integer.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isInteger)) + { + return originalList.stream().map(Object::toString).map(Integer::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + else if (clazz == Float.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isFloat)) + { + return originalList.stream().map(Object::toString).map(Float::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + else if (clazz == Double.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isDouble)) + { + return originalList.stream().map(Object::toString).map(Double::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + return null; + } + + @SuppressWarnings("unchecked") + public Map getMap(String key, Class keyClass, Class valueClass) + { + final Object obj = _set.get(key); + if (!(obj instanceof Map)) + { + return null; + } + + final Map originalList = (Map) obj; + if (!originalList.isEmpty() && ((!originalList.keySet().stream().allMatch(keyClass::isInstance)) || (!originalList.values().stream().allMatch(valueClass::isInstance)))) + { + LOGGER.log(Level.WARNING, "getMap(\"" + key + "\", " + keyClass.getSimpleName() + ", " + valueClass.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); + } + return (Map) obj; + } + + public StatSet set(String name, Object value) + { + if (value == null) + { + return this; + } + _set.put(name, value); + return this; + } + + public StatSet set(String key, boolean value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, byte value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, short value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, int value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, long value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, float value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, double value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, String value) + { + if (value == null) + { + return this; + } + _set.put(key, value); + return this; + } + + public StatSet set(String key, Enum value) + { + if (value == null) + { + return this; + } + _set.put(key, value); + return this; + } + + public static StatSet valueOf(String key, Object value) + { + final StatSet set = new StatSet(); + set.set(key, value); + return set; + } + + public void remove(String key) + { + _set.remove(key); + } + + public boolean contains(String name) + { + return _set.containsKey(name); + } + + @Override + public String toString() + { + return "StatSet{_set=" + _set + '}'; + } +} diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/StatsSet.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/StatsSet.java deleted file mode 100644 index 5ce013ebd2..0000000000 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/StatsSet.java +++ /dev/null @@ -1,968 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.ConcurrentHashMap; -import java.util.function.Supplier; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.stream.Collectors; - -import org.l2jmobius.commons.util.TimeUtil; -import org.l2jmobius.gameserver.model.holders.MinionHolder; -import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.interfaces.IParserAdvUtils; -import org.l2jmobius.gameserver.util.Util; - -/** - * This class is meant to hold a set of (key,value) pairs.
- * They are stored as object but can be retrieved in any type wanted. As long as cast is available.
- * @author mkizub - */ -public class StatsSet implements IParserAdvUtils -{ - private static final Logger LOGGER = Logger.getLogger(StatsSet.class.getName()); - /** Static empty immutable map, used to avoid multiple null checks over the source. */ - public static final StatsSet EMPTY_STATSET = new StatsSet(Collections.emptyMap()); - - private final Map _set; - - public StatsSet() - { - this(ConcurrentHashMap::new); - } - - public StatsSet(Supplier> mapFactory) - { - this(mapFactory.get()); - } - - public StatsSet(Map map) - { - _set = map; - } - - /** - * Returns the set of values - * @return HashMap - */ - public Map getSet() - { - return _set; - } - - /** - * Add a set of couple values in the current set - * @param newSet : StatsSet pointing out the list of couples to add in the current set - */ - public void merge(StatsSet newSet) - { - _set.putAll(newSet.getSet()); - } - - /** - * Verifies if the stat set is empty. - * @return {@code true} if the stat set is empty, {@code false} otherwise - */ - public boolean isEmpty() - { - return _set.isEmpty(); - } - - /** - * Return the boolean value associated with key. - * @param key : String designating the key in the set - * @return boolean : value associated to the key - * @throws IllegalArgumentException : If value is not set or value is not boolean - */ - @Override - public boolean getBoolean(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Boolean value required, but not specified"); - } - if (val instanceof Boolean) - { - return ((Boolean) val).booleanValue(); - } - try - { - return Boolean.parseBoolean((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Boolean value required, but found: " + val); - } - } - - /** - * Return the boolean value associated with key.
- * If no value is associated with key, or type of value is wrong, returns defaultValue. - * @param key : String designating the key in the entry set - * @return boolean : value associated to the key - */ - @Override - public boolean getBoolean(String key, boolean defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Boolean) - { - return ((Boolean) val).booleanValue(); - } - try - { - return Boolean.parseBoolean((String) val); - } - catch (Exception e) - { - return defaultValue; - } - } - - @Override - public byte getByte(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Byte value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).byteValue(); - } - try - { - return Byte.parseByte((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - - @Override - public byte getByte(String key, byte defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).byteValue(); - } - try - { - return Byte.parseByte((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - - public short increaseByte(String key, byte increaseWith) - { - final byte newValue = (byte) (getByte(key) + increaseWith); - set(key, newValue); - return newValue; - } - - public short increaseByte(String key, byte defaultValue, byte increaseWith) - { - final byte newValue = (byte) (getByte(key, defaultValue) + increaseWith); - set(key, newValue); - return newValue; - } - - public byte[] getByteArray(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Byte value required, but not specified"); - } - if (val instanceof Number) - { - return new byte[] - { - ((Number) val).byteValue() - }; - } - int c = 0; - final String[] vals = ((String) val).split(splitOn); - final byte[] result = new byte[vals.length]; - for (String v : vals) - { - try - { - result[c++] = Byte.parseByte(v); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - return result; - } - - public List getByteList(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final List result = new ArrayList<>(); - for (Byte i : getByteArray(key, splitOn)) - { - result.add(i); - } - return result; - } - - @Override - public short getShort(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Short value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).shortValue(); - } - try - { - return Short.parseShort((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Short value required, but found: " + val); - } - } - - @Override - public short getShort(String key, short defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).shortValue(); - } - try - { - return Short.parseShort((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Short value required, but found: " + val); - } - } - - public short increaseShort(String key, short increaseWith) - { - final short newValue = (short) (getShort(key) + increaseWith); - set(key, newValue); - return newValue; - } - - public short increaseShort(String key, short defaultValue, short increaseWith) - { - final short newValue = (short) (getShort(key, defaultValue) + increaseWith); - set(key, newValue); - return newValue; - } - - @Override - public int getInt(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Integer value required, but not specified: " + key + "!"); - } - - if (val instanceof Number) - { - return ((Number) val).intValue(); - } - - try - { - return Integer.parseInt((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val + "!"); - } - } - - @Override - public int getInt(String key, int defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).intValue(); - } - try - { - return Integer.parseInt((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val); - } - } - - public int increaseInt(String key, int increaseWith) - { - final int newValue = getInt(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public int increaseInt(String key, int defaultValue, int increaseWith) - { - final int newValue = getInt(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - public int[] getIntArray(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Integer value required, but not specified"); - } - if (val instanceof Number) - { - return new int[] - { - ((Number) val).intValue() - }; - } - int c = 0; - final String[] vals = ((String) val).split(splitOn); - final int[] result = new int[vals.length]; - for (String v : vals) - { - try - { - result[c++] = Integer.parseInt(v); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val); - } - } - return result; - } - - public List getIntegerList(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final List result = new ArrayList<>(); - for (int i : getIntArray(key, splitOn)) - { - result.add(i); - } - return result; - } - - @Override - public long getLong(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Long value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).longValue(); - } - try - { - return Long.parseLong((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Long value required, but found: " + val); - } - } - - @Override - public long getLong(String key, long defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).longValue(); - } - try - { - return Long.parseLong((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Long value required, but found: " + val); - } - } - - public long increaseLong(String key, long increaseWith) - { - final long newValue = getLong(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public long increaseLong(String key, long defaultValue, long increaseWith) - { - final long newValue = getLong(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public float getFloat(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Float value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).floatValue(); - } - try - { - return Float.parseFloat((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Float value required, but found: " + val); - } - } - - @Override - public float getFloat(String key, float defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).floatValue(); - } - try - { - return Float.parseFloat((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Float value required, but found: " + val); - } - } - - public float increaseFloat(String key, float increaseWith) - { - final float newValue = getFloat(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public float increaseFloat(String key, float defaultValue, float increaseWith) - { - final float newValue = getFloat(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public double getDouble(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Double value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).doubleValue(); - } - try - { - return Double.parseDouble((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Double value required, but found: " + val); - } - } - - @Override - public double getDouble(String key, double defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).doubleValue(); - } - try - { - return Double.parseDouble((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Double value required, but found: " + val); - } - } - - public double increaseDouble(String key, double increaseWith) - { - final double newValue = getDouble(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public double increaseDouble(String key, double defaultValue, double increaseWith) - { - final double newValue = getDouble(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public String getString(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("String value required, but not specified"); - } - return String.valueOf(val); - } - - @Override - public String getString(String key, String defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - return String.valueOf(val); - } - - @Override - public Duration getDuration(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("String value required, but not specified"); - } - return TimeUtil.parseDuration(String.valueOf(val)); - } - - @Override - public Duration getDuration(String key, Duration defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - return TimeUtil.parseDuration(String.valueOf(val)); - } - - @Override - @SuppressWarnings("unchecked") - public > T getEnum(String key, Class enumClass) - { - Objects.requireNonNull(key); - Objects.requireNonNull(enumClass); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but not specified"); - } - if (enumClass.isInstance(val)) - { - return (T) val; - } - try - { - return Enum.valueOf(enumClass, String.valueOf(val)); - } - catch (Exception e) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); - } - } - - @Override - @SuppressWarnings("unchecked") - public > T getEnum(String key, Class enumClass, T defaultValue) - { - Objects.requireNonNull(key); - Objects.requireNonNull(enumClass); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (enumClass.isInstance(val)) - { - return (T) val; - } - try - { - return Enum.valueOf(enumClass, String.valueOf(val)); - } - catch (Exception e) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); - } - } - - @SuppressWarnings("unchecked") - public A getObject(String name, Class type) - { - Objects.requireNonNull(name); - Objects.requireNonNull(type); - final Object obj = _set.get(name); - if ((obj == null) || !type.isAssignableFrom(obj.getClass())) - { - return null; - } - - return (A) obj; - } - - @SuppressWarnings("unchecked") - public A getObject(String name, Class type, A defaultValue) - { - Objects.requireNonNull(name); - Objects.requireNonNull(type); - final Object obj = _set.get(name); - if ((obj == null) || !type.isAssignableFrom(obj.getClass())) - { - return defaultValue; - } - - return (A) obj; - } - - public SkillHolder getSkillHolder(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof SkillHolder)) - { - return null; - } - - return (SkillHolder) obj; - } - - public Location getLocation(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof Location)) - { - return null; - } - return (Location) obj; - } - - @SuppressWarnings("unchecked") - public List getMinionList(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return Collections.emptyList(); - } - - return (List) obj; - } - - @SuppressWarnings("unchecked") - public List getList(String key, Class clazz) - { - Objects.requireNonNull(key); - Objects.requireNonNull(clazz); - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return null; - } - - final List originalList = (List) obj; - if (!originalList.isEmpty() && !originalList.stream().allMatch(clazz::isInstance)) - { - if (clazz.getSuperclass() == Enum.class) - { - throw new IllegalAccessError("Please use getEnumList if you want to get list of Enums!"); - } - - // Attempt to convert the list - final List convertedList = convertList(originalList, clazz); - if (convertedList == null) - { - LOGGER.log(Level.WARNING, "getList(\"" + key + "\", " + clazz.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); - return null; - } - - // Overwrite the existing list with proper generic type - _set.put(key, convertedList); - return convertedList; - } - return (List) obj; - } - - public List getList(String key, Class clazz, List defaultValue) - { - final List list = getList(key, clazz); - return list == null ? defaultValue : list; - } - - @SuppressWarnings("unchecked") - public > List getEnumList(String key, Class clazz) - { - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return null; - } - - final List originalList = (List) obj; - if (!originalList.isEmpty() && (obj.getClass().getGenericInterfaces()[0] != clazz) && originalList.stream().allMatch(name -> Util.isEnum(name.toString(), clazz))) - { - final List convertedList = originalList.stream().map(Object::toString).map(name -> Enum.valueOf(clazz, name)).map(clazz::cast).collect(Collectors.toList()); - - // Overwrite the existing list with proper generic type - _set.put(key, convertedList); - return convertedList; - } - return (List) obj; - } - - /** - * @param - * @param originalList - * @param clazz - * @return - */ - private List convertList(List originalList, Class clazz) - { - if (clazz == Integer.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isInteger)) - { - return originalList.stream().map(Object::toString).map(Integer::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - else if (clazz == Float.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isFloat)) - { - return originalList.stream().map(Object::toString).map(Float::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - else if (clazz == Double.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isDouble)) - { - return originalList.stream().map(Object::toString).map(Double::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - return null; - } - - @SuppressWarnings("unchecked") - public Map getMap(String key, Class keyClass, Class valueClass) - { - final Object obj = _set.get(key); - if (!(obj instanceof Map)) - { - return null; - } - - final Map originalList = (Map) obj; - if (!originalList.isEmpty() && ((!originalList.keySet().stream().allMatch(keyClass::isInstance)) || (!originalList.values().stream().allMatch(valueClass::isInstance)))) - { - LOGGER.log(Level.WARNING, "getMap(\"" + key + "\", " + keyClass.getSimpleName() + ", " + valueClass.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); - } - return (Map) obj; - } - - public StatsSet set(String name, Object value) - { - if (value == null) - { - return this; - } - _set.put(name, value); - return this; - } - - public StatsSet set(String key, boolean value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, byte value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, short value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, int value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, long value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, float value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, double value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, String value) - { - if (value == null) - { - return this; - } - _set.put(key, value); - return this; - } - - public StatsSet set(String key, Enum value) - { - if (value == null) - { - return this; - } - _set.put(key, value); - return this; - } - - public static StatsSet valueOf(String key, Object value) - { - final StatsSet set = new StatsSet(); - set.set(key, value); - return set; - } - - public void remove(String key) - { - _set.remove(key); - } - - public boolean contains(String name) - { - return _set.containsKey(name); - } - - @Override - public String toString() - { - return "StatsSet{_set=" + _set + '}'; - } -} diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Npc.java index a1a7e98aba..2b90533cc5 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.MpRewardTask; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.FishermanInstance; @@ -148,7 +148,7 @@ public class Npc extends Creature private NpcStringId _titleString; private NpcStringId _nameString; - private StatsSet _params; + private StatSet _params; private RaidBossStatus _raidStatus; /** Contains information about local tax payments. */ @@ -1756,7 +1756,7 @@ public class Npc extends Creature /** * @return the parameters of the npc merged with the spawn parameters (if there are any) */ - public StatsSet getParameters() + public StatSet getParameters() { if (_params != null) { @@ -1768,10 +1768,10 @@ public class Npc extends Creature final NpcSpawnTemplate npcSpawnTemplate = _spawn.getNpcSpawnTemplate(); if ((npcSpawnTemplate != null) && (npcSpawnTemplate.getParameters() != null) && !npcSpawnTemplate.getParameters().isEmpty()) { - final StatsSet params = getTemplate().getParameters(); + final StatSet params = getTemplate().getParameters(); if ((params != null) && !params.getSet().isEmpty()) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.merge(params); set.merge(npcSpawnTemplate.getParameters()); _params = set; diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 82f429bc18..4cb0835220 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -21,7 +21,7 @@ import java.util.EnumMap; import java.util.Map; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; @@ -49,12 +49,12 @@ public class CreatureTemplate extends ListenersContainer /** The creature's race. */ private Race _race; - public CreatureTemplate(StatsSet set) + public CreatureTemplate(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { // Base stats _baseValues.put(Stat.STAT_STR, set.getDouble("baseSTR", 0)); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java index 86441c678c..14f0e9cae8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.CubicInstance; @@ -46,7 +46,7 @@ public class CubicTemplate implements ICubicConditionHolder private final List _conditions = new ArrayList<>(); public List _skills = new ArrayList<>(); - public CubicTemplate(StatsSet set) + public CubicTemplate(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java index c40883ac75..410040bc86 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.templates; import org.l2jmobius.gameserver.enums.DoorOpenType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -57,7 +57,7 @@ public class DoorTemplate extends CreatureTemplate implements IIdentifiable private final boolean _stealth; private final boolean _isInverted; - public DoorTemplate(StatsSet set) + public DoorTemplate(StatSet set) { super(set); _doorId = set.getInt("id"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 767743de2e..8ab41c70e3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.enums.MpRewardAffectType; import org.l2jmobius.gameserver.enums.MpRewardType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -63,7 +63,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private boolean _usingServerSideName; private String _title; private boolean _usingServerSideTitle; - private StatsSet _parameters; + private StatSet _parameters; private Sex _sex; private int _chestId; private int _rhandId; @@ -123,15 +123,15 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable /** * Constructor of Creature. - * @param set The StatsSet object to transfer data to the method + * @param set The StatSet object to transfer data to the method */ - public NpcTemplate(StatsSet set) + public NpcTemplate(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _id = set.getInt("id"); @@ -320,12 +320,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _usingServerSideTitle; } - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } - public void setParameters(StatsSet set) + public void setParameters(StatSet set) { _parameters = set; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 50292b8bc8..28458aa09e 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -50,7 +50,7 @@ public class PlayerTemplate extends CreatureTemplate private final List _creationPoints; private final Map _baseSlotDef; - public PlayerTemplate(StatsSet set, List creationPoints) + public PlayerTemplate(StatSet set, List creationPoints) { super(set); _classId = ClassId.getClassId(set.getInt("classId")); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index aa28a0f648..260da48365 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -23,7 +23,7 @@ import java.util.Objects; import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import org.l2jmobius.gameserver.enums.InventoryBlockType; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -57,7 +57,7 @@ public class Transform implements IIdentifiable private TransformTemplate _maleTemplate; private TransformTemplate _femaleTemplate; - public Transform(StatsSet set) + public Transform(StatSet set) { _id = set.getInt("id"); _displayId = set.getInt("displayId", _id); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java index 5660852a01..729998503f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.actor.transform; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -31,7 +31,7 @@ public class TransformLevelData private final double _levelMod; private Map _stats; - public TransformLevelData(StatsSet set) + public TransformLevelData(StatSet set) { _level = set.getInt("val"); _levelMod = set.getDouble("levelMod"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 4de84b8bdc..7aca059f91 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -23,7 +23,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -49,7 +49,7 @@ public class TransformTemplate private ExBasicActionList _list; private final Map _data = new LinkedHashMap<>(100); - public TransformTemplate(StatsSet set) + public TransformTemplate(StatSet set) { _collisionRadius = set.contains("radius") ? set.getDouble("radius") : null; _collisionHeight = set.contains("height") ? set.getDouble("height") : null; diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java index d808a6b8bf..02550d2818 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -36,7 +36,7 @@ public class AlchemyCraftData private ItemHolder _productionSuccess; private ItemHolder _productionFailure; - public AlchemyCraftData(StatsSet set) + public AlchemyCraftData(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java index 0bd061d3c4..79dd6c0207 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.beautyshop; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -32,7 +32,7 @@ public class BeautyItem private final int _beautyShopTicket; private final Map _colors = new HashMap<>(); - public BeautyItem(StatsSet set) + public BeautyItem(StatSet set) { _id = set.getInt("id"); _adena = set.getInt("adena", 0); @@ -60,7 +60,7 @@ public class BeautyItem return _beautyShopTicket; } - public void addColor(StatsSet set) + public void addColor(StatSet set) { final BeautyItem color = new BeautyItem(set); _colors.put(set.getInt("id"), color); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index 689a61464d..8b32364c1a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party.MessageType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.appearance.PlayerAppearance; @@ -244,7 +244,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent player.teleToLocation(_instance.getEnterLocations().get(index++), 0, _instance); } - getTimers().addTimer("match_start_countdown", StatsSet.valueOf("time", 60), 100, null, null); + getTimers().addTimer("match_start_countdown", StatSet.valueOf("time", 60), 100, null, null); getTimers().addTimer("teleport_message1", 10000, null, null); getTimers().addTimer("teleport_message2", 14000, null, null); @@ -400,7 +400,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent } } getTimers().cancelTimer("update", null, null); - getTimers().addTimer("match_end_countdown", StatsSet.valueOf("time", 30), 30 * 1000, null, null); + getTimers().addTimer("match_end_countdown", StatSet.valueOf("time", 30), 30 * 1000, null, null); EventDispatcher.getInstance().notifyEvent(new OnCeremonyOfChaosMatchResult(winners, members)); } @@ -493,7 +493,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java index 39f9196d93..371f8dc459 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.conditions.ICubicCondition; @@ -38,7 +38,7 @@ public class CubicSkill extends SkillHolder implements ICubicConditionHolder private final List _conditions = new ArrayList<>(); private final boolean _targetDebuff; - public CubicSkill(StatsSet set) + public CubicSkill(StatSet set) { super(set.getInt("id"), set.getInt("level")); _triggerRate = set.getInt("triggerRate", 100); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/entity/ClanHall.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/entity/ClanHall.java index 8da77477fd..22af370709 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/entity/ClanHall.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/entity/ClanHall.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -75,7 +75,7 @@ public class ClanHall extends AbstractResidence private static final String LOAD_CLANHALL = "SELECT * FROM clanhall WHERE id=?"; private static final String UPDATE_CLANHALL = "UPDATE clanhall SET ownerId=?,paidUntil=? WHERE id=?"; - public ClanHall(StatsSet params) + public ClanHall(StatSet params) { super(params.getInt("id")); // Set static parameters diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/entity/Hero.java index c7ffd29b6c..49e8061204 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/entity/Hero.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/entity/Hero.java @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.data.xml.impl.ClassListData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -74,13 +74,13 @@ public class Hero // delete hero items private static final String DELETE_ITEMS = "DELETE FROM items WHERE item_id IN (30392, 30393, 30394, 30395, 30396, 30397, 30398, 30399, 30400, 30401, 30402, 30403, 30404, 30405, 30372, 30373, 6842, 6611, 6612, 6613, 6614, 6615, 6616, 6617, 6618, 6619, 6620, 6621, 9388, 9389, 9390) AND owner_id NOT IN (SELECT charId FROM characters WHERE accesslevel > 0)"; - private static final Map HEROES = new ConcurrentHashMap<>(); - private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); + private static final Map HEROES = new ConcurrentHashMap<>(); + private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); - private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); - private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); + private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); + private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); - private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); + private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); private static final Map HERO_MESSAGE = new ConcurrentHashMap<>(); public static final String COUNT = "count"; @@ -119,7 +119,7 @@ public class Hero { while (rset.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset.getInt(Olympiad.CLASS_ID)); @@ -139,7 +139,7 @@ public class Hero while (rset2.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset2.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset2.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset2.getInt(Olympiad.CLASS_ID)); @@ -162,7 +162,7 @@ public class Hero LOGGER.info("Hero System: Loaded " + COMPLETE_HEROS.size() + " all time Heroes."); } - private void processHeros(PreparedStatement ps, int charId, StatsSet hero) throws SQLException + private void processHeros(PreparedStatement ps, int charId, StatSet hero) throws SQLException { ps.setInt(1, charId); try (ResultSet rs = ps.executeQuery()) @@ -227,7 +227,7 @@ public class Hero public void loadDiary(int charId) { - final List diary = new ArrayList<>(); + final List diary = new ArrayList<>(); int diaryentries = 0; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement("SELECT * FROM heroes_diary WHERE charId=? ORDER BY time ASC")) @@ -237,7 +237,7 @@ public class Hero { while (rset.next()) { - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final long time = rset.getLong("time"); final int action = rset.getInt("action"); @@ -282,8 +282,8 @@ public class Hero public void loadFights(int charId) { - final List fights = new ArrayList<>(); - final StatsSet heroCountData = new StatsSet(); + final List fights = new ArrayList<>(); + final StatSet heroCountData = new StatSet(); final Calendar data = Calendar.getInstance(); data.set(Calendar.DAY_OF_MONTH, 1); data.set(Calendar.HOUR_OF_DAY, 0); @@ -329,7 +329,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charTwoClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -365,7 +365,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charOneClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -413,19 +413,19 @@ public class Hero } } - public Map getHeroes() + public Map getHeroes() { return HEROES; } - public Map getCompleteHeroes() + public Map getCompleteHeroes() { return COMPLETE_HEROS; } public int getHeroByClass(int classid) { - for (Entry e : HEROES.entrySet()) + for (Entry e : HEROES.entrySet()) { if (e.getValue().getInt(Olympiad.CLASS_ID) == classid) { @@ -446,7 +446,7 @@ public class Hero public void showHeroDiary(PlayerInstance player, int heroclass, int charid, int page) { final int perpage = 10; - final List mainList = HERO_DIARY.get(charid); + final List mainList = HERO_DIARY.get(charid); if (mainList != null) { final NpcHtmlMessage diaryReply = new NpcHtmlMessage(); @@ -461,7 +461,7 @@ public class Hero if (!mainList.isEmpty()) { - final List list = new ArrayList<>(mainList); + final List list = new ArrayList<>(mainList); Collections.reverse(list); boolean color = true; @@ -471,7 +471,7 @@ public class Hero for (int i = (page - 1) * perpage; i < list.size(); i++) { breakat = i; - final StatsSet diaryEntry = list.get(i); + final StatSet diaryEntry = list.get(i); fList.append(""); if (color) { @@ -532,7 +532,7 @@ public class Hero int loss = 0; int draw = 0; - final List heroFights = HERO_FIGHTS.get(charid); + final List heroFights = HERO_FIGHTS.get(charid); if (heroFights != null) { final NpcHtmlMessage fightReply = new NpcHtmlMessage(); @@ -544,7 +544,7 @@ public class Hero if (!heroFights.isEmpty()) { - final StatsSet heroCount = HERO_COUNTS.get(charid); + final StatSet heroCount = HERO_COUNTS.get(charid); if (heroCount != null) { win = heroCount.getInt("victory"); @@ -559,7 +559,7 @@ public class Hero for (int i = (page - 1) * perpage; i < heroFights.size(); i++) { breakat = i; - final StatsSet fight = heroFights.get(i); + final StatSet fight = heroFights.get(i); fList.append(""); if (color) { @@ -617,7 +617,7 @@ public class Hero } } - public synchronized void computeNewHeroes(List newHeroes) + public synchronized void computeNewHeroes(List newHeroes) { updateHeroes(true); @@ -667,13 +667,13 @@ public class Hero return; } - for (StatsSet hero : newHeroes) + for (StatSet hero : newHeroes) { final int charId = hero.getInt(Olympiad.CHAR_ID); if (COMPLETE_HEROS.containsKey(charId)) { - final StatsSet oldHero = COMPLETE_HEROS.get(charId); + final StatSet oldHero = COMPLETE_HEROS.get(charId); if (hero.getInt(LEGEND_COUNT) == 1) { final int count = oldHero.getInt(LEGEND_COUNT); @@ -690,7 +690,7 @@ public class Hero } else { - final StatsSet newHero = new StatsSet(); + final StatSet newHero = new StatSet(); newHero.set(Olympiad.CHAR_NAME, hero.getString(Olympiad.CHAR_NAME)); newHero.set(Olympiad.CLASS_ID, hero.getInt(Olympiad.CLASS_ID)); if (hero.getInt(LEGEND_COUNT) == 1) @@ -723,9 +723,9 @@ public class Hero } else { - StatsSet hero; + StatSet hero; int heroId; - for (Entry entry : HEROES.entrySet()) + for (Entry entry : HEROES.entrySet()) { hero = entry.getValue(); heroId = entry.getKey(); @@ -812,13 +812,13 @@ public class Hero setDiaryData(charId, ACTION_RAID_KILLED, npcId); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (template == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -831,13 +831,13 @@ public class Hero setDiaryData(charId, ACTION_CASTLE_TAKEN, castleId); final Castle castle = CastleManager.getInstance().getCastleById(castleId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (castle == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -947,10 +947,10 @@ public class Hero */ public void claimHero(PlayerInstance player) { - StatsSet hero = HEROES.get(player.getObjectId()); + StatSet hero = HEROES.get(player.getObjectId()); if (hero == null) { - hero = new StatsSet(); + hero = new StatSet(); HEROES.put(player.getObjectId(), hero); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java index f1263e8d44..c52f487402 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java @@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.atomic.AtomicReference; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.eventengine.drop.IEventDrop; import org.l2jmobius.gameserver.model.events.AbstractScript; @@ -42,7 +42,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout public abstract class AbstractEventManager>extends AbstractScript { private String _name; - private StatsSet _variables = StatsSet.EMPTY_STATSET; + private StatSet _variables = StatSet.EMPTY_STATSET; private Set _schedulers = Collections.emptySet(); private Set _conditionalSchedulers = Collections.emptySet(); private Map _rewards = Collections.emptyMap(); @@ -67,14 +67,14 @@ public abstract class AbstractEventManager>extends Ab /* ********************** */ - public StatsSet getVariables() + public StatSet getVariables() { return _variables; } - public void setVariables(StatsSet variables) + public void setVariables(StatSet variables) { - _variables = new StatsSet(Collections.unmodifiableMap(variables.getSet())); + _variables = new StatSet(Collections.unmodifiableMap(variables.getSet())); } /* ********************** */ diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java index 59c64b812c..e41af41d1a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.util.cron4j.PastPredictor; import org.l2jmobius.gameserver.util.cron4j.Predictor; @@ -45,7 +45,7 @@ public class EventScheduler private List _notifications; private ScheduledFuture _task; - public EventScheduler(AbstractEventManager manager, StatsSet set) + public EventScheduler(AbstractEventManager manager, StatSet set) { _eventManager = manager; _name = set.getString("name", ""); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 1189dc9aa4..ca9d08a337 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -51,7 +51,7 @@ import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -183,12 +183,12 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime onTimerCancel(holder.getEvent(), holder.getParams(), holder.getNpc(), holder.getPlayer()); } - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { LOGGER.warning("[" + getClass().getSimpleName() + "]: Timer event arrived at non overriden onTimerEvent method event: " + event + " npc: " + npc + " player: " + player); } - public void onTimerCancel(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerCancel(String event, StatSet params, Npc npc, PlayerInstance player) { } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java index 400fb64b6e..861c4a9b31 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java @@ -24,7 +24,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.timers.IEventTimerCancel; @@ -69,7 +69,7 @@ public class TimerExecutor * @param eventTimer * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - public boolean addTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) + public boolean addTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) { return addTimer(new TimerHolder<>(event, params, time, npc, player, false, eventTimer, _cancelListener, this)); } @@ -95,7 +95,7 @@ public class TimerExecutor * @param player * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - public boolean addTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player) + public boolean addTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player) { return addTimer(event, params, time, npc, player, _eventListener); } @@ -123,7 +123,7 @@ public class TimerExecutor * @param eventTimer * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - private boolean addRepeatingTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) + private boolean addRepeatingTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) { return addTimer(new TimerHolder<>(event, params, time, npc, player, true, eventTimer, _cancelListener, this)); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java index ab8fa150ca..0fcafba759 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java @@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.gameserver.instancemanager.TimersManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.TimerExecutor; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.events.TimerExecutor; public class TimerHolder implements Runnable { private final T _event; - private final StatsSet _params; + private final StatSet _params; private final long _time; private final Npc _npc; private final PlayerInstance _player; @@ -44,7 +44,7 @@ public class TimerHolder implements Runnable private final TimerExecutor _postExecutor; private final ScheduledFuture _task; - public TimerHolder(T event, StatsSet params, long time, Npc npc, PlayerInstance player, boolean isRepeating, IEventTimerEvent eventScript, IEventTimerCancel cancelScript, TimerExecutor postExecutor) + public TimerHolder(T event, StatSet params, long time, Npc npc, PlayerInstance player, boolean isRepeating, IEventTimerEvent eventScript, IEventTimerCancel cancelScript, TimerExecutor postExecutor) { Objects.requireNonNull(event, getClass().getSimpleName() + ": \"event\" cannot be null!"); Objects.requireNonNull(eventScript, getClass().getSimpleName() + ": \"script\" cannot be null!"); @@ -73,7 +73,7 @@ public class TimerHolder implements Runnable /** * @return the parameters of this timer */ - public StatsSet getParams() + public StatSet getParams() { return _params; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index db95bd7dbc..df52427f29 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; @@ -37,7 +37,7 @@ public class AppearanceHolder private final AppearanceTargetType _targetType; private final long _bodyPart; - public AppearanceHolder(StatsSet set) + public AppearanceHolder(StatSet set) { _visualId = set.getInt("id", 0); _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java index 29740873cd..0f9488448d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Nik @@ -43,7 +43,7 @@ public class AttachSkillHolder extends SkillHolder return _requiredSkillLevel; } - public static AttachSkillHolder fromStatsSet(StatsSet set) + public static AttachSkillHolder fromStatSet(StatSet set) { return new AttachSkillHolder(set.getInt("skillId"), set.getInt("skillLevel", 1), set.getInt("requiredSkillId"), set.getInt("requiredSkillLevel", 1)); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java index cc41724532..57b6d47c40 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Set; import org.l2jmobius.gameserver.enums.SkillEnchantType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -36,7 +36,7 @@ public class EnchantSkillHolder private final Map _chance = new EnumMap<>(SkillEnchantType.class); private final Map> _requiredItems = new EnumMap<>(SkillEnchantType.class); - public EnchantSkillHolder(StatsSet set) + public EnchantSkillHolder(StatSet set) { _level = set.getInt("level"); _enchantFailLevel = set.getInt("enchantFailLevel"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java index e6706c8467..33d14e4345 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Map; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -36,7 +36,7 @@ public class ExtendDropDataHolder private final List _conditions; private final Map _systemMessages; - public ExtendDropDataHolder(StatsSet set) + public ExtendDropDataHolder(StatSet set) { _id = set.getInt("id"); _items = set.getList("items", ExtendDropItemHolder.class); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java index 16454d764a..d63d4eb775 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -52,7 +52,7 @@ public class FakePlayerHolder private final int _clanId; private final int _pledgeStatus; - public FakePlayerHolder(StatsSet set) + public FakePlayerHolder(StatSet set) { _classId = set.getInt("classId", 182); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java index a9c72776cd..86af0c1405 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -29,7 +29,7 @@ public class ItemHolder implements IIdentifiable private final int _id; private final long _count; - public ItemHolder(StatsSet set) + public ItemHolder(StatSet set) { _id = set.getInt("id"); _count = set.getLong("count"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java index 5f7bb2008b..1c6f7b506b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -25,7 +25,7 @@ public class ItemPointHolder extends ItemHolder { private final int _points; - public ItemPointHolder(StatsSet params) + public ItemPointHolder(StatSet params) { this(params.getInt("id"), params.getLong("count"), params.getInt("points")); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java index 71d4f56eea..1b65c8912f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.holders; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -34,7 +34,7 @@ public class LuckyGameDataHolder private int _minModifyRewardGame; private int _maxModifyRewardGame; - public LuckyGameDataHolder(StatsSet params) + public LuckyGameDataHolder(StatSet params) { _index = params.getInt("index"); _turningPoints = params.getInt("turning_point"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java index f77e380e8d..9fa8c99654 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.holders; import java.time.Duration; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -32,7 +32,7 @@ public class MinionHolder implements IIdentifiable private final long _respawnTime; private final int _weightPoint; - public MinionHolder(StatsSet set) + public MinionHolder(StatSet set) { _id = set.getInt("id"); _count = set.getInt("count", 1); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java index f4173594d1..36ac70176d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -52,7 +52,7 @@ public class MultisellListHolder implements IIdentifiable } @SuppressWarnings("unchecked") - public MultisellListHolder(StatsSet set) + public MultisellListHolder(StatSet set) { _listId = set.getInt("listId"); _isChanceMultisell = set.getBoolean("isChanceMultisell", false); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java index cef1e13e8f..5e9c55ea74 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.StatusUpdateType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -56,7 +56,7 @@ public class RecipeHolder implements IIdentifiable private final double _maxOfferingBonus; private final long _maxOffering; - public RecipeHolder(StatsSet set, List ingredients, List productGroup, List npcFee, Map statUse) + public RecipeHolder(StatSet set, List ingredients, List productGroup, List npcFee, Map statUse) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 3e3ea5d31b..c2f4ab4119 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -45,7 +45,7 @@ import org.l2jmobius.gameserver.enums.InstanceReenterType; import org.l2jmobius.gameserver.enums.InstanceTeleportType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -87,7 +87,7 @@ public class Instance implements IIdentifiable, INamable private final Set _players = ConcurrentHashMap.newKeySet(); // Players inside instance private final Set _npcs = ConcurrentHashMap.newKeySet(); // Spawned NPCs inside instance private final Map _doors = new HashMap<>(); // Spawned doors inside instance - private final StatsSet _parameters = new StatsSet(); + private final StatSet _parameters = new StatSet(); // Timers private final Map> _ejectDeadTasks = new ConcurrentHashMap<>(); private ScheduledFuture _cleanUpTask = null; @@ -171,7 +171,7 @@ public class Instance implements IIdentifiable, INamable * Get instance world parameters. * @return instance parameters */ - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } @@ -1020,7 +1020,7 @@ public class Instance implements IIdentifiable, INamable * Get parameters from instance template.
* @return template parameters */ - public StatsSet getTemplateParameters() + public StatSet getTemplateParameters() { return _template.getParameters(); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 2a196f73ef..b53b0a819d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.AbstractPlayerGroup; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -71,7 +71,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl private float _spRate = Config.RATE_INSTANCE_SP; private float _expPartyRate = Config.RATE_INSTANCE_PARTY_XP; private float _spPartyRate = Config.RATE_INSTANCE_PARTY_SP; - private StatsSet _parameters = StatsSet.EMPTY_STATSET; + private StatSet _parameters = StatSet.EMPTY_STATSET; private final Map _doors = new HashMap<>(); private final List _spawns = new ArrayList<>(); // Locations @@ -92,7 +92,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl /** * @param set */ - public InstanceTemplate(StatsSet set) + public InstanceTemplate(StatSet set) { _templateId = set.getInt("id", 0); _name = set.getString("name", null); @@ -178,7 +178,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (!set.isEmpty()) { - _parameters = new StatsSet(Collections.unmodifiableMap(set)); + _parameters = new StatSet(Collections.unmodifiableMap(set)); } } @@ -469,7 +469,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl * Get instance template parameters. * @return parameters of template */ - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java index 3b67ff72f4..3627959662 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; import java.util.function.BiConsumer; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public abstract class Condition { private final InstanceTemplate _template; - private final StatsSet _parameters; + private final StatSet _parameters; private final boolean _leaderOnly; private final boolean _showMessageAndHtml; private SystemMessageId _systemMsg = null; @@ -46,7 +46,7 @@ public abstract class Condition * @param onlyLeader flag which means if only leader should be affected (leader means player who wants to enter not group leader!) * @param showMessageAndHtml if {@code true} and HTML message is defined then both are send, otherwise only HTML or message is send */ - public Condition(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public Condition(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { _template = template; _parameters = parameters; @@ -58,7 +58,7 @@ public abstract class Condition * Gets parameters of condition. * @return set of parameters */ - protected final StatsSet getParameters() + protected final StatSet getParameters() { return _parameters; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java index e379741b59..c27d92d662 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionCommandChannel extends Condition { - public ConditionCommandChannel(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionCommandChannel(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_CANNOT_ENTER_BECAUSE_YOU_ARE_NOT_ASSOCIATED_WITH_THE_CURRENT_COMMAND_CHANNEL); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java index ed434e3524..a828dcceae 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.model.AbstractPlayerGroup; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionCommandChannelLeader extends Condition { - public ConditionCommandChannelLeader(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionCommandChannelLeader(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java index d2a60816d0..423a37a94e 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionDistance extends Condition { - public ConditionDistance(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionDistance(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); setSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED, (message, player) -> message.addString(player.getName())); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java index 3dc78a98c7..8aa68b7e08 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionGroupMax extends Condition { - public ConditionGroupMax(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionGroupMax(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_CANNOT_ENTER_DUE_TO_THE_PARTY_HAVING_EXCEEDED_THE_LIMIT); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java index 818803c844..70ea03c187 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionGroupMin extends Condition { - public ConditionGroupMin(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionGroupMin(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_MUST_HAVE_A_MINIMUM_OF_S1_PEOPLE_TO_ENTER_THIS_INSTANCE_ZONE, (msg, player) -> msg.addInt(getLimit())); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 3088d8ae64..53fee609aa 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.enums.ResidenceType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; */ public class ConditionHasResidence extends Condition { - public ConditionHasResidence(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionHasResidence(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); } @@ -43,7 +43,7 @@ public class ConditionHasResidence extends Condition return false; } - final StatsSet params = getParameters(); + final StatSet params = getParameters(); final int id = params.getInt("id"); boolean test = false; switch (params.getEnum("type", ResidenceType.class)) diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java index 4e1c407325..eed350db38 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -32,7 +32,7 @@ public class ConditionItem extends Condition private final long _count; private final boolean _take; - public ConditionItem(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionItem(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Load params diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java index 7d509a20c7..b38f8c0e2c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -32,7 +32,7 @@ public class ConditionLevel extends Condition private final int _min; private final int _max; - public ConditionLevel(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionLevel(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Load params diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java index b91deeffdb..d71e6d0a39 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; */ public class ConditionNoParty extends Condition { - public ConditionNoParty(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionNoParty(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java index dd31bf3ca5..5bf768a03e 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionParty extends Condition { - public ConditionParty(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionParty(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java index 524a59675a..0363715536 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionPartyLeader extends Condition { - public ConditionPartyLeader(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionPartyLeader(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java index 481cb251ce..48d7fc7981 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.instancemanager.QuestManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionQuest extends Condition { - public ConditionQuest(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionQuest(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Set message diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 899b17aff9..a073129734 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionReenter extends Condition { - public ConditionReenter(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionReenter(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); setSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET, (message, player) -> message.addString(player.getName())); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java index ec255025c3..fafafe5604 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.itemauction; import java.util.Calendar; import java.util.concurrent.TimeUnit; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Forsaiken @@ -40,7 +40,7 @@ public class AuctionDateGenerator private int _hour_of_day; private int _minute_of_hour; - public AuctionDateGenerator(StatsSet config) + public AuctionDateGenerator(StatSet config) { _calendar = Calendar.getInstance(); _interval = config.getInt(FIELD_INTERVAL, -1); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 64bf0a6ff1..cb554e4dce 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.itemauction; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.idfactory.IdFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,9 +34,9 @@ public class AuctionItem private final int _itemId; private final long _itemCount; @SuppressWarnings("unused") - private final StatsSet _itemExtra; + private final StatSet _itemExtra; - public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatsSet itemExtra) + public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatSet itemExtra) { _auctionItemId = auctionItemId; _auctionLength = auctionLength; diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 6dff6e3a4d..dc3a7f6f6b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -44,7 +44,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -84,7 +84,7 @@ public class ItemAuctionInstance _items = new ArrayList<>(); final NamedNodeMap nanode = node.getAttributes(); - final StatsSet generatorConfig = new StatsSet(); + final StatSet generatorConfig = new StatSet(); for (int i = nanode.getLength(); i-- > 0;) { final Node n = nanode.item(i); @@ -115,7 +115,7 @@ public class ItemAuctionInstance throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } - final StatsSet itemExtra = new StatsSet(); + final StatSet itemExtra = new StatSet(); final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Armor.java index d4fd97ef10..bfc90d126d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Armor.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.type.ArmorType; /** @@ -28,15 +28,15 @@ public class Armor extends Item /** * Constructor for Armor. - * @param set the StatsSet designating the set of couples (key,value) characterizing the armor. + * @param set the StatSet designating the set of couples (key,value) characterizing the armor. */ - public Armor(StatsSet set) + public Armor(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/EtcItem.java index 86d7291595..a902860c0d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/EtcItem.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -38,15 +38,15 @@ public class EtcItem extends Item /** * Constructor for EtcItem. - * @param set StatsSet designating the set of couples (key,value) for description of the Etc + * @param set StatSet designating the set of couples (key,value) for description of the Etc */ - public EtcItem(StatsSet set) + public EtcItem(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Henna.java index c669b86eec..c4c32e7cda 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -21,7 +21,7 @@ import java.util.EnumMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; @@ -45,7 +45,7 @@ public class Henna private final List _skills; private final List _wear_class; - public Henna(StatsSet set) + public Henna(StatSet set) { _dyeId = set.getInt("dyeId"); _dyeItemId = set.getInt("dyeItemId"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Item.java index 85df3f7449..95b6a9ebdc 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Item.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.enums.ItemGrade; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; @@ -180,14 +180,14 @@ public abstract class Item extends ListenersContainer implements IIdentifiable /** * Constructor of the Item that fill class variables.
*
- * @param set : StatsSet corresponding to a set of couples (key,value) for description of the item + * @param set : StatSet corresponding to a set of couples (key,value) for description of the item */ - protected Item(StatsSet set) + protected Item(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { _itemId = set.getInt("item_id"); _displayId = set.getInt("displayId", _itemId); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java index ab196007a8..3ca228cbe5 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -29,7 +29,7 @@ public class PlayerItemTemplate extends ItemHolder /** * @param set the set containing the values for this object */ - public PlayerItemTemplate(StatsSet set) + public PlayerItemTemplate(StatSet set) { super(set.getInt("id"), set.getInt("count")); _equipped = set.getBoolean("equipped", false); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Weapon.java index 16f0c47287..5f9f8507bd 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Weapon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.items; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ItemSkillType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -58,15 +58,15 @@ public class Weapon extends Item /** * Constructor for Weapon. - * @param set the StatsSet designating the set of couples (key,value) characterizing the weapon. + * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. */ - public Weapon(StatsSet set) + public Weapon(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java index 7bdd968d90..6d05c20ff3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java @@ -23,7 +23,7 @@ import java.util.List; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -54,7 +54,7 @@ public class AppearanceStone private List _racesNot; private List _allVisualIds; - public AppearanceStone(StatsSet set) + public AppearanceStone(StatSet set) { _id = set.getInt("id"); _visualId = set.getInt("visualId", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java index f3b53f1a67..a2897ba911 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.items.combination; import java.util.EnumMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -31,7 +31,7 @@ public class CombinationItem private final int _chance; private final Map _rewards = new EnumMap<>(CombinationItemType.class); - public CombinationItem(StatsSet set) + public CombinationItem(StatSet set) { _itemOne = set.getInt("one"); _itemTwo = set.getInt("two"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java index 1cde38a6d6..a7f1326bd8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.CrystalType; @@ -59,7 +59,7 @@ public abstract class AbstractEnchantItem private final int _maxEnchantLevel; private final double _bonusRate; - public AbstractEnchantItem(StatsSet set) + public AbstractEnchantItem(StatSet set) { _id = set.getInt("id"); if (getItem() == null) diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java index 36ccf3a5a4..310a7643ec 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -40,7 +40,7 @@ public class EnchantScroll extends AbstractEnchantItem private final int _scrollGroupId; private Set _items; - public EnchantScroll(StatsSet set) + public EnchantScroll(StatSet set) { super(set); _scrollGroupId = set.getInt("scrollGroupId", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java index c02095428b..978e38d533 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items.enchant; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.items.type.ItemType; @@ -30,7 +30,7 @@ public class EnchantSupportItem extends AbstractEnchantItem private final boolean _isGiant; private final ItemType type; - public EnchantSupportItem(StatsSet set) + public EnchantSupportItem(StatSet set) { super(set); type = getItem().getItemType(); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 6b1065a016..af74f07917 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.data.xml.impl.CategoryData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.entity.Hero; @@ -61,7 +61,7 @@ public class Olympiad extends ListenersContainer protected static final Logger LOGGER = Logger.getLogger(Olympiad.class.getName()); protected static final Logger LOGGER_OLYMPIAD = Logger.getLogger("olympiad"); - private static final Map NOBLES = new ConcurrentHashMap<>(); + private static final Map NOBLES = new ConcurrentHashMap<>(); private static final Map NOBLES_RANK = new HashMap<>(); public static final String OLYMPIAD_HTML_PATH = "data/html/olympiad/"; @@ -227,10 +227,10 @@ public class Olympiad extends ListenersContainer PreparedStatement statement = con.prepareStatement(OLYMPIAD_LOAD_NOBLES); ResultSet rset = statement.executeQuery()) { - StatsSet statData; + StatSet statData; while (rset.next()) { - statData = new StatsSet(); + statData = new StatSet(); statData.set(CLASS_ID, rset.getInt(CLASS_ID)); statData.set(CHAR_NAME, rset.getString(CHAR_NAME)); statData.set(POINTS, rset.getInt(POINTS)); @@ -453,7 +453,7 @@ public class Olympiad extends ListenersContainer saveNobleData(); _period = 1; - final List heroesToBe = sortHerosToBe(); + final List heroesToBe = sortHerosToBe(); Hero.getInstance().resetData(); Hero.getInstance().computeNewHeroes(heroesToBe); @@ -487,7 +487,7 @@ public class Olympiad extends ListenersContainer return NOBLES.size(); } - public static StatsSet getNobleStats(int playerId) + public static StatSet getNobleStats(int playerId) { return NOBLES.get(playerId); } @@ -786,7 +786,7 @@ public class Olympiad extends ListenersContainer } int currentPoints; - for (StatsSet nobleInfo : NOBLES.values()) + for (StatSet nobleInfo : NOBLES.values()) { currentPoints = nobleInfo.getInt(POINTS); currentPoints += WEEKLY_POINTS; @@ -804,7 +804,7 @@ public class Olympiad extends ListenersContainer return; } - for (StatsSet nobleInfo : NOBLES.values()) + for (StatSet nobleInfo : NOBLES.values()) { nobleInfo.set(COMP_DONE_WEEK, 0); } @@ -837,9 +837,9 @@ public class Olympiad extends ListenersContainer try (Connection con = DatabaseFactory.getConnection()) { - for (Entry entry : NOBLES.entrySet()) + for (Entry entry : NOBLES.entrySet()) { - final StatsSet nobleInfo = entry.getValue(); + final StatSet nobleInfo = entry.getValue(); if (nobleInfo == null) { @@ -952,7 +952,7 @@ public class Olympiad extends ListenersContainer } } - protected List sortHerosToBe() + protected List sortHerosToBe() { if (_period != 1) { @@ -962,8 +962,8 @@ public class Olympiad extends ListenersContainer if (NOBLES != null) { LOGGER_OLYMPIAD.info("Noble,charid,classid,compDone,points"); - StatsSet nobleInfo; - for (Entry entry : NOBLES.entrySet()) + StatSet nobleInfo; + for (Entry entry : NOBLES.entrySet()) { nobleInfo = entry.getValue(); if (nobleInfo == null) @@ -981,7 +981,7 @@ public class Olympiad extends ListenersContainer } } - final List heroesToBe = new LinkedList<>(); + final List heroesToBe = new LinkedList<>(); int legendId = 0; try (Connection con = DatabaseFactory.getConnection(); @@ -1000,7 +1000,7 @@ public class Olympiad extends ListenersContainer try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(OLYMPIAD_GET_HEROS)) { - StatsSet hero; + StatSet hero; for (int element : HERO_IDS) { statement.setInt(1, element); @@ -1009,7 +1009,7 @@ public class Olympiad extends ListenersContainer { if (rset.next()) { - hero = new StatsSet(); + hero = new StatSet(); final int charId = rset.getInt(CHAR_ID); hero.set(CLASS_ID, element); hero.set(CHAR_ID, charId); @@ -1065,7 +1065,7 @@ public class Olympiad extends ListenersContainer return 0; } - final StatsSet noble = NOBLES.get(objectId); + final StatSet noble = NOBLES.get(objectId); if ((noble == null) || (noble.getInt(POINTS) == 0)) { return 0; @@ -1115,7 +1115,7 @@ public class Olympiad extends ListenersContainer { if (!NOBLES.containsKey(player.getObjectId())) { - final StatsSet statDat = new StatsSet(); + final StatSet statDat = new StatSet(); statDat.set(CLASS_ID, player.getBaseClass()); statDat.set(CHAR_NAME, player.getName()); statDat.set(POINTS, DEFAULT_POINTS); @@ -1222,7 +1222,7 @@ public class Olympiad extends ListenersContainer * @param data the stats set data to add. * @return the old stats set if the noble is already present, null otherwise. */ - public static StatsSet addNobleStats(int charId, StatsSet data) + public static StatSet addNobleStats(int charId, StatSet data) { return NOBLES.put(charId, data); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/Participant.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/Participant.java index 670066ac32..b6d879b902 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/Participant.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/Participant.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.olympiad; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class Participant private final int baseClass; private boolean disconnected = false; private boolean defaulted = false; - private final StatsSet stats; + private final StatSet stats; public String clanName; public int clanId; @@ -125,7 +125,7 @@ public class Participant /** * @return the stats */ - public StatsSet getStats() + public StatSet getStats() { return stats; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java index 4d5231ca5d..c1fb0f88f6 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.primeshop; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -49,7 +49,7 @@ public class PrimeShopGroup private final int _availableCount; private final List _items; - public PrimeShopGroup(StatsSet set, List items) + public PrimeShopGroup(StatSet set, List items) { _brId = set.getInt("id"); _category = set.getInt("cat", 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java index d150ec98cd..88795e0721 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.residences; import java.time.Duration; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -33,7 +33,7 @@ public class ResidenceFunctionTemplate private final Duration _duration; private final double _value; - public ResidenceFunctionTemplate(StatsSet set) + public ResidenceFunctionTemplate(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java index 4f15efda0b..b19f8e59d5 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; /** @@ -34,7 +34,7 @@ public class ShuttleDataHolder private final List _stops = new ArrayList<>(2); private final List _routes = new ArrayList<>(2); - public ShuttleDataHolder(StatsSet set) + public ShuttleDataHolder(StatSet set) { _id = set.getInt("id"); _loc = new Location(set); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/Skill.java index c44b45a781..0e97466a3a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.handler.IAffectScopeHandler; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.CubicInstance; @@ -210,7 +210,7 @@ public class Skill implements IIdentifiable private final SkillBuffType _buffType; private final boolean _displayInList; - public Skill(StatsSet set) + public Skill(StatSet set) { _id = set.getInt(".id"); _level = set.getInt(".level"); @@ -391,7 +391,7 @@ public class Skill implements IIdentifiable _toggleGroupId = set.getInt("toggleGroupId", -1); _attachToggleGroupId = set.getInt("attachToggleGroupId", -1); - _attachSkills = set.getList("attachSkillList", StatsSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatsSet).collect(Collectors.toList()); + _attachSkills = set.getList("attachSkillList", StatSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatSet).collect(Collectors.toList()); final String abnormalResist = set.getString("abnormalResists", null); if (abnormalResist != null) diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java index bfc25bddde..39b738dbca 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.ChanceLocation; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory; /** * @author UnAfraid */ -public class NpcSpawnTemplate implements Cloneable, IParameterized +public class NpcSpawnTemplate implements Cloneable, IParameterized { private static final Logger LOGGER = Logger.getLogger(NpcSpawnTemplate.class.getName()); @@ -56,7 +56,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized private final Duration _respawnTimeRandom; private List _locations; private SpawnTerritory _zone; - private StatsSet _parameters; + private StatSet _parameters; private final boolean _spawnAnimation; private final boolean _saveInDB; private final String _dbName; @@ -82,7 +82,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized _minions = template._minions; } - public NpcSpawnTemplate(SpawnTemplate spawnTemplate, SpawnGroup group, StatsSet set) + public NpcSpawnTemplate(SpawnTemplate spawnTemplate, SpawnGroup group, StatSet set) { _spawnTemplate = spawnTemplate; _group = group; @@ -128,14 +128,14 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized mergeParameters(spawnTemplate, group); } - private StatsSet mergeParameters(SpawnTemplate spawnTemplate, SpawnGroup group) + private StatSet mergeParameters(SpawnTemplate spawnTemplate, SpawnGroup group) { if ((_parameters == null) && (spawnTemplate.getParameters() == null) && (group.getParameters() == null)) { return null; } - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); if (spawnTemplate.getParameters() != null) { set.merge(spawnTemplate.getParameters()); @@ -206,13 +206,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized } @Override - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } @Override - public void setParameters(StatsSet parameters) + public void setParameters(StatSet parameters) { if (_parameters == null) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java index 6723863c93..7ceb2d46af 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IParameterized; import org.l2jmobius.gameserver.model.interfaces.ITerritorized; @@ -31,16 +31,16 @@ import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory; /** * @author UnAfraid */ -public class SpawnGroup implements Cloneable, ITerritorized, IParameterized +public class SpawnGroup implements Cloneable, ITerritorized, IParameterized { private final String _name; private final boolean _spawnByDefault; private List _territories; private List _bannedTerritories; private final List _spawns = new ArrayList<>(); - private StatsSet _parameters; + private StatSet _parameters; - public SpawnGroup(StatsSet set) + public SpawnGroup(StatSet set) { this(set.getString("name", null), set.getBoolean("spawnByDefault", true)); } @@ -104,13 +104,13 @@ public class SpawnGroup implements Cloneable, ITerritorized, IParameterized +public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized { private final String _name; private final String _ai; @@ -45,9 +45,9 @@ public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized _territories; private List _bannedTerritories; private final List _groups = new ArrayList<>(); - private StatsSet _parameters; + private StatSet _parameters; - public SpawnTemplate(StatsSet set, File file) + public SpawnTemplate(StatSet set, File file) { this(set.getString("name", null), set.getString("ai", null), set.getBoolean("spawnByDefault", true), file); } @@ -128,13 +128,13 @@ public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized _castleId; - public TeleportLocation(int id, StatsSet set) + public TeleportLocation(int id, StatSet set) { super(set); _id = id; diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java index 916ae0790c..33cf6ac3bc 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.variables; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.IRestorable; import org.l2jmobius.gameserver.model.interfaces.IStorable; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.interfaces.IStorable; /** * @author UnAfraid */ -public abstract class AbstractVariables extends StatsSet implements IRestorable, IStorable, IDeletable +public abstract class AbstractVariables extends StatSet implements IRestorable, IStorable, IDeletable { private final AtomicBoolean _hasChanges = new AtomicBoolean(false); @@ -41,42 +41,42 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, */ @Override - public StatsSet set(String name, boolean value) + public StatSet set(String name, boolean value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, double value) + public StatSet set(String name, double value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, Enum value) + public StatSet set(String name, Enum value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, int value) + public StatSet set(String name, int value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, long value) + public StatSet set(String name, long value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, String value) + public StatSet set(String name, String value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); @@ -89,7 +89,7 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, * @param markAsChanged * @return */ - public StatsSet set(String name, String value, boolean markAsChanged) + public StatSet set(String name, String value, boolean markAsChanged) { if (markAsChanged) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index 5c03122a62..4d97f0017a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExHeroList implements IClientOutgoingPacket { - private final Map _heroList; + private final Map _heroList; public ExHeroList() { @@ -42,7 +42,7 @@ public class ExHeroList implements IClientOutgoingPacket OutgoingPackets.EX_HERO_LIST.writeId(packet); packet.writeD(_heroList.size()); - for (StatsSet hero : _heroList.values()) + for (StatSet hero : _heroList.values()) { packet.writeS(hero.getString(Olympiad.CHAR_NAME)); packet.writeD(hero.getInt(Olympiad.CLASS_ID)); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java index 92f447c21b..c693291c54 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java @@ -27,7 +27,7 @@ import java.util.GregorianCalendar; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.RankManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; @@ -135,7 +135,7 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket int legendCount = 0; if (Hero.getInstance().getCompleteHeroes().containsKey(_player.getObjectId())) { - final StatsSet hero = Hero.getInstance().getCompleteHeroes().get(_player.getObjectId()); + final StatSet hero = Hero.getInstance().getCompleteHeroes().get(_player.getObjectId()); heroCount = hero.getInt("count"); legendCount = hero.getInt("legend_count"); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java index 7b4c7e5d36..693f8a86ef 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.RankManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -39,8 +39,8 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket private final int _unk; private final int _classId; private final int _serverId; - private final Map _playerList; - private final Map _snapshotList; + private final Map _playerList; + private final Map _snapshotList; public ExOlympiadRankingInfo(PlayerInstance player, int tabId, int rankingType, int unk, int classId, int serverId) { @@ -78,7 +78,7 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket for (Integer id : _playerList.keySet()) { - final StatsSet player = _playerList.get(id); + final StatSet player = _playerList.get(id); packet.writeString(player.getString("name")); // name packet.writeString(player.getString("clanName")); // clan name @@ -88,7 +88,7 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket { for (Integer id2 : _snapshotList.keySet()) { - final StatsSet snapshot = _snapshotList.get(id2); + final StatSet snapshot = _snapshotList.get(id2); if (player.getInt("charId") == snapshot.getInt("charId")) { @@ -117,7 +117,7 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket boolean found = false; for (Integer id : _playerList.keySet()) { - final StatsSet player = _playerList.get(id); + final StatSet player = _playerList.get(id); if (player.getInt("charId") == _player.getObjectId()) { @@ -136,7 +136,7 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket for (int id2 = first; id2 <= last; id2++) { - final StatsSet plr = _playerList.get(id2); + final StatSet plr = _playerList.get(id2); packet.writeString(plr.getString("name")); packet.writeString(plr.getString("clanName")); @@ -145,7 +145,7 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket { for (Integer id3 : _snapshotList.keySet()) { - final StatsSet snapshot = _snapshotList.get(id3); + final StatSet snapshot = _snapshotList.get(id3); if (player.getInt("charId") == snapshot.getInt("charId")) { packet.writeD(id3); // class rank snapshot @@ -184,7 +184,7 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket for (int i = 1; i <= _playerList.size(); i++) { - final StatsSet player = _playerList.get(i); + final StatSet player = _playerList.get(i); if (_classId == player.getInt("classId")) { count++; @@ -195,7 +195,7 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket int i = 1; for (Integer id : _playerList.keySet()) { - final StatsSet player = _playerList.get(id); + final StatSet player = _playerList.get(id); if (_classId == player.getInt("classId")) { @@ -204,11 +204,11 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket packet.writeD(i); // class rank if (_snapshotList.size() > 0) { - final Map snapshotRaceList = new ConcurrentHashMap<>(); + final Map snapshotRaceList = new ConcurrentHashMap<>(); int j = 1; for (Integer id2 : _snapshotList.keySet()) { - final StatsSet snapshot = _snapshotList.get(id2); + final StatSet snapshot = _snapshotList.get(id2); if (_classId == snapshot.getInt("classId")) { @@ -218,7 +218,7 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket } for (Integer id2 : snapshotRaceList.keySet()) { - final StatsSet snapshot = snapshotRaceList.get(id2); + final StatSet snapshot = snapshotRaceList.get(id2); if (player.getInt("charId") == snapshot.getInt("charId")) { @@ -247,11 +247,11 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket else { boolean found = false; - final Map classList = new ConcurrentHashMap<>(); + final Map classList = new ConcurrentHashMap<>(); int i = 1; for (Integer id : _playerList.keySet()) { - final StatsSet set = _playerList.get(id); + final StatSet set = _playerList.get(id); if (_player.getBaseClass() == set.getInt("classId")) { @@ -262,7 +262,7 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket for (Integer id : classList.keySet()) { - final StatsSet player = classList.get(id); + final StatSet player = classList.get(id); if (player.getInt("charId") == _player.getObjectId()) { @@ -279,7 +279,7 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket } for (int id2 = first; id2 <= last; id2++) { - final StatsSet plr = classList.get(id2); + final StatSet plr = classList.get(id2); packet.writeString(plr.getString("name")); packet.writeString(plr.getString("clanName")); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java index c99698db80..16c1874d0c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java @@ -20,7 +20,7 @@ import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.RankManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -33,8 +33,8 @@ public class ExRankingCharInfo implements IClientOutgoingPacket @SuppressWarnings("unused") private final short _unk; private final PlayerInstance _player; - private final Map _playerList; - private final Map _snapshotList; + private final Map _playerList; + private final Map _snapshotList; public ExRankingCharInfo(PlayerInstance player, short unk) { @@ -53,7 +53,7 @@ public class ExRankingCharInfo implements IClientOutgoingPacket { for (Integer id : _playerList.keySet()) { - final StatsSet player = _playerList.get(id); + final StatSet player = _playerList.get(id); if (player.getInt("charId") == _player.getObjectId()) { packet.writeD(id); // server rank @@ -61,7 +61,7 @@ public class ExRankingCharInfo implements IClientOutgoingPacket for (Integer id2 : _snapshotList.keySet()) { - final StatsSet snapshot = _snapshotList.get(id2); + final StatSet snapshot = _snapshotList.get(id2); if (player.getInt("charId") == snapshot.getInt("charId")) { packet.writeD(id2); // server rank snapshot diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java index 2c974bbe88..5c97ee4e99 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.RankManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -38,8 +38,8 @@ public class ExRankingCharRankers implements IClientOutgoingPacket private final int _group; private final int _scope; - private final Map _playerList; - private final Map _snapshotList; + private final Map _playerList; + private final Map _snapshotList; public ExRankingCharRankers(PlayerInstance player, int group, int scope, int race) { @@ -76,7 +76,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket for (Integer id : _playerList.keySet()) { - final StatsSet player = _playerList.get(id); + final StatSet player = _playerList.get(id); packet.writeString(player.getString("name")); packet.writeString(player.getString("clanName")); @@ -88,7 +88,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket { for (Integer id2 : _snapshotList.keySet()) { - final StatsSet snapshot = _snapshotList.get(id2); + final StatSet snapshot = _snapshotList.get(id2); if (player.getInt("charId") == snapshot.getInt("charId")) { @@ -109,7 +109,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket boolean found = false; for (Integer id : _playerList.keySet()) { - final StatsSet player = _playerList.get(id); + final StatSet player = _playerList.get(id); if (player.getInt("charId") == _player.getObjectId()) { @@ -126,7 +126,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket } for (int id2 = first; id2 <= last; id2++) { - final StatsSet plr = _playerList.get(id2); + final StatSet plr = _playerList.get(id2); packet.writeString(plr.getString("name")); packet.writeString(plr.getString("clanName")); @@ -139,7 +139,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket { for (Integer id3 : _snapshotList.keySet()) { - final StatsSet snapshot = _snapshotList.get(id3); + final StatSet snapshot = _snapshotList.get(id3); if (player.getInt("charId") == snapshot.getInt("charId")) { packet.writeD(id3); // server rank snapshot @@ -165,7 +165,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket for (int i = 1; i <= _playerList.size(); i++) { - final StatsSet player = _playerList.get(i); + final StatSet player = _playerList.get(i); if (_race == player.getInt("race")) { count++; @@ -176,7 +176,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket int i = 1; for (Integer id : _playerList.keySet()) { - final StatsSet player = _playerList.get(id); + final StatSet player = _playerList.get(id); if (_race == player.getInt("race")) { @@ -188,11 +188,11 @@ public class ExRankingCharRankers implements IClientOutgoingPacket packet.writeD(i); // server rank if (_snapshotList.size() > 0) { - final Map snapshotRaceList = new ConcurrentHashMap<>(); + final Map snapshotRaceList = new ConcurrentHashMap<>(); int j = 1; for (Integer id2 : _snapshotList.keySet()) { - final StatsSet snapshot = _snapshotList.get(id2); + final StatSet snapshot = _snapshotList.get(id2); if (_race == snapshot.getInt("race")) { @@ -202,7 +202,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket } for (Integer id2 : snapshotRaceList.keySet()) { - final StatsSet snapshot = snapshotRaceList.get(id2); + final StatSet snapshot = snapshotRaceList.get(id2); if (player.getInt("charId") == snapshot.getInt("charId")) { @@ -224,11 +224,11 @@ public class ExRankingCharRankers implements IClientOutgoingPacket { boolean found = false; - final Map raceList = new ConcurrentHashMap<>(); + final Map raceList = new ConcurrentHashMap<>(); int i = 1; for (Integer id : _playerList.keySet()) { - final StatsSet set = _playerList.get(id); + final StatSet set = _playerList.get(id); if (_player.getRace().ordinal() == set.getInt("race")) { @@ -239,7 +239,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket for (Integer id : raceList.keySet()) { - final StatsSet player = raceList.get(id); + final StatSet player = raceList.get(id); if (player.getInt("charId") == _player.getObjectId()) { @@ -256,7 +256,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket } for (int id2 = first; id2 <= last; id2++) { - final StatsSet plr = raceList.get(id2); + final StatSet plr = raceList.get(id2); packet.writeString(plr.getString("name")); packet.writeString(plr.getString("clanName")); @@ -280,11 +280,11 @@ public class ExRankingCharRankers implements IClientOutgoingPacket { if (_player.getClan() != null) { - final Map clanList = new ConcurrentHashMap<>(); + final Map clanList = new ConcurrentHashMap<>(); int i = 1; for (Integer id : _playerList.keySet()) { - final StatsSet set = _playerList.get(id); + final StatSet set = _playerList.get(id); if (_player.getClan().getName() == set.getString("clanName")) { @@ -297,7 +297,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket for (Integer id : clanList.keySet()) { - final StatsSet player = clanList.get(id); + final StatSet player = clanList.get(id); packet.writeString(player.getString("name")); packet.writeString(player.getString("clanName")); @@ -309,7 +309,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket { for (Integer id2 : _snapshotList.keySet()) { - final StatsSet snapshot = _snapshotList.get(id2); + final StatSet snapshot = _snapshotList.get(id2); if (player.getInt("charId") == snapshot.getInt("charId")) { @@ -342,7 +342,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket { for (Integer id2 : _playerList.keySet()) { - final StatsSet temp = _playerList.get(id2); + final StatSet temp = _playerList.get(id2); if (temp.getInt("charId") == id) { friendList.add(temp.getInt("charId")); @@ -356,7 +356,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket for (int id : _playerList.keySet()) { - final StatsSet player = _playerList.get(id); + final StatSet player = _playerList.get(id); if (friendList.contains(player.getInt("charId"))) { packet.writeString(player.getString("name")); @@ -369,7 +369,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket { for (Integer id2 : _snapshotList.keySet()) { - final StatsSet snapshot = _snapshotList.get(id2); + final StatSet snapshot = _snapshotList.get(id2); if (player.getInt("charId") == snapshot.getInt("charId")) { @@ -407,7 +407,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket { for (Integer id : _snapshotList.keySet()) { - final StatsSet snapshot = _snapshotList.get(id); + final StatSet snapshot = _snapshotList.get(id); if (_player.getObjectId() == snapshot.getInt("charId")) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/BypassParser.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/BypassParser.java index 414125bdeb..a80323ba1f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/BypassParser.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/BypassParser.java @@ -20,12 +20,12 @@ import java.util.LinkedHashMap; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid */ -public class BypassParser extends StatsSet +public class BypassParser extends StatSet { private static final String ALLOWED_CHARS = "a-zA-Z0-9-_`!@#%^&*()\\[\\]|\\\\/"; private static final Pattern PATTERN = Pattern.compile(String.format("([%s]*)=('([%s ]*)'|[%s]*)", ALLOWED_CHARS, ALLOWED_CHARS, ALLOWED_CHARS)); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java index f4ff2684ce..3cc39b526f 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; @@ -242,7 +242,7 @@ public class Antharas extends Quest if (FWA_OLDANTHARAS || (status == WAITING)) { - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANTHARASOLDID); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANTHARASOLDID); final Long respawnTime = info.getLong("respawn_time"); if ((status == DEAD) && (respawnTime <= System.currentTimeMillis())) { @@ -305,7 +305,7 @@ public class Antharas extends Quest } if ((antharasId != 0) && (status == FIGHTING)) { - final StatsSet info = GrandBossManager.getInstance().getStatsSet(antharasId); + final StatSet info = GrandBossManager.getInstance().getStatSet(antharasId); final int loc_x = info.getInt("loc_x"); final int loc_y = info.getInt("loc_y"); final int loc_z = info.getInt("loc_z"); @@ -321,7 +321,7 @@ public class Antharas extends Quest } else if ((antharasId != 0) && (status == DEAD)) { - final StatsSet info = GrandBossManager.getInstance().getStatsSet(antharasId); + final StatSet info = GrandBossManager.getInstance().getStatSet(antharasId); final Long respawnTime = info.getLong("respawn_time"); if (respawnTime <= System.currentTimeMillis()) { @@ -967,9 +967,9 @@ public class Antharas extends Quest final long respawnTime = (Config.ANTHARAS_RESP_FIRST + Rnd.get(Config.ANTHARAS_RESP_SECOND)) * 3600000; ThreadPool.schedule(new UnlockAntharas(npc.getNpcId()), respawnTime); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(npc.getNpcId()); + final StatSet info = GrandBossManager.getInstance().getStatSet(npc.getNpcId()); info.set("respawn_time", (System.currentTimeMillis() + respawnTime)); - GrandBossManager.getInstance().setStatsSet(npc.getNpcId(), info); + GrandBossManager.getInstance().setStatSet(npc.getNpcId(), info); } } else if (npc.getNpcId() == 29069) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java index 7429f30f72..2ea80db7ee 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; @@ -109,7 +109,7 @@ public class Baium extends Quest addTalkId(STONE_BAIUM); addTalkId(ANGELIC_VORTEX); _zone = GrandBossManager.getInstance().getZone(113100, 14500, 10077); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LIVE_BAIUM); + final StatSet info = GrandBossManager.getInstance().getStatSet(LIVE_BAIUM); final Integer status = GrandBossManager.getInstance().getBossStatus(LIVE_BAIUM); @@ -430,9 +430,9 @@ public class Baium extends Quest GrandBossManager.getInstance().setBossStatus(LIVE_BAIUM, DEAD); startQuestTimer("baium_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(LIVE_BAIUM); + final StatSet info = GrandBossManager.getInstance().getStatSet(LIVE_BAIUM); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(LIVE_BAIUM, info); + GrandBossManager.getInstance().setStatSet(LIVE_BAIUM, info); } for (NpcInstance minion : _minions) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Core.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Core.java index 3016873bea..41f562662c 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Core.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Core.java @@ -26,7 +26,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; @@ -99,7 +99,7 @@ public class Core extends Quest } _firstAttacked = false; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. @@ -239,9 +239,9 @@ public class Core extends Quest final long respawnTime = (Config.CORE_RESP_FIRST + Rnd.get(Config.CORE_RESP_SECOND)) * 3600000; startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(CORE, info); + GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java index f85c2ad169..7161987af7 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.CommandChannel; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; @@ -310,7 +310,7 @@ public class Frintezza extends Quest addStartNpc(CUBE); addTalkId(CUBE); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(FRINTEZZA); + final StatSet info = GrandBossManager.getInstance().getStatSet(FRINTEZZA); final Integer status = GrandBossManager.getInstance().getBossStatus(FRINTEZZA); if (status == DEAD) { @@ -1741,9 +1741,9 @@ public class Frintezza extends Quest final long respawnTime = (Config.FRINTEZZA_RESP_FIRST + Rnd.get(Config.FRINTEZZA_RESP_SECOND)) * 3600000; startQuestTimer("frintezza_unlock", respawnTime, npc, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(FRINTEZZA); + final StatSet info = GrandBossManager.getInstance().getStatSet(FRINTEZZA); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(FRINTEZZA, info); + GrandBossManager.getInstance().setStatSet(FRINTEZZA, info); } } else if (npc.getNpcId() == 18328) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Orfen.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Orfen.java index 616fd722e4..467db88bc5 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Orfen.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Orfen.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -55,7 +55,7 @@ public class Orfen extends Quest { super(-1, "ai/bosses"); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); final Integer status = GrandBossManager.getInstance().getBossStatus(ORFEN); addEventId(ORFEN, EventType.ON_KILL); @@ -152,11 +152,11 @@ public class Orfen extends Quest double hp = -1; if ((npc.getNpcId() == ORFEN) && !npc.getSpawn().isCustomBossInstance()) { - hp = GrandBossManager.getInstance().getStatsSet(ORFEN).getDouble("currentHP"); + hp = GrandBossManager.getInstance().getStatSet(ORFEN).getDouble("currentHP"); if (hp < npc.getCurrentHp()) { npc.setCurrentHp(hp); - GrandBossManager.getInstance().getStatsSet(ORFEN).set("currentHP", npc.getMaxHp()); + GrandBossManager.getInstance().getStatSet(ORFEN).set("currentHP", npc.getMaxHp()); } } if ((_teleported && (npc.getCurrentHp() > (npc.getMaxHp() * 0.95)))) @@ -205,7 +205,7 @@ public class Orfen extends Quest { if (((npc.getCurrentHp() - damage) < (npc.getMaxHp() / 2)) && !_teleported) { - GrandBossManager.getInstance().getStatsSet(ORFEN).set("currentHP", npc.getCurrentHp()); + GrandBossManager.getInstance().getStatSet(ORFEN).set("currentHP", npc.getCurrentHp()); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); _teleported = true; npc.getSpawn().setX(43577); @@ -245,9 +245,9 @@ public class Orfen extends Quest cancelQuestTimer("ORFEN_REFRESH", npc, null); startQuestTimer("ORFEN_SPAWN", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(ORFEN, info); + GrandBossManager.getInstance().setStatSet(ORFEN, info); } } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt.java index 12751f06a6..3f6f4e4bcb 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -91,7 +91,7 @@ public class QueenAnt extends Quest _zone = GrandBossManager.getInstance().getZone(-21610, 181594, -5734); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); final Integer status = GrandBossManager.getInstance().getBossStatus(QUEEN); @@ -382,9 +382,9 @@ public class QueenAnt extends Quest cancelQuestTimer("HEAL", null, null); // cancelQuestTimer("CHECK_QA_ZONE", npc, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(QUEEN, info); + GrandBossManager.getInstance().setStatSet(QUEEN, info); } startQuestTimer("DESPAWN_MINIONS", 10000, null, null); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Valakas.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Valakas.java index 55d5ce1e30..7bf42631a6 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Valakas.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Valakas.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; @@ -91,7 +91,7 @@ public class Valakas extends Quest i_quest0 = 0; lastAttackTime = System.currentTimeMillis(); _Zone = GrandBossManager.getInstance().getZone(212852, -114842, -1632); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(VALAKAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); final Integer status = GrandBossManager.getInstance().getBossStatus(VALAKAS); @@ -610,9 +610,9 @@ public class Valakas extends Quest startQuestTimer("valakas_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(VALAKAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); info.set("respawn_time", (System.currentTimeMillis() + respawnTime)); - GrandBossManager.getInstance().setStatsSet(VALAKAS, info); + GrandBossManager.getInstance().setStatSet(VALAKAS, info); } return super.onKill(npc, killer, isPet); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java index e7f2285a36..2dddb75b7d 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java @@ -41,7 +41,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -1277,13 +1277,13 @@ public class VanHalter extends Quest if (status != INTERVAL) { final long interval = Rnd.get(Config.HPH_FIXINTERVALOFHALTER, Config.HPH_FIXINTERVALOFHALTER + Config.HPH_RANDOMINTERVALOFHALTER)/* * 3600000 */; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(29062); + final StatSet info = GrandBossManager.getInstance().getStatSet(29062); info.set("respawn_time", (System.currentTimeMillis() + interval)); - GrandBossManager.getInstance().setStatsSet(29062, info); + GrandBossManager.getInstance().setStatSet(29062, info); GrandBossManager.getInstance().setBossStatus(29062, INTERVAL); } - final StatsSet info = GrandBossManager.getInstance().getStatsSet(29062); + final StatSet info = GrandBossManager.getInstance().getStatSet(29062); final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); _intervalTask = ThreadPool.schedule(new Interval(), temp); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Zaken.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Zaken.java index f17dd0be7f..78cbbfa74a 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Zaken.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Zaken.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.datatables.xml.DoorData; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; @@ -163,7 +163,7 @@ public class Zaken extends Quest _Zone = GrandBossManager.getInstance().getZone(55312, 219168, -3223); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ZAKEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN); final Integer status = GrandBossManager.getInstance().getBossStatus(ZAKEN); if (status == DEAD) { @@ -869,9 +869,9 @@ public class Zaken extends Quest cancelQuestTimer("1001", npc, null); cancelQuestTimer("1003", npc, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ZAKEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(ZAKEN, info); + GrandBossManager.getInstance().setStatSet(ZAKEN, info); } } else if (status == ALIVE) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/CharTemplateTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/CharTemplateTable.java index 178df8a935..cfc8ee2f54 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/CharTemplateTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/CharTemplateTable.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.base.ClassId; @@ -171,7 +171,7 @@ public class CharTemplateTable while (rset.next()) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.set("classId", rset.getInt("id")); set.set("className", rset.getString("className")); set.set("raceId", rset.getInt("raceId")); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/HelperBuffTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/HelperBuffTable.java index 5393126a87..3b2c89b70d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/HelperBuffTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/HelperBuffTable.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.HelperBuffHolder; /** @@ -84,7 +84,7 @@ public class HelperBuffTable { while (helperBuffData.next()) { - final StatsSet helperBuffDat = new StatsSet(); + final StatSet helperBuffDat = new StatSet(); final int id = helperBuffData.getInt("id"); helperBuffDat.set("id", id); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/NpcTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/NpcTable.java index 008ecf1e81..c931579205 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/NpcTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/NpcTable.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.DropCategory; import org.l2jmobius.gameserver.model.DropData; import org.l2jmobius.gameserver.model.MinionData; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.BaseStat; @@ -284,7 +284,7 @@ public class NpcTable { while (npcData.next()) { - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); final int id = npcData.getInt("id"); @@ -606,7 +606,7 @@ public class NpcTable load(); } - public void saveNpc(StatsSet npc) + public void saveNpc(StatSet npc) { try (Connection con = DatabaseFactory.getConnection()) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/AdminData.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/AdminData.java index c397d9ba8a..894b797cc0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/AdminData.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/AdminData.java @@ -31,7 +31,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.AccessLevel; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.GameServerPacket; @@ -75,7 +75,7 @@ public class AdminData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set = null; + StatSet set = null; String command = null; int accessLevel = 0; String name = null; @@ -101,7 +101,7 @@ public class AdminData implements IXmlReader { if ("access".equals(d.getNodeName())) { - set = new StatsSet(parseAttributes(d)); + set = new StatSet(parseAttributes(d)); accessLevel = set.getInt("level"); name = set.getString("name"); @@ -175,7 +175,7 @@ public class AdminData implements IXmlReader } else if ("admin".equals(d.getNodeName())) { - set = new StatsSet(parseAttributes(d)); + set = new StatSet(parseAttributes(d)); command = set.getString("command"); accessLevel = set.getInt("accessLevel"); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/DoorData.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/DoorData.java index c447ba3e65..5b670616e3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/DoorData.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/DoorData.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.datatables.csv.MapRegionTable; import org.l2jmobius.gameserver.idfactory.IdFactory; import org.l2jmobius.gameserver.instancemanager.ClanHallManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; import org.l2jmobius.gameserver.model.entity.ClanHall; @@ -57,7 +57,7 @@ public class DoorData implements IXmlReader { try { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final Node n = doc.getFirstChild(); for (Node node = n.getFirstChild(); node != null; node = node.getNextSibling()) @@ -91,7 +91,7 @@ public class DoorData implements IXmlReader } } - public static DoorInstance createDoor(StatsSet set) + public static DoorInstance createDoor(StatSet set) { final String name = set.getString("name"); final int id = set.getInt("id"); @@ -135,7 +135,7 @@ public class DoorData implements IXmlReader collisionRadius = xMax - xMin; } - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", id); npcDat.set("level", 0); npcDat.set("jClass", "door"); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/FishData.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/FishData.java index 9bed05dea5..f75ab4fb2e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/FishData.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/FishData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Fish; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * This class loads and stores {@link Fish} infos. @@ -52,8 +52,8 @@ public class FishData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - // StatsSet used to feed informations. Cleaned on every entry. - final StatsSet set = new StatsSet(); + // StatSet used to feed informations. Cleaned on every entry. + final StatSet set = new StatSet(); // First element is never read. final Node n = doc.getFirstChild(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/HennaData.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/HennaData.java index 7d5cd83eb8..a86da4fe50 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/HennaData.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/HennaData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.Henna; @@ -54,8 +54,8 @@ public class HennaData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - // StatsSet used to feed informations. Cleaned on every entry. - final StatsSet set = new StatsSet(); + // StatSet used to feed informations. Cleaned on every entry. + final StatSet set = new StatSet(); // First element is never read. final Node n = doc.getFirstChild(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java index 0679e194a6..ec04dff7dc 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.Skill.SkillType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.items.Weapon; @@ -123,7 +123,7 @@ public abstract class DocumentBase protected abstract void parseDocument(Document doc); - protected abstract StatsSet getStatsSet(); + protected abstract StatSet getStatSet(); protected abstract String getTableValue(String name); @@ -873,7 +873,7 @@ public abstract class DocumentBase setTable(name, res); } - protected void parseBeanSet(Node n, StatsSet set, Integer level) + protected void parseBeanSet(Node n, StatSet set, Integer level) { final String name = n.getAttributes().getNamedItem("name").getNodeValue().trim(); final String value = n.getAttributes().getNamedItem("val").getNodeValue().trim(); @@ -921,7 +921,7 @@ public abstract class DocumentBase } // try to find value out of item fields - final StatsSet set = getStatsSet(); + final StatSet set = getStatSet(); final String field = set.getString(val.substring(1)); if (field != null) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentItem.java index 342ce8452d..35663a275a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentItem.java @@ -26,7 +26,7 @@ import java.util.logging.Level; import org.w3c.dom.Document; import org.w3c.dom.Node; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Armor; import org.l2jmobius.gameserver.model.items.EtcItem; import org.l2jmobius.gameserver.model.items.Item; @@ -104,7 +104,7 @@ final class DocumentItem extends DocumentBase } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return _currentItem.set; } @@ -157,7 +157,7 @@ final class DocumentItem extends DocumentBase _currentItem.id = itemId; _currentItem.name = itemName; - _currentItem.set = new StatsSet(); + _currentItem.set = new StatSet(); _currentItem.set.set("item_id", itemId); _currentItem.set.set("name", itemName); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentSkill.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentSkill.java index 9559df92bd..84fc512c63 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentSkill.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentSkill.java @@ -26,7 +26,7 @@ import org.w3c.dom.Node; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.Skill.SkillType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.skills.conditions.Condition; /** @@ -48,7 +48,7 @@ final class DocumentSkill extends DocumentBase } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return _currentSkill.sets[_currentSkill.currentLevel]; } @@ -135,13 +135,13 @@ final class DocumentSkill extends DocumentBase _currentSkill.id = skillId; _currentSkill.name = skillName; - _currentSkill.sets = new StatsSet[lastLvl]; - _currentSkill.enchsets1 = new StatsSet[enchantLevels1]; - _currentSkill.enchsets2 = new StatsSet[enchantLevels2]; + _currentSkill.sets = new StatSet[lastLvl]; + _currentSkill.enchsets1 = new StatSet[enchantLevels1]; + _currentSkill.enchsets2 = new StatSet[enchantLevels2]; for (int i = 0; i < lastLvl; i++) { - _currentSkill.sets[i] = new StatsSet(); + _currentSkill.sets[i] = new StatSet(); _currentSkill.sets[i].set("skill_id", _currentSkill.id); _currentSkill.sets[i].set("level", i + 1); _currentSkill.sets[i].set("name", _currentSkill.name); @@ -174,7 +174,7 @@ final class DocumentSkill extends DocumentBase for (int i = 0; i < enchantLevels1; i++) { - _currentSkill.enchsets1[i] = new StatsSet(); + _currentSkill.enchsets1[i] = new StatSet(); _currentSkill.enchsets1[i].set("skill_id", _currentSkill.id); _currentSkill.enchsets1[i].set("level", i + 101); _currentSkill.enchsets1[i].set("name", _currentSkill.name); @@ -203,7 +203,7 @@ final class DocumentSkill extends DocumentBase for (int i = 0; i < enchantLevels2; i++) { - _currentSkill.enchsets2[i] = new StatsSet(); + _currentSkill.enchsets2[i] = new StatSet(); _currentSkill.enchsets2[i].set("skill_id", _currentSkill.id); _currentSkill.enchsets2[i].set("level", i + 141); _currentSkill.enchsets2[i].set("name", _currentSkill.name); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/ItemDataHolder.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/ItemDataHolder.java index 7b67f999bb..65ae6f3d55 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/ItemDataHolder.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/ItemDataHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.engines; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; /** @@ -28,7 +28,7 @@ public class ItemDataHolder public int id; public Enum type; public String name; - public StatsSet set; + public StatSet set; public int currentLevel; public Item item; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/SkillDataHolder.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/SkillDataHolder.java index 08abbe51c8..ba19acfd9e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/SkillDataHolder.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/SkillDataHolder.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -29,9 +29,9 @@ public class SkillDataHolder { public int id; public String name; - public StatsSet[] sets; - public StatsSet[] enchsets1; - public StatsSet[] enchsets2; + public StatSet[] sets; + public StatSet[] enchsets1; + public StatSet[] enchsets2; public int currentLevel; public List skills = new ArrayList<>(); public List currentSkills = new ArrayList<>(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java index 17c152b3c5..59f7d2367d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.DropCategory; import org.l2jmobius.gameserver.model.DropData; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -920,7 +920,7 @@ public class AdminEditNpc implements IAdminCommandHandler private void save_npc_property(PlayerInstance activeChar, String[] commandSplit) { - final StatsSet newNpcData = new StatsSet(); + final StatSet newNpcData = new StatSet(); try { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSpawn.java index 0801071986..a40a6e95dc 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSpawn.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSpawn.java @@ -319,7 +319,7 @@ public class AdminSpawn implements IAdminCommandHandler if (RaidBossSpawnManager.getInstance().getValidTemplate(spawn.getNpcId()) != null) { - RaidBossSpawnManager.getInstance().addNewSpawn(spawn, 0, template1.getStatsSet().getDouble("baseHpMax"), template1.getStatsSet().getDouble("baseMpMax"), permanent); + RaidBossSpawnManager.getInstance().addNewSpawn(spawn, 0, template1.getStatSet().getDouble("baseHpMax"), template1.getStatSet().getDouble("baseMpMax"), permanent); } else { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java index b3a04f567a..21c9eed8fc 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.idfactory.IdFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.BoatInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; @@ -141,7 +141,7 @@ public class BoatManager final int zspawn = Integer.parseInt(st.nextToken()); final int heading = Integer.parseInt(st.nextToken()); - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", id); npcDat.set("level", 0); npcDat.set("jClass", "boat"); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java index 15cce34eb7..b8e6c2c380 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java @@ -30,7 +30,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.datatables.sql.NpcTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; @@ -65,7 +65,7 @@ public class GrandBossManager private static final String UPDATE_GRAND_BOSS_DATA2 = "UPDATE grandboss_data set status = ? where boss_id = ?"; protected static Map _bosses; - protected static Map _storedInfo; + protected static Map _storedInfo; private Map _bossStatus; private Collection _zones; @@ -87,7 +87,7 @@ public class GrandBossManager while (rset.next()) { // Read all info from DB, and store it for AI to read and decide what to do faster than accessing DB in real time - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); final int bossId = rset.getInt("boss_id"); info.set("loc_x", rset.getInt("loc_x")); info.set("loc_y", rset.getInt("loc_y")); @@ -248,12 +248,12 @@ public class GrandBossManager return _bosses.remove(bossId); } - public StatsSet getStatsSet(int bossId) + public StatSet getStatSet(int bossId) { return _storedInfo.get(bossId); } - public void setStatsSet(int bossId, StatsSet info) + public void setStatSet(int bossId, StatSet info) { if (_storedInfo.containsKey(bossId)) { @@ -268,11 +268,11 @@ public class GrandBossManager { try (Connection con = DatabaseFactory.getConnection()) { - for (Entry entry : _storedInfo.entrySet()) + for (Entry entry : _storedInfo.entrySet()) { final int bossId = entry.getKey(); final GrandBossInstance boss = _bosses.get(bossId); - final StatsSet info = entry.getValue(); + final StatSet info = entry.getValue(); if ((boss == null) || (info == null)) { final PreparedStatement update2 = con.prepareStatement(UPDATE_GRAND_BOSS_DATA2); @@ -341,11 +341,11 @@ public class GrandBossManager } } - for (Entry entry : _storedInfo.entrySet()) + for (Entry entry : _storedInfo.entrySet()) { final int bossId = entry.getKey(); final GrandBossInstance boss = _bosses.get(bossId); - final StatsSet info = entry.getValue(); + final StatSet info = entry.getValue(); if ((boss == null) || (info == null)) { final PreparedStatement update2 = con.prepareStatement(UPDATE_GRAND_BOSS_DATA2); @@ -390,7 +390,7 @@ public class GrandBossManager try (Connection con = DatabaseFactory.getConnection()) { final GrandBossInstance boss = _bosses.get(bossId); - final StatsSet info = _storedInfo.get(bossId); + final StatSet info = _storedInfo.get(bossId); if (statusOnly || (boss == null) || (info == null)) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java index 63d07097f6..08bf89af3e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.datatables.sql.NpcTable; import org.l2jmobius.gameserver.datatables.sql.SpawnTable; import org.l2jmobius.gameserver.datatables.xml.AdminData; import org.l2jmobius.gameserver.enums.RaidBossStatus; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.RaidBossInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.entity.Announcements; @@ -52,7 +52,7 @@ public class RaidBossSpawnManager protected static final Map _bosses = new ConcurrentHashMap<>(); protected static final Map _spawns = new ConcurrentHashMap<>(); - protected static final Map _storedInfo = new ConcurrentHashMap<>(); + protected static final Map _storedInfo = new ConcurrentHashMap<>(); protected static final Map> _schedules = new ConcurrentHashMap<>(); /** @@ -143,7 +143,7 @@ public class RaidBossSpawnManager { raidboss.setRaidStatus(RaidBossStatus.ALIVE); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", raidboss.getCurrentHp()); info.set("currentMP", raidboss.getCurrentMp()); info.set("respawnTime", 0); @@ -175,7 +175,7 @@ public class RaidBossSpawnManager */ public void updateStatus(RaidBossInstance boss, boolean isBossDead) { - final StatsSet info = _storedInfo.get(boss.getNpcId()); + final StatSet info = _storedInfo.get(boss.getNpcId()); if (info == null) { return; @@ -255,7 +255,7 @@ public class RaidBossSpawnManager _bosses.put(bossId, raidboss); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", currentHP); info.set("currentMP", currentMP); info.set("respawnTime", 0); @@ -378,7 +378,7 @@ public class RaidBossSpawnManager updateStatus(boss, false); } - final StatsSet info = _storedInfo.get(bossId); + final StatSet info = _storedInfo.get(bossId); if (info == null) { @@ -498,7 +498,7 @@ public class RaidBossSpawnManager */ public void notifySpawnNightBoss(RaidBossInstance raidboss) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", raidboss.getCurrentHp()); info.set("currentMP", raidboss.getCurrentMp()); info.set("respawnTime", 0); @@ -544,7 +544,7 @@ public class RaidBossSpawnManager * Gets the stored info. * @return the stored info */ - public Map getStoredInfo() + public Map getStoredInfo() { return _storedInfo; } @@ -568,7 +568,7 @@ public class RaidBossSpawnManager _spawns.clear(); } - public StatsSet getStatsSet(int bossId) + public StatSet getStatSet(int bossId) { return _storedInfo.get(bossId); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ChanceCondition.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ChanceCondition.java index d8a561e6f7..db1c3618e7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ChanceCondition.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ChanceCondition.java @@ -89,7 +89,7 @@ public class ChanceCondition _chance = chance; } - public static ChanceCondition parse(StatsSet set) + public static ChanceCondition parse(StatSet set) { try { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Fish.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Fish.java index 1e16f7a4b4..0c8543d3ba 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Fish.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Fish.java @@ -34,7 +34,7 @@ public class Fish private final int _waitTime; private final int _combatTime; - public Fish(StatsSet set) + public Fish(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/NpcWalkerNode.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/NpcWalkerNode.java index 989287431a..2e8859dd7b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/NpcWalkerNode.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/NpcWalkerNode.java @@ -133,9 +133,9 @@ public class NpcWalkerNode /** * Constructor of NpcWalker.
*
- * @param set The StatsSet object to transfert data to the method + * @param set The StatSet object to transfert data to the method */ - public NpcWalkerNode(StatsSet set) + public NpcWalkerNode(StatSet set) { _npcId = set.getInt("npc_id"); _movePoint = set.getString("move_point"); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java index 722c34c256..3f005dc1e0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java @@ -264,11 +264,11 @@ public abstract class Skill private final Class _class; - public Skill makeSkill(StatsSet set) + public Skill makeSkill(StatSet set) { try { - final Constructor c = _class.getConstructor(StatsSet.class); + final Constructor c = _class.getConstructor(StatSet.class); return c.newInstance(set); } @@ -512,7 +512,7 @@ public abstract class Skill private final boolean _advancedFlag; private final int _advancedMultiplier; - protected Skill(StatsSet set) + protected Skill(StatSet set) { _id = set.getInt("skill_id", 0); _level = set.getInt("level", 1); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/StatsSet.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/StatSet.java similarity index 94% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/StatsSet.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/StatSet.java index bb100e0cbb..e196b53a94 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/StatsSet.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/StatSet.java @@ -38,25 +38,25 @@ import org.l2jmobius.gameserver.util.Util; * They are stored as object but can be retrieved in any type wanted. As long as cast is available.
* @author mkizub */ -public class StatsSet implements IParserAdvUtils +public class StatSet implements IParserAdvUtils { - private static final Logger LOGGER = Logger.getLogger(StatsSet.class.getName()); + private static final Logger LOGGER = Logger.getLogger(StatSet.class.getName()); /** Static empty immutable map, used to avoid multiple null checks over the source. */ - public static final StatsSet EMPTY_STATSET = new StatsSet(Collections.emptyMap()); + public static final StatSet EMPTY_STATSET = new StatSet(Collections.emptyMap()); private final Map _set; - public StatsSet() + public StatSet() { this(ConcurrentHashMap::new); } - public StatsSet(Supplier> mapFactory) + public StatSet(Supplier> mapFactory) { this(mapFactory.get()); } - public StatsSet(Map map) + public StatSet(Map map) { _set = map; } @@ -72,9 +72,9 @@ public class StatsSet implements IParserAdvUtils /** * Add a set of couple values in the current set - * @param newSet : StatsSet pointing out the list of couples to add in the current set + * @param newSet : StatSet pointing out the list of couples to add in the current set */ - public void merge(StatsSet newSet) + public void merge(StatSet newSet) { _set.putAll(newSet.getSet()); } @@ -857,7 +857,7 @@ public class StatsSet implements IParserAdvUtils return (Map) obj; } - public StatsSet set(String name, Object value) + public StatSet set(String name, Object value) { if (value == null) { @@ -867,49 +867,49 @@ public class StatsSet implements IParserAdvUtils return this; } - public StatsSet set(String key, boolean value) + public StatSet set(String key, boolean value) { _set.put(key, value); return this; } - public StatsSet set(String key, byte value) + public StatSet set(String key, byte value) { _set.put(key, value); return this; } - public StatsSet set(String key, short value) + public StatSet set(String key, short value) { _set.put(key, value); return this; } - public StatsSet set(String key, int value) + public StatSet set(String key, int value) { _set.put(key, value); return this; } - public StatsSet set(String key, long value) + public StatSet set(String key, long value) { _set.put(key, value); return this; } - public StatsSet set(String key, float value) + public StatSet set(String key, float value) { _set.put(key, value); return this; } - public StatsSet set(String key, double value) + public StatSet set(String key, double value) { _set.put(key, value); return this; } - public StatsSet set(String key, String value) + public StatSet set(String key, String value) { if (value == null) { @@ -919,7 +919,7 @@ public class StatsSet implements IParserAdvUtils return this; } - public StatsSet set(String key, Enum value) + public StatSet set(String key, Enum value) { if (value == null) { @@ -944,15 +944,15 @@ public class StatsSet implements IParserAdvUtils if ((min <= max) && ((value < min) || (value >= max))) { - LOGGER.info("[StatsSet][safeSet] Incorrect value: " + value + "for: " + name + "Ref: " + reference); + LOGGER.info("[StatSet][safeSet] Incorrect value: " + value + "for: " + name + "Ref: " + reference); } set(name, value); } - public static StatsSet valueOf(String key, Object value) + public static StatSet valueOf(String key, Object value) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.set(key, value); return set; } @@ -970,6 +970,6 @@ public class StatsSet implements IParserAdvUtils @Override public String toString() { - return "StatsSet{_set=" + _set + '}'; + return "StatSet{_set=" + _set + '}'; } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java index 3127ebdcfe..e852502c34 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -6530,14 +6530,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder if (bossTemplate.getType().equals("RaidBoss")) { - if (RaidBossSpawnManager.getInstance().getStatsSet(bossId) != null) + if (RaidBossSpawnManager.getInstance().getStatSet(bossId) != null) { bossInstance = RaidBossSpawnManager.getInstance().getBoss(bossId); } } else if (bossTemplate.getType().equals("GrandBoss")) { - if (GrandBossManager.getInstance().getStatsSet(bossId) != null) + if (GrandBossManager.getInstance().getStatSet(bossId) != null) { bossInstance = GrandBossManager.getInstance().getBoss(bossId); } @@ -8362,14 +8362,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder if (bossTemplate.getType().equals("RaidBoss")) { - if (RaidBossSpawnManager.getInstance().getStatsSet(bossId) != null) + if (RaidBossSpawnManager.getInstance().getStatSet(bossId) != null) { bossInstance = RaidBossSpawnManager.getInstance().getBoss(bossId); } } else if (bossTemplate.getType().equals("GrandBoss")) { - if (GrandBossManager.getInstance().getStatsSet(bossId) != null) + if (GrandBossManager.getInstance().getStatSet(bossId) != null) { bossInstance = GrandBossManager.getInstance().getBoss(bossId); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FestivalGuideInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FestivalGuideInstance.java index 1222dde647..b2899848b2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FestivalGuideInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FestivalGuideInstance.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.entity.sevensigns.SevenSigns; import org.l2jmobius.gameserver.model.entity.sevensigns.SevenSignsFestival; @@ -322,9 +322,9 @@ public class FestivalGuideInstance extends FolkInstance case 4: // Current High Scores { final StringBuilder strBuffer = new StringBuilder("Festival Guide:
These are the top scores of the week, for the "); - final StatsSet dawnData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DAWN, _festivalType); - final StatsSet duskData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DUSK, _festivalType); - final StatsSet overallData = SevenSignsFestival.getInstance().getOverallHighestScoreData(_festivalType); + final StatSet dawnData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DAWN, _festivalType); + final StatSet duskData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DUSK, _festivalType); + final StatSet overallData = SevenSignsFestival.getInstance().getOverallHighestScoreData(_festivalType); final int dawnScore = dawnData.getInt("score"); final int duskScore = duskData.getInt("score"); int overallScore = 0; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java index 6e95bd4bd2..4ebcb9fba0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java @@ -1089,7 +1089,7 @@ public class VillageMasterInstance extends FolkInstance */ private final Race getVillageMasterRace() { - final String npcClass = getTemplate().getStatsSet().getString("jClass").toLowerCase(); + final String npcClass = getTemplate().getStatSet().getString("jClass").toLowerCase(); if (npcClass.contains("human")) { @@ -1120,7 +1120,7 @@ public class VillageMasterInstance extends FolkInstance */ private final ClassType getVillageMasterTeachType() { - final String npcClass = getTemplate().getStatsSet().getString("jClass"); + final String npcClass = getTemplate().getStatSet().getString("jClass"); if (npcClass.contains("sanctuary") || npcClass.contains("clergyman")) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 7de552667b..9a19273b80 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.actor.templates; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; public class CreatureTemplate { @@ -93,7 +93,7 @@ public class CreatureTemplate private final int _collisionRadius; private final int _collisionHeight; - public CreatureTemplate(StatsSet set) + public CreatureTemplate(StatSet set) { // Base stats _baseSTR = set.getInt("baseSTR"); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index f1ac16d584..af3f2979a1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.DropCategory; import org.l2jmobius.gameserver.model.DropData; import org.l2jmobius.gameserver.model.MinionData; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.quest.EventType; import org.l2jmobius.gameserver.model.quest.Quest; @@ -114,7 +114,7 @@ public class NpcTemplate extends CreatureTemplate UNKNOWN } - private final StatsSet _npcStatsSet; + private final StatSet _npcStatSet; /** The table containing all Item that can be dropped by NpcInstance using this NpcTemplate */ private final List _categories = new ArrayList<>(); @@ -130,10 +130,10 @@ public class NpcTemplate extends CreatureTemplate /** * Constructor of Creature. - * @param set The StatsSet object to transfer data to the method + * @param set The StatSet object to transfer data to the method * @param custom */ - public NpcTemplate(StatsSet set, boolean custom) + public NpcTemplate(StatSet set, boolean custom) { super(set); _npcId = set.getInt("npcId"); @@ -163,7 +163,7 @@ public class NpcTemplate extends CreatureTemplate setFactionId(f.intern()); } _factionRange = set.getInt("factionRange", 0); - _npcStatsSet = set; + _npcStatSet = set; _custom = custom; } @@ -353,9 +353,9 @@ public class NpcTemplate extends CreatureTemplate return _questEvents.get(eventType); } - public StatsSet getStatsSet() + public StatSet getStatSet() { - return _npcStatsSet; + return _npcStatSet; } public void setRace(int raceId) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 8a90ca4c0b..32c0cb6d21 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.Item; @@ -52,7 +52,7 @@ public class PlayerTemplate extends CreatureTemplate private final List _items = new ArrayList<>(); - public PlayerTemplate(StatsSet set) + public PlayerTemplate(StatSet set) { super(set); _classId = ClassId.getClassId(set.getInt("classId")); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/ClanHall.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/ClanHall.java index b68220a378..ba9be0e92c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/ClanHall.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/ClanHall.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.datatables.sql.ClanTable; import org.l2jmobius.gameserver.datatables.xml.DoorData; import org.l2jmobius.gameserver.instancemanager.AuctionManager; import org.l2jmobius.gameserver.instancemanager.ClanHallManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -54,7 +54,7 @@ public class ClanHall public static final int FUNC_DECO_CURTAINS = 8; final int _clanHallId; private final List _doors = new ArrayList<>(); - private final List _doorDefault = new ArrayList<>(); + private final List _doorDefault = new ArrayList<>(); final String _name; private int _ownerId; private Clan _ownerClan; @@ -866,7 +866,7 @@ public class ClanHall while (rs.next()) { // Create set of the door default for use when respawning dead doors - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.set("name", rs.getString("name")); set.set("id", rs.getInt("id")); set.set("x", rs.getInt("x")); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/Hero.java index f20b9c2585..d794fd13d9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/Hero.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/Hero.java @@ -29,7 +29,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.datatables.sql.ClanTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -58,8 +58,8 @@ public class Hero private static final String GET_CLAN_NAME = "SELECT clan_name FROM clan_data WHERE clan_id = (SELECT clanid FROM characters WHERE char_name = ?)"; private static final String DELETE_ITEMS = "DELETE FROM items WHERE item_id IN (6842, 6611, 6612, 6613, 6614, 6615, 6616, 6617, 6618, 6619, 6620, 6621) AND owner_id NOT IN (SELECT obj_id FROM characters WHERE accesslevel > 0)"; private static final List _heroItems = Arrays.asList(6842, 6611, 6612, 6613, 6614, 6615, 6616, 6617, 6618, 6619, 6620, 6621); - private static Map _heroes; - private static Map _completeHeroes; + private static Map _heroes; + private static Map _completeHeroes; public static final String COUNT = "count"; public static final String PLAYED = "played"; @@ -88,7 +88,7 @@ public class Hero rset = statement.executeQuery(); while (rset.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset.getInt(Olympiad.CLASS_ID)); @@ -130,7 +130,7 @@ public class Hero rset = statement.executeQuery(); while (rset.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset.getInt(Olympiad.CHAR_ID); final String charName = rset.getString(Olympiad.CHAR_NAME); @@ -190,7 +190,7 @@ public class Hero { try { - final StatsSet newHero = new StatsSet(); + final StatSet newHero = new StatSet(); newHero.set(Olympiad.CHAR_NAME, player.getName()); newHero.set(Olympiad.CLASS_ID, player.getClassId().getId()); newHero.set(COUNT, 1); @@ -219,19 +219,19 @@ public class Hero } } - public Map getHeroes() + public Map getHeroes() { return _heroes; } - public synchronized void computeNewHeroes(List newHeroes) + public synchronized void computeNewHeroes(List newHeroes) { updateHeroes(true); ItemInstance[] items; InventoryUpdate iu; if (_heroes.size() != 0) { - for (StatsSet hero : _heroes.values()) + for (StatSet hero : _heroes.values()) { final String name = hero.getString(Olympiad.CHAR_NAME); final PlayerInstance player = World.getInstance().getPlayer(name); @@ -305,13 +305,13 @@ public class Hero _heroes.clear(); return; } - final Map heroes = new HashMap<>(); - for (StatsSet hero : newHeroes) + final Map heroes = new HashMap<>(); + for (StatSet hero : newHeroes) { final int charId = hero.getInt(Olympiad.CHAR_ID); if ((_completeHeroes != null) && _completeHeroes.containsKey(charId)) { - final StatsSet oldHero = _completeHeroes.get(charId); + final StatSet oldHero = _completeHeroes.get(charId); final int count = oldHero.getInt(COUNT); oldHero.set(COUNT, count + 1); oldHero.set(PLAYED, 1); @@ -319,7 +319,7 @@ public class Hero } else { - final StatsSet newHero = new StatsSet(); + final StatSet newHero = new StatSet(); newHero.set(Olympiad.CHAR_NAME, hero.getString(Olympiad.CHAR_NAME)); newHero.set(Olympiad.CLASS_ID, hero.getInt(Olympiad.CLASS_ID)); newHero.set(COUNT, 1); @@ -332,7 +332,7 @@ public class Hero _heroes.putAll(heroes); heroes.clear(); updateHeroes(false); - for (StatsSet hero : _heroes.values()) + for (StatSet hero : _heroes.values()) { final String name = hero.getString(Olympiad.CHAR_NAME); final PlayerInstance player = World.getInstance().getPlayer(name); @@ -404,10 +404,10 @@ public class Hero } else { - for (Entry entry : _heroes.entrySet()) + for (Entry entry : _heroes.entrySet()) { final Integer heroId = entry.getKey(); - final StatsSet hero = entry.getValue(); + final StatSet hero = entry.getValue(); if ((_completeHeroes == null) || !_completeHeroes.containsKey(heroId)) { statement = con.prepareStatement(INSERT_HERO); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/olympiad/Olympiad.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/olympiad/Olympiad.java index 997d431c4c..28807c1626 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/olympiad/Olympiad.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/olympiad/Olympiad.java @@ -45,7 +45,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.instancemanager.OlympiadStadiaManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.entity.Announcements; @@ -59,9 +59,9 @@ public class Olympiad { protected static final Logger LOGGER = Logger.getLogger(Olympiad.class.getName()); - private static Map _nobles; - private static Map _oldnobles; - protected static List _heroesToBe; + private static Map _nobles; + private static Map _oldnobles; + protected static List _heroesToBe; private static List _nonClassBasedRegisters; private static Map> _classBasedRegisters; public static final int OLY_MANAGER = 31688; @@ -255,7 +255,7 @@ public class Olympiad while (rset.next()) { - final StatsSet statData = new StatsSet(); + final StatSet statData = new StatSet(); final int charId = rset.getInt(CHAR_ID); statData.set(CLASS_ID, rset.getInt(CLASS_ID)); statData.set(CHAR_NAME, rset.getString(CHAR_NAME)); @@ -284,7 +284,7 @@ public class Olympiad while (rset.next()) { - final StatsSet statData = new StatsSet(); + final StatSet statData = new StatSet(); final int charId = rset.getInt(CHAR_ID); statData.set(CLASS_ID, rset.getInt(CLASS_ID)); statData.set(CHAR_NAME, rset.getString(CHAR_NAME)); @@ -541,7 +541,7 @@ public class Olympiad if (!_nobles.containsKey(noble.getObjectId())) { - final StatsSet statDat = new StatsSet(); + final StatSet statDat = new StatSet(); statDat.set(CLASS_ID, noble.getClassId().getId()); statDat.set(CHAR_NAME, noble.getName()); statDat.set(POINTS, DEFAULT_POINTS); @@ -600,18 +600,18 @@ public class Olympiad return _nobles.size(); } - protected static StatsSet getNobleStats(int playerId) + protected static StatSet getNobleStats(int playerId) { return _nobles.get(playerId); } - protected static synchronized void updateNobleStats(int playerId, StatsSet stats) + protected static synchronized void updateNobleStats(int playerId, StatSet stats) { _nobles.remove(playerId); _nobles.put(playerId, stats); } - protected static synchronized void updateOldNobleStats(int playerId, StatsSet stats) + protected static synchronized void updateOldNobleStats(int playerId, StatSet stats) { _oldnobles.remove(playerId); _oldnobles.put(playerId, stats); @@ -1007,10 +1007,10 @@ public class Olympiad return; } - for (Entry entry : _nobles.entrySet()) + for (Entry entry : _nobles.entrySet()) { final Integer nobleId = entry.getKey(); - final StatsSet nobleInfo = entry.getValue(); + final StatSet nobleInfo = entry.getValue(); int currentPoints = nobleInfo.getInt(POINTS); currentPoints += WEEKLY_POINTS; nobleInfo.set(POINTS, currentPoints); @@ -1136,10 +1136,10 @@ public class Olympiad con = DatabaseFactory.getConnection(); PreparedStatement statement; - for (Entry entry : _nobles.entrySet()) + for (Entry entry : _nobles.entrySet()) { final Integer nobleId = entry.getKey(); - final StatsSet nobleInfo = entry.getValue(); + final StatSet nobleInfo = entry.getValue(); if (nobleInfo == null) { @@ -1202,7 +1202,7 @@ public class Olympiad PreparedStatement statement = null; try (Connection con = DatabaseFactory.getConnection()) { - final StatsSet nobleInfo = _oldnobles.get(nobleId); + final StatSet nobleInfo = _oldnobles.get(nobleId); if (nobleInfo == null) { @@ -1310,10 +1310,10 @@ public class Olympiad if (_nobles != null) { - for (Entry entry : _nobles.entrySet()) + for (Entry entry : _nobles.entrySet()) { final Integer nobleId = entry.getKey(); - final StatsSet nobleInfo = entry.getValue(); + final StatSet nobleInfo = entry.getValue(); if (nobleInfo == null) { @@ -1336,7 +1336,7 @@ public class Olympiad ResultSet rset = null; try (Connection con = DatabaseFactory.getConnection()) { - StatsSet hero; + StatSet hero; for (int HERO_ID : HERO_IDS) { statement = con.prepareStatement(OLYMPIAD_GET_HEROS); @@ -1345,7 +1345,7 @@ public class Olympiad while (rset.next()) { - hero = new StatsSet(); + hero = new StatSet(); hero.set(CLASS_ID, HERO_ID); hero.set(CHAR_ID, rset.getInt(CHAR_ID)); hero.set(CHAR_NAME, rset.getString(CHAR_NAME)); @@ -1404,11 +1404,11 @@ public class Olympiad return; } - for (StatsSet hero : _heroesToBe) + for (StatSet hero : _heroesToBe) { final int charId = hero.getInt(CHAR_ID); - final StatsSet noble = _nobles.get(charId); + final StatSet noble = _nobles.get(charId); int currentPoints = noble.getInt(POINTS); currentPoints += Config.ALT_OLY_HERO_POINTS; noble.set(POINTS, currentPoints); @@ -1426,7 +1426,7 @@ public class Olympiad return 0; } - final StatsSet noble = _nobles.get(objId); + final StatSet noble = _nobles.get(objId); if (noble == null) { return 0; @@ -1450,7 +1450,7 @@ public class Olympiad return 0; } - final StatsSet noble = _oldnobles.get(objId); + final StatSet noble = _oldnobles.get(objId); if (noble == null) { return 0; @@ -1495,7 +1495,7 @@ public class Olympiad return 0; } - final StatsSet noble = _nobles.get(objId); + final StatSet noble = _nobles.get(objId); if (noble == null) { return 0; @@ -1511,7 +1511,7 @@ public class Olympiad return 0; } - final StatsSet noble = _nobles.get(objId); + final StatSet noble = _nobles.get(objId); if (noble == null) { return 0; @@ -1527,7 +1527,7 @@ public class Olympiad return 0; } - final StatsSet noble = _nobles.get(objId); + final StatSet noble = _nobles.get(objId); if (noble == null) { return 0; @@ -1543,7 +1543,7 @@ public class Olympiad return 0; } - final StatsSet noble = _nobles.get(objId); + final StatSet noble = _nobles.get(objId); if (noble == null) { return 0; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/olympiad/OlympiadGame.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/olympiad/OlympiadGame.java index 3b02facb96..f20c0ae77f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/olympiad/OlympiadGame.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/olympiad/OlympiadGame.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.datatables.HeroSkillTable; import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.CubicInstance; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; @@ -641,8 +641,8 @@ class OlympiadGame } } - final StatsSet playerOneStat = Olympiad.getNobleStats(_playerOne.getObjectId()); - final StatsSet playerTwoStat = Olympiad.getNobleStats(_playerTwo.getObjectId()); + final StatSet playerOneStat = Olympiad.getNobleStats(_playerOne.getObjectId()); + final StatSet playerTwoStat = Olympiad.getNobleStats(_playerTwo.getObjectId()); final int playerOnePlayed = playerOneStat.getInt(COMP_DONE); final int playerTwoPlayed = playerTwoStat.getInt(COMP_DONE); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/sevensigns/SevenSigns.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/sevensigns/SevenSigns.java index 435c80823e..c87a63897d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/sevensigns/SevenSigns.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/sevensigns/SevenSigns.java @@ -32,7 +32,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.datatables.csv.MapRegionTable; import org.l2jmobius.gameserver.handler.AutoChatHandler; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.spawn.AutoSpawn; @@ -101,7 +101,7 @@ public class SevenSigns protected int _duskFestivalScore; protected int _compWinner; protected int _previousWinner; - private final Map _signsPlayerData; + private final Map _signsPlayerData; private final Map _signsSealOwners; private final Map _signsDuskSealTotals; private final Map _signsDawnSealTotals; @@ -740,7 +740,7 @@ public class SevenSigns int cabalMembers = 0; final String cabalName = getCabalShortName(cabal); - for (StatsSet sevenDat : _signsPlayerData.values()) + for (StatSet sevenDat : _signsPlayerData.values()) { if (sevenDat.getString("cabal").equals(cabalName)) { @@ -756,7 +756,7 @@ public class SevenSigns * @param player the player * @return the player data */ - public StatsSet getPlayerData(PlayerInstance player) + public StatSet getPlayerData(PlayerInstance player) { if (!hasRegisteredBefore(player)) { @@ -780,7 +780,7 @@ public class SevenSigns int stoneCount = 0; - final StatsSet currPlayer = getPlayerData(player); + final StatSet currPlayer = getPlayerData(player); stoneCount += currPlayer.getInt("red_stones"); stoneCount += currPlayer.getInt("green_stones"); @@ -801,7 +801,7 @@ public class SevenSigns return 0; } - final StatsSet currPlayer = getPlayerData(player); + final StatSet currPlayer = getPlayerData(player); return currPlayer.getInt("contribution_score"); } @@ -878,7 +878,7 @@ public class SevenSigns { final int charObjId = rset.getInt("char_obj_id"); - final StatsSet sevenDat = new StatsSet(); + final StatSet sevenDat = new StatSet(); sevenDat.set("char_obj_id", charObjId); sevenDat.set("cabal", rset.getString("cabal")); sevenDat.set("seal", rset.getInt("seal")); @@ -950,7 +950,7 @@ public class SevenSigns { PreparedStatement statement = null; - for (StatsSet sevenDat : _signsPlayerData.values()) + for (StatSet sevenDat : _signsPlayerData.values()) { if ((player != null) && (sevenDat.getInt("char_obj_id") != player.getObjectId())) { @@ -1025,7 +1025,7 @@ public class SevenSigns protected void resetPlayerData() { // Reset each player's contribution data as well as seal and cabal. - for (StatsSet sevenDat : _signsPlayerData.values()) + for (StatSet sevenDat : _signsPlayerData.values()) { final int charObjId = sevenDat.getInt("char_obj_id"); @@ -1060,7 +1060,7 @@ public class SevenSigns { final int charObjId = player.getObjectId(); PreparedStatement statement = null; - StatsSet currPlayerData = getPlayerData(player); + StatSet currPlayerData = getPlayerData(player); if (currPlayerData != null) { @@ -1072,7 +1072,7 @@ public class SevenSigns } else { - currPlayerData = new StatsSet(); + currPlayerData = new StatSet(); currPlayerData.set("char_obj_id", charObjId); currPlayerData.set("cabal", getCabalShortName(chosenCabal)); currPlayerData.set("seal", chosenSeal); @@ -1124,7 +1124,7 @@ public class SevenSigns */ public int getAncientAdenaReward(PlayerInstance player, boolean removeReward) { - final StatsSet currPlayer = getPlayerData(player); + final StatSet currPlayer = getPlayerData(player); final int rewardAmount = currPlayer.getInt("ancient_adena_amount"); currPlayer.set("red_stones", 0); @@ -1151,7 +1151,7 @@ public class SevenSigns */ public int addPlayerStoneContrib(PlayerInstance player, int blueCount, int greenCount, int redCount) { - final StatsSet currPlayer = getPlayerData(player); + final StatSet currPlayer = getPlayerData(player); final int contribScore = calcContributionScore(blueCount, greenCount, redCount); final int totalAncientAdena = currPlayer.getInt("ancient_adena_amount") + calcAncientAdenaReward(blueCount, greenCount, redCount); @@ -1516,7 +1516,7 @@ public class SevenSigns { for (PlayerInstance onlinePlayer : World.getInstance().getAllPlayers()) { - final StatsSet currPlayer = getPlayerData(onlinePlayer); + final StatSet currPlayer = getPlayerData(onlinePlayer); if (isSealValidationPeriod() || isCompResultsPeriod()) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/sevensigns/SevenSignsFestival.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/sevensigns/SevenSignsFestival.java index bbd80c51ed..ae0564830c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/sevensigns/SevenSignsFestival.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/sevensigns/SevenSignsFestival.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.datatables.sql.SpawnTable; import org.l2jmobius.gameserver.datatables.xml.ExperienceData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.FestivalMonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; @@ -3136,7 +3136,7 @@ public class SevenSignsFestival implements SpawnListener protected Map> _duskPreviousParticipants; private Map _dawnFestivalScores; private Map _duskFestivalScores; - private Map> _festivalData; + private Map> _festivalData; /** * Instantiates a new seven signs festival. @@ -3314,7 +3314,7 @@ public class SevenSignsFestival implements SpawnListener int festivalId = rset.getInt("festivalId"); final String cabal = rset.getString("cabal"); - final StatsSet festivalDat = new StatsSet(); + final StatSet festivalDat = new StatSet(); festivalDat.set("festivalId", festivalId); festivalDat.set("cabal", cabal); festivalDat.set("cycle", festivalCycle); @@ -3327,7 +3327,7 @@ public class SevenSignsFestival implements SpawnListener festivalId += FESTIVAL_COUNT; } - Map tempData = _festivalData.get(festivalCycle); + Map tempData = _festivalData.get(festivalCycle); if (tempData == null) { @@ -3385,9 +3385,9 @@ public class SevenSignsFestival implements SpawnListener { PreparedStatement statement = null; - for (Map currCycleData : _festivalData.values()) + for (Map currCycleData : _festivalData.values()) { - for (StatsSet festivalDat : currCycleData.values()) + for (StatSet festivalDat : currCycleData.values()) { final int festivalCycle = festivalDat.getInt("cycle"); final int festivalId = festivalDat.getInt("festivalId"); @@ -3441,7 +3441,7 @@ public class SevenSignsFestival implements SpawnListener protected void rewardHighRanked() { String[] partyMembers; - StatsSet overallData = getOverallHighestScoreData(FESTIVAL_LEVEL_MAX_FOR_31); + StatSet overallData = getOverallHighestScoreData(FESTIVAL_LEVEL_MAX_FOR_31); if (overallData != null) { partyMembers = overallData.getString("members").split(","); @@ -3570,7 +3570,7 @@ public class SevenSignsFestival implements SpawnListener _duskFestivalScores.clear(); // Set up a new data set for the current cycle of festivals - final Map newData = new HashMap<>(); + final Map newData = new HashMap<>(); for (int i = 0; i < (FESTIVAL_COUNT * 2); i++) { @@ -3581,8 +3581,8 @@ public class SevenSignsFestival implements SpawnListener festivalId -= FESTIVAL_COUNT; } - // Create a new StatsSet with "default" data for Dusk - final StatsSet tempStats = new StatsSet(); + // Create a new StatSet with "default" data for Dusk + final StatSet tempStats = new StatSet(); tempStats.set("festivalId", festivalId); tempStats.set("cycle", _signsCycle); tempStats.set("date", "0"); @@ -3918,9 +3918,9 @@ public class SevenSignsFestival implements SpawnListener * Returns a stats set containing the highest score this cycle for the the specified cabal and associated festival ID. * @param oracle the oracle * @param festivalId the festival id - * @return StatsSet festivalDat + * @return StatSet festivalDat */ - public StatsSet getHighestScoreData(int oracle, int festivalId) + public StatSet getHighestScoreData(int oracle, int festivalId) { int offsetId = festivalId; @@ -3930,7 +3930,7 @@ public class SevenSignsFestival implements SpawnListener } // Attempt to retrieve existing score data (if found), otherwise create a new blank data set and display a console warning. - StatsSet currData = null; + StatSet currData = null; if ((_festivalData != null) && (_festivalData.get(_signsCycle) != null)) { @@ -3938,7 +3938,7 @@ public class SevenSignsFestival implements SpawnListener } else { - currData = new StatsSet(); + currData = new StatSet(); currData.set("score", 0); currData.set("members", ""); } @@ -3949,16 +3949,16 @@ public class SevenSignsFestival implements SpawnListener /** * Returns a stats set containing the highest ever recorded score data for the specified festival. * @param festivalId the festival id - * @return StatsSet result + * @return StatSet result */ - public StatsSet getOverallHighestScoreData(int festivalId) + public StatSet getOverallHighestScoreData(int festivalId) { - StatsSet result = null; + StatSet result = null; int highestScore = 0; - for (Map currCycleData : _festivalData.values()) + for (Map currCycleData : _festivalData.values()) { - for (StatsSet currFestData : currCycleData.values()) + for (StatSet currFestData : currCycleData.values()) { final int currFestID = currFestData.getInt("festivalId"); final int festivalScore = currFestData.getInt("score"); @@ -4012,7 +4012,7 @@ public class SevenSignsFestival implements SpawnListener _duskFestivalScores.put(festivalId, offeringScore); } - final StatsSet currFestData = getHighestScoreData(oracle, festivalId); + final StatSet currFestData = getHighestScoreData(oracle, festivalId); // Check if this is the highest score for this level range so far for the player's cabal. if (offeringScore > thisCabalHighScore) @@ -4139,7 +4139,7 @@ public class SevenSignsFestival implements SpawnListener if (_festivalData.get(_signsCycle) != null) { - for (StatsSet festivalData : _festivalData.get(_signsCycle).values()) + for (StatSet festivalData : _festivalData.get(_signsCycle).values()) { if (festivalData.getString("members").contains(playerName)) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Castle.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Castle.java index 957697a994..4efa999867 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Castle.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Castle.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManorManager.CropProcure; import org.l2jmobius.gameserver.instancemanager.CastleManorManager.SeedProduction; import org.l2jmobius.gameserver.instancemanager.CrownManager; import org.l2jmobius.gameserver.model.Manor; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -68,7 +68,7 @@ public class Castle private int _castleId = 0; private final List _doors = new ArrayList<>(); - private final List _doorDefault = new ArrayList<>(); + private final List _doorDefault = new ArrayList<>(); private String _name = ""; private int _ownerId = 0; private Siege _siege = null; @@ -571,7 +571,7 @@ public class Castle while (rs.next()) { // Create set of the door default for use when respawning dead doors - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.set("name", rs.getString("name")); set.set("id", rs.getInt("id")); set.set("x", rs.getInt("x")); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Fort.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Fort.java index 930cfff0aa..acbffaeec1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Fort.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Fort.java @@ -28,7 +28,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.datatables.sql.ClanTable; import org.l2jmobius.gameserver.datatables.xml.DoorData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -48,7 +48,7 @@ public class Fort private int _fortId = 0; private final List _doors = new ArrayList<>(); - private final List _doorDefault = new ArrayList<>(); + private final List _doorDefault = new ArrayList<>(); private String _name = ""; private int _ownerId = 0; private Clan _fortOwner = null; @@ -396,7 +396,7 @@ public class Fort while (rs.next()) { // Create set of the door default for use when respawning dead doors - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.set("name", rs.getString("name")); set.set("id", rs.getInt("id")); set.set("x", rs.getInt("x")); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Siege.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Siege.java index 5a4c3c05aa..55447d25a6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Siege.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Siege.java @@ -1622,7 +1622,7 @@ public class Siege final NpcTemplate template = NpcTable.getInstance().getTemplate(_sp.getNpcId()); - template.getStatsSet().set("baseHpMax", _sp.getHp()); + template.getStatSet().set("baseHpMax", _sp.getHp()); ct = new ControlTowerInstance(IdFactory.getInstance().getNextId(), template); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/holders/HelperBuffHolder.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/holders/HelperBuffHolder.java index 092af3cabd..81956ef7aa 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/holders/HelperBuffHolder.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/holders/HelperBuffHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * This class represents a Newbie Helper Buff Author: Ayor @@ -46,7 +46,7 @@ public class HelperBuffHolder *
* @param set */ - public HelperBuffHolder(StatsSet set) + public HelperBuffHolder(StatSet set) { _lowerLevel = set.getInt("lowerLevel"); _upperLevel = set.getInt("upperLevel"); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Armor.java index a0cfb7e779..180496ecac 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Armor.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.datatables.SkillTable; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.ArmorType; @@ -50,10 +50,10 @@ public class Armor extends Item *
  • _pDef & _mDef
    • *
  • _mpBonus & _hpBonus
    • * @param type : ArmorType designating the type of armor - * @param set : StatsSet designating the set of couples (key,value) caracterizing the armor + * @param set : StatSet designating the set of couples (key,value) caracterizing the armor * @see Item constructor */ - public Armor(ArmorType type, StatsSet set) + public Armor(ArmorType type, StatSet set) { super(type, set); _avoidModifier = set.getInt("avoid_modify"); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/EtcItem.java index a06773c608..32f20c05cd 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/EtcItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.type.EtcItemType; /** @@ -29,9 +29,9 @@ public class EtcItem extends Item * Constructor for EtcItem. * @see Item constructor * @param type : EtcItemType designating the type of object Etc - * @param set : StatsSet designating the set of couples (key,value) for description of the Etc + * @param set : StatSet designating the set of couples (key,value) for description of the Etc */ - public EtcItem(EtcItemType type, StatsSet set) + public EtcItem(EtcItemType type, StatSet set) { super(type, set); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Henna.java index 1c8c4b34ca..f429ae5259 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.items; import org.l2jmobius.commons.util.Util; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; /** @@ -37,7 +37,7 @@ public class Henna private final int _WIT; private final int[] _classes; - public Henna(StatsSet set) + public Henna(StatSet set) { _symbolId = set.getInt("symbolId"); _dyeId = set.getInt("dyeId"); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Item.java index 61f4c5ee9d..a860c524ee 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Item.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -159,9 +159,9 @@ public abstract class Item *
  • _referencePrice
    • *
  • _sellable
    • * @param type : Enum designating the type of the item - * @param set : StatsSet corresponding to a set of couples (key,value) for description of the item + * @param set : StatSet corresponding to a set of couples (key,value) for description of the item */ - protected Item(Enum type, StatsSet set) + protected Item(Enum type, StatSet set) { _type = type; _itemId = set.getInt("item_id"); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Weapon.java index 3615bb1a2b..e706eb266c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Weapon.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.handler.SkillHandler; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.Skill.SkillType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -78,10 +78,10 @@ public class Weapon extends Item *
  • _atkSpeed & _AtkReuse
    • *
  • _mpConsume
    • * @param type : ArmorType designating the type of armor - * @param set : StatsSet designating the set of couples (key,value) caracterizing the armor + * @param set : StatSet designating the set of couples (key,value) caracterizing the armor * @see Item constructor */ - public Weapon(WeaponType type, StatsSet set) + public Weapon(WeaponType type, StatSet set) { super(type, set); _soulShotCount = set.getInt("soulshots"); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillCharge.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillCharge.java index 3203663f9f..85d9ce9db9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillCharge.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillCharge.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.skills.handlers; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class SkillCharge extends Skill { - public SkillCharge(StatsSet set) + public SkillCharge(StatSet set) { super(set); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeDmg.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeDmg.java index 7993567e7b..d3082db1bf 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeDmg.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeDmg.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.skills.handlers; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -36,7 +36,7 @@ public class SkillChargeDmg extends Skill final int chargeSkillId; - public SkillChargeDmg(StatsSet set) + public SkillChargeDmg(StatSet set) { super(set); chargeSkillId = set.getInt("charge_skill_id"); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeEffect.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeEffect.java index bc079b1e6f..1ac9b991fa 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeEffect.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeEffect.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.skills.handlers; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -30,7 +30,7 @@ public class SkillChargeEffect extends Skill { final int chargeSkillId; - public SkillChargeEffect(StatsSet set) + public SkillChargeEffect(StatSet set) { super(set); chargeSkillId = set.getInt("charge_skill_id"); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillCreateItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillCreateItem.java index 6fb21749f3..f56283ee9c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillCreateItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillCreateItem.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.idfactory.IdFactory; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -39,7 +39,7 @@ public class SkillCreateItem extends Skill private final int _createItemCount; private final int _randomCount; - public SkillCreateItem(StatsSet set) + public SkillCreateItem(StatSet set) { super(set); _createItemId = set.getList("create_item_id", Integer.class); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillDefault.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillDefault.java index c840666292..3aaae84336 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillDefault.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillDefault.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.skills.handlers; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class SkillDefault extends Skill { - public SkillDefault(StatsSet set) + public SkillDefault(StatSet set) { super(set); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillDrain.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillDrain.java index e14d5b9a98..9ecc6838d3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillDrain.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillDrain.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.skills.handlers; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.CubicInstance; @@ -35,7 +35,7 @@ public class SkillDrain extends Skill private final float _absorbPart; private final int _absorbAbs; - public SkillDrain(StatsSet set) + public SkillDrain(StatSet set) { super(set); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillElemental.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillElemental.java index 84d1525d06..063c8eba43 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillElemental.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillElemental.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.skills.handlers; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.Formulas; @@ -30,7 +30,7 @@ public class SkillElemental extends Skill private final int[] _seeds; private final boolean _seedAny; - public SkillElemental(StatsSet set) + public SkillElemental(StatSet set) { super(set); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSeed.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSeed.java index edb13a7933..ccedcff2d5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSeed.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSeed.java @@ -18,14 +18,14 @@ package org.l2jmobius.gameserver.model.skills.handlers; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.effects.EffectSeed; public class SkillSeed extends Skill { - public SkillSeed(StatsSet set) + public SkillSeed(StatSet set) { super(set); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSignet.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSignet.java index ba0930d174..16d149fbe8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSignet.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSignet.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.datatables.sql.NpcTable; import org.l2jmobius.gameserver.idfactory.IdFactory; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -33,7 +33,7 @@ public class SkillSignet extends Skill private final int _effectNpcId; public int effectId; - public SkillSignet(StatsSet set) + public SkillSignet(StatSet set) { super(set); _effectNpcId = set.getInt("effectNpcId", -1); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSignetCasttime.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSignetCasttime.java index 1275e5ce3f..1fea254574 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSignetCasttime.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSignetCasttime.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.skills.handlers; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -26,7 +26,7 @@ public class SkillSignetCasttime extends Skill public int _effectNpcId; public int effectId; - public SkillSignetCasttime(StatsSet set) + public SkillSignetCasttime(StatSet set) { super(set); _effectNpcId = set.getInt("effectNpcId", -1); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSummon.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSummon.java index db5a432e15..6339735c13 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSummon.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSummon.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.datatables.sql.NpcTable; import org.l2jmobius.gameserver.datatables.xml.ExperienceData; import org.l2jmobius.gameserver.idfactory.IdFactory; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -52,7 +52,7 @@ public class SkillSummon extends Skill // What is the total lifetime of summons (in millisecs) private final int _summonTotalLifeTime; - public SkillSummon(StatsSet set) + public SkillSummon(StatSet set) { super(set); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java index 3350f2a3a6..5a7e7043d0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.variables; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.IRestorable; import org.l2jmobius.gameserver.model.interfaces.IStorable; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.interfaces.IStorable; /** * @author UnAfraid */ -public abstract class AbstractVariables extends StatsSet implements IRestorable, IStorable, IDeletable +public abstract class AbstractVariables extends StatSet implements IRestorable, IStorable, IDeletable { private final AtomicBoolean _hasChanges = new AtomicBoolean(false); @@ -41,42 +41,42 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, */ @Override - public StatsSet set(String name, boolean value) + public StatSet set(String name, boolean value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, double value) + public StatSet set(String name, double value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, Enum value) + public StatSet set(String name, Enum value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, int value) + public StatSet set(String name, int value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, long value) + public StatSet set(String name, long value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, String value) + public StatSet set(String name, String value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index d2431b2684..d6ddb6c495 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.entity.olympiad.Olympiad; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.entity.olympiad.Olympiad; */ public class ExHeroList extends GameServerPacket { - private final Map _heroList; + private final Map _heroList; public ExHeroList() { @@ -42,7 +42,7 @@ public class ExHeroList extends GameServerPacket writeH(0x23); writeD(_heroList.size()); - for (StatsSet hero : _heroList.values()) + for (StatSet hero : _heroList.values()) { writeS(hero.getString(Olympiad.CHAR_NAME)); writeD(hero.getInt(Olympiad.CLASS_ID)); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SSQStatus.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SSQStatus.java index 753f55f8cb..baf6ad5787 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SSQStatus.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SSQStatus.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.entity.sevensigns.SevenSigns; import org.l2jmobius.gameserver.model.entity.sevensigns.SevenSignsFestival; @@ -164,7 +164,7 @@ public class SSQStatus extends GameServerPacket final int dawnScore = SevenSignsFestival.getInstance().getHighestScore(SevenSigns.CABAL_DAWN, i); // Dusk Score \\ writeD(duskScore); - StatsSet highScoreData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DUSK, i); + StatSet highScoreData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DUSK, i); String[] partyMembers = highScoreData.getString("members").split(","); if (partyMembers != null) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index 2b67569fcb..9ef2298c12 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -137,7 +137,7 @@ public class Antharas extends AbstractNpcAI addAttackId(ANTHARAS, BOMBER, BEHEMOTH); addKillId(ANTHARAS, BEHEMOTH); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANTHARAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANTHARAS); final double curr_hp = info.getDouble("currentHP"); final double curr_mp = info.getDouble("currentMP"); final int loc_x = info.getInt("loc_x"); @@ -763,7 +763,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(PlayerInstance attacker, int damage) diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Baium/Baium.java index e09c3d5c9a..c547faeae1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -110,7 +110,7 @@ public class Baium extends AbstractNpcAI addSeeCreatureId(BAIUM); addSpellFinishedId(BAIUM); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(BAIUM); + final StatSet info = GrandBossManager.getInstance().getStatSet(BAIUM); final double curr_hp = info.getDouble("currentHP"); final double curr_mp = info.getDouble("currentMP"); final int loc_x = info.getInt("loc_x"); @@ -659,7 +659,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(BAIUM).set("respawn_time", System.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", System.currentTimeMillis() + respawnTime); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java index b6507585e7..654b1c22aa 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; @@ -105,7 +105,7 @@ public class Beleth extends AbstractNpcAI addStartNpc(STONE_COFFIN); addTalkId(STONE_COFFIN); addFirstTalkId(ELF); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(REAL_BELETH); + final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH); if (status == DEAD) { @@ -751,9 +751,9 @@ public class Beleth extends AbstractNpcAI setBelethKiller(killer); GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD); final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(REAL_BELETH); + final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(REAL_BELETH, info); + GrandBossManager.getInstance().setStatSet(REAL_BELETH, info); startQuestTimer("BELETH_UNLOCK", respawnTime, null, null); deleteAll(); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Core/Core.java index 63dc35b62c..951f4bd089 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; @@ -86,7 +86,7 @@ public class Core extends AbstractNpcAI registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR); _firstAttacked = false; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. @@ -207,9 +207,9 @@ public class Core extends AbstractNpcAI final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000; startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(CORE, info); + GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java index 5a0d74c1b4..ad56cdef8a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; @@ -63,7 +63,7 @@ public class DrChaos extends AbstractNpcAI addKillId(CHAOS_GOLEM); // Message + despawn. addAttackId(CHAOS_GOLEM); // Random messages when he attacks. - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CHAOS_GOLEM); + final StatSet info = GrandBossManager.getInstance().getStatSet(CHAOS_GOLEM); final int status = GrandBossManager.getInstance().getBossStatus(CHAOS_GOLEM); // Load the reset date and time for Dr. Chaos from DB. @@ -249,9 +249,9 @@ public class DrChaos extends AbstractNpcAI startQuestTimer("reset_drchaos", respawnTime, null, null, false); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CHAOS_GOLEM); + final StatSet info = GrandBossManager.getInstance().getStatSet(CHAOS_GOLEM); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(CHAOS_GOLEM, info); + GrandBossManager.getInstance().setStatSet(CHAOS_GOLEM, info); return null; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Frintezza/Frintezza.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Frintezza/Frintezza.java index 1be9df7f19..a6b4cb86b1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Frintezza/Frintezza.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Frintezza/Frintezza.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.CommandChannel; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -289,7 +289,7 @@ public class Frintezza extends AbstractNpcAI addTalkId(GUIDE); addStartNpc(CUBE); addTalkId(CUBE); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(FRINTEZZA); + final StatSet info = GrandBossManager.getInstance().getStatSet(FRINTEZZA); final int status = GrandBossManager.getInstance().getBossStatus(FRINTEZZA); if (status == DEAD) { @@ -1508,9 +1508,9 @@ public class Frintezza extends AbstractNpcAI startQuestTimer("frintezza_unlock", respawnTime, npc, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(FRINTEZZA); + final StatSet info = GrandBossManager.getInstance().getStatSet(FRINTEZZA); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(FRINTEZZA, info); + GrandBossManager.getInstance().setStatSet(FRINTEZZA, info); } else if (npc.getId() == 18328) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index b2d81f44cc..049b4a0c2e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -87,7 +87,7 @@ public class Orfen extends AbstractNpcAI registerMobs(mobs); _hasTeleported = false; ZONE = GrandBossManager.getInstance().getZone(POS[0]); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); if (GrandBossManager.getInstance().getBossStatus(ORFEN) == DEAD) { // load the unlock date and time for Orfen from DB @@ -324,9 +324,9 @@ public class Orfen extends AbstractNpcAI final long respawnTime = (Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM)) * 3600000; startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(ORFEN, info); + GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); startQuestTimer("despawn_minions", 20000, null, null); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index d1c0001805..4f884609fd 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; @@ -89,7 +89,7 @@ public class QueenAnt extends AbstractNpcAI addFactionCallId(NURSE); _zone = GrandBossManager.getInstance().getZone(QUEEN_X, QUEEN_Y, QUEEN_Z); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); if (GrandBossManager.getInstance().getBossStatus(QUEEN) == DEAD) { // load the unlock date and time for queen ant from DB @@ -354,9 +354,9 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("action", npc, null); cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(QUEEN, info); + GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); _larva.deleteMe(); _larva = null; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java index 03d31c793e..9c546d733a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; @@ -122,7 +122,7 @@ public class Valakas extends AbstractNpcAI registerMobs(VALAKAS); ZONE = GrandBossManager.getInstance().getZone(212852, -114842, -1632); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(VALAKAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); final int status = GrandBossManager.getInstance().getBossStatus(VALAKAS); if (status == DEAD) @@ -445,9 +445,9 @@ public class Valakas extends AbstractNpcAI final long respawnTime = (Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM)) * 3600000; startQuestTimer("valakas_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(VALAKAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(VALAKAS, info); + GrandBossManager.getInstance().setStatSet(VALAKAS, info); return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java index 4b9d11c3cc..d51c9282d8 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java @@ -16,7 +16,7 @@ */ package ai.others.NpcBuffers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.AffectObject; @@ -33,7 +33,7 @@ public class NpcBufferSkillData private final AffectScope _affectScope; private final AffectObject _affectObject; - public NpcBufferSkillData(StatsSet set) + public NpcBufferSkillData(StatSet set) { _skill = new SkillHolder(set.getInt("id"), set.getInt("level")); _initialDelay = set.getInt("skillInitDelay", 0) * 1000; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java index 94a0daf6e8..83bae6501d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -52,7 +52,7 @@ public class NpcBuffersData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node attr; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -73,7 +73,7 @@ public class NpcBuffersData implements IXmlReader case "skill": { attrs = c.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { attr = attrs.item(i); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index a8a9a0f7ff..387d9d3159 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.zone.type.NoRestartZone; @@ -299,7 +299,7 @@ public class AdminGrandBoss implements IAdminCommandHandler } } - final StatsSet info = GrandBossManager.getInstance().getStatsSet(grandBossId); + final StatSet info = GrandBossManager.getInstance().getStatSet(grandBossId); final String bossRespawn = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(info.getLong("respawn_time")); final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/Festival.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/Festival.java index 109bea059a..10f1e3a62a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/Festival.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/Festival.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.SevenSignsFestival; import org.l2jmobius.gameserver.handler.IBypassHandler; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party.MessageType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.FestivalGuideInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -195,9 +195,9 @@ public class Festival implements IBypassHandler { final StringBuilder strBuffer = new StringBuilder(500); strBuffer.append("Festival Guide:
    These are the top scores of the week, for the "); - final StatsSet dawnData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DAWN, npc.getFestivalType()); - final StatsSet duskData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DUSK, npc.getFestivalType()); - final StatsSet overallData = SevenSignsFestival.getInstance().getOverallHighestScoreData(npc.getFestivalType()); + final StatSet dawnData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DAWN, npc.getFestivalType()); + final StatSet duskData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DUSK, npc.getFestivalType()); + final StatSet overallData = SevenSignsFestival.getInstance().getOverallHighestScoreData(npc.getFestivalType()); final int dawnScore = dawnData.getInt("score"); final int duskScore = duskData.getInt("score"); int overallScore = 0; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index aad3b493ed..af887b3106 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ public class AddHate extends AbstractEffect { private final double _power; - public AddHate(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public AddHate(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index 6690260488..3abcaf0e00 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.stat.CreatureStat; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class AttackTrait extends AbstractEffect { private final Map _attackTraits = new EnumMap<>(TraitType.class); - public AttackTrait(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public AttackTrait(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index c8381ce588..1d632ae966 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.stats.Formulas; */ public class Backstab extends AbstractEffect { - public Backstab(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Backstab(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Betray.java index d7ff8a84d2..520f72d74d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Betray extends AbstractEffect { - public Betray(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Betray(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Blink.java index 6a818db90e..0f1c7f2f86 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class Blink extends AbstractEffect { - public Blink(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Blink(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index d44755deb1..cf048f805c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -21,7 +21,7 @@ import java.util.Set; import org.l2jmobius.gameserver.datatables.BotReportTable; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; @@ -37,7 +37,7 @@ public class BlockAction extends AbstractEffect { private final Set _blockedActions = new HashSet<>(); - public BlockAction(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public BlockAction(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/BlockBuffSlot.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/BlockBuffSlot.java index 4bb0ae9b8a..36a09b54d1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/BlockBuffSlot.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/BlockBuffSlot.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.AbnormalType; @@ -34,7 +34,7 @@ public class BlockBuffSlot extends AbstractEffect { private final Set _blockBuffSlots; - public BlockBuffSlot(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public BlockBuffSlot(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 29d5afced2..db7de0bbb8 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class BlockChat extends AbstractEffect { - public BlockChat(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public BlockChat(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index 8a3efb6db0..86229ada76 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class BlockParty extends AbstractEffect { - public BlockParty(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public BlockParty(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java index 168d157350..97ab438714 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BlockResurrection extends AbstractEffect { - public BlockResurrection(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public BlockResurrection(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index be43ec166f..0167b27dd0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class Bluff extends AbstractEffect { private final int _chance; - public Bluff(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Bluff(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Buff.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Buff.java index f0a2944cf0..299167dba1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Buff.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Buff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Buff extends AbstractEffect { - public Buff(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Buff(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index e3edf16c15..d4bed591f9 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class CallParty extends AbstractEffect { - public CallParty(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public CallParty(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index 0982162049..1a758f9b4f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.SevenSigns; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -42,7 +42,7 @@ public class CallPc extends AbstractEffect private final int _itemId; private final int _itemCount; - public CallPc(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public CallPc(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index 1e35504592..bdeaac7bbd 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -30,7 +30,7 @@ public class CallSkill extends AbstractEffect { private final SkillHolder _skill; - public CallSkill(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public CallSkill(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index 3e5131da13..6f6b8ec166 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -32,7 +32,7 @@ public class ChameleonRest extends AbstractEffect { private final double _power; - public ChameleonRest(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ChameleonRest(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 91e52ac54e..7bd4b58696 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ public class ChangeFace extends AbstractEffect { private final int _value; - public ChangeFace(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ChangeFace(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java index 584839a0c7..3508749014 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; */ public class ChangeFishingMastery extends AbstractEffect { - public ChangeFishingMastery(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ChangeFishingMastery(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index da28ef1fee..332f6d75d5 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ public class ChangeHairColor extends AbstractEffect { private final int _value; - public ChangeHairColor(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ChangeHairColor(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index c7517728b2..5b853f47e7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ public class ChangeHairStyle extends AbstractEffect { private final int _value; - public ChangeHairStyle(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ChangeHairStyle(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ClanGate.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ClanGate.java index cccb759287..c2b52b0008 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ClanGate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ClanGate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class ClanGate extends AbstractEffect { - public ClanGate(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ClanGate(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index c36333dcdf..e1746866be 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -39,7 +39,7 @@ public class Confuse extends AbstractEffect { private final int _chance; - public Confuse(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Confuse(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 43e8ad675c..ec6dedf306 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class ConsumeBody extends AbstractEffect { - public ConsumeBody(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ConsumeBody(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 3e0fe9153f..b458844b5b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Elementals; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class ConvertItem extends AbstractEffect { - public ConvertItem(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ConvertItem(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java index 3b355fc38b..34be58e20f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -31,7 +31,7 @@ public class CpDamPercent extends AbstractEffect { private final double _power; - public CpDamPercent(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public CpDamPercent(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index 53777d0933..89c37a40ad 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class CpHeal extends AbstractEffect { private final double _power; - public CpHeal(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public CpHeal(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index b7cfa75080..8f1c099299 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -28,7 +28,7 @@ public class CpHealOverTime extends AbstractEffect { private final double _power; - public CpHealOverTime(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public CpHealOverTime(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index 2b0e8cdb9b..c301612419 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class CpHealPercent extends AbstractEffect { private final double _power; - public CpHealPercent(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public CpHealPercent(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index 70c66e73f0..e4aeb3e650 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ public class CrystalGradeModify extends AbstractEffect { private final int _grade; - public CrystalGradeModify(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public CrystalGradeModify(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java index 7e6c1cdb3e..b27126adce 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -29,7 +29,7 @@ public class CubicMastery extends AbstractEffect { private final int _cubicCount; - public CubicMastery(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public CubicMastery(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index 0b6caad704..ed7783afa3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -31,7 +31,7 @@ public class DamOverTime extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTime(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public DamOverTime(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index a187a5f14f..c28356de8a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -32,7 +32,7 @@ public class DamOverTimePercent extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTimePercent(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public DamOverTimePercent(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index 6fea8d2cc0..5c0b888d07 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DeathLink extends AbstractEffect { - public DeathLink(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public DeathLink(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Debuff.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Debuff.java index 7c3efa1fa2..5738ce419b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Debuff.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Debuff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; */ public class Debuff extends AbstractEffect { - public Debuff(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Debuff(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index ef83b11d22..784c30a8ef 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.stat.CreatureStat; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class DefenceTrait extends AbstractEffect { private final Map _defenceTraits = new EnumMap<>(TraitType.class); - public DefenceTrait(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public DefenceTrait(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index d38d1de82b..f6e2824cb2 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class DeleteHate extends AbstractEffect { private final int _chance; - public DeleteHate(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public DeleteHate(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index 4cf78e3deb..0754123b29 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class DeleteHateOfMe extends AbstractEffect { private final int _chance; - public DeleteHateOfMe(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public DeleteHateOfMe(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index 89c088e45c..317ba3eedc 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class DetectHiddenObjects extends AbstractEffect { - public DetectHiddenObjects(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public DetectHiddenObjects(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Detection.java index 0c36f9f0cc..cbd3e8f9de 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Detection extends AbstractEffect { - public Detection(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Detection(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index c69bcbdd11..d624bd042c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Disarm extends AbstractEffect { - public Disarm(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Disarm(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index f16dd8f08a..9bf46fd982 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class DispelAll extends AbstractEffect { - public DispelAll(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public DispelAll(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 8bd55b11ae..6a95fe5544 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class DispelByCategory extends AbstractEffect private final int _rate; private final int _max; - public DispelByCategory(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public DispelByCategory(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index 6cd80e93de..66a025724c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -22,7 +22,7 @@ import java.util.Map; import java.util.Map.Entry; import org.l2jmobius.gameserver.model.EffectList; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class DispelBySlot extends AbstractEffect private final String _dispel; private final Map _dispelAbnormals; - public DispelBySlot(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public DispelBySlot(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index f0348aac2a..5f4a1dd953 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.EffectList; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ public class DispelBySlotProbability extends AbstractEffect private final Map _dispelAbnormals; private final int _rate; - public DispelBySlotProbability(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public DispelBySlotProbability(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index 77457ebcfd..a08a2b82db 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class EnableCloak extends AbstractEffect { - public EnableCloak(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public EnableCloak(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/EnemyCharge.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/EnemyCharge.java index 7bd6dc57af..097b7132c0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/EnemyCharge.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/EnemyCharge.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; */ public class EnemyCharge extends AbstractEffect { - public EnemyCharge(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public EnemyCharge(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 167c233858..9ee8450559 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -42,7 +42,7 @@ public class EnergyAttack extends AbstractEffect private final int _criticalChance; private final boolean _ignoreShieldDefence; - public EnergyAttack(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public EnergyAttack(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index 0e19fad09b..10fce16d50 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -29,7 +29,7 @@ public class EnlargeAbnormalSlot extends AbstractEffect { private final int _slots; - public EnlargeAbnormalSlot(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public EnlargeAbnormalSlot(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Escape.java index e1dce82a54..2317651302 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.GuardInstance; @@ -34,7 +34,7 @@ public class Escape extends AbstractEffect { private final TeleportWhereType _escapeType; - public Escape(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Escape(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 0c03af8924..914e558adb 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class FakeDeath extends AbstractEffect { private final double _power; - public FakeDeath(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public FakeDeath(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index b62d96bf21..2f4e677104 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.stats.Formulas; */ public class FatalBlow extends AbstractEffect { - public FatalBlow(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public FatalBlow(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 9e1bfa3437..8affb2b666 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DefenderInstance; import org.l2jmobius.gameserver.model.actor.instance.FortCommanderInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlagInstance; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Fear extends AbstractEffect { - public Fear(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Fear(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Fishing.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Fishing.java index 4a848782cb..f1066b38f7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Fishing.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Fishing.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -50,7 +50,7 @@ public class Fishing extends AbstractEffect private static final int MIN_BAIT_DISTANCE = 90; private static final int MAX_BAIT_DISTANCE = 250; - public Fishing(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Fishing(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 20b5dc570f..262fdfd365 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Flag extends AbstractEffect { - public Flag(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Flag(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java index 5c88351ba4..8bfc1fbeda 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -29,7 +29,7 @@ public class FocusEnergy extends AbstractEffect { private final int _charge; - public FocusEnergy(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public FocusEnergy(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/FocusMaxEnergy.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/FocusMaxEnergy.java index ff1d6c1687..f98a65efcb 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/FocusMaxEnergy.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/FocusMaxEnergy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class FocusMaxEnergy extends AbstractEffect { - public FocusMaxEnergy(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public FocusMaxEnergy(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index f1fcb82fdb..54fbec09ca 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class FocusSouls extends AbstractEffect { private final int _charge; - public FocusSouls(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public FocusSouls(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 7c3bb2ad80..bdc324cc65 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Set; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class GetAgro extends AbstractEffect { - public GetAgro(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public GetAgro(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index 72832598bd..20f4435e39 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class GiveRecommendation extends AbstractEffect { private final int _amount; - public GiveRecommendation(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public GiveRecommendation(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index 3babc9d4c9..c75815f75d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -29,7 +29,7 @@ public class GiveSp extends AbstractEffect { private final int _sp; - public GiveSp(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public GiveSp(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 09ad46b17c..12b3bb516c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Grow extends AbstractEffect { - public Grow(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Grow(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index 08e13d43e0..84e9527c53 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Harvesting extends AbstractEffect { - public Harvesting(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Harvesting(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index 8f88e27b03..b25a95690d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlagInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -33,7 +33,7 @@ public class HeadquarterCreate extends AbstractEffect private static final int HQ_NPC_ID = 35062; private final boolean _isAdvanced; - public HeadquarterCreate(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public HeadquarterCreate(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 1762d71103..0138b5b3ef 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -38,7 +38,7 @@ public class Heal extends AbstractEffect { private final double _power; - public Heal(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Heal(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index c446bf0496..79189e83cc 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.AbnormalType; @@ -30,7 +30,7 @@ public class HealOverTime extends AbstractEffect { private final double _power; - public HealOverTime(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public HealOverTime(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index 73ef5a8232..1e9c7974ba 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class HealPercent extends AbstractEffect { private final int _power; - public HealPercent(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public HealPercent(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 6738ef36f6..c1d2902eb9 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Hide extends AbstractEffect { - public Hide(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Hide(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index 01001ee54a..d180a145b7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -32,7 +32,7 @@ public class HpByLevel extends AbstractEffect { private final double _power; - public HpByLevel(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public HpByLevel(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index e5ad3d41a1..d18c115c48 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class HpDrain extends AbstractEffect { private final double _power; - public HpDrain(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public HpDrain(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ImmobileBuff.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ImmobileBuff.java index 52f1702cbb..a4c1d8bb00 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ImmobileBuff.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ImmobileBuff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class ImmobileBuff extends Buff { - public ImmobileBuff(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ImmobileBuff(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index df7435adf7..b24a5f729b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class ImmobilePetBuff extends AbstractEffect { - public ImmobilePetBuff(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ImmobilePetBuff(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Invincible.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Invincible.java index ce4ddd97bb..279aaa215c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Invincible.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Invincible.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class Invincible extends AbstractEffect { - public Invincible(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Invincible(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index 786a273ac6..1fc0c31157 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class Lethal extends AbstractEffect private final int _fullLethal; private final int _halfLethal; - public Lethal(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Lethal(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Lucky.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Lucky.java index 195db01e2f..144fb95a0e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Lucky.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Lucky.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Lucky extends AbstractEffect { - public Lucky(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Lucky(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index d32c18aebb..19e16ffbfc 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAttack extends AbstractEffect { - public MagicalAttack(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public MagicalAttack(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index f073974720..1959a32c39 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAttackByAbnormal extends AbstractEffect { - public MagicalAttackByAbnormal(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public MagicalAttackByAbnormal(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index ed304349c2..e3fdca9b17 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class MagicalAttackMp extends AbstractEffect { - public MagicalAttackMp(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public MagicalAttackMp(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index b28acacf4f..05457b5c7c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalSoulAttack extends AbstractEffect { - public MagicalSoulAttack(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public MagicalSoulAttack(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index 0f53d5a565..b5074fda5e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -29,7 +29,7 @@ public class ManaDamOverTime extends AbstractEffect { private final double _power; - public ManaDamOverTime(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ManaDamOverTime(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index 90ed407144..25cb0f2664 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class ManaHeal extends AbstractEffect { private final double _power; - public ManaHeal(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ManaHeal(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index a02fb51b71..ffb9154946 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class ManaHealByLevel extends AbstractEffect { private final double _power; - public ManaHealByLevel(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ManaHealByLevel(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index aa0243cf73..bcc12c9558 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -28,7 +28,7 @@ public class ManaHealOverTime extends AbstractEffect { private final double _power; - public ManaHealOverTime(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ManaHealOverTime(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 68d9225598..c4f074448a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class ManaHealPercent extends AbstractEffect { private final double _power; - public ManaHealPercent(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ManaHealPercent(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 0649c45c19..bd95f75dd8 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.EffectCalculationType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.CreatureStat; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -38,7 +38,7 @@ public class MaxCp extends AbstractEffect private final EffectCalculationType _type; private final boolean _heal; - public MaxCp(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public MaxCp(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 3a9e84e70f..d4ffd455ef 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.EffectCalculationType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.CreatureStat; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -38,7 +38,7 @@ public class MaxHp extends AbstractEffect private final EffectCalculationType _type; private final boolean _heal; - public MaxHp(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public MaxHp(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index 4cf2a57f54..e071ff72fd 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ public class MpConsumePerLevel extends AbstractEffect { private final double _power; - public MpConsumePerLevel(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public MpConsumePerLevel(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 2b0f0f5e39..0b4a078093 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Mute extends AbstractEffect { - public Mute(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Mute(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java index f147084a4a..37b4c3322a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class NoblesseBless extends AbstractEffect { - public NoblesseBless(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public NoblesseBless(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index 37a6a089cd..80f0d928fb 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class OpenChest extends AbstractEffect { - public OpenChest(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public OpenChest(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 671c9b76b9..06484e5c83 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.RecipeController; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpenCommonRecipeBook extends AbstractEffect { - public OpenCommonRecipeBook(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public OpenCommonRecipeBook(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index c8c0b93cad..dd8d3782d0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -36,7 +36,7 @@ public class OpenDoor extends AbstractEffect private final int _chance; private final boolean _isItem; - public OpenDoor(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public OpenDoor(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index 600bc6aa33..9bb776675d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.RecipeController; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpenDwarfRecipeBook extends AbstractEffect { - public OpenDwarfRecipeBook(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public OpenDwarfRecipeBook(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/OutpostCreate.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/OutpostCreate.java index 554f618343..39e7ccaa27 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/OutpostCreate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/OutpostCreate.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlagInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -33,7 +33,7 @@ public class OutpostCreate extends AbstractEffect { private static final int HQ_NPC_ID = 36590; - public OutpostCreate(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public OutpostCreate(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/OutpostDestroy.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/OutpostDestroy.java index 0ae19027b3..fb2f357b65 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/OutpostDestroy.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/OutpostDestroy.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlagInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class OutpostDestroy extends AbstractEffect { - public OutpostDestroy(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public OutpostDestroy(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Paralyze.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Paralyze.java index cb0d2016c8..72acb9f92f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Paralyze.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Paralyze.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Paralyze extends AbstractEffect { - public Paralyze(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Paralyze(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Passive.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Passive.java index 21699ca88d..27e4b929d4 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Passive.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Passive.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Passive extends AbstractEffect { - public Passive(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Passive(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Petrification.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Petrification.java index 6b0e87ef0e..e54293ddc7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Petrification.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Petrification.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Petrification extends AbstractEffect { - public Petrification(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Petrification(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 5e2c74d4a2..4e6f1abdc7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class PhysicalAttack extends AbstractEffect { - public PhysicalAttack(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public PhysicalAttack(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index 6d8a591756..3af1e502a4 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class PhysicalAttackHpLink extends AbstractEffect { - public PhysicalAttackHpLink(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public PhysicalAttackHpLink(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index dfb98f21f1..ee025d1c5a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class PhysicalAttackMute extends AbstractEffect { - public PhysicalAttackMute(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public PhysicalAttackMute(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index f6e5d31232..326b1f68d3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class PhysicalMute extends AbstractEffect { - public PhysicalMute(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public PhysicalMute(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index c62796142c..7c66cc2059 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class PhysicalSoulAttack extends AbstractEffect { - public PhysicalSoulAttack(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public PhysicalSoulAttack(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java index a548bce62e..08857fc4ce 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class ProtectionBlessing extends AbstractEffect { - public ProtectionBlessing(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ProtectionBlessing(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Pumping.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Pumping.java index 2c359e578e..6c51095b71 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Pumping.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Pumping.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.FishingRodsData; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -41,7 +41,7 @@ public class Pumping extends AbstractEffect { private final double _power; - public Pumping(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Pumping(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 1a12167900..494946d36f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.stream.Collectors; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -35,7 +35,7 @@ public class RandomizeHate extends AbstractEffect { private final int _chance; - public RandomizeHate(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public RandomizeHate(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index bcd15b20e3..447d5f0625 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RebalanceHP extends AbstractEffect { - public RebalanceHP(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public RebalanceHP(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Recovery.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Recovery.java index 7c72c7cf3d..25d6f4189b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Recovery.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Recovery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Recovery extends AbstractEffect { - public Recovery(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Recovery(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Reeling.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Reeling.java index 50a547c76a..7507e410a2 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Reeling.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Reeling.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.FishingRodsData; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -41,7 +41,7 @@ public class Reeling extends AbstractEffect { private final double _power; - public Reeling(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Reeling(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index d43a996798..9d9ddd4e1e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class RefuelAirship extends AbstractEffect { private final int _value; - public RefuelAirship(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public RefuelAirship(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Relax.java index 84354999e9..7b183d177e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -32,7 +32,7 @@ public class Relax extends AbstractEffect { private final double _power; - public Relax(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Relax(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index ec73413858..8b8e485da4 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class ResistSkill extends AbstractEffect { private final List _skills = new ArrayList<>(); - public ResistSkill(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ResistSkill(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index bdebee1bee..01fcb0fccd 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -32,7 +32,7 @@ public class Restoration extends AbstractEffect private final int _itemId; private final int _itemCount; - public Restoration(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Restoration(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 8c14557d00..c6b2f585a7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.model.ExtractableProductItem; import org.l2jmobius.gameserver.model.ExtractableSkill; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class RestorationRandom extends AbstractEffect { - public RestorationRandom(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public RestorationRandom(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index f94ee534e2..4225025b69 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class Resurrection extends AbstractEffect { private final int _power; - public Resurrection(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Resurrection(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 1e83373127..eebf332cf2 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -33,7 +33,7 @@ public class ResurrectionSpecial extends AbstractEffect { private final int _power; - public ResurrectionSpecial(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ResurrectionSpecial(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Root.java index 1bfc43159d..1455e183ab 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Root extends AbstractEffect { - public Root(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Root(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/RunAway.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/RunAway.java index 08f0cdbe2f..775bf13dbb 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/RunAway.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/RunAway.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -33,7 +33,7 @@ public class RunAway extends AbstractEffect private final int _power; private final int _time; - public RunAway(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public RunAway(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java index 6059cf7949..1075d8e6f3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -51,7 +51,7 @@ public class ServitorShare extends AbstractEffect } } - public ServitorShare(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ServitorShare(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index 273aeb6204..f11567b730 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -32,7 +32,7 @@ public class SetSkill extends AbstractEffect private final int _skillId; private final int _skillLvl; - public SetSkill(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public SetSkill(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java index 00715fd755..d8b64647e6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ public class SilentMove extends AbstractEffect { private final double _power; - public SilentMove(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public SilentMove(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 9a9ce915fd..43056e813e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -29,7 +29,7 @@ public class SkillTurning extends AbstractEffect { private final int _chance; - public SkillTurning(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public SkillTurning(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Sleep.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Sleep.java index fc973198b8..881e5a4351 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Sleep.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Sleep.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Sleep extends AbstractEffect { - public Sleep(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Sleep(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index 71ba58c9a5..00a3ff2ca9 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.stats.Formulas; */ public class SoulBlow extends AbstractEffect { - public SoulBlow(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public SoulBlow(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index ceee1a13f5..3747eb9042 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -38,7 +38,7 @@ public class SoulEating extends AbstractEffect { private final int _expNeeded; - public SoulEating(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public SoulEating(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); _expNeeded = params.getInt("expNeeded"); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Sow.java index 79109cdc4f..abec313da1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Seed; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Sow extends AbstractEffect { - public Sow(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Sow(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index b2a716c963..3b52e093e5 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class Spoil extends AbstractEffect { - public Spoil(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Spoil(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java index 97a275c1bd..6c7f51bb85 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -29,7 +29,7 @@ public class StaticDamage extends AbstractEffect { private final int _power; - public StaticDamage(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public StaticDamage(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index c60b937d2c..2f06b0aae8 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class StealAbnormal extends AbstractEffect private final int _rate; private final int _max; - public StealAbnormal(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public StealAbnormal(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Stun.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Stun.java index 4b48270ba9..7d4c2e017c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Stun.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Stun.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Stun extends AbstractEffect { - public Stun(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Stun(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Summon.java index 6dbfe97cdf..575600ed7b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.ServitorInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -40,7 +40,7 @@ public class Summon extends AbstractEffect private final int _lifeTime; private final int _consumeItemInterval; - public Summon(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Summon(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index f70485743f..04300842de 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ public class SummonAgathion extends AbstractEffect { private final int _npcId; - public SummonAgathion(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public SummonAgathion(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index bdb5198707..8b9e5c8e14 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.CubicInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -43,7 +43,7 @@ public class SummonCubic extends AbstractEffect /** Cubic activation chance. */ private final int _cubicSkillChance; - public SummonCubic(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public SummonCubic(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index d4f88bcd96..8f7ac5dac8 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DecoyInstance; import org.l2jmobius.gameserver.model.actor.instance.EffectPointInstance; @@ -44,7 +44,7 @@ public class SummonNpc extends AbstractEffect private final boolean _randomOffset; private final boolean _isSummonSpawn; - public SummonNpc(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public SummonNpc(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 2c1e46d6ee..a7b4195cda 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.data.xml.impl.PetDataTable; import org.l2jmobius.gameserver.model.PetData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PetItemList; */ public class SummonPet extends AbstractEffect { - public SummonPet(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public SummonPet(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index 0372571337..60ae4c4ec9 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -34,7 +34,7 @@ public class SummonTrap extends AbstractEffect private final int _despawnTime; private final int _npcId; - public SummonTrap(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public SummonTrap(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 0512297aa5..335eb7d549 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.Collection; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Sweeper extends AbstractEffect { - public Sweeper(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Sweeper(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index 520647ed66..c2b63895bd 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Castle; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class TakeCastle extends AbstractEffect { - public TakeCastle(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TakeCastle(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index e5c62a84b2..d92818e6e9 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Fort; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class TakeFort extends AbstractEffect { - public TakeFort(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TakeFort(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 9de9b4d8fd..e9a69751d8 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TakeFortStart extends AbstractEffect { - public TakeFortStart(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TakeFortStart(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TakeTerritoryFlag.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TakeTerritoryFlag.java index b3839eb979..1a0984eb27 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TakeTerritoryFlag.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TakeTerritoryFlag.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlagInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -33,7 +33,7 @@ public class TakeTerritoryFlag extends AbstractEffect { private static final int FLAG_NPC_ID = 35062; - public TakeTerritoryFlag(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TakeTerritoryFlag(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index 0ca29844ad..8544034c47 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -29,7 +29,7 @@ public class TalismanSlot extends AbstractEffect { private final int _slots; - public TalismanSlot(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TalismanSlot(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index b1703e87f3..7b5feefa47 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -31,7 +31,7 @@ public class TargetCancel extends AbstractEffect { private final int _chance; - public TargetCancel(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TargetCancel(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 60d2bbb9b2..49e2cce8b1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class TargetMe extends AbstractEffect { - public TargetMe(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TargetMe(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index bbd1479ef2..40dee2c119 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class TargetMeProbability extends AbstractEffect { private final int _chance; - public TargetMeProbability(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TargetMeProbability(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 213a4c36a6..bf1d83ece1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -31,7 +31,7 @@ public class Teleport extends AbstractEffect { private final Location _loc; - public Teleport(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Teleport(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index fa518a145b..65e7469889 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class TeleportToTarget extends AbstractEffect { - public TeleportToTarget(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TeleportToTarget(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ThrowUp.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ThrowUp.java index 11b9b56474..e8a5608802 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ThrowUp.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ThrowUp.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; */ public class ThrowUp extends AbstractEffect { - public ThrowUp(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ThrowUp(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TransferDamage.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TransferDamage.java index 85b2bb596d..57c00f0e77 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TransferDamage.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TransferDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class TransferDamage extends AbstractEffect { - public TransferDamage(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TransferDamage(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index 0e9bbf0f6e..20710f3613 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -32,7 +32,7 @@ public class TransferHate extends AbstractEffect { private final int _chance; - public TransferHate(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TransferHate(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 0c9c01fa98..fe5d91ea65 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.TransformData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -30,7 +30,7 @@ public class Transformation extends AbstractEffect { private final int _id; - public Transformation(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Transformation(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 9f4e00a3c4..c8058e7041 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ public class TrapDetect extends AbstractEffect { private final int _power; - public TrapDetect(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TrapDetect(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index 15c1870184..8285f032f0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.TrapAction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -35,7 +35,7 @@ public class TrapRemove extends AbstractEffect { private final int _power; - public TrapRemove(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TrapRemove(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 6fe958524d..a57d4ee411 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -57,7 +57,7 @@ public class TriggerSkillByAttack extends AbstractEffect * @param params */ - public TriggerSkillByAttack(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TriggerSkillByAttack(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index c64a9f0620..54fe703cde 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -49,7 +49,7 @@ public class TriggerSkillByAvoid extends AbstractEffect * @param params */ - public TriggerSkillByAvoid(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TriggerSkillByAvoid(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index 84c824f8ff..52e961f04c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -47,7 +47,7 @@ public class TriggerSkillByDamage extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillByDamage(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TriggerSkillByDamage(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 0df732a0a3..6b0df3cf77 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -50,7 +50,7 @@ public class TriggerSkillBySkill extends AbstractEffect * @param params */ - public TriggerSkillBySkill(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TriggerSkillBySkill(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index defba608d5..2162719a15 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -34,7 +34,7 @@ public class Unsummon extends AbstractEffect { private final int _chance; - public Unsummon(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Unsummon(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index d086462e3f..3c514ba80b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class UnsummonAgathion extends AbstractEffect { - public UnsummonAgathion(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public UnsummonAgathion(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index 2a86311962..691775ac92 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -30,7 +30,7 @@ public class VitalityPointUp extends AbstractEffect { private final float _value; - public VitalityPointUp(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public VitalityPointUp(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/SevenSigns.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/SevenSigns.java index 19ae195abb..7218839018 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/SevenSigns.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/SevenSigns.java @@ -35,7 +35,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.AutoSpawnHandler; import org.l2jmobius.gameserver.model.AutoSpawnHandler.AutoSpawnInstance; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -125,7 +125,7 @@ public class SevenSigns protected int _previousWinner; protected Calendar _lastSave = Calendar.getInstance(); - protected Map _signsPlayerData = new LinkedHashMap<>(); + protected Map _signsPlayerData = new LinkedHashMap<>(); private final Map _signsSealOwners = new LinkedHashMap<>(); private final Map _signsDuskSealTotals = new LinkedHashMap<>(); private final Map _signsDawnSealTotals = new LinkedHashMap<>(); @@ -758,7 +758,7 @@ public class SevenSigns int cabalMembers = 0; final String cabalName = getCabalShortName(cabal); - for (StatsSet sevenDat : _signsPlayerData.values()) + for (StatSet sevenDat : _signsPlayerData.values()) { if (sevenDat.getString("cabal").equals(cabalName)) { @@ -771,7 +771,7 @@ public class SevenSigns public int getPlayerStoneContrib(int objectId) { - final StatsSet currPlayer = _signsPlayerData.get(objectId); + final StatSet currPlayer = _signsPlayerData.get(objectId); if (currPlayer == null) { return 0; @@ -787,7 +787,7 @@ public class SevenSigns public int getPlayerContribScore(int objectId) { - final StatsSet currPlayer = _signsPlayerData.get(objectId); + final StatSet currPlayer = _signsPlayerData.get(objectId); if (currPlayer == null) { return 0; @@ -798,7 +798,7 @@ public class SevenSigns public int getPlayerAdenaCollect(int objectId) { - final StatsSet currPlayer = _signsPlayerData.get(objectId); + final StatSet currPlayer = _signsPlayerData.get(objectId); if (currPlayer == null) { return 0; @@ -809,7 +809,7 @@ public class SevenSigns public int getPlayerSeal(int objectId) { - final StatsSet currPlayer = _signsPlayerData.get(objectId); + final StatSet currPlayer = _signsPlayerData.get(objectId); if (currPlayer == null) { return SEAL_NULL; @@ -820,7 +820,7 @@ public class SevenSigns public int getPlayerCabal(int objectId) { - final StatsSet currPlayer = _signsPlayerData.get(objectId); + final StatSet currPlayer = _signsPlayerData.get(objectId); if (currPlayer == null) { return CABAL_NULL; @@ -851,13 +851,13 @@ public class SevenSigns try (Statement s = con.createStatement(); ResultSet rs = s.executeQuery(LOAD_DATA)) { - StatsSet sevenDat = null; + StatSet sevenDat = null; int charObjId; while (rs.next()) { charObjId = rs.getInt("charId"); - sevenDat = new StatsSet(); + sevenDat = new StatSet(); sevenDat.set("charId", charObjId); sevenDat.set("cabal", rs.getString("cabal")); sevenDat.set("seal", rs.getInt("seal")); @@ -916,7 +916,7 @@ public class SevenSigns try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(UPDATE_PLAYER)) { - for (StatsSet sevenDat : _signsPlayerData.values()) + for (StatSet sevenDat : _signsPlayerData.values()) { ps.setString(1, sevenDat.getString("cabal")); ps.setInt(2, sevenDat.getInt("seal")); @@ -938,7 +938,7 @@ public class SevenSigns public void saveSevenSignsData(int objectId) { - final StatsSet sevenDat = _signsPlayerData.get(objectId); + final StatSet sevenDat = _signsPlayerData.get(objectId); if (sevenDat == null) { return; @@ -1007,7 +1007,7 @@ public class SevenSigns protected void resetPlayerData() { // Reset each player's contribution data as well as seal and cabal. - for (StatsSet sevenDat : _signsPlayerData.values()) + for (StatSet sevenDat : _signsPlayerData.values()) { // Reset the player's cabal and seal information sevenDat.set("cabal", ""); @@ -1026,7 +1026,7 @@ public class SevenSigns */ public int setPlayerInfo(int objectId, int chosenCabal, int chosenSeal) { - StatsSet currPlayerData = _signsPlayerData.get(objectId); + StatSet currPlayerData = _signsPlayerData.get(objectId); if (currPlayerData != null) { @@ -1039,7 +1039,7 @@ public class SevenSigns } else { - currPlayerData = new StatsSet(); + currPlayerData = new StatSet(); currPlayerData.set("charId", objectId); currPlayerData.set("cabal", getCabalShortName(chosenCabal)); currPlayerData.set("seal", chosenSeal); @@ -1093,7 +1093,7 @@ public class SevenSigns */ public int getAncientAdenaReward(int objectId, boolean removeReward) { - final StatsSet currPlayer = _signsPlayerData.get(objectId); + final StatSet currPlayer = _signsPlayerData.get(objectId); final int rewardAmount = currPlayer.getInt("ancient_adena_amount"); currPlayer.set("red_stones", 0); @@ -1126,7 +1126,7 @@ public class SevenSigns */ public long addPlayerStoneContrib(int objectId, long blueCount, long greenCount, long redCount) { - final StatsSet currPlayer = _signsPlayerData.get(objectId); + final StatSet currPlayer = _signsPlayerData.get(objectId); final long contribScore = calcContributionScore(blueCount, greenCount, redCount); final long totalAncientAdena = currPlayer.getLong("ancient_adena_amount") + calcAncientAdenaReward(blueCount, greenCount, redCount); @@ -1493,7 +1493,7 @@ public class SevenSigns { for (PlayerInstance player : World.getInstance().getPlayers()) { - final StatsSet currPlayer = _signsPlayerData.get(player.getObjectId()); + final StatSet currPlayer = _signsPlayerData.get(player.getObjectId()); if (isSealValidationPeriod() || isCompResultsPeriod()) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/SevenSignsFestival.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/SevenSignsFestival.java index abf2125c22..4f737a605a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/SevenSignsFestival.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/SevenSignsFestival.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party.MessageType; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.SpawnListener; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; @@ -780,10 +780,10 @@ public class SevenSignsFestival implements SpawnListener private final Map _duskFestivalScores = new HashMap<>(); /** - * _festivalData is essentially an instance of the seven_signs_festival table and should be treated as such. Data is initially accessed by the related Seven Signs cycle, with _signsCycle representing data for the current round of Festivals. The actual table data is stored as a series of StatsSet + * _festivalData is essentially an instance of the seven_signs_festival table and should be treated as such. Data is initially accessed by the related Seven Signs cycle, with _signsCycle representing data for the current round of Festivals. The actual table data is stored as a series of StatSet * constructs. These are accessed by the use of an offset based on the number of festivals, thus: offset = FESTIVAL_COUNT + festivalId (Data for Dawn is always accessed by offset > FESTIVAL_COUNT) */ - private final Map> _festivalData = new HashMap<>(); + private final Map> _festivalData = new HashMap<>(); protected SevenSignsFestival() { @@ -950,7 +950,7 @@ public class SevenSignsFestival implements SpawnListener int festivalId = rs.getInt("festivalId"); final String cabal = rs.getString("cabal"); - final StatsSet festivalDat = new StatsSet(); + final StatSet festivalDat = new StatSet(); festivalDat.set("festivalId", festivalId); festivalDat.set("cabal", cabal); festivalDat.set("cycle", festivalCycle); @@ -963,7 +963,7 @@ public class SevenSignsFestival implements SpawnListener festivalId += FESTIVAL_COUNT; } - final Map tempData = _festivalData.getOrDefault(festivalCycle, new HashMap<>()); + final Map tempData = _festivalData.getOrDefault(festivalCycle, new HashMap<>()); tempData.put(festivalId, festivalDat); _festivalData.put(festivalCycle, tempData); } @@ -1017,9 +1017,9 @@ public class SevenSignsFestival implements SpawnListener try (Connection con = DatabaseFactory.getConnection(); PreparedStatement psInsert = con.prepareStatement("REPLACE INTO seven_signs_festival (festivalId, cabal, cycle, date, score, members) VALUES (?,?,?,?,?,?)")) { - for (Map currCycleData : _festivalData.values()) + for (Map currCycleData : _festivalData.values()) { - for (StatsSet festivalDat : currCycleData.values()) + for (StatSet festivalDat : currCycleData.values()) { psInsert.setInt(1, festivalDat.getInt("festivalId")); psInsert.setString(2, festivalDat.getString("cabal")); @@ -1050,7 +1050,7 @@ public class SevenSignsFestival implements SpawnListener protected void rewardHighestRanked() { String[] partyMembers; - StatsSet overallData = getOverallHighestScoreData(FESTIVAL_LEVEL_MAX_31); + StatSet overallData = getOverallHighestScoreData(FESTIVAL_LEVEL_MAX_31); if (overallData != null) { partyMembers = overallData.getString("members").split(","); @@ -1172,7 +1172,7 @@ public class SevenSignsFestival implements SpawnListener _duskFestivalScores.clear(); // Set up a new data set for the current cycle of festivals - final Map newData = new HashMap<>(); + final Map newData = new HashMap<>(); for (int i = 0; i < (FESTIVAL_COUNT * 2); i++) { @@ -1183,8 +1183,8 @@ public class SevenSignsFestival implements SpawnListener festivalId -= FESTIVAL_COUNT; } - // Create a new StatsSet with "default" data for Dusk - final StatsSet tempStats = new StatsSet(); + // Create a new StatSet with "default" data for Dusk + final StatSet tempStats = new StatSet(); tempStats.set("festivalId", festivalId); tempStats.set("cycle", _signsCycle); tempStats.set("date", "0"); @@ -1465,9 +1465,9 @@ public class SevenSignsFestival implements SpawnListener * Returns a stats set containing the highest score this cycle for the the specified cabal and associated festival ID. * @param oracle * @param festivalId - * @return StatsSet festivalDat + * @return StatSet festivalDat */ - public StatsSet getHighestScoreData(int oracle, int festivalId) + public StatSet getHighestScoreData(int oracle, int festivalId) { int offsetId = festivalId; @@ -1478,7 +1478,7 @@ public class SevenSignsFestival implements SpawnListener // Attempt to retrieve existing score data (if found), otherwise create a // new blank data set and display a console warning. - StatsSet currData = null; + StatSet currData = null; try { @@ -1486,7 +1486,7 @@ public class SevenSignsFestival implements SpawnListener } catch (Exception e) { - currData = new StatsSet(); + currData = new StatSet(); currData.set("score", 0); currData.set("members", ""); } @@ -1497,16 +1497,16 @@ public class SevenSignsFestival implements SpawnListener /** * Returns a stats set containing the highest ever recorded score data for the specified festival. * @param festivalId - * @return StatsSet result + * @return StatSet result */ - public StatsSet getOverallHighestScoreData(int festivalId) + public StatSet getOverallHighestScoreData(int festivalId) { - StatsSet result = null; + StatSet result = null; int highestScore = 0; - for (Map currCycleData : _festivalData.values()) + for (Map currCycleData : _festivalData.values()) { - for (StatsSet currFestData : currCycleData.values()) + for (StatSet currFestData : currCycleData.values()) { final int currFestID = currFestData.getInt("festivalId"); final int festivalScore = currFestData.getInt("score"); @@ -1560,7 +1560,7 @@ public class SevenSignsFestival implements SpawnListener _duskFestivalScores.put(festivalId, offeringScore); } - final StatsSet currFestData = getHighestScoreData(oracle, festivalId); + final StatSet currFestData = getHighestScoreData(oracle, festivalId); // Check if this is the highest score for this level range so far for the player's cabal. if (offeringScore > thisCabalHighScore) @@ -1663,10 +1663,10 @@ public class SevenSignsFestival implements SpawnListener return 0; } - final Map festivalDataMap = _festivalData.get(_signsCycle); + final Map festivalDataMap = _festivalData.get(_signsCycle); if (festivalDataMap != null) { - for (StatsSet festivalData : festivalDataMap.values()) + for (StatSet festivalData : festivalDataMap.values()) { if (festivalData.getString("members").contains(playerName)) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java index 8837d8386d..b933332550 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java @@ -32,7 +32,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.AdminCommandAccessRight; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -70,7 +70,7 @@ public class AdminData implements IXmlReader { NamedNodeMap attrs; Node attr; - StatsSet set; + StatSet set; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) { if ("list".equalsIgnoreCase(n.getNodeName())) @@ -79,7 +79,7 @@ public class AdminData implements IXmlReader { if ("access".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -95,7 +95,7 @@ public class AdminData implements IXmlReader } else if ("admin".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java index 1fdd8637de..2970bf8534 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java @@ -33,7 +33,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; @@ -45,7 +45,7 @@ public class DoorData implements IXmlReader { private static final Map> _groups = new HashMap<>(); private final Map _doors = new HashMap<>(); - private final Map _templates = new HashMap<>(); + private final Map _templates = new HashMap<>(); private final Map> _regions = new HashMap<>(); protected DoorData() @@ -74,7 +74,7 @@ public class DoorData implements IXmlReader if ("door".equalsIgnoreCase(b.getNodeName())) { final NamedNodeMap attrs = b.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.set("baseHpMax", 1); // Avoid doors without HP value created dead due to default value 0 in CreatureTemplate for (int i = 0; i < attrs.getLength(); i++) { @@ -91,7 +91,7 @@ public class DoorData implements IXmlReader LOGGER.info(getClass().getSimpleName() + ": Loaded " + _doors.size() + " door templates for " + _regions.size() + " regions."); } - public void insertCollisionData(StatsSet set) + public void insertCollisionData(StatSet set) { int posX; int posY; @@ -118,7 +118,7 @@ public class DoorData implements IXmlReader /** * @param set */ - private void makeDoor(StatsSet set) + private void makeDoor(StatSet set) { insertCollisionData(set); final DoorTemplate template = new DoorTemplate(set); @@ -128,7 +128,7 @@ public class DoorData implements IXmlReader putDoor(door, MapRegionManager.getInstance().getMapRegionLocId(door)); } - public StatsSet getDoorTemplate(int doorId) + public StatSet getDoorTemplate(int doorId) { return _templates.get(doorId); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java index 440a95c33e..1f65bf3cb4 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -62,7 +62,7 @@ public class EnchantItemData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node att; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -74,7 +74,7 @@ public class EnchantItemData implements IXmlReader if ("enchant".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -105,7 +105,7 @@ public class EnchantItemData implements IXmlReader else if ("support".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java index 6fcad3662a..c57215f5da 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java @@ -30,7 +30,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.EnchantSkillGroup; import org.l2jmobius.gameserver.model.EnchantSkillGroup.EnchantSkillHolder; import org.l2jmobius.gameserver.model.EnchantSkillLearn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -98,7 +98,7 @@ public class EnchantSkillGroupsData implements IXmlReader if ("enchant".equalsIgnoreCase(b.getNodeName())) { attrs = b.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java index 57a16d6390..608f4702b8 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.FakePlayerHolder; @@ -72,7 +72,7 @@ public class FakePlayerData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayer", fakePlayerNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerNode)); final int npcId = set.getInt("npcId"); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); final String name = template.getName(); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java index a0ad168a72..51d9e32f03 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.FenceState; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldRegion; import org.l2jmobius.gameserver.model.actor.instance.FenceInstance; @@ -78,7 +78,7 @@ public class FenceData implements IXmlReader private void spawnFence(Node fenceNode) { - final StatsSet set = new StatsSet(parseAttributes(fenceNode)); + final StatSet set = new StatSet(parseAttributes(fenceNode)); spawnFence(set.getInt("x"), set.getInt("y"), set.getInt("z"), set.getString("name"), set.getInt("width"), set.getInt("length"), set.getInt("height"), 0, set.getEnum("state", FenceState.class, FenceState.CLOSED)); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/FishData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/FishData.java index 0efc17a16f..6e939300c1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/FishData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/FishData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.fishing.Fish; /** @@ -71,7 +71,7 @@ public class FishData implements IXmlReader { final NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/FishingMonstersData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/FishingMonstersData.java index aef9bc9eaf..9a0937989c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/FishingMonstersData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/FishingMonstersData.java @@ -25,7 +25,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.fishing.FishingMonster; /** @@ -64,7 +64,7 @@ public class FishingMonstersData implements IXmlReader if ("fishingMonster".equalsIgnoreCase(d.getNodeName())) { final NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/FishingRodsData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/FishingRodsData.java index a3e7aa2675..ce71960d03 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/FishingRodsData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/FishingRodsData.java @@ -25,7 +25,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.fishing.FishingRod; /** @@ -64,7 +64,7 @@ public class FishingRodsData implements IXmlReader if ("fishingRod".equalsIgnoreCase(d.getNodeName())) { final NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java index de839258cd..48b7b0b074 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.Henna; @@ -82,7 +82,7 @@ public class HennaData implements IXmlReader */ private void parseHenna(Node d) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final List wearClassIds = new ArrayList<>(); NamedNodeMap attrs = d.getAttributes(); Node attr; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java index 894856d113..13494a05cd 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; @@ -91,7 +91,7 @@ public class InitialEquipmentData implements IXmlReader { if ("item".equalsIgnoreCase(c.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java index a3d1d83841..8a8b518d83 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java @@ -31,7 +31,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.file.filter.NumericNameFilter; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.multisell.Entry; @@ -168,14 +168,14 @@ public class MultisellData implements IXmlReader NamedNodeMap attrs; Node att; - StatsSet set; + StatSet set; for (n = first; n != null; n = n.getNextSibling()) { if ("ingredient".equalsIgnoreCase(n.getNodeName())) { attrs = n.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -186,7 +186,7 @@ public class MultisellData implements IXmlReader else if ("production".equalsIgnoreCase(n.getNodeName())) { attrs = n.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java index de8119c14b..13433dec76 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java @@ -40,7 +40,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.AISkillScope; import org.l2jmobius.gameserver.enums.DropType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -94,7 +94,7 @@ public class NpcData implements IXmlReader if ("npc".equalsIgnoreCase(listNode.getNodeName())) { NamedNodeMap attrs = listNode.getAttributes(); - final StatsSet set = new StatsSet(new HashMap<>()); + final StatSet set = new StatSet(new HashMap<>()); final int npcId = parseInteger(attrs, "id"); Map parameters = null; Map skills = null; @@ -521,7 +521,7 @@ public class NpcData implements IXmlReader template.set(set); } - template.setParameters(parameters != null ? new StatsSet(Collections.unmodifiableMap(parameters)) : StatsSet.EMPTY_STATSET); + template.setParameters(parameters != null ? new StatSet(Collections.unmodifiableMap(parameters)) : StatSet.EMPTY_STATSET); if (skills != null) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java index 3712cca6af..373f87ecfc 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -79,7 +79,7 @@ public class NpcNameLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); NPC_NAME_LOCALISATIONS.get(_lang).put(set.getInt("id"), new String[] { set.getString("name"), diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java index 09e72fe7d6..968e176d86 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java @@ -28,7 +28,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.PetLevelData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * This class parse and hold all pet parameters.
    @@ -112,7 +112,7 @@ public class PetDataTable implements IXmlReader if (s.getNodeName().equals("stat")) { final int level = Integer.parseInt(s.getAttributes().getNamedItem("level").getNodeValue()); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (Node bean = s.getFirstChild(); bean != null; bean = bean.getNextSibling()) { if (bean.getNodeName().equals("set")) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java index 736cce15dd..f43a449483 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.base.ClassId; @@ -77,7 +77,7 @@ public class PlayerTemplateData implements IXmlReader } else if ("staticData".equalsIgnoreCase(d.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.set("classId", classId); final List creationPoints = new ArrayList<>(); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java index cdbb85ca5c..585de145c8 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.PrimeShopProductHolder; /** @@ -62,7 +62,7 @@ public class PrimeShopData implements IXmlReader { NamedNodeMap attrs; Node att; - StatsSet set = null; + StatSet set = null; for (Node a = doc.getFirstChild(); a != null; a = a.getNextSibling()) { if ("list".equalsIgnoreCase(a.getNodeName())) @@ -72,7 +72,7 @@ public class PrimeShopData implements IXmlReader if ("product".equalsIgnoreCase(b.getNodeName())) { attrs = b.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java index c7decad0f4..c7f2c9ed0c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java @@ -30,7 +30,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.RecipeInstance; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.RecipeStatInstance; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; /** @@ -79,7 +79,7 @@ public class RecipeData implements IXmlReader Node att; int id = -1; boolean haveRare = false; - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); att = attrs.getNamedItem("id"); if (att == null) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java index 053d9089ce..d6b28a5962 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; /** @@ -82,7 +82,7 @@ public class SendMessageLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); SEND_MESSAGE_LOCALISATIONS.get(_lang).put(set.getString("message").split(SPLIT_STRING), set.getString("translation").split(SPLIT_STRING)); })); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java index 8cfc0d9847..4b09c05b63 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.SiegeScheduleDate; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.util.Util; /** @@ -51,7 +51,7 @@ public class SiegeScheduleData implements IXmlReader LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded " + _scheduleData.size() + " siege schedulers."); if (_scheduleData.isEmpty()) { - _scheduleData.add(new SiegeScheduleDate(new StatsSet())); + _scheduleData.add(new SiegeScheduleDate(new StatSet())); LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Emergency Loaded: " + _scheduleData.size() + " default siege schedulers."); } } @@ -69,7 +69,7 @@ public class SiegeScheduleData implements IXmlReader { case "schedule": { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final NamedNodeMap attrs = cd.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java index 60f572be00..b0c54aa3d0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java @@ -38,7 +38,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.SkillLearn.SubClassData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.base.ClassId; @@ -183,7 +183,7 @@ public class SkillTreesData implements IXmlReader { if ("skill".equalsIgnoreCase(c.getNodeName())) { - final StatsSet learnSkillSet = new StatsSet(); + final StatSet learnSkillSet = new StatSet(); NamedNodeMap attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java index 46176f6f44..ca8e408ea8 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java @@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; @@ -66,7 +66,7 @@ public class StaticObjectData implements IXmlReader if ("object".equalsIgnoreCase(d.getNodeName())) { final NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -83,9 +83,9 @@ public class StaticObjectData implements IXmlReader * Initialize an static object based on the stats set and add it to the map. * @param set the stats set to add. */ - private void addObject(StatsSet set) + private void addObject(StatSet set) { - final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatsSet()), set.getInt("id")); + final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatSet()), set.getInt("id")); obj.setType(set.getInt("type", 0)); obj.setName(set.getString("name")); obj.setMap(set.getString("texture", "none"), set.getInt("map_x", 0), set.getInt("map_y", 0)); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java index 0e3f8ccdf4..fbe944e3e6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java @@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.transform.Transform; import org.l2jmobius.gameserver.model.actor.transform.TransformLevelData; @@ -68,7 +68,7 @@ public class TransformData implements IXmlReader if ("transform".equalsIgnoreCase(d.getNodeName())) { NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -190,7 +190,7 @@ public class TransformData implements IXmlReader transform.setTemplate(isMale, templateData); } - final StatsSet levelsSet = new StatsSet(); + final StatSet levelsSet = new StatSet(); for (Node s = z.getFirstChild(); s != null; s = s.getNextSibling()) { if ("level".equals(s.getNodeName())) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/datatables/SpawnTable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/datatables/SpawnTable.java index 5a130b5d90..5a0394a57b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/datatables/SpawnTable.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/datatables/SpawnTable.java @@ -41,7 +41,7 @@ import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.DayNightSpawnManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -200,7 +200,7 @@ public class SpawnTable implements IXmlReader continue; } - final StatsSet spawnInfo = new StatsSet(); + final StatSet spawnInfo = new StatSet(); spawnInfo.set("npcTemplateid", templateId); spawnInfo.set("x", x); spawnInfo.set("y", y); @@ -251,11 +251,11 @@ public class SpawnTable implements IXmlReader /** * Creates NPC spawn - * @param spawnInfo StatsSet of spawn parameters + * @param spawnInfo StatSet of spawn parameters * @param aiData Map of specific AI parameters for this spawn * @return count NPC instances, spawned by this spawn */ - private int addSpawn(StatsSet spawnInfo, Map aiData) + private int addSpawn(StatSet spawnInfo, Map aiData) { Spawn spawnDat; int ret = 0; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/DocumentBase.java index 6c78e3cef5..197207e8ca 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/DocumentBase.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/DocumentBase.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.PlayerState; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionCategoryType; @@ -168,7 +168,7 @@ public abstract class DocumentBase protected abstract void parseDocument(Document doc); - protected abstract StatsSet getStatsSet(); + protected abstract StatSet getStatSet(); protected abstract String getTableValue(String name); @@ -292,14 +292,14 @@ public abstract class DocumentBase protected void attachEffect(Node n, Object template, Condition attachCond, EffectScope effectScope) { final NamedNodeMap attrs = n.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); set.set(att.getNodeName(), getValue(att.getNodeValue(), template)); } - final StatsSet parameters = parseParameters(n.getFirstChild(), template); + final StatSet parameters = parseParameters(n.getFirstChild(), template); final Condition applayCond = parseCondition(n.getFirstChild(), template); if (template instanceof IIdentifiable) @@ -337,9 +337,9 @@ public abstract class DocumentBase * @param template the effect template * @return the list of parameters if any, {@code null} otherwise */ - private StatsSet parseParameters(Node n, Object template) + private StatSet parseParameters(Node n, Object template) { - StatsSet parameters = null; + StatSet parameters = null; while ((n != null)) { // Parse all parameters. @@ -347,7 +347,7 @@ public abstract class DocumentBase { if (parameters == null) { - parameters = new StatsSet(); + parameters = new StatSet(); } final NamedNodeMap params = n.getAttributes(); for (int i = 0; i < params.getLength(); i++) @@ -358,7 +358,7 @@ public abstract class DocumentBase } n = n.getNextSibling(); } - return parameters == null ? StatsSet.EMPTY_STATSET : parameters; + return parameters == null ? StatSet.EMPTY_STATSET : parameters; } protected Condition parseCondition(Node n, Object template) @@ -1257,7 +1257,7 @@ public abstract class DocumentBase setTable(name, array.toArray(new String[array.size()])); } - protected void parseBeanSet(Node n, StatsSet set, Integer level) + protected void parseBeanSet(Node n, StatSet set, Integer level) { final String name = n.getAttributes().getNamedItem("name").getNodeValue().trim(); final String value = n.getAttributes().getNamedItem("val").getNodeValue().trim(); @@ -1272,7 +1272,7 @@ public abstract class DocumentBase } } - protected void setExtractableSkillData(StatsSet set, String value) + protected void setExtractableSkillData(StatSet set, String value) { set.set("capsuled_items_skill", value); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java index b1900ebd83..49f979e5f9 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.gameserver.engines.DocumentBase; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.items.Item; @@ -48,7 +48,7 @@ public class DocumentItem extends DocumentBase } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return _currentItem.set; } @@ -102,7 +102,7 @@ public class DocumentItem extends DocumentBase _currentItem.id = itemId; _currentItem.name = itemName; _currentItem.type = className; - _currentItem.set = new StatsSet(); + _currentItem.set = new StatSet(); _currentItem.set.set("item_id", itemId); _currentItem.set.set("name", itemName); @@ -167,7 +167,7 @@ public class DocumentItem extends DocumentBase try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatsSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (Item) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java index f883526371..d2d838264e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.engines.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; public class ItemDataHolder @@ -24,7 +24,7 @@ public class ItemDataHolder int id; String type; String name; - StatsSet set; + StatSet set; int currentLevel; Item item; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/skills/DocumentSkill.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/skills/DocumentSkill.java index a047c817b3..83c391e630 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/skills/DocumentSkill.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/skills/DocumentSkill.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; import org.l2jmobius.gameserver.data.xml.impl.EnchantSkillGroupsData; import org.l2jmobius.gameserver.engines.DocumentBase; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.skills.EffectScope; import org.l2jmobius.gameserver.model.skills.Skill; @@ -51,7 +51,7 @@ public class DocumentSkill extends DocumentBase } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return _currentSkill.sets[_currentSkill.currentLevel]; } @@ -166,19 +166,19 @@ public class DocumentSkill extends DocumentBase _currentSkill.id = skillId; _currentSkill.name = skillName; - _currentSkill.sets = new StatsSet[lastLvl]; - _currentSkill.enchsets1 = new StatsSet[enchantLevels1]; - _currentSkill.enchsets2 = new StatsSet[enchantLevels2]; - _currentSkill.enchsets3 = new StatsSet[enchantLevels3]; - _currentSkill.enchsets4 = new StatsSet[enchantLevels4]; - _currentSkill.enchsets5 = new StatsSet[enchantLevels5]; - _currentSkill.enchsets6 = new StatsSet[enchantLevels6]; - _currentSkill.enchsets7 = new StatsSet[enchantLevels7]; - _currentSkill.enchsets8 = new StatsSet[enchantLevels8]; + _currentSkill.sets = new StatSet[lastLvl]; + _currentSkill.enchsets1 = new StatSet[enchantLevels1]; + _currentSkill.enchsets2 = new StatSet[enchantLevels2]; + _currentSkill.enchsets3 = new StatSet[enchantLevels3]; + _currentSkill.enchsets4 = new StatSet[enchantLevels4]; + _currentSkill.enchsets5 = new StatSet[enchantLevels5]; + _currentSkill.enchsets6 = new StatSet[enchantLevels6]; + _currentSkill.enchsets7 = new StatSet[enchantLevels7]; + _currentSkill.enchsets8 = new StatSet[enchantLevels8]; for (int i = 0; i < lastLvl; i++) { - _currentSkill.sets[i] = new StatsSet(); + _currentSkill.sets[i] = new StatSet(); _currentSkill.sets[i].set("skill_id", _currentSkill.id); _currentSkill.sets[i].set("level", i + 1); _currentSkill.sets[i].set("name", _currentSkill.name); @@ -217,7 +217,7 @@ public class DocumentSkill extends DocumentBase } for (int i = 0; i < enchantLevels1; i++) { - _currentSkill.enchsets1[i] = new StatsSet(); + _currentSkill.enchsets1[i] = new StatSet(); _currentSkill.enchsets1[i].set("skill_id", _currentSkill.id); // currentSkill.enchsets1[i] = currentSkill.sets[currentSkill.sets.length-1]; _currentSkill.enchsets1[i].set("level", i + 101); @@ -248,7 +248,7 @@ public class DocumentSkill extends DocumentBase for (int i = 0; i < enchantLevels2; i++) { - _currentSkill.enchsets2[i] = new StatsSet(); + _currentSkill.enchsets2[i] = new StatSet(); // currentSkill.enchsets2[i] = currentSkill.sets[currentSkill.sets.length-1]; _currentSkill.enchsets2[i].set("skill_id", _currentSkill.id); _currentSkill.enchsets2[i].set("level", i + 201); @@ -279,7 +279,7 @@ public class DocumentSkill extends DocumentBase for (int i = 0; i < enchantLevels3; i++) { - _currentSkill.enchsets3[i] = new StatsSet(); + _currentSkill.enchsets3[i] = new StatSet(); _currentSkill.enchsets3[i].set("skill_id", _currentSkill.id); _currentSkill.enchsets3[i].set("level", i + 301); _currentSkill.enchsets3[i].set("name", _currentSkill.name); @@ -308,7 +308,7 @@ public class DocumentSkill extends DocumentBase for (int i = 0; i < enchantLevels4; i++) { - _currentSkill.enchsets4[i] = new StatsSet(); + _currentSkill.enchsets4[i] = new StatSet(); _currentSkill.enchsets4[i].set("skill_id", _currentSkill.id); _currentSkill.enchsets4[i].set("level", i + 401); _currentSkill.enchsets4[i].set("name", _currentSkill.name); @@ -337,7 +337,7 @@ public class DocumentSkill extends DocumentBase for (int i = 0; i < enchantLevels5; i++) { - _currentSkill.enchsets5[i] = new StatsSet(); + _currentSkill.enchsets5[i] = new StatSet(); _currentSkill.enchsets5[i].set("skill_id", _currentSkill.id); _currentSkill.enchsets5[i].set("level", i + 501); _currentSkill.enchsets5[i].set("name", _currentSkill.name); @@ -366,7 +366,7 @@ public class DocumentSkill extends DocumentBase for (int i = 0; i < enchantLevels6; i++) { - _currentSkill.enchsets6[i] = new StatsSet(); + _currentSkill.enchsets6[i] = new StatSet(); _currentSkill.enchsets6[i].set("skill_id", _currentSkill.id); _currentSkill.enchsets6[i].set("level", i + 601); _currentSkill.enchsets6[i].set("name", _currentSkill.name); @@ -395,7 +395,7 @@ public class DocumentSkill extends DocumentBase for (int i = 0; i < enchantLevels7; i++) { - _currentSkill.enchsets7[i] = new StatsSet(); + _currentSkill.enchsets7[i] = new StatSet(); _currentSkill.enchsets7[i].set("skill_id", _currentSkill.id); _currentSkill.enchsets7[i].set("level", i + 701); _currentSkill.enchsets7[i].set("name", _currentSkill.name); @@ -424,7 +424,7 @@ public class DocumentSkill extends DocumentBase for (int i = 0; i < enchantLevels8; i++) { - _currentSkill.enchsets8[i] = new StatsSet(); + _currentSkill.enchsets8[i] = new StatSet(); _currentSkill.enchsets8[i].set("skill_id", _currentSkill.id); _currentSkill.enchsets8[i].set("level", i + 801); _currentSkill.enchsets8[i].set("name", _currentSkill.name); @@ -1527,7 +1527,7 @@ public class DocumentSkill extends DocumentBase { int count = 0; _currentSkill.currentSkills = new ArrayList<>(_currentSkill.sets.length + _currentSkill.enchsets1.length + _currentSkill.enchsets2.length + _currentSkill.enchsets3.length + _currentSkill.enchsets4.length + _currentSkill.enchsets5.length + _currentSkill.enchsets6.length + _currentSkill.enchsets7.length + _currentSkill.enchsets8.length); - StatsSet set; + StatSet set; for (int i = 0; i < _currentSkill.sets.length; i++) { set = _currentSkill.sets[i]; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/skills/SkillDataHolder.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/skills/SkillDataHolder.java index 47c757e65a..2b69cdab75 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/skills/SkillDataHolder.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/skills/SkillDataHolder.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.engines.skills; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.skills.Skill; /** @@ -29,15 +29,15 @@ public class SkillDataHolder { public int id; public String name; - public StatsSet[] sets; - public StatsSet[] enchsets1; - public StatsSet[] enchsets2; - public StatsSet[] enchsets3; - public StatsSet[] enchsets4; - public StatsSet[] enchsets5; - public StatsSet[] enchsets6; - public StatsSet[] enchsets7; - public StatsSet[] enchsets8; + public StatSet[] sets; + public StatSet[] enchsets1; + public StatSet[] enchsets2; + public StatSet[] enchsets3; + public StatSet[] enchsets4; + public StatSet[] enchsets5; + public StatSet[] enchsets6; + public StatSet[] enchsets7; + public StatSet[] enchsets8; public int currentLevel; public List skills = new ArrayList<>(); public List currentSkills = new ArrayList<>(); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java index b56968efbc..c9ff14fcc4 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.model.AirShipTeleportList; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShipInstance; @@ -45,13 +45,13 @@ public class AirShipManager private static final String UPDATE_DB = "UPDATE airships SET fuel=? WHERE owner_id=?"; private CreatureTemplate _airShipTemplate = null; - private final Map _airShipsInfo = new HashMap<>(); + private final Map _airShipsInfo = new HashMap<>(); private final Map _airShips = new HashMap<>(); private final Map _teleports = new HashMap<>(); protected AirShipManager() { - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", 9); npcDat.set("level", 0); npcDat.set("jClass", "boat"); @@ -106,7 +106,7 @@ public class AirShipManager public AirShipInstance getNewAirShip(int x, int y, int z, int heading, int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return null; @@ -142,7 +142,7 @@ public class AirShipManager return; } storeInDb(ship.getOwnerId()); - final StatsSet info = _airShipsInfo.get(ship.getOwnerId()); + final StatSet info = _airShipsInfo.get(ship.getOwnerId()); if (info != null) { info.set("fuel", ship.getFuel()); @@ -160,7 +160,7 @@ public class AirShipManager { return; } - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("fuel", 600); _airShipsInfo.put(ownerId, info); try (Connection con = DatabaseFactory.getConnection(); @@ -237,10 +237,10 @@ public class AirShipManager Statement s = con.createStatement(); ResultSet rs = s.executeQuery(LOAD_DB)) { - StatsSet info; + StatSet info; while (rs.next()) { - info = new StatsSet(); + info = new StatSet(); info.set("fuel", rs.getInt("fuel")); _airShipsInfo.put(rs.getInt("owner_id"), info); } @@ -258,7 +258,7 @@ public class AirShipManager private void storeInDb(int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java index 21cad620a8..364663990d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.BoatInstance; @@ -57,7 +57,7 @@ public class BoatManager return null; } - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", boatId); npcDat.set("level", 0); npcDat.set("jClass", "boat"); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CHSiegeManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CHSiegeManager.java index 0096466804..e4b667856a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CHSiegeManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CHSiegeManager.java @@ -25,7 +25,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -62,7 +62,7 @@ public class CHSiegeManager { final int id = rs.getInt("clanHallId"); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.set("id", id); set.set("name", rs.getString("name")); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index d46dee2069..c794faba83 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.enums.ManorMode; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; import org.l2jmobius.gameserver.model.SeedProduction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.entity.Castle; @@ -122,7 +122,7 @@ public class CastleManorManager implements IXmlReader, IStorable @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; NamedNodeMap attrs; Node att; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -138,7 +138,7 @@ public class CastleManorManager implements IXmlReader, IStorable { if ("crop".equalsIgnoreCase(c.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); set.set("castleId", castleId); attrs = c.getAttributes(); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/ClanHallManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/ClanHallManager.java index 36bea62080..209a3c6ccf 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/ClanHallManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/ClanHallManager.java @@ -27,7 +27,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.sql.impl.ClanTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.entity.ClanHall; @@ -70,7 +70,7 @@ public class ClanHallManager int lease; while (rs.next()) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); id = rs.getInt("id"); ownerId = rs.getInt("ownerId"); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index 3dd4e3f652..767bed6954 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.datatables.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.FakePlayerChatHolder; @@ -73,7 +73,7 @@ public class FakePlayerChatManager implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayerChat", fakePlayerChatNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerChatNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerChatNode)); MESSAGES.add(new FakePlayerChatHolder(set.getString("fpcName"), set.getString("searchMethod"), set.getString("searchText"), set.getString("answers"))); })); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java index 47384f5c76..bc7eb9fc0c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java @@ -36,7 +36,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.tasks.GrandBossManagerStoreTask; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; @@ -60,7 +60,7 @@ public class GrandBossManager implements IStorable protected static final Map BOSSES = new ConcurrentHashMap<>(); - protected static Map _storedInfo = new HashMap<>(); + protected static Map _storedInfo = new HashMap<>(); private final Map _bossStatus = new ConcurrentHashMap<>(); @@ -81,7 +81,7 @@ public class GrandBossManager implements IStorable { // Read all info from DB, and store it for AI to read and decide what to do // faster than accessing DB in real time - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); final int bossId = rs.getInt("boss_id"); info.set("loc_x", rs.getInt("loc_x")); info.set("loc_y", rs.getInt("loc_y")); @@ -215,12 +215,12 @@ public class GrandBossManager implements IStorable return BOSSES.get(bossId); } - public StatsSet getStatsSet(int bossId) + public StatSet getStatSet(int bossId) { return _storedInfo.get(bossId); } - public void setStatsSet(int bossId, StatsSet info) + public void setStatSet(int bossId, StatSet info) { _storedInfo.put(bossId, info); updateDb(bossId, false); @@ -252,10 +252,10 @@ public class GrandBossManager implements IStorable } } } - for (Entry e : _storedInfo.entrySet()) + for (Entry e : _storedInfo.entrySet()) { final GrandBossInstance boss = BOSSES.get(e.getKey()); - final StatsSet info = e.getValue(); + final StatSet info = e.getValue(); if ((boss == null) || (info == null)) { try (PreparedStatement update = con.prepareStatement(UPDATE_GRAND_BOSS_DATA2)) @@ -305,7 +305,7 @@ public class GrandBossManager implements IStorable try (Connection con = DatabaseFactory.getConnection()) { final GrandBossInstance boss = BOSSES.get(bossId); - final StatsSet info = _storedInfo.get(bossId); + final StatSet info = _storedInfo.get(bossId); if (statusOnly || (boss == null) || (info == null)) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java index a970941207..a0e581d6f7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java @@ -36,7 +36,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.datatables.SpawnTable; import org.l2jmobius.gameserver.enums.RaidBossStatus; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.RaidBossInstance; /** @@ -49,7 +49,7 @@ public class RaidBossSpawnManager protected static final Map _bosses = new ConcurrentHashMap<>(); protected static final Map _spawns = new ConcurrentHashMap<>(); - protected static final Map _storedInfo = new ConcurrentHashMap<>(); + protected static final Map _storedInfo = new ConcurrentHashMap<>(); protected static final Map> _schedules = new ConcurrentHashMap<>(); /** @@ -131,7 +131,7 @@ public class RaidBossSpawnManager { raidboss.setRaidStatus(RaidBossStatus.ALIVE); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", raidboss.getCurrentHp()); info.set("currentMP", raidboss.getCurrentMp()); info.set("respawnTime", 0); @@ -154,7 +154,7 @@ public class RaidBossSpawnManager */ public void updateStatus(RaidBossInstance boss, boolean isBossDead) { - final StatsSet info = _storedInfo.get(boss.getId()); + final StatSet info = _storedInfo.get(boss.getId()); if (info == null) { return; @@ -225,7 +225,7 @@ public class RaidBossSpawnManager _bosses.put(bossId, raidboss); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", currentHP); info.set("currentMP", currentMP); info.set("respawnTime", 0); @@ -324,7 +324,7 @@ public class RaidBossSpawnManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE raidboss_spawnlist SET respawn_time = ?, currentHP = ?, currentMP = ? WHERE boss_id = ?")) { - for (Entry entry : _storedInfo.entrySet()) + for (Entry entry : _storedInfo.entrySet()) { final Integer bossId = entry.getKey(); if (bossId == null) @@ -343,7 +343,7 @@ public class RaidBossSpawnManager updateStatus(boss, false); } - final StatsSet info = entry.getValue(); + final StatSet info = entry.getValue(); if (info == null) { continue; @@ -429,7 +429,7 @@ public class RaidBossSpawnManager */ public void notifySpawnNightBoss(RaidBossInstance raidboss) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", raidboss.getCurrentHp()); info.set("currentMP", raidboss.getCurrentMp()); info.set("respawnTime", 0); @@ -475,7 +475,7 @@ public class RaidBossSpawnManager * Gets the stored info. * @return the stored info */ - public Map getStoredInfo() + public Map getStoredInfo() { return _storedInfo; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/AccessLevel.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/AccessLevel.java index 2ecfbd194e..ced434ddda 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/AccessLevel.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/AccessLevel.java @@ -52,7 +52,7 @@ public class AccessLevel /** Flag to gain exp in party */ private boolean _gainExp = false; - public AccessLevel(StatsSet set) + public AccessLevel(StatSet set) { _accessLevel = set.getInt("level"); _name = set.getString("name"); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java index 241f56554d..4ea90781a5 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java @@ -27,7 +27,7 @@ public class AdminCommandAccessRight private final int _accessLevel; private final boolean _requireConfirm; - public AdminCommandAccessRight(StatsSet set) + public AdminCommandAccessRight(StatSet set) { _adminCommand = set.getString("command"); _requireConfirm = set.getBoolean("confirmDlg", false); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/EnchantSkillGroup.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/EnchantSkillGroup.java index e6a1588b02..9a31ac6536 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/EnchantSkillGroup.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/EnchantSkillGroup.java @@ -54,7 +54,7 @@ public class EnchantSkillGroup private final int _spCost; private final byte[] _rate; - public EnchantSkillHolder(StatsSet set) + public EnchantSkillHolder(StatSet set) { _level = set.getInt("level"); _adenaCost = set.getInt("adena", 0); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/PetLevelData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/PetLevelData.java index 16f1c1ff07..a302e51ce4 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/PetLevelData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/PetLevelData.java @@ -46,7 +46,7 @@ public class PetLevelData private final double _slowFlySpeedOnRide; private final double _fastFlySpeedOnRide; - public PetLevelData(StatsSet set) + public PetLevelData(StatSet set) { _ownerExpTaken = set.getInt("get_exp_type"); _petMaxExp = set.getLong("exp"); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/RecipeList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/RecipeList.java index b2c7b9a612..f660608e0a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/RecipeList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/RecipeList.java @@ -68,7 +68,7 @@ public class RecipeList * @param set * @param haveRare */ - public RecipeList(StatsSet set, boolean haveRare) + public RecipeList(StatSet set, boolean haveRare) { _recipes = new RecipeInstance[0]; _statUse = new RecipeStatInstance[0]; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Seed.java index 08a7984914..32dc9a0ba3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Seed.java @@ -35,7 +35,7 @@ public class Seed private final int _seedReferencePrice; private final int _cropReferencePrice; - public Seed(StatsSet set) + public Seed(StatSet set) { _cropId = set.getInt("id"); _seedId = set.getInt("seedId"); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java index caa0d8162e..d854355fb0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java @@ -27,7 +27,7 @@ public class SiegeScheduleDate private final int _hour; private final int _maxConcurrent; - public SiegeScheduleDate(StatsSet set) + public SiegeScheduleDate(StatSet set) { _day = set.getInt("day", Calendar.SUNDAY); _hour = set.getInt("hour", 16); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/SkillLearn.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/SkillLearn.java index 0d612afbcd..a73c1853d3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/SkillLearn.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/SkillLearn.java @@ -79,7 +79,7 @@ public class SkillLearn * Constructor for SkillLearn. * @param set the set with the SkillLearn data. */ - public SkillLearn(StatsSet set) + public SkillLearn(StatSet set) { _skillName = set.getString("skillName"); _skillId = set.getInt("skillId"); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/StatSet.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/StatSet.java new file mode 100644 index 0000000000..ec175436cd --- /dev/null +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/StatSet.java @@ -0,0 +1,968 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Supplier; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.stream.Collectors; + +import org.l2jmobius.commons.util.TimeUtil; +import org.l2jmobius.gameserver.model.holders.MinionHolder; +import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.interfaces.IParserAdvUtils; +import org.l2jmobius.gameserver.util.Util; + +/** + * This class is meant to hold a set of (key,value) pairs.
    + * They are stored as object but can be retrieved in any type wanted. As long as cast is available.
    + * @author mkizub + */ +public class StatSet implements IParserAdvUtils +{ + private static final Logger LOGGER = Logger.getLogger(StatSet.class.getName()); + /** Static empty immutable map, used to avoid multiple null checks over the source. */ + public static final StatSet EMPTY_STATSET = new StatSet(Collections.emptyMap()); + + private final Map _set; + + public StatSet() + { + this(ConcurrentHashMap::new); + } + + public StatSet(Supplier> mapFactory) + { + this(mapFactory.get()); + } + + public StatSet(Map map) + { + _set = map; + } + + /** + * Returns the set of values + * @return HashMap + */ + public Map getSet() + { + return _set; + } + + /** + * Add a set of couple values in the current set + * @param newSet : StatSet pointing out the list of couples to add in the current set + */ + public void merge(StatSet newSet) + { + _set.putAll(newSet.getSet()); + } + + /** + * Verifies if the stat set is empty. + * @return {@code true} if the stat set is empty, {@code false} otherwise + */ + public boolean isEmpty() + { + return _set.isEmpty(); + } + + /** + * Return the boolean value associated with key. + * @param key : String designating the key in the set + * @return boolean : value associated to the key + * @throws IllegalArgumentException : If value is not set or value is not boolean + */ + @Override + public boolean getBoolean(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Boolean value required, but not specified"); + } + if (val instanceof Boolean) + { + return ((Boolean) val).booleanValue(); + } + try + { + return Boolean.parseBoolean((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Boolean value required, but found: " + val); + } + } + + /** + * Return the boolean value associated with key.
    + * If no value is associated with key, or type of value is wrong, returns defaultValue. + * @param key : String designating the key in the entry set + * @return boolean : value associated to the key + */ + @Override + public boolean getBoolean(String key, boolean defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Boolean) + { + return ((Boolean) val).booleanValue(); + } + try + { + return Boolean.parseBoolean((String) val); + } + catch (Exception e) + { + return defaultValue; + } + } + + @Override + public byte getByte(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Byte value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).byteValue(); + } + try + { + return Byte.parseByte((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + + @Override + public byte getByte(String key, byte defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).byteValue(); + } + try + { + return Byte.parseByte((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + + public short increaseByte(String key, byte increaseWith) + { + final byte newValue = (byte) (getByte(key) + increaseWith); + set(key, newValue); + return newValue; + } + + public short increaseByte(String key, byte defaultValue, byte increaseWith) + { + final byte newValue = (byte) (getByte(key, defaultValue) + increaseWith); + set(key, newValue); + return newValue; + } + + public byte[] getByteArray(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Byte value required, but not specified"); + } + if (val instanceof Number) + { + return new byte[] + { + ((Number) val).byteValue() + }; + } + int c = 0; + final String[] vals = ((String) val).split(splitOn); + final byte[] result = new byte[vals.length]; + for (String v : vals) + { + try + { + result[c++] = Byte.parseByte(v); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + return result; + } + + public List getByteList(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final List result = new ArrayList<>(); + for (Byte i : getByteArray(key, splitOn)) + { + result.add(i); + } + return result; + } + + @Override + public short getShort(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Short value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).shortValue(); + } + try + { + return Short.parseShort((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Short value required, but found: " + val); + } + } + + @Override + public short getShort(String key, short defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).shortValue(); + } + try + { + return Short.parseShort((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Short value required, but found: " + val); + } + } + + public short increaseShort(String key, short increaseWith) + { + final short newValue = (short) (getShort(key) + increaseWith); + set(key, newValue); + return newValue; + } + + public short increaseShort(String key, short defaultValue, short increaseWith) + { + final short newValue = (short) (getShort(key, defaultValue) + increaseWith); + set(key, newValue); + return newValue; + } + + @Override + public int getInt(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Integer value required, but not specified: " + key + "!"); + } + + if (val instanceof Number) + { + return ((Number) val).intValue(); + } + + try + { + return Integer.parseInt((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val + "!"); + } + } + + @Override + public int getInt(String key, int defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).intValue(); + } + try + { + return Integer.parseInt((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val); + } + } + + public int increaseInt(String key, int increaseWith) + { + final int newValue = getInt(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public int increaseInt(String key, int defaultValue, int increaseWith) + { + final int newValue = getInt(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + public int[] getIntArray(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Integer value required, but not specified"); + } + if (val instanceof Number) + { + return new int[] + { + ((Number) val).intValue() + }; + } + int c = 0; + final String[] vals = ((String) val).split(splitOn); + final int[] result = new int[vals.length]; + for (String v : vals) + { + try + { + result[c++] = Integer.parseInt(v); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val); + } + } + return result; + } + + public List getIntegerList(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final List result = new ArrayList<>(); + for (int i : getIntArray(key, splitOn)) + { + result.add(i); + } + return result; + } + + @Override + public long getLong(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Long value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).longValue(); + } + try + { + return Long.parseLong((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Long value required, but found: " + val); + } + } + + @Override + public long getLong(String key, long defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).longValue(); + } + try + { + return Long.parseLong((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Long value required, but found: " + val); + } + } + + public long increaseLong(String key, long increaseWith) + { + final long newValue = getLong(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public long increaseLong(String key, long defaultValue, long increaseWith) + { + final long newValue = getLong(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public float getFloat(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Float value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).floatValue(); + } + try + { + return Float.parseFloat((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Float value required, but found: " + val); + } + } + + @Override + public float getFloat(String key, float defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).floatValue(); + } + try + { + return Float.parseFloat((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Float value required, but found: " + val); + } + } + + public float increaseFloat(String key, float increaseWith) + { + final float newValue = getFloat(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public float increaseFloat(String key, float defaultValue, float increaseWith) + { + final float newValue = getFloat(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public double getDouble(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Double value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).doubleValue(); + } + try + { + return Double.parseDouble((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Double value required, but found: " + val); + } + } + + @Override + public double getDouble(String key, double defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).doubleValue(); + } + try + { + return Double.parseDouble((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Double value required, but found: " + val); + } + } + + public double increaseDouble(String key, double increaseWith) + { + final double newValue = getDouble(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public double increaseDouble(String key, double defaultValue, double increaseWith) + { + final double newValue = getDouble(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public String getString(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("String value required, but not specified"); + } + return String.valueOf(val); + } + + @Override + public String getString(String key, String defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + return String.valueOf(val); + } + + @Override + public Duration getDuration(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("String value required, but not specified"); + } + return TimeUtil.parseDuration(String.valueOf(val)); + } + + @Override + public Duration getDuration(String key, Duration defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + return TimeUtil.parseDuration(String.valueOf(val)); + } + + @Override + @SuppressWarnings("unchecked") + public > T getEnum(String key, Class enumClass) + { + Objects.requireNonNull(key); + Objects.requireNonNull(enumClass); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but not specified"); + } + if (enumClass.isInstance(val)) + { + return (T) val; + } + try + { + return Enum.valueOf(enumClass, String.valueOf(val)); + } + catch (Exception e) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); + } + } + + @Override + @SuppressWarnings("unchecked") + public > T getEnum(String key, Class enumClass, T defaultValue) + { + Objects.requireNonNull(key); + Objects.requireNonNull(enumClass); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (enumClass.isInstance(val)) + { + return (T) val; + } + try + { + return Enum.valueOf(enumClass, String.valueOf(val)); + } + catch (Exception e) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); + } + } + + @SuppressWarnings("unchecked") + public A getObject(String name, Class type) + { + Objects.requireNonNull(name); + Objects.requireNonNull(type); + final Object obj = _set.get(name); + if ((obj == null) || !type.isAssignableFrom(obj.getClass())) + { + return null; + } + + return (A) obj; + } + + @SuppressWarnings("unchecked") + public A getObject(String name, Class type, A defaultValue) + { + Objects.requireNonNull(name); + Objects.requireNonNull(type); + final Object obj = _set.get(name); + if ((obj == null) || !type.isAssignableFrom(obj.getClass())) + { + return defaultValue; + } + + return (A) obj; + } + + public SkillHolder getSkillHolder(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof SkillHolder)) + { + return null; + } + + return (SkillHolder) obj; + } + + public Location getLocation(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof Location)) + { + return null; + } + return (Location) obj; + } + + @SuppressWarnings("unchecked") + public List getMinionList(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return Collections.emptyList(); + } + + return (List) obj; + } + + @SuppressWarnings("unchecked") + public List getList(String key, Class clazz) + { + Objects.requireNonNull(key); + Objects.requireNonNull(clazz); + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return null; + } + + final List originalList = (List) obj; + if (!originalList.isEmpty() && !originalList.stream().allMatch(clazz::isInstance)) + { + if (clazz.getSuperclass() == Enum.class) + { + throw new IllegalAccessError("Please use getEnumList if you want to get list of Enums!"); + } + + // Attempt to convert the list + final List convertedList = convertList(originalList, clazz); + if (convertedList == null) + { + LOGGER.log(Level.WARNING, "getList(\"" + key + "\", " + clazz.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); + return null; + } + + // Overwrite the existing list with proper generic type + _set.put(key, convertedList); + return convertedList; + } + return (List) obj; + } + + public List getList(String key, Class clazz, List defaultValue) + { + final List list = getList(key, clazz); + return list == null ? defaultValue : list; + } + + @SuppressWarnings("unchecked") + public > List getEnumList(String key, Class clazz) + { + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return null; + } + + final List originalList = (List) obj; + if (!originalList.isEmpty() && (obj.getClass().getGenericInterfaces()[0] != clazz) && originalList.stream().allMatch(name -> Util.isEnum(name.toString(), clazz))) + { + final List convertedList = originalList.stream().map(Object::toString).map(name -> Enum.valueOf(clazz, name)).map(clazz::cast).collect(Collectors.toList()); + + // Overwrite the existing list with proper generic type + _set.put(key, convertedList); + return convertedList; + } + return (List) obj; + } + + /** + * @param + * @param originalList + * @param clazz + * @return + */ + private List convertList(List originalList, Class clazz) + { + if (clazz == Integer.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isInteger)) + { + return originalList.stream().map(Object::toString).map(Integer::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + else if (clazz == Float.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isFloat)) + { + return originalList.stream().map(Object::toString).map(Float::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + else if (clazz == Double.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isDouble)) + { + return originalList.stream().map(Object::toString).map(Double::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + return null; + } + + @SuppressWarnings("unchecked") + public Map getMap(String key, Class keyClass, Class valueClass) + { + final Object obj = _set.get(key); + if (!(obj instanceof Map)) + { + return null; + } + + final Map originalList = (Map) obj; + if (!originalList.isEmpty() && ((!originalList.keySet().stream().allMatch(keyClass::isInstance)) || (!originalList.values().stream().allMatch(valueClass::isInstance)))) + { + LOGGER.log(Level.WARNING, "getMap(\"" + key + "\", " + keyClass.getSimpleName() + ", " + valueClass.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); + } + return (Map) obj; + } + + public StatSet set(String name, Object value) + { + if (value == null) + { + return this; + } + _set.put(name, value); + return this; + } + + public StatSet set(String key, boolean value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, byte value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, short value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, int value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, long value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, float value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, double value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, String value) + { + if (value == null) + { + return this; + } + _set.put(key, value); + return this; + } + + public StatSet set(String key, Enum value) + { + if (value == null) + { + return this; + } + _set.put(key, value); + return this; + } + + public static StatSet valueOf(String key, Object value) + { + final StatSet set = new StatSet(); + set.set(key, value); + return set; + } + + public void remove(String key) + { + _set.remove(key); + } + + public boolean contains(String name) + { + return _set.containsKey(name); + } + + @Override + public String toString() + { + return "StatSet{_set=" + _set + '}'; + } +} diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/StatsSet.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/StatsSet.java deleted file mode 100644 index 1062ae7f1b..0000000000 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/StatsSet.java +++ /dev/null @@ -1,968 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.ConcurrentHashMap; -import java.util.function.Supplier; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.stream.Collectors; - -import org.l2jmobius.commons.util.TimeUtil; -import org.l2jmobius.gameserver.model.holders.MinionHolder; -import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.interfaces.IParserAdvUtils; -import org.l2jmobius.gameserver.util.Util; - -/** - * This class is meant to hold a set of (key,value) pairs.
    - * They are stored as object but can be retrieved in any type wanted. As long as cast is available.
    - * @author mkizub - */ -public class StatsSet implements IParserAdvUtils -{ - private static final Logger LOGGER = Logger.getLogger(StatsSet.class.getName()); - /** Static empty immutable map, used to avoid multiple null checks over the source. */ - public static final StatsSet EMPTY_STATSET = new StatsSet(Collections.emptyMap()); - - private final Map _set; - - public StatsSet() - { - this(ConcurrentHashMap::new); - } - - public StatsSet(Supplier> mapFactory) - { - this(mapFactory.get()); - } - - public StatsSet(Map map) - { - _set = map; - } - - /** - * Returns the set of values - * @return HashMap - */ - public Map getSet() - { - return _set; - } - - /** - * Add a set of couple values in the current set - * @param newSet : StatsSet pointing out the list of couples to add in the current set - */ - public void merge(StatsSet newSet) - { - _set.putAll(newSet.getSet()); - } - - /** - * Verifies if the stat set is empty. - * @return {@code true} if the stat set is empty, {@code false} otherwise - */ - public boolean isEmpty() - { - return _set.isEmpty(); - } - - /** - * Return the boolean value associated with key. - * @param key : String designating the key in the set - * @return boolean : value associated to the key - * @throws IllegalArgumentException : If value is not set or value is not boolean - */ - @Override - public boolean getBoolean(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Boolean value required, but not specified"); - } - if (val instanceof Boolean) - { - return ((Boolean) val).booleanValue(); - } - try - { - return Boolean.parseBoolean((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Boolean value required, but found: " + val); - } - } - - /** - * Return the boolean value associated with key.
    - * If no value is associated with key, or type of value is wrong, returns defaultValue. - * @param key : String designating the key in the entry set - * @return boolean : value associated to the key - */ - @Override - public boolean getBoolean(String key, boolean defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Boolean) - { - return ((Boolean) val).booleanValue(); - } - try - { - return Boolean.parseBoolean((String) val); - } - catch (Exception e) - { - return defaultValue; - } - } - - @Override - public byte getByte(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Byte value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).byteValue(); - } - try - { - return Byte.parseByte((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - - @Override - public byte getByte(String key, byte defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).byteValue(); - } - try - { - return Byte.parseByte((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - - public short increaseByte(String key, byte increaseWith) - { - final byte newValue = (byte) (getByte(key) + increaseWith); - set(key, newValue); - return newValue; - } - - public short increaseByte(String key, byte defaultValue, byte increaseWith) - { - final byte newValue = (byte) (getByte(key, defaultValue) + increaseWith); - set(key, newValue); - return newValue; - } - - public byte[] getByteArray(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Byte value required, but not specified"); - } - if (val instanceof Number) - { - return new byte[] - { - ((Number) val).byteValue() - }; - } - int c = 0; - final String[] vals = ((String) val).split(splitOn); - final byte[] result = new byte[vals.length]; - for (String v : vals) - { - try - { - result[c++] = Byte.parseByte(v); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - return result; - } - - public List getByteList(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final List result = new ArrayList<>(); - for (Byte i : getByteArray(key, splitOn)) - { - result.add(i); - } - return result; - } - - @Override - public short getShort(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Short value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).shortValue(); - } - try - { - return Short.parseShort((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Short value required, but found: " + val); - } - } - - @Override - public short getShort(String key, short defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).shortValue(); - } - try - { - return Short.parseShort((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Short value required, but found: " + val); - } - } - - public short increaseShort(String key, short increaseWith) - { - final short newValue = (short) (getShort(key) + increaseWith); - set(key, newValue); - return newValue; - } - - public short increaseShort(String key, short defaultValue, short increaseWith) - { - final short newValue = (short) (getShort(key, defaultValue) + increaseWith); - set(key, newValue); - return newValue; - } - - @Override - public int getInt(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Integer value required, but not specified: " + key + "!"); - } - - if (val instanceof Number) - { - return ((Number) val).intValue(); - } - - try - { - return Integer.parseInt((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val + "!"); - } - } - - @Override - public int getInt(String key, int defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).intValue(); - } - try - { - return Integer.parseInt((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val); - } - } - - public int increaseInt(String key, int increaseWith) - { - final int newValue = getInt(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public int increaseInt(String key, int defaultValue, int increaseWith) - { - final int newValue = getInt(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - public int[] getIntArray(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Integer value required, but not specified"); - } - if (val instanceof Number) - { - return new int[] - { - ((Number) val).intValue() - }; - } - int c = 0; - final String[] vals = ((String) val).split(splitOn); - final int[] result = new int[vals.length]; - for (String v : vals) - { - try - { - result[c++] = Integer.parseInt(v); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val); - } - } - return result; - } - - public List getIntegerList(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final List result = new ArrayList<>(); - for (int i : getIntArray(key, splitOn)) - { - result.add(i); - } - return result; - } - - @Override - public long getLong(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Long value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).longValue(); - } - try - { - return Long.parseLong((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Long value required, but found: " + val); - } - } - - @Override - public long getLong(String key, long defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).longValue(); - } - try - { - return Long.parseLong((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Long value required, but found: " + val); - } - } - - public long increaseLong(String key, long increaseWith) - { - final long newValue = getLong(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public long increaseLong(String key, long defaultValue, long increaseWith) - { - final long newValue = getLong(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public float getFloat(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Float value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).floatValue(); - } - try - { - return Float.parseFloat((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Float value required, but found: " + val); - } - } - - @Override - public float getFloat(String key, float defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).floatValue(); - } - try - { - return Float.parseFloat((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Float value required, but found: " + val); - } - } - - public float increaseFloat(String key, float increaseWith) - { - final float newValue = getFloat(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public float increaseFloat(String key, float defaultValue, float increaseWith) - { - final float newValue = getFloat(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public double getDouble(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Double value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).doubleValue(); - } - try - { - return Double.parseDouble((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Double value required, but found: " + val); - } - } - - @Override - public double getDouble(String key, double defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).doubleValue(); - } - try - { - return Double.parseDouble((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Double value required, but found: " + val); - } - } - - public double increaseDouble(String key, double increaseWith) - { - final double newValue = getDouble(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public double increaseDouble(String key, double defaultValue, double increaseWith) - { - final double newValue = getDouble(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public String getString(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("String value required, but not specified"); - } - return String.valueOf(val); - } - - @Override - public String getString(String key, String defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - return String.valueOf(val); - } - - @Override - public Duration getDuration(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("String value required, but not specified"); - } - return TimeUtil.parseDuration(String.valueOf(val)); - } - - @Override - public Duration getDuration(String key, Duration defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - return TimeUtil.parseDuration(String.valueOf(val)); - } - - @Override - @SuppressWarnings("unchecked") - public > T getEnum(String key, Class enumClass) - { - Objects.requireNonNull(key); - Objects.requireNonNull(enumClass); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but not specified"); - } - if (enumClass.isInstance(val)) - { - return (T) val; - } - try - { - return Enum.valueOf(enumClass, String.valueOf(val)); - } - catch (Exception e) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); - } - } - - @Override - @SuppressWarnings("unchecked") - public > T getEnum(String key, Class enumClass, T defaultValue) - { - Objects.requireNonNull(key); - Objects.requireNonNull(enumClass); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (enumClass.isInstance(val)) - { - return (T) val; - } - try - { - return Enum.valueOf(enumClass, String.valueOf(val)); - } - catch (Exception e) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); - } - } - - @SuppressWarnings("unchecked") - public A getObject(String name, Class type) - { - Objects.requireNonNull(name); - Objects.requireNonNull(type); - final Object obj = _set.get(name); - if ((obj == null) || !type.isAssignableFrom(obj.getClass())) - { - return null; - } - - return (A) obj; - } - - @SuppressWarnings("unchecked") - public A getObject(String name, Class type, A defaultValue) - { - Objects.requireNonNull(name); - Objects.requireNonNull(type); - final Object obj = _set.get(name); - if ((obj == null) || !type.isAssignableFrom(obj.getClass())) - { - return defaultValue; - } - - return (A) obj; - } - - public SkillHolder getSkillHolder(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof SkillHolder)) - { - return null; - } - - return (SkillHolder) obj; - } - - public Location getLocation(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof Location)) - { - return null; - } - return (Location) obj; - } - - @SuppressWarnings("unchecked") - public List getMinionList(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return Collections.emptyList(); - } - - return (List) obj; - } - - @SuppressWarnings("unchecked") - public List getList(String key, Class clazz) - { - Objects.requireNonNull(key); - Objects.requireNonNull(clazz); - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return null; - } - - final List originalList = (List) obj; - if (!originalList.isEmpty() && !originalList.stream().allMatch(clazz::isInstance)) - { - if (clazz.getSuperclass() == Enum.class) - { - throw new IllegalAccessError("Please use getEnumList if you want to get list of Enums!"); - } - - // Attempt to convert the list - final List convertedList = convertList(originalList, clazz); - if (convertedList == null) - { - LOGGER.log(Level.WARNING, "getList(\"" + key + "\", " + clazz.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); - return null; - } - - // Overwrite the existing list with proper generic type - _set.put(key, convertedList); - return convertedList; - } - return (List) obj; - } - - public List getList(String key, Class clazz, List defaultValue) - { - final List list = getList(key, clazz); - return list == null ? defaultValue : list; - } - - @SuppressWarnings("unchecked") - public > List getEnumList(String key, Class clazz) - { - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return null; - } - - final List originalList = (List) obj; - if (!originalList.isEmpty() && (obj.getClass().getGenericInterfaces()[0] != clazz) && originalList.stream().allMatch(name -> Util.isEnum(name.toString(), clazz))) - { - final List convertedList = originalList.stream().map(Object::toString).map(name -> Enum.valueOf(clazz, name)).map(clazz::cast).collect(Collectors.toList()); - - // Overwrite the existing list with proper generic type - _set.put(key, convertedList); - return convertedList; - } - return (List) obj; - } - - /** - * @param - * @param originalList - * @param clazz - * @return - */ - private List convertList(List originalList, Class clazz) - { - if (clazz == Integer.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isInteger)) - { - return originalList.stream().map(Object::toString).map(Integer::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - else if (clazz == Float.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isFloat)) - { - return originalList.stream().map(Object::toString).map(Float::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - else if (clazz == Double.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isDouble)) - { - return originalList.stream().map(Object::toString).map(Double::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - return null; - } - - @SuppressWarnings("unchecked") - public Map getMap(String key, Class keyClass, Class valueClass) - { - final Object obj = _set.get(key); - if (!(obj instanceof Map)) - { - return null; - } - - final Map originalList = (Map) obj; - if (!originalList.isEmpty() && ((!originalList.keySet().stream().allMatch(keyClass::isInstance)) || (!originalList.values().stream().allMatch(valueClass::isInstance)))) - { - LOGGER.log(Level.WARNING, "getMap(\"" + key + "\", " + keyClass.getSimpleName() + ", " + valueClass.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); - } - return (Map) obj; - } - - public StatsSet set(String name, Object value) - { - if (value == null) - { - return this; - } - _set.put(name, value); - return this; - } - - public StatsSet set(String key, boolean value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, byte value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, short value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, int value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, long value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, float value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, double value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, String value) - { - if (value == null) - { - return this; - } - _set.put(key, value); - return this; - } - - public StatsSet set(String key, Enum value) - { - if (value == null) - { - return this; - } - _set.put(key, value); - return this; - } - - public static StatsSet valueOf(String key, Object value) - { - final StatsSet set = new StatsSet(); - set.set(key, value); - return set; - } - - public void remove(String key) - { - _set.remove(key); - } - - public boolean contains(String name) - { - return _set.containsKey(name); - } - - @Override - public String toString() - { - return "StatsSet{_set=" + _set + '}'; - } -} diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 1ad451eaa4..9b03729b90 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.Map; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; @@ -85,12 +85,12 @@ public class CreatureTemplate extends ListenersContainer /** The creature's race. */ private Race _race; - public CreatureTemplate(StatsSet set) + public CreatureTemplate(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { // Base stats _baseSTR = set.getInt("baseSTR", 0); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java index 6bd0412460..94a0d9c4b1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.actor.templates; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; @@ -57,7 +57,7 @@ public class DoorTemplate extends CreatureTemplate implements IIdentifiable private final int _clanhallId; private final boolean _stealth; - public DoorTemplate(StatsSet set) + public DoorTemplate(StatSet set) { super(set); _doorId = set.getInt("id"); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 70b58895e6..d864392f65 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.enums.AIType; import org.l2jmobius.gameserver.enums.DropType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.DropHolder; @@ -58,7 +58,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private boolean _usingServerSideName; private String _title; private boolean _usingServerSideTitle; - private StatsSet _parameters; + private StatSet _parameters; private Sex _sex; private int _chestId; private int _rhandId; @@ -110,15 +110,15 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable /** * Constructor of Creature. - * @param set The StatsSet object to transfer data to the method + * @param set The StatSet object to transfer data to the method */ - public NpcTemplate(StatsSet set) + public NpcTemplate(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _id = set.getInt("id"); @@ -293,12 +293,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _usingServerSideTitle; } - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } - public void setParameters(StatsSet set) + public void setParameters(StatSet set) { _parameters = set; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 2a370772f6..6eb8ed173d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -50,7 +50,7 @@ public class PlayerTemplate extends CreatureTemplate private final List _creationPoints; private final Map _baseSlotDef; - public PlayerTemplate(StatsSet set, List creationPoints) + public PlayerTemplate(StatSet set, List creationPoints) { super(set); _classId = ClassId.getClassId(set.getInt("classId")); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index 23101c3b38..4b0d6dcc97 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; @@ -47,7 +47,7 @@ public class Transform implements IIdentifiable private TransformTemplate _maleTemplate; private TransformTemplate _femaleTemplate; - public Transform(StatsSet set) + public Transform(StatSet set) { _id = set.getInt("id"); _displayId = set.getInt("displayId", _id); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java index 5ec55248b4..8bb71ac375 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.actor.transform; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -31,7 +31,7 @@ public class TransformLevelData private final double _levelMod; private Map _stats; - public TransformLevelData(StatsSet set) + public TransformLevelData(StatSet set) { _level = set.getInt("val"); _levelMod = set.getDouble("levelMod"); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 5923601287..8c9c1e94bb 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -23,7 +23,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -53,7 +53,7 @@ public class TransformTemplate private ExBasicActionList _list; private final Map _data = new LinkedHashMap<>(100); - public TransformTemplate(StatsSet set) + public TransformTemplate(StatSet set) { _collisionRadius = set.getDouble("radius", 0); _collisionHeight = set.getDouble("height", 0); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java index f0a0718dc5..1e0ab77670 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -25,7 +25,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.EffectHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -56,7 +56,7 @@ public abstract class AbstractEffect * @param set the attributes * @param params the parameters */ - protected AbstractEffect(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + protected AbstractEffect(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { _attachCond = attachCond; _name = set.getString("name"); @@ -71,7 +71,7 @@ public abstract class AbstractEffect * @param params the parameters * @return the new effect */ - public static AbstractEffect createEffect(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public static AbstractEffect createEffect(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { final String name = set.getString("name"); final Class handler = EffectHandler.getInstance().getHandler(name); @@ -84,7 +84,7 @@ public abstract class AbstractEffect final Constructor constructor; try { - constructor = handler.getConstructor(Condition.class, Condition.class, StatsSet.class, StatsSet.class); + constructor = handler.getConstructor(Condition.class, Condition.class, StatSet.class, StatSet.class); } catch (NoSuchMethodException | SecurityException e) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/ClanHall.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/ClanHall.java index 77e8ad82e8..22b22f95f2 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/ClanHall.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/ClanHall.java @@ -29,7 +29,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.sql.impl.ClanTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -199,7 +199,7 @@ public abstract class ClanHall } } - public ClanHall(StatsSet set) + public ClanHall(StatSet set) { _clanHallId = set.getInt("id"); _name = set.getString("name"); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/Hero.java index 5e5d94b9e4..f1ce6c4441 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/Hero.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/Hero.java @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.data.xml.impl.ClassListData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -73,13 +73,13 @@ public class Hero // delete hero items private static final String DELETE_ITEMS = "DELETE FROM items WHERE item_id IN (6842, 6611, 6612, 6613, 6614, 6615, 6616, 6617, 6618, 6619, 6620, 6621, 9388, 9389, 9390) AND owner_id NOT IN (SELECT charId FROM characters WHERE accesslevel > 0)"; - private static final Map HEROES = new ConcurrentHashMap<>(); - private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); + private static final Map HEROES = new ConcurrentHashMap<>(); + private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); - private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); - private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); + private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); + private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); - private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); + private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); private static final Map HERO_MESSAGE = new ConcurrentHashMap<>(); public static final String COUNT = "count"; @@ -117,7 +117,7 @@ public class Hero { while (rset.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset.getInt(Olympiad.CLASS_ID)); @@ -136,7 +136,7 @@ public class Hero while (rset2.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset2.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset2.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset2.getInt(Olympiad.CLASS_ID)); @@ -158,7 +158,7 @@ public class Hero LOGGER.info("Hero System: Loaded " + COMPLETE_HEROS.size() + " all time Heroes."); } - private void processHeros(PreparedStatement ps, int charId, StatsSet hero) throws SQLException + private void processHeros(PreparedStatement ps, int charId, StatSet hero) throws SQLException { ps.setInt(1, charId); try (ResultSet rs = ps.executeQuery()) @@ -223,7 +223,7 @@ public class Hero public void loadDiary(int charId) { - final List diary = new ArrayList<>(); + final List diary = new ArrayList<>(); int diaryentries = 0; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement("SELECT * FROM heroes_diary WHERE charId=? ORDER BY time ASC")) @@ -233,7 +233,7 @@ public class Hero { while (rset.next()) { - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final long time = rset.getLong("time"); final int action = rset.getInt("action"); @@ -278,8 +278,8 @@ public class Hero public void loadFights(int charId) { - final List fights = new ArrayList<>(); - final StatsSet heroCountData = new StatsSet(); + final List fights = new ArrayList<>(); + final StatSet heroCountData = new StatSet(); final Calendar data = Calendar.getInstance(); data.set(Calendar.DAY_OF_MONTH, 1); data.set(Calendar.HOUR_OF_DAY, 0); @@ -325,7 +325,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charTwoClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -361,7 +361,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charOneClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -409,14 +409,14 @@ public class Hero } } - public Map getHeroes() + public Map getHeroes() { return HEROES; } public int getHeroByClass(int classid) { - for (Entry e : HEROES.entrySet()) + for (Entry e : HEROES.entrySet()) { if (e.getValue().getInt(Olympiad.CLASS_ID) == classid) { @@ -438,7 +438,7 @@ public class Hero { final int perpage = 10; - final List mainList = HERO_DIARY.get(charid); + final List mainList = HERO_DIARY.get(charid); if (mainList != null) { final NpcHtmlMessage diaryReply = new NpcHtmlMessage(); @@ -453,7 +453,7 @@ public class Hero if (!mainList.isEmpty()) { - final List list = new ArrayList<>(mainList); + final List list = new ArrayList<>(mainList); Collections.reverse(list); boolean color = true; @@ -463,7 +463,7 @@ public class Hero for (int i = (page - 1) * perpage; i < list.size(); i++) { breakat = i; - final StatsSet diaryEntry = list.get(i); + final StatSet diaryEntry = list.get(i); fList.append(""); if (color) { @@ -524,7 +524,7 @@ public class Hero int loss = 0; int draw = 0; - final List heroFights = HERO_FIGHTS.get(charid); + final List heroFights = HERO_FIGHTS.get(charid); if (heroFights != null) { final NpcHtmlMessage fightReply = new NpcHtmlMessage(); @@ -536,7 +536,7 @@ public class Hero if (!heroFights.isEmpty()) { - final StatsSet heroCount = HERO_COUNTS.get(charid); + final StatSet heroCount = HERO_COUNTS.get(charid); if (heroCount != null) { win = heroCount.getInt("victory"); @@ -551,7 +551,7 @@ public class Hero for (int i = (page - 1) * perpage; i < heroFights.size(); i++) { breakat = i; - final StatsSet fight = heroFights.get(i); + final StatSet fight = heroFights.get(i); fList.append(""); if (color) { @@ -609,7 +609,7 @@ public class Hero } } - public synchronized void computeNewHeroes(List newHeroes) + public synchronized void computeNewHeroes(List newHeroes) { updateHeroes(true); @@ -659,13 +659,13 @@ public class Hero return; } - for (StatsSet hero : newHeroes) + for (StatSet hero : newHeroes) { final int charId = hero.getInt(Olympiad.CHAR_ID); if (COMPLETE_HEROS.containsKey(charId)) { - final StatsSet oldHero = COMPLETE_HEROS.get(charId); + final StatSet oldHero = COMPLETE_HEROS.get(charId); final int count = oldHero.getInt(COUNT); oldHero.set(COUNT, count + 1); oldHero.set(PLAYED, 1); @@ -674,7 +674,7 @@ public class Hero } else { - final StatsSet newHero = new StatsSet(); + final StatSet newHero = new StatSet(); newHero.set(Olympiad.CHAR_NAME, hero.getString(Olympiad.CHAR_NAME)); newHero.set(Olympiad.CLASS_ID, hero.getInt(Olympiad.CLASS_ID)); newHero.set(COUNT, 1); @@ -700,9 +700,9 @@ public class Hero } else { - StatsSet hero; + StatSet hero; int heroId; - for (Entry entry : HEROES.entrySet()) + for (Entry entry : HEROES.entrySet()) { hero = entry.getValue(); heroId = entry.getKey(); @@ -787,13 +787,13 @@ public class Hero setDiaryData(charId, ACTION_RAID_KILLED, npcId); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (template == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -806,13 +806,13 @@ public class Hero setDiaryData(charId, ACTION_CASTLE_TAKEN, castleId); final Castle castle = CastleManager.getInstance().getCastleById(castleId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (castle == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -919,10 +919,10 @@ public class Hero */ public void claimHero(PlayerInstance player) { - StatsSet hero = HEROES.get(player.getObjectId()); + StatSet hero = HEROES.get(player.getObjectId()); if (hero == null) { - hero = new StatsSet(); + hero = new StatSet(); HEROES.put(player.getObjectId(), hero); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/clanhall/AuctionableHall.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/clanhall/AuctionableHall.java index b1f35bde04..071b07d51b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/clanhall/AuctionableHall.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/clanhall/AuctionableHall.java @@ -26,7 +26,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; import org.l2jmobius.gameserver.instancemanager.ClanHallManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -42,7 +42,7 @@ public class AuctionableHall extends ClanHall protected boolean _paid; final int _lease; - public AuctionableHall(StatsSet set) + public AuctionableHall(StatSet set) { super(set); _paidUntil = set.getLong("paidUntil"); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/clanhall/SiegableHall.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/clanhall/SiegableHall.java index c602b48ea7..aa5ac6f89f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/clanhall/SiegableHall.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/clanhall/SiegableHall.java @@ -24,7 +24,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.SiegeClan.SiegeClanType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -56,7 +56,7 @@ public class SiegableHall extends ClanHall private ClanHallSiegeEngine _siege; - public SiegableHall(StatsSet set) + public SiegableHall(StatSet set) { super(set); _siegeLength = set.getLong("siegeLenght"); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/fishing/Fish.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/fishing/Fish.java index 88856e5dc6..b0a4b7ff95 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/fishing/Fish.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/fishing/Fish.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.fishing; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * Class for the Fish object. @@ -42,7 +42,7 @@ public class Fish implements Cloneable private final double _cheatingProb; private final int _fishGrade; - public Fish(StatsSet set) + public Fish(StatSet set) { _fishId = set.getInt("fishId"); _itemId = set.getInt("itemId"); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/fishing/FishingMonster.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/fishing/FishingMonster.java index 2d27304dfb..569d1ec33a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/fishing/FishingMonster.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/fishing/FishingMonster.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.fishing; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * Class for the Fishing Monsters object. @@ -29,7 +29,7 @@ public class FishingMonster private final int _fishingMonsterId; private final int _probability; - public FishingMonster(StatsSet set) + public FishingMonster(StatSet set) { _userMinLevel = set.getInt("userMinLevel"); _userMaxLevel = set.getInt("userMaxLevel"); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/fishing/FishingRod.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/fishing/FishingRod.java index 3b7dc6d0fa..a39620ccf9 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/fishing/FishingRod.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/fishing/FishingRod.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.fishing; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * Class for the Fishing Rod object. @@ -30,7 +30,7 @@ public class FishingRod private final String _fishingRodName; private final double _fishingRodDamage; - public FishingRod(StatsSet set) + public FishingRod(StatSet set) { _fishingRodId = set.getInt("fishingRodId"); _fishingRodItemId = set.getInt("fishingRodItemId"); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java index 16454d764a..d63d4eb775 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -52,7 +52,7 @@ public class FakePlayerHolder private final int _clanId; private final int _pledgeStatus; - public FakePlayerHolder(StatsSet set) + public FakePlayerHolder(StatSet set) { _classId = set.getInt("classId", 182); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 40bb4dd8aa..1dd7399ab7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -43,7 +43,7 @@ import org.l2jmobius.gameserver.enums.InstanceRemoveBuffType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldRegion; @@ -73,9 +73,9 @@ public class Instance private boolean _allowRandomWalk = true; private final Collection _players = ConcurrentHashMap.newKeySet(); private final Collection _npcs = ConcurrentHashMap.newKeySet(); - private final Collection _doorTemplates = ConcurrentHashMap.newKeySet(); + private final Collection _doorTemplates = ConcurrentHashMap.newKeySet(); private final Map _doors = new ConcurrentHashMap<>(); - private final Collection _spawnTemplates = ConcurrentHashMap.newKeySet(); + private final Collection _spawnTemplates = ConcurrentHashMap.newKeySet(); private Collection _enterLocations = ConcurrentHashMap.newKeySet(); private Location _exitLocation = null; private boolean _allowSummon = true; @@ -245,9 +245,9 @@ public class Instance /** * Adds a door into the instance - * @param set - StatsSet for initializing door + * @param set - StatSet for initializing door */ - public void addDoor(StatsSet set) + public void addDoor(StatSet set) { if (_doorTemplates.contains(set)) { @@ -262,11 +262,11 @@ public class Instance */ public void spawnDoors() { - for (StatsSet template : _doorTemplates) + for (StatSet template : _doorTemplates) { // Create new door instance final int doorId = template.getInt("DoorId"); - final StatsSet doorTemplate = DoorData.getInstance().getDoorTemplate(doorId); + final StatSet doorTemplate = DoorData.getInstance().getDoorTemplate(doorId); final DoorInstance newdoor = new DoorInstance(new DoorTemplate(doorTemplate)); newdoor.setInstanceId(_id); newdoor.setCurrentHp(newdoor.getMaxHp()); @@ -420,7 +420,7 @@ public class Instance public List spawnGroup(String groupName) { final List spawnedNpcs = new ArrayList<>(); - for (StatsSet set : _spawnTemplates) + for (StatSet set : _spawnTemplates) { if (set.getString("spawnGroup").equals(groupName)) { @@ -569,7 +569,7 @@ public class Instance if ("door".equalsIgnoreCase(d.getNodeName())) { doorId = Integer.parseInt(d.getAttributes().getNamedItem("id").getNodeValue()); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.set("DoorId", doorId); for (Node bean = d.getFirstChild(); bean != null; bean = bean.getNextSibling()) { @@ -631,7 +631,7 @@ public class Instance allowRandomWalk = Boolean.parseBoolean(d.getAttributes().getNamedItem("allowRandomWalk").getNodeValue()); } - final StatsSet spawnSet = new StatsSet(); + final StatSet spawnSet = new StatSet(); spawnSet.set("spawnGroup", spawnGroup); spawnSet.set("npcId", npcId); spawnSet.set("x", x); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/InstanceWorld.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/InstanceWorld.java index 758567f7e0..08906b6b72 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/InstanceWorld.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/InstanceWorld.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; @@ -37,7 +37,7 @@ public class InstanceWorld { private Instance _instance; private final Set _players = ConcurrentHashMap.newKeySet(); - private final StatsSet _parameters = new StatsSet(); + private final StatSet _parameters = new StatSet(); /** * Sets the instance. @@ -110,7 +110,7 @@ public class InstanceWorld * Get instance world parameters. * @return instance parameters */ - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java index d97b75f419..c329766e9e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.itemauction; import java.util.Calendar; import java.util.concurrent.TimeUnit; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Forsaiken @@ -40,7 +40,7 @@ public class AuctionDateGenerator private int _hour_of_day; private int _minute_of_hour; - public AuctionDateGenerator(StatsSet config) + public AuctionDateGenerator(StatSet config) { _calendar = Calendar.getInstance(); _interval = config.getInt(FIELD_INTERVAL, -1); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 57a31cd5ac..6bcc634b46 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.itemauction; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.model.Augmentation; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; /** @@ -32,9 +32,9 @@ public class AuctionItem private final int _itemId; private final long _itemCount; - private final StatsSet _itemExtra; + private final StatSet _itemExtra; - public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatsSet itemExtra) + public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatSet itemExtra) { _auctionItemId = auctionItemId; _auctionLength = auctionLength; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 27840b4711..c4d350b8c5 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -45,7 +45,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -85,7 +85,7 @@ public class ItemAuctionInstance _items = new ArrayList<>(); final NamedNodeMap nanode = node.getAttributes(); - final StatsSet generatorConfig = new StatsSet(); + final StatSet generatorConfig = new StatSet(); for (int i = nanode.getLength(); i-- > 0;) { final Node n = nanode.item(i); @@ -116,7 +116,7 @@ public class ItemAuctionInstance throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } - final StatsSet itemExtra = new StatsSet(); + final StatSet itemExtra = new StatSet(); final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Armor.java index 127ff02d8c..59403e35df 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Armor.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; @@ -34,15 +34,15 @@ public class Armor extends Item /** * Constructor for Armor. - * @param set the StatsSet designating the set of couples (key,value) characterizing the armor. + * @param set the StatSet designating the set of couples (key,value) characterizing the armor. */ - public Armor(StatsSet set) + public Armor(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/EtcItem.java index 38552b7d51..3746d54d2c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/EtcItem.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -36,15 +36,15 @@ public class EtcItem extends Item /** * Constructor for EtcItem. - * @param set StatsSet designating the set of couples (key,value) for description of the Etc + * @param set StatSet designating the set of couples (key,value) for description of the Etc */ - public EtcItem(StatsSet set) + public EtcItem(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Henna.java index 8dac2a1b6a..50b4611f63 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.items; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; /** @@ -42,7 +42,7 @@ public class Henna private final int _cancel_count; private final List _wear_class; - public Henna(StatsSet set) + public Henna(StatSet set) { _dyeId = set.getInt("dyeId"); _dyeItemId = set.getInt("dyeItemId"); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Item.java index d36ee024f2..36e702f73e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Item.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.ItemGrade; import org.l2jmobius.gameserver.model.Elementals; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -155,14 +155,14 @@ public abstract class Item extends ListenersContainer implements IIdentifiable /** * Constructor of the Item that fill class variables.
    *
    - * @param set : StatsSet corresponding to a set of couples (key,value) for description of the item + * @param set : StatSet corresponding to a set of couples (key,value) for description of the item */ - protected Item(StatsSet set) + protected Item(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { _itemId = set.getInt("item_id"); _displayId = set.getInt("displayId", _itemId); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java index dfe114707a..c632a41dfb 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -29,7 +29,7 @@ public class PlayerItemTemplate extends ItemHolder /** * @param set the set containing the values for this object */ - public PlayerItemTemplate(StatsSet set) + public PlayerItemTemplate(StatSet set) { super(set.getInt("id"), set.getInt("count")); _equipped = set.getBoolean("equipped", false); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Weapon.java index db59da128c..1f9b4b1c3d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Weapon.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -69,15 +69,15 @@ public class Weapon extends Item /** * Constructor for Weapon. - * @param set the StatsSet designating the set of couples (key,value) characterizing the weapon. + * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. */ - public Weapon(StatsSet set) + public Weapon(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java index 1edb6aea57..912bf4d895 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.CrystalType; @@ -51,7 +51,7 @@ public abstract class AbstractEnchantItem private final int _maxEnchantLevel; private final double _bonusRate; - public AbstractEnchantItem(StatsSet set) + public AbstractEnchantItem(StatSet set) { _id = set.getInt("id"); if (getItem() == null) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java index 3da036859a..866e47b80a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java @@ -23,7 +23,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -40,7 +40,7 @@ public class EnchantScroll extends AbstractEnchantItem private final int _scrollGroupId; private Set _items; - public EnchantScroll(StatsSet set) + public EnchantScroll(StatSet set) { super(set); _scrollGroupId = set.getInt("scrollGroupId", 0); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java index f4f95738c7..e0314ae7f0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items.enchant; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.type.EtcItemType; /** @@ -26,7 +26,7 @@ public class EnchantSupportItem extends AbstractEnchantItem { private final boolean _isWeapon; - public EnchantSupportItem(StatsSet set) + public EnchantSupportItem(StatSet set) { super(set); _isWeapon = getItem().getItemType() == EtcItemType.SCRL_INC_ENCHANT_PROP_WP; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/multisell/Ingredient.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/multisell/Ingredient.java index 384d0ae554..cfd168fe63 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/multisell/Ingredient.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/multisell/Ingredient.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.multisell; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Armor; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.items.Weapon; @@ -36,7 +36,7 @@ public class Ingredient private Item _template = null; private ItemInfo _itemInfo = null; - public Ingredient(StatsSet set) + public Ingredient(StatSet set) { this(set.getInt("id"), set.getLong("count"), set.getInt("enchantmentLevel", 0), set.getBoolean("isTaxIngredient", false), set.getBoolean("maintainIngredient", false)); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 2f12d6b6a9..b4b1adaeea 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -41,7 +41,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.entity.Hero; @@ -61,8 +61,8 @@ public class Olympiad extends ListenersContainer protected static final Logger LOGGER = Logger.getLogger(Olympiad.class.getName()); protected static final Logger LOGGER_OLYMPIAD = Logger.getLogger("olympiad"); - private static final Map NOBLES = new ConcurrentHashMap<>(); - protected static List HEROS_TO_BE; + private static final Map NOBLES = new ConcurrentHashMap<>(); + protected static List HEROS_TO_BE; private static Map NOBLES_RANK = new HashMap<>(); private static List _nonClassBasedRegisters; private static Map> _classBasedRegisters; @@ -269,10 +269,10 @@ public class Olympiad extends ListenersContainer PreparedStatement statement = con.prepareStatement(OLYMPIAD_LOAD_NOBLES); ResultSet rset = statement.executeQuery()) { - StatsSet statData; + StatSet statData; while (rset.next()) { - statData = new StatsSet(); + statData = new StatSet(); final int charId = rset.getInt(CHAR_ID); statData.set(CLASS_ID, rset.getInt(CLASS_ID)); statData.set(CHAR_NAME, rset.getString(CHAR_NAME)); @@ -614,7 +614,7 @@ public class Olympiad extends ListenersContainer if (!NOBLES.containsKey(noble.getObjectId())) { - final StatsSet statDat = new StatsSet(); + final StatSet statDat = new StatSet(); statDat.set(CLASS_ID, noble.getClassId().getId()); statDat.set(CHAR_NAME, noble.getName()); statDat.set(POINTS, DEFAULT_POINTS); @@ -673,12 +673,12 @@ public class Olympiad extends ListenersContainer return NOBLES.size(); } - protected static StatsSet getNobleStats(int playerId) + protected static StatSet getNobleStats(int playerId) { return NOBLES.get(playerId); } - protected static synchronized void updateNobleStats(int playerId, StatsSet stats) + protected static synchronized void updateNobleStats(int playerId, StatSet stats) { NOBLES.remove(playerId); NOBLES.put(playerId, stats); @@ -1135,9 +1135,9 @@ public class Olympiad extends ListenersContainer return; } - for (Entry entry : NOBLES.entrySet()) + for (Entry entry : NOBLES.entrySet()) { - final StatsSet nobleInfo = entry.getValue(); + final StatSet nobleInfo = entry.getValue(); int currentPoints = nobleInfo.getInt(POINTS); currentPoints += WEEKLY_POINTS; nobleInfo.set(POINTS, currentPoints); @@ -1273,9 +1273,9 @@ public class Olympiad extends ListenersContainer try (Connection con = DatabaseFactory.getConnection()) { - for (Entry entry : NOBLES.entrySet()) + for (Entry entry : NOBLES.entrySet()) { - final StatsSet nobleInfo = entry.getValue(); + final StatSet nobleInfo = entry.getValue(); if (nobleInfo == null) { @@ -1380,8 +1380,8 @@ public class Olympiad extends ListenersContainer if (NOBLES != null) { LOGGER_OLYMPIAD.info("Noble,charid,classid,compDone,points"); - StatsSet nobleInfo; - for (Entry entry : NOBLES.entrySet()) + StatSet nobleInfo; + for (Entry entry : NOBLES.entrySet()) { nobleInfo = entry.getValue(); if (nobleInfo == null) @@ -1412,8 +1412,8 @@ public class Olympiad extends ListenersContainer try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(OLYMPIAD_GET_HEROS)) { - StatsSet hero; - final List soulHounds = new ArrayList<>(); + StatSet hero; + final List soulHounds = new ArrayList<>(); for (int element : HERO_IDS) { statement.setInt(1, element); @@ -1422,7 +1422,7 @@ public class Olympiad extends ListenersContainer { if (rset.next()) { - hero = new StatsSet(); + hero = new StatSet(); hero.set(CLASS_ID, element); hero.set(CHAR_ID, rset.getInt(CHAR_ID)); hero.set(CHAR_NAME, rset.getString(CHAR_NAME)); @@ -1456,8 +1456,8 @@ public class Olympiad extends ListenersContainer } case 1: { - hero = new StatsSet(); - final StatsSet winner = soulHounds.get(0); + hero = new StatSet(); + final StatSet winner = soulHounds.get(0); hero.set(CLASS_ID, winner.getInt(CLASS_ID)); hero.set(CHAR_ID, winner.getInt(CHAR_ID)); hero.set(CHAR_NAME, winner.getString(CHAR_NAME)); @@ -1474,10 +1474,10 @@ public class Olympiad extends ListenersContainer } case 2: { - hero = new StatsSet(); - StatsSet winner; - final StatsSet hero1 = soulHounds.get(0); - final StatsSet hero2 = soulHounds.get(1); + hero = new StatSet(); + StatSet winner; + final StatSet hero1 = soulHounds.get(0); + final StatSet hero2 = soulHounds.get(1); final int hero1Points = hero1.getInt(POINTS); final int hero2Points = hero2.getInt(POINTS); final int hero1Comps = hero1.getInt(COMP_DONE); @@ -1573,7 +1573,7 @@ public class Olympiad extends ListenersContainer return 0; } - final StatsSet noble = NOBLES.get(objectId); + final StatSet noble = NOBLES.get(objectId); if ((noble == null) || (noble.getInt(POINTS) == 0)) { return 0; @@ -1644,7 +1644,7 @@ public class Olympiad extends ListenersContainer return 0; } - final StatsSet noble = NOBLES.get(objId); + final StatSet noble = NOBLES.get(objId); if (noble == null) { return 0; @@ -1682,7 +1682,7 @@ public class Olympiad extends ListenersContainer return 0; } - final StatsSet noble = NOBLES.get(objId); + final StatSet noble = NOBLES.get(objId); if (noble == null) { return 0; @@ -1698,7 +1698,7 @@ public class Olympiad extends ListenersContainer return 0; } - final StatsSet noble = NOBLES.get(objId); + final StatSet noble = NOBLES.get(objId); if (noble == null) { return 0; @@ -1714,7 +1714,7 @@ public class Olympiad extends ListenersContainer return 0; } - final StatsSet noble = NOBLES.get(objId); + final StatSet noble = NOBLES.get(objId); if (noble == null) { return 0; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java index 7f2cd48acc..ef8122b0c4 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; @@ -576,8 +576,8 @@ class OlympiadGame break; } - final StatsSet playerOneStat = Olympiad.getNobleStats(_playerOneID); - final StatsSet playerTwoStat = Olympiad.getNobleStats(_playerTwoID); + final StatSet playerOneStat = Olympiad.getNobleStats(_playerOneID); + final StatSet playerTwoStat = Olympiad.getNobleStats(_playerTwoID); final int playerOnePlayed = playerOneStat.getInt(COMP_DONE); final int playerTwoPlayed = playerTwoStat.getInt(COMP_DONE); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/skills/Skill.java index 81083b9801..19d5f653be 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.ExtractableProductItem; import org.l2jmobius.gameserver.model.ExtractableSkill; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.BlockInstance; @@ -215,7 +215,7 @@ public class Skill implements IIdentifiable private final boolean _isPvPOnly; - public Skill(StatsSet set) + public Skill(StatSet set) { _id = set.getInt("skill_id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java index cc5bb04b47..1196102e51 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.variables; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.IRestorable; import org.l2jmobius.gameserver.model.interfaces.IStorable; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.interfaces.IStorable; /** * @author UnAfraid */ -public abstract class AbstractVariables extends StatsSet implements IRestorable, IStorable, IDeletable +public abstract class AbstractVariables extends StatSet implements IRestorable, IStorable, IDeletable { private final AtomicBoolean _hasChanges = new AtomicBoolean(false); @@ -41,42 +41,42 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, */ @Override - public StatsSet set(String name, boolean value) + public StatSet set(String name, boolean value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, double value) + public StatSet set(String name, double value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, Enum value) + public StatSet set(String name, Enum value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, int value) + public StatSet set(String name, int value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, long value) + public StatSet set(String name, long value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, String value) + public StatSet set(String name, String value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); @@ -89,7 +89,7 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, * @param markAsChanged * @return */ - public StatsSet set(String name, String value, boolean markAsChanged) + public StatSet set(String name, String value, boolean markAsChanged) { if (markAsChanged) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index b233b4b082..8d63964c86 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExHeroList implements IClientOutgoingPacket { - private final Map _heroList; + private final Map _heroList; public ExHeroList() { @@ -42,7 +42,7 @@ public class ExHeroList implements IClientOutgoingPacket OutgoingPackets.EX_HERO_LIST.writeId(packet); packet.writeD(_heroList.size()); - for (StatsSet hero : _heroList.values()) + for (StatSet hero : _heroList.values()) { packet.writeS(hero.getString(Olympiad.CHAR_NAME)); packet.writeD(hero.getInt(Olympiad.CLASS_ID)); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SSQStatus.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SSQStatus.java index 8cbe273b5f..3581d3af9e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SSQStatus.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SSQStatus.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.SevenSigns; import org.l2jmobius.gameserver.SevenSignsFestival; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -174,7 +174,7 @@ public class SSQStatus implements IClientOutgoingPacket // Dusk Score \\ packet.writeQ(duskScore); - StatsSet highScoreData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DUSK, i); + StatSet highScoreData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DUSK, i); String[] partyMembers = highScoreData.getString("members").split(","); if (partyMembers != null) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index 470576330a..a534b5b8f7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -137,7 +137,7 @@ public class Antharas extends AbstractNpcAI addAttackId(ANTHARAS, BOMBER, BEHEMOTH, TERASQUE); addKillId(ANTHARAS, TERASQUE, BEHEMOTH); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANTHARAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANTHARAS); final double curr_hp = info.getDouble("currentHP"); final double curr_mp = info.getDouble("currentMP"); final int loc_x = info.getInt("loc_x"); @@ -762,7 +762,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(PlayerInstance attacker, int damage) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Baium/Baium.java index e09c3d5c9a..c547faeae1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -110,7 +110,7 @@ public class Baium extends AbstractNpcAI addSeeCreatureId(BAIUM); addSpellFinishedId(BAIUM); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(BAIUM); + final StatSet info = GrandBossManager.getInstance().getStatSet(BAIUM); final double curr_hp = info.getDouble("currentHP"); final double curr_mp = info.getDouble("currentMP"); final int loc_x = info.getInt("loc_x"); @@ -659,7 +659,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(BAIUM).set("respawn_time", System.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", System.currentTimeMillis() + respawnTime); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java index b6507585e7..654b1c22aa 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; @@ -105,7 +105,7 @@ public class Beleth extends AbstractNpcAI addStartNpc(STONE_COFFIN); addTalkId(STONE_COFFIN); addFirstTalkId(ELF); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(REAL_BELETH); + final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH); if (status == DEAD) { @@ -751,9 +751,9 @@ public class Beleth extends AbstractNpcAI setBelethKiller(killer); GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD); final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(REAL_BELETH); + final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(REAL_BELETH, info); + GrandBossManager.getInstance().setStatSet(REAL_BELETH, info); startQuestTimer("BELETH_UNLOCK", respawnTime, null, null); deleteAll(); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Core/Core.java index 63dc35b62c..951f4bd089 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; @@ -86,7 +86,7 @@ public class Core extends AbstractNpcAI registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR); _firstAttacked = false; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. @@ -207,9 +207,9 @@ public class Core extends AbstractNpcAI final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000; startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(CORE, info); + GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java index 5a0d74c1b4..ad56cdef8a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; @@ -63,7 +63,7 @@ public class DrChaos extends AbstractNpcAI addKillId(CHAOS_GOLEM); // Message + despawn. addAttackId(CHAOS_GOLEM); // Random messages when he attacks. - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CHAOS_GOLEM); + final StatSet info = GrandBossManager.getInstance().getStatSet(CHAOS_GOLEM); final int status = GrandBossManager.getInstance().getBossStatus(CHAOS_GOLEM); // Load the reset date and time for Dr. Chaos from DB. @@ -249,9 +249,9 @@ public class DrChaos extends AbstractNpcAI startQuestTimer("reset_drchaos", respawnTime, null, null, false); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CHAOS_GOLEM); + final StatSet info = GrandBossManager.getInstance().getStatSet(CHAOS_GOLEM); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(CHAOS_GOLEM, info); + GrandBossManager.getInstance().setStatSet(CHAOS_GOLEM, info); return null; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index b2d81f44cc..049b4a0c2e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -87,7 +87,7 @@ public class Orfen extends AbstractNpcAI registerMobs(mobs); _hasTeleported = false; ZONE = GrandBossManager.getInstance().getZone(POS[0]); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); if (GrandBossManager.getInstance().getBossStatus(ORFEN) == DEAD) { // load the unlock date and time for Orfen from DB @@ -324,9 +324,9 @@ public class Orfen extends AbstractNpcAI final long respawnTime = (Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM)) * 3600000; startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(ORFEN, info); + GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); startQuestTimer("despawn_minions", 20000, null, null); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index d1c0001805..4f884609fd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; @@ -89,7 +89,7 @@ public class QueenAnt extends AbstractNpcAI addFactionCallId(NURSE); _zone = GrandBossManager.getInstance().getZone(QUEEN_X, QUEEN_Y, QUEEN_Z); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); if (GrandBossManager.getInstance().getBossStatus(QUEEN) == DEAD) { // load the unlock date and time for queen ant from DB @@ -354,9 +354,9 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("action", npc, null); cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(QUEEN, info); + GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); _larva.deleteMe(); _larva = null; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java index 03d31c793e..9c546d733a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; @@ -122,7 +122,7 @@ public class Valakas extends AbstractNpcAI registerMobs(VALAKAS); ZONE = GrandBossManager.getInstance().getZone(212852, -114842, -1632); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(VALAKAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); final int status = GrandBossManager.getInstance().getBossStatus(VALAKAS); if (status == DEAD) @@ -445,9 +445,9 @@ public class Valakas extends AbstractNpcAI final long respawnTime = (Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM)) * 3600000; startQuestTimer("valakas_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(VALAKAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(VALAKAS, info); + GrandBossManager.getInstance().setStatSet(VALAKAS, info); return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java index 4b9d11c3cc..d51c9282d8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java @@ -16,7 +16,7 @@ */ package ai.others.NpcBuffers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.AffectObject; @@ -33,7 +33,7 @@ public class NpcBufferSkillData private final AffectScope _affectScope; private final AffectObject _affectObject; - public NpcBufferSkillData(StatsSet set) + public NpcBufferSkillData(StatSet set) { _skill = new SkillHolder(set.getInt("id"), set.getInt("level")); _initialDelay = set.getInt("skillInitDelay", 0) * 1000; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java index 94a0daf6e8..83bae6501d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -52,7 +52,7 @@ public class NpcBuffersData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node attr; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -73,7 +73,7 @@ public class NpcBuffersData implements IXmlReader case "skill": { attrs = c.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { attr = attrs.item(i); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index a8a9a0f7ff..387d9d3159 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.zone.type.NoRestartZone; @@ -299,7 +299,7 @@ public class AdminGrandBoss implements IAdminCommandHandler } } - final StatsSet info = GrandBossManager.getInstance().getStatsSet(grandBossId); + final StatSet info = GrandBossManager.getInstance().getStatSet(grandBossId); final String bossRespawn = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(info.getLong("respawn_time")); final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Festival.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Festival.java index 109bea059a..10f1e3a62a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Festival.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Festival.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.SevenSignsFestival; import org.l2jmobius.gameserver.handler.IBypassHandler; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party.MessageType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.FestivalGuideInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -195,9 +195,9 @@ public class Festival implements IBypassHandler { final StringBuilder strBuffer = new StringBuilder(500); strBuffer.append("Festival Guide:
    These are the top scores of the week, for the "); - final StatsSet dawnData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DAWN, npc.getFestivalType()); - final StatsSet duskData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DUSK, npc.getFestivalType()); - final StatsSet overallData = SevenSignsFestival.getInstance().getOverallHighestScoreData(npc.getFestivalType()); + final StatSet dawnData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DAWN, npc.getFestivalType()); + final StatSet duskData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DUSK, npc.getFestivalType()); + final StatSet overallData = SevenSignsFestival.getInstance().getOverallHighestScoreData(npc.getFestivalType()); final int dawnScore = dawnData.getInt("score"); final int duskScore = duskData.getInt("score"); int overallScore = 0; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index aad3b493ed..af887b3106 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ public class AddHate extends AbstractEffect { private final double _power; - public AddHate(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public AddHate(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index 6690260488..3abcaf0e00 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.stat.CreatureStat; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class AttackTrait extends AbstractEffect { private final Map _attackTraits = new EnumMap<>(TraitType.class); - public AttackTrait(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public AttackTrait(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index c8381ce588..1d632ae966 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.stats.Formulas; */ public class Backstab extends AbstractEffect { - public Backstab(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Backstab(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Betray.java index d7ff8a84d2..520f72d74d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Betray extends AbstractEffect { - public Betray(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Betray(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Blink.java index 6a818db90e..0f1c7f2f86 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class Blink extends AbstractEffect { - public Blink(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Blink(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index d44755deb1..cf048f805c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -21,7 +21,7 @@ import java.util.Set; import org.l2jmobius.gameserver.datatables.BotReportTable; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; @@ -37,7 +37,7 @@ public class BlockAction extends AbstractEffect { private final Set _blockedActions = new HashSet<>(); - public BlockAction(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public BlockAction(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/BlockBuffSlot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/BlockBuffSlot.java index 4bb0ae9b8a..36a09b54d1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/BlockBuffSlot.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/BlockBuffSlot.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.AbnormalType; @@ -34,7 +34,7 @@ public class BlockBuffSlot extends AbstractEffect { private final Set _blockBuffSlots; - public BlockBuffSlot(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public BlockBuffSlot(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 29d5afced2..db7de0bbb8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class BlockChat extends AbstractEffect { - public BlockChat(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public BlockChat(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index 8a3efb6db0..86229ada76 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class BlockParty extends AbstractEffect { - public BlockParty(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public BlockParty(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java index 168d157350..97ab438714 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BlockResurrection extends AbstractEffect { - public BlockResurrection(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public BlockResurrection(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index be43ec166f..0167b27dd0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class Bluff extends AbstractEffect { private final int _chance; - public Bluff(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Bluff(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Buff.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Buff.java index f0a2944cf0..299167dba1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Buff.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Buff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Buff extends AbstractEffect { - public Buff(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Buff(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index e3edf16c15..d4bed591f9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class CallParty extends AbstractEffect { - public CallParty(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public CallParty(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index d920cb256e..c0fbe5386a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.SevenSigns; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -42,7 +42,7 @@ public class CallPc extends AbstractEffect private final int _itemId; private final int _itemCount; - public CallPc(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public CallPc(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index 1e35504592..bdeaac7bbd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -30,7 +30,7 @@ public class CallSkill extends AbstractEffect { private final SkillHolder _skill; - public CallSkill(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public CallSkill(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index 3e5131da13..6f6b8ec166 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -32,7 +32,7 @@ public class ChameleonRest extends AbstractEffect { private final double _power; - public ChameleonRest(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ChameleonRest(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 91e52ac54e..7bd4b58696 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ public class ChangeFace extends AbstractEffect { private final int _value; - public ChangeFace(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ChangeFace(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java index 584839a0c7..3508749014 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; */ public class ChangeFishingMastery extends AbstractEffect { - public ChangeFishingMastery(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ChangeFishingMastery(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index da28ef1fee..332f6d75d5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ public class ChangeHairColor extends AbstractEffect { private final int _value; - public ChangeHairColor(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ChangeHairColor(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index c7517728b2..5b853f47e7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ public class ChangeHairStyle extends AbstractEffect { private final int _value; - public ChangeHairStyle(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ChangeHairStyle(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ClanGate.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ClanGate.java index cccb759287..c2b52b0008 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ClanGate.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ClanGate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class ClanGate extends AbstractEffect { - public ClanGate(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ClanGate(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index c36333dcdf..e1746866be 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -39,7 +39,7 @@ public class Confuse extends AbstractEffect { private final int _chance; - public Confuse(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Confuse(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 43e8ad675c..ec6dedf306 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class ConsumeBody extends AbstractEffect { - public ConsumeBody(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ConsumeBody(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 3e0fe9153f..b458844b5b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Elementals; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class ConvertItem extends AbstractEffect { - public ConvertItem(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ConvertItem(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java index 3b355fc38b..34be58e20f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -31,7 +31,7 @@ public class CpDamPercent extends AbstractEffect { private final double _power; - public CpDamPercent(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public CpDamPercent(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index 53777d0933..89c37a40ad 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class CpHeal extends AbstractEffect { private final double _power; - public CpHeal(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public CpHeal(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index b7cfa75080..8f1c099299 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -28,7 +28,7 @@ public class CpHealOverTime extends AbstractEffect { private final double _power; - public CpHealOverTime(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public CpHealOverTime(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index 2b0e8cdb9b..c301612419 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class CpHealPercent extends AbstractEffect { private final double _power; - public CpHealPercent(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public CpHealPercent(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index 70c66e73f0..e4aeb3e650 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ public class CrystalGradeModify extends AbstractEffect { private final int _grade; - public CrystalGradeModify(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public CrystalGradeModify(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java index 7e6c1cdb3e..b27126adce 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -29,7 +29,7 @@ public class CubicMastery extends AbstractEffect { private final int _cubicCount; - public CubicMastery(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public CubicMastery(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index 0b6caad704..ed7783afa3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -31,7 +31,7 @@ public class DamOverTime extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTime(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public DamOverTime(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index a187a5f14f..c28356de8a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -32,7 +32,7 @@ public class DamOverTimePercent extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTimePercent(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public DamOverTimePercent(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index 6fea8d2cc0..5c0b888d07 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DeathLink extends AbstractEffect { - public DeathLink(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public DeathLink(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Debuff.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Debuff.java index 7c3efa1fa2..5738ce419b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Debuff.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Debuff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; */ public class Debuff extends AbstractEffect { - public Debuff(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Debuff(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index ef83b11d22..784c30a8ef 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.stat.CreatureStat; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class DefenceTrait extends AbstractEffect { private final Map _defenceTraits = new EnumMap<>(TraitType.class); - public DefenceTrait(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public DefenceTrait(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index d38d1de82b..f6e2824cb2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class DeleteHate extends AbstractEffect { private final int _chance; - public DeleteHate(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public DeleteHate(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index 4cf78e3deb..0754123b29 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class DeleteHateOfMe extends AbstractEffect { private final int _chance; - public DeleteHateOfMe(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public DeleteHateOfMe(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index 89c088e45c..317ba3eedc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class DetectHiddenObjects extends AbstractEffect { - public DetectHiddenObjects(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public DetectHiddenObjects(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Detection.java index 0c36f9f0cc..cbd3e8f9de 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Detection extends AbstractEffect { - public Detection(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Detection(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index c69bcbdd11..d624bd042c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Disarm extends AbstractEffect { - public Disarm(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Disarm(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index f16dd8f08a..9bf46fd982 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class DispelAll extends AbstractEffect { - public DispelAll(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public DispelAll(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 8bd55b11ae..6a95fe5544 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class DispelByCategory extends AbstractEffect private final int _rate; private final int _max; - public DispelByCategory(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public DispelByCategory(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index 6cd80e93de..66a025724c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -22,7 +22,7 @@ import java.util.Map; import java.util.Map.Entry; import org.l2jmobius.gameserver.model.EffectList; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class DispelBySlot extends AbstractEffect private final String _dispel; private final Map _dispelAbnormals; - public DispelBySlot(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public DispelBySlot(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index f0348aac2a..5f4a1dd953 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.EffectList; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ public class DispelBySlotProbability extends AbstractEffect private final Map _dispelAbnormals; private final int _rate; - public DispelBySlotProbability(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public DispelBySlotProbability(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index 77457ebcfd..a08a2b82db 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class EnableCloak extends AbstractEffect { - public EnableCloak(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public EnableCloak(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/EnemyCharge.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/EnemyCharge.java index 7bd6dc57af..097b7132c0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/EnemyCharge.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/EnemyCharge.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; */ public class EnemyCharge extends AbstractEffect { - public EnemyCharge(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public EnemyCharge(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 167c233858..9ee8450559 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -42,7 +42,7 @@ public class EnergyAttack extends AbstractEffect private final int _criticalChance; private final boolean _ignoreShieldDefence; - public EnergyAttack(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public EnergyAttack(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index 0e19fad09b..10fce16d50 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -29,7 +29,7 @@ public class EnlargeAbnormalSlot extends AbstractEffect { private final int _slots; - public EnlargeAbnormalSlot(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public EnlargeAbnormalSlot(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Escape.java index e1dce82a54..2317651302 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.GuardInstance; @@ -34,7 +34,7 @@ public class Escape extends AbstractEffect { private final TeleportWhereType _escapeType; - public Escape(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Escape(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 0c03af8924..914e558adb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class FakeDeath extends AbstractEffect { private final double _power; - public FakeDeath(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public FakeDeath(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index b62d96bf21..2f4e677104 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.stats.Formulas; */ public class FatalBlow extends AbstractEffect { - public FatalBlow(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public FatalBlow(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 9e1bfa3437..8affb2b666 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DefenderInstance; import org.l2jmobius.gameserver.model.actor.instance.FortCommanderInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlagInstance; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Fear extends AbstractEffect { - public Fear(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Fear(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Fishing.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Fishing.java index 4a848782cb..f1066b38f7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Fishing.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Fishing.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -50,7 +50,7 @@ public class Fishing extends AbstractEffect private static final int MIN_BAIT_DISTANCE = 90; private static final int MAX_BAIT_DISTANCE = 250; - public Fishing(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Fishing(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 20b5dc570f..262fdfd365 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Flag extends AbstractEffect { - public Flag(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Flag(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java index 5c88351ba4..8bfc1fbeda 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -29,7 +29,7 @@ public class FocusEnergy extends AbstractEffect { private final int _charge; - public FocusEnergy(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public FocusEnergy(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/FocusMaxEnergy.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/FocusMaxEnergy.java index ff1d6c1687..f98a65efcb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/FocusMaxEnergy.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/FocusMaxEnergy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class FocusMaxEnergy extends AbstractEffect { - public FocusMaxEnergy(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public FocusMaxEnergy(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index f1fcb82fdb..54fbec09ca 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class FocusSouls extends AbstractEffect { private final int _charge; - public FocusSouls(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public FocusSouls(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 7c3bb2ad80..bdc324cc65 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Set; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class GetAgro extends AbstractEffect { - public GetAgro(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public GetAgro(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index 5b9e14b741..e68c8186eb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class GiveRecommendation extends AbstractEffect { private final int _amount; - public GiveRecommendation(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public GiveRecommendation(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index 3babc9d4c9..c75815f75d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -29,7 +29,7 @@ public class GiveSp extends AbstractEffect { private final int _sp; - public GiveSp(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public GiveSp(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 09ad46b17c..12b3bb516c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Grow extends AbstractEffect { - public Grow(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Grow(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index 08e13d43e0..84e9527c53 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Harvesting extends AbstractEffect { - public Harvesting(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Harvesting(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index 8f88e27b03..b25a95690d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlagInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -33,7 +33,7 @@ public class HeadquarterCreate extends AbstractEffect private static final int HQ_NPC_ID = 35062; private final boolean _isAdvanced; - public HeadquarterCreate(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public HeadquarterCreate(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 1762d71103..0138b5b3ef 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -38,7 +38,7 @@ public class Heal extends AbstractEffect { private final double _power; - public Heal(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Heal(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index c446bf0496..79189e83cc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.AbnormalType; @@ -30,7 +30,7 @@ public class HealOverTime extends AbstractEffect { private final double _power; - public HealOverTime(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public HealOverTime(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index 73ef5a8232..1e9c7974ba 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class HealPercent extends AbstractEffect { private final int _power; - public HealPercent(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public HealPercent(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 6738ef36f6..c1d2902eb9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Hide extends AbstractEffect { - public Hide(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Hide(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index 01001ee54a..d180a145b7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -32,7 +32,7 @@ public class HpByLevel extends AbstractEffect { private final double _power; - public HpByLevel(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public HpByLevel(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index e5ad3d41a1..d18c115c48 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class HpDrain extends AbstractEffect { private final double _power; - public HpDrain(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public HpDrain(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ImmobileBuff.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ImmobileBuff.java index 52f1702cbb..a4c1d8bb00 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ImmobileBuff.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ImmobileBuff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class ImmobileBuff extends Buff { - public ImmobileBuff(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ImmobileBuff(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index df7435adf7..b24a5f729b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class ImmobilePetBuff extends AbstractEffect { - public ImmobilePetBuff(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ImmobilePetBuff(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Invincible.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Invincible.java index ce4ddd97bb..279aaa215c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Invincible.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Invincible.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class Invincible extends AbstractEffect { - public Invincible(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Invincible(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index 786a273ac6..1fc0c31157 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class Lethal extends AbstractEffect private final int _fullLethal; private final int _halfLethal; - public Lethal(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Lethal(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Lucky.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Lucky.java index 195db01e2f..144fb95a0e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Lucky.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Lucky.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Lucky extends AbstractEffect { - public Lucky(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Lucky(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index d32c18aebb..19e16ffbfc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAttack extends AbstractEffect { - public MagicalAttack(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public MagicalAttack(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index f073974720..1959a32c39 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAttackByAbnormal extends AbstractEffect { - public MagicalAttackByAbnormal(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public MagicalAttackByAbnormal(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index ed304349c2..e3fdca9b17 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class MagicalAttackMp extends AbstractEffect { - public MagicalAttackMp(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public MagicalAttackMp(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index b28acacf4f..05457b5c7c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalSoulAttack extends AbstractEffect { - public MagicalSoulAttack(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public MagicalSoulAttack(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index 0f53d5a565..b5074fda5e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -29,7 +29,7 @@ public class ManaDamOverTime extends AbstractEffect { private final double _power; - public ManaDamOverTime(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ManaDamOverTime(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index 90ed407144..25cb0f2664 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class ManaHeal extends AbstractEffect { private final double _power; - public ManaHeal(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ManaHeal(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index a02fb51b71..ffb9154946 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class ManaHealByLevel extends AbstractEffect { private final double _power; - public ManaHealByLevel(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ManaHealByLevel(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index aa0243cf73..bcc12c9558 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -28,7 +28,7 @@ public class ManaHealOverTime extends AbstractEffect { private final double _power; - public ManaHealOverTime(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ManaHealOverTime(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 68d9225598..c4f074448a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class ManaHealPercent extends AbstractEffect { private final double _power; - public ManaHealPercent(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ManaHealPercent(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 0649c45c19..bd95f75dd8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.EffectCalculationType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.CreatureStat; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -38,7 +38,7 @@ public class MaxCp extends AbstractEffect private final EffectCalculationType _type; private final boolean _heal; - public MaxCp(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public MaxCp(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 3a9e84e70f..d4ffd455ef 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.EffectCalculationType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.CreatureStat; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -38,7 +38,7 @@ public class MaxHp extends AbstractEffect private final EffectCalculationType _type; private final boolean _heal; - public MaxHp(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public MaxHp(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index 4cf2a57f54..e071ff72fd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ public class MpConsumePerLevel extends AbstractEffect { private final double _power; - public MpConsumePerLevel(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public MpConsumePerLevel(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 2b0f0f5e39..0b4a078093 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Mute extends AbstractEffect { - public Mute(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Mute(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/NevitsHourglass.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/NevitsHourglass.java index 43e35a4f9a..97e37c9b1b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/NevitsHourglass.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/NevitsHourglass.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class NevitsHourglass extends AbstractEffect { - public NevitsHourglass(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public NevitsHourglass(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java index f147084a4a..37b4c3322a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class NoblesseBless extends AbstractEffect { - public NoblesseBless(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public NoblesseBless(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index 37a6a089cd..80f0d928fb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class OpenChest extends AbstractEffect { - public OpenChest(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public OpenChest(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 671c9b76b9..06484e5c83 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.RecipeController; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpenCommonRecipeBook extends AbstractEffect { - public OpenCommonRecipeBook(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public OpenCommonRecipeBook(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index c8c0b93cad..dd8d3782d0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -36,7 +36,7 @@ public class OpenDoor extends AbstractEffect private final int _chance; private final boolean _isItem; - public OpenDoor(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public OpenDoor(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index 600bc6aa33..9bb776675d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.RecipeController; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpenDwarfRecipeBook extends AbstractEffect { - public OpenDwarfRecipeBook(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public OpenDwarfRecipeBook(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/OutpostCreate.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/OutpostCreate.java index 554f618343..39e7ccaa27 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/OutpostCreate.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/OutpostCreate.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlagInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -33,7 +33,7 @@ public class OutpostCreate extends AbstractEffect { private static final int HQ_NPC_ID = 36590; - public OutpostCreate(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public OutpostCreate(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/OutpostDestroy.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/OutpostDestroy.java index 0ae19027b3..fb2f357b65 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/OutpostDestroy.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/OutpostDestroy.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlagInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class OutpostDestroy extends AbstractEffect { - public OutpostDestroy(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public OutpostDestroy(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Paralyze.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Paralyze.java index cb0d2016c8..72acb9f92f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Paralyze.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Paralyze.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Paralyze extends AbstractEffect { - public Paralyze(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Paralyze(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Passive.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Passive.java index 21699ca88d..27e4b929d4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Passive.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Passive.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Passive extends AbstractEffect { - public Passive(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Passive(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Petrification.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Petrification.java index 6b0e87ef0e..e54293ddc7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Petrification.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Petrification.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Petrification extends AbstractEffect { - public Petrification(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Petrification(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 5e2c74d4a2..4e6f1abdc7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class PhysicalAttack extends AbstractEffect { - public PhysicalAttack(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public PhysicalAttack(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index 6d8a591756..3af1e502a4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class PhysicalAttackHpLink extends AbstractEffect { - public PhysicalAttackHpLink(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public PhysicalAttackHpLink(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index dfb98f21f1..ee025d1c5a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class PhysicalAttackMute extends AbstractEffect { - public PhysicalAttackMute(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public PhysicalAttackMute(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index f6e5d31232..326b1f68d3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class PhysicalMute extends AbstractEffect { - public PhysicalMute(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public PhysicalMute(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index c62796142c..7c66cc2059 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class PhysicalSoulAttack extends AbstractEffect { - public PhysicalSoulAttack(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public PhysicalSoulAttack(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java index a548bce62e..08857fc4ce 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class ProtectionBlessing extends AbstractEffect { - public ProtectionBlessing(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ProtectionBlessing(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Pumping.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Pumping.java index 2c359e578e..6c51095b71 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Pumping.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Pumping.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.FishingRodsData; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -41,7 +41,7 @@ public class Pumping extends AbstractEffect { private final double _power; - public Pumping(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Pumping(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 1a12167900..494946d36f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.stream.Collectors; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -35,7 +35,7 @@ public class RandomizeHate extends AbstractEffect { private final int _chance; - public RandomizeHate(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public RandomizeHate(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index bcd15b20e3..447d5f0625 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RebalanceHP extends AbstractEffect { - public RebalanceHP(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public RebalanceHP(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Recovery.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Recovery.java index 7c72c7cf3d..25d6f4189b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Recovery.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Recovery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Recovery extends AbstractEffect { - public Recovery(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Recovery(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Reeling.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Reeling.java index 50a547c76a..7507e410a2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Reeling.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Reeling.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.FishingRodsData; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -41,7 +41,7 @@ public class Reeling extends AbstractEffect { private final double _power; - public Reeling(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Reeling(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index d43a996798..9d9ddd4e1e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class RefuelAirship extends AbstractEffect { private final int _value; - public RefuelAirship(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public RefuelAirship(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Relax.java index 84354999e9..7b183d177e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -32,7 +32,7 @@ public class Relax extends AbstractEffect { private final double _power; - public Relax(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Relax(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index ec73413858..8b8e485da4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class ResistSkill extends AbstractEffect { private final List _skills = new ArrayList<>(); - public ResistSkill(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ResistSkill(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index bdebee1bee..01fcb0fccd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -32,7 +32,7 @@ public class Restoration extends AbstractEffect private final int _itemId; private final int _itemCount; - public Restoration(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Restoration(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 8c14557d00..c6b2f585a7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.model.ExtractableProductItem; import org.l2jmobius.gameserver.model.ExtractableSkill; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class RestorationRandom extends AbstractEffect { - public RestorationRandom(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public RestorationRandom(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index f94ee534e2..4225025b69 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class Resurrection extends AbstractEffect { private final int _power; - public Resurrection(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Resurrection(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 1e83373127..eebf332cf2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -33,7 +33,7 @@ public class ResurrectionSpecial extends AbstractEffect { private final int _power; - public ResurrectionSpecial(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ResurrectionSpecial(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Root.java index 1bfc43159d..1455e183ab 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Root extends AbstractEffect { - public Root(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Root(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RunAway.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RunAway.java index 08f0cdbe2f..775bf13dbb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RunAway.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RunAway.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -33,7 +33,7 @@ public class RunAway extends AbstractEffect private final int _power; private final int _time; - public RunAway(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public RunAway(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java index 6059cf7949..1075d8e6f3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -51,7 +51,7 @@ public class ServitorShare extends AbstractEffect } } - public ServitorShare(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ServitorShare(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index 273aeb6204..f11567b730 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -32,7 +32,7 @@ public class SetSkill extends AbstractEffect private final int _skillId; private final int _skillLvl; - public SetSkill(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public SetSkill(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java index 00715fd755..d8b64647e6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ public class SilentMove extends AbstractEffect { private final double _power; - public SilentMove(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public SilentMove(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 9a9ce915fd..43056e813e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -29,7 +29,7 @@ public class SkillTurning extends AbstractEffect { private final int _chance; - public SkillTurning(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public SkillTurning(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Sleep.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Sleep.java index fc973198b8..881e5a4351 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Sleep.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Sleep.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Sleep extends AbstractEffect { - public Sleep(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Sleep(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index 71ba58c9a5..00a3ff2ca9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.stats.Formulas; */ public class SoulBlow extends AbstractEffect { - public SoulBlow(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public SoulBlow(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index ceee1a13f5..3747eb9042 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -38,7 +38,7 @@ public class SoulEating extends AbstractEffect { private final int _expNeeded; - public SoulEating(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public SoulEating(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); _expNeeded = params.getInt("expNeeded"); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Sow.java index 79109cdc4f..abec313da1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Seed; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Sow extends AbstractEffect { - public Sow(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Sow(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index b2a716c963..3b52e093e5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class Spoil extends AbstractEffect { - public Spoil(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Spoil(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java index 97a275c1bd..6c7f51bb85 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -29,7 +29,7 @@ public class StaticDamage extends AbstractEffect { private final int _power; - public StaticDamage(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public StaticDamage(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index c60b937d2c..2f06b0aae8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class StealAbnormal extends AbstractEffect private final int _rate; private final int _max; - public StealAbnormal(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public StealAbnormal(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Stun.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Stun.java index 4b48270ba9..7d4c2e017c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Stun.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Stun.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Stun extends AbstractEffect { - public Stun(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Stun(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Summon.java index 6dbfe97cdf..575600ed7b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.ServitorInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -40,7 +40,7 @@ public class Summon extends AbstractEffect private final int _lifeTime; private final int _consumeItemInterval; - public Summon(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Summon(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index f70485743f..04300842de 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ public class SummonAgathion extends AbstractEffect { private final int _npcId; - public SummonAgathion(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public SummonAgathion(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index bdb5198707..8b9e5c8e14 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.CubicInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -43,7 +43,7 @@ public class SummonCubic extends AbstractEffect /** Cubic activation chance. */ private final int _cubicSkillChance; - public SummonCubic(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public SummonCubic(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index d4f88bcd96..8f7ac5dac8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DecoyInstance; import org.l2jmobius.gameserver.model.actor.instance.EffectPointInstance; @@ -44,7 +44,7 @@ public class SummonNpc extends AbstractEffect private final boolean _randomOffset; private final boolean _isSummonSpawn; - public SummonNpc(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public SummonNpc(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 2c1e46d6ee..a7b4195cda 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.data.xml.impl.PetDataTable; import org.l2jmobius.gameserver.model.PetData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PetItemList; */ public class SummonPet extends AbstractEffect { - public SummonPet(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public SummonPet(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index 0372571337..60ae4c4ec9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -34,7 +34,7 @@ public class SummonTrap extends AbstractEffect private final int _despawnTime; private final int _npcId; - public SummonTrap(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public SummonTrap(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 0512297aa5..335eb7d549 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.Collection; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class Sweeper extends AbstractEffect { - public Sweeper(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Sweeper(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index 520647ed66..c2b63895bd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Castle; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class TakeCastle extends AbstractEffect { - public TakeCastle(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TakeCastle(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index e5c62a84b2..d92818e6e9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Fort; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class TakeFort extends AbstractEffect { - public TakeFort(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TakeFort(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 9de9b4d8fd..e9a69751d8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TakeFortStart extends AbstractEffect { - public TakeFortStart(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TakeFortStart(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TakeTerritoryFlag.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TakeTerritoryFlag.java index b3839eb979..1a0984eb27 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TakeTerritoryFlag.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TakeTerritoryFlag.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlagInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -33,7 +33,7 @@ public class TakeTerritoryFlag extends AbstractEffect { private static final int FLAG_NPC_ID = 35062; - public TakeTerritoryFlag(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TakeTerritoryFlag(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index 0ca29844ad..8544034c47 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -29,7 +29,7 @@ public class TalismanSlot extends AbstractEffect { private final int _slots; - public TalismanSlot(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TalismanSlot(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index b1703e87f3..7b5feefa47 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -31,7 +31,7 @@ public class TargetCancel extends AbstractEffect { private final int _chance; - public TargetCancel(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TargetCancel(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 60d2bbb9b2..49e2cce8b1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class TargetMe extends AbstractEffect { - public TargetMe(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TargetMe(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index bbd1479ef2..40dee2c119 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class TargetMeProbability extends AbstractEffect { private final int _chance; - public TargetMeProbability(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TargetMeProbability(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 213a4c36a6..bf1d83ece1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -31,7 +31,7 @@ public class Teleport extends AbstractEffect { private final Location _loc; - public Teleport(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Teleport(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index fa518a145b..65e7469889 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class TeleportToTarget extends AbstractEffect { - public TeleportToTarget(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TeleportToTarget(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ThrowUp.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ThrowUp.java index 11b9b56474..e8a5608802 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ThrowUp.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ThrowUp.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; */ public class ThrowUp extends AbstractEffect { - public ThrowUp(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public ThrowUp(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TransferDamage.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TransferDamage.java index 85b2bb596d..57c00f0e77 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TransferDamage.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TransferDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class TransferDamage extends AbstractEffect { - public TransferDamage(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TransferDamage(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index 0e9bbf0f6e..20710f3613 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -32,7 +32,7 @@ public class TransferHate extends AbstractEffect { private final int _chance; - public TransferHate(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TransferHate(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 0c9c01fa98..fe5d91ea65 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.TransformData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -30,7 +30,7 @@ public class Transformation extends AbstractEffect { private final int _id; - public Transformation(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Transformation(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 9f4e00a3c4..c8058e7041 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ public class TrapDetect extends AbstractEffect { private final int _power; - public TrapDetect(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TrapDetect(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index 15c1870184..8285f032f0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.TrapAction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -35,7 +35,7 @@ public class TrapRemove extends AbstractEffect { private final int _power; - public TrapRemove(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TrapRemove(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 6fe958524d..a57d4ee411 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -57,7 +57,7 @@ public class TriggerSkillByAttack extends AbstractEffect * @param params */ - public TriggerSkillByAttack(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TriggerSkillByAttack(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index c64a9f0620..54fe703cde 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -49,7 +49,7 @@ public class TriggerSkillByAvoid extends AbstractEffect * @param params */ - public TriggerSkillByAvoid(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TriggerSkillByAvoid(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index 84c824f8ff..52e961f04c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -47,7 +47,7 @@ public class TriggerSkillByDamage extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillByDamage(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TriggerSkillByDamage(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 0df732a0a3..6b0df3cf77 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -50,7 +50,7 @@ public class TriggerSkillBySkill extends AbstractEffect * @param params */ - public TriggerSkillBySkill(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public TriggerSkillBySkill(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index defba608d5..2162719a15 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -34,7 +34,7 @@ public class Unsummon extends AbstractEffect { private final int _chance; - public Unsummon(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public Unsummon(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index d086462e3f..3c514ba80b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.BuffInfo; */ public class UnsummonAgathion extends AbstractEffect { - public UnsummonAgathion(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public UnsummonAgathion(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index 2a86311962..691775ac92 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -30,7 +30,7 @@ public class VitalityPointUp extends AbstractEffect { private final float _value; - public VitalityPointUp(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public VitalityPointUp(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { super(attachCond, applyCond, set, params); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java index 5393900279..56fef09f92 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.CommandChannel; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -192,7 +192,7 @@ public class IceQueensCastleBattle extends AbstractInstance final InstanceWorld world = InstanceManager.getInstance().getWorld(npc); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); final Npc controller = params.getObject("controller", Npc.class); final Npc freya = params.getObject("freya", Npc.class); switch (event) @@ -763,7 +763,7 @@ public class IceQueensCastleBattle extends AbstractInstance final InstanceWorld world = InstanceManager.getInstance().getWorld(npc); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); switch (npc.getId()) { case FREYA_THRONE: @@ -1107,7 +1107,7 @@ public class IceQueensCastleBattle extends AbstractInstance final InstanceWorld world = InstanceManager.getInstance().getWorld(npc); if (world != null) { - final StatsSet params = world.getParameters(); + final StatSet params = world.getParameters(); final Npc controller = params.getObject("controller", Npc.class); switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/SevenSigns.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/SevenSigns.java index 19ae195abb..7218839018 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/SevenSigns.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/SevenSigns.java @@ -35,7 +35,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.AutoSpawnHandler; import org.l2jmobius.gameserver.model.AutoSpawnHandler.AutoSpawnInstance; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -125,7 +125,7 @@ public class SevenSigns protected int _previousWinner; protected Calendar _lastSave = Calendar.getInstance(); - protected Map _signsPlayerData = new LinkedHashMap<>(); + protected Map _signsPlayerData = new LinkedHashMap<>(); private final Map _signsSealOwners = new LinkedHashMap<>(); private final Map _signsDuskSealTotals = new LinkedHashMap<>(); private final Map _signsDawnSealTotals = new LinkedHashMap<>(); @@ -758,7 +758,7 @@ public class SevenSigns int cabalMembers = 0; final String cabalName = getCabalShortName(cabal); - for (StatsSet sevenDat : _signsPlayerData.values()) + for (StatSet sevenDat : _signsPlayerData.values()) { if (sevenDat.getString("cabal").equals(cabalName)) { @@ -771,7 +771,7 @@ public class SevenSigns public int getPlayerStoneContrib(int objectId) { - final StatsSet currPlayer = _signsPlayerData.get(objectId); + final StatSet currPlayer = _signsPlayerData.get(objectId); if (currPlayer == null) { return 0; @@ -787,7 +787,7 @@ public class SevenSigns public int getPlayerContribScore(int objectId) { - final StatsSet currPlayer = _signsPlayerData.get(objectId); + final StatSet currPlayer = _signsPlayerData.get(objectId); if (currPlayer == null) { return 0; @@ -798,7 +798,7 @@ public class SevenSigns public int getPlayerAdenaCollect(int objectId) { - final StatsSet currPlayer = _signsPlayerData.get(objectId); + final StatSet currPlayer = _signsPlayerData.get(objectId); if (currPlayer == null) { return 0; @@ -809,7 +809,7 @@ public class SevenSigns public int getPlayerSeal(int objectId) { - final StatsSet currPlayer = _signsPlayerData.get(objectId); + final StatSet currPlayer = _signsPlayerData.get(objectId); if (currPlayer == null) { return SEAL_NULL; @@ -820,7 +820,7 @@ public class SevenSigns public int getPlayerCabal(int objectId) { - final StatsSet currPlayer = _signsPlayerData.get(objectId); + final StatSet currPlayer = _signsPlayerData.get(objectId); if (currPlayer == null) { return CABAL_NULL; @@ -851,13 +851,13 @@ public class SevenSigns try (Statement s = con.createStatement(); ResultSet rs = s.executeQuery(LOAD_DATA)) { - StatsSet sevenDat = null; + StatSet sevenDat = null; int charObjId; while (rs.next()) { charObjId = rs.getInt("charId"); - sevenDat = new StatsSet(); + sevenDat = new StatSet(); sevenDat.set("charId", charObjId); sevenDat.set("cabal", rs.getString("cabal")); sevenDat.set("seal", rs.getInt("seal")); @@ -916,7 +916,7 @@ public class SevenSigns try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(UPDATE_PLAYER)) { - for (StatsSet sevenDat : _signsPlayerData.values()) + for (StatSet sevenDat : _signsPlayerData.values()) { ps.setString(1, sevenDat.getString("cabal")); ps.setInt(2, sevenDat.getInt("seal")); @@ -938,7 +938,7 @@ public class SevenSigns public void saveSevenSignsData(int objectId) { - final StatsSet sevenDat = _signsPlayerData.get(objectId); + final StatSet sevenDat = _signsPlayerData.get(objectId); if (sevenDat == null) { return; @@ -1007,7 +1007,7 @@ public class SevenSigns protected void resetPlayerData() { // Reset each player's contribution data as well as seal and cabal. - for (StatsSet sevenDat : _signsPlayerData.values()) + for (StatSet sevenDat : _signsPlayerData.values()) { // Reset the player's cabal and seal information sevenDat.set("cabal", ""); @@ -1026,7 +1026,7 @@ public class SevenSigns */ public int setPlayerInfo(int objectId, int chosenCabal, int chosenSeal) { - StatsSet currPlayerData = _signsPlayerData.get(objectId); + StatSet currPlayerData = _signsPlayerData.get(objectId); if (currPlayerData != null) { @@ -1039,7 +1039,7 @@ public class SevenSigns } else { - currPlayerData = new StatsSet(); + currPlayerData = new StatSet(); currPlayerData.set("charId", objectId); currPlayerData.set("cabal", getCabalShortName(chosenCabal)); currPlayerData.set("seal", chosenSeal); @@ -1093,7 +1093,7 @@ public class SevenSigns */ public int getAncientAdenaReward(int objectId, boolean removeReward) { - final StatsSet currPlayer = _signsPlayerData.get(objectId); + final StatSet currPlayer = _signsPlayerData.get(objectId); final int rewardAmount = currPlayer.getInt("ancient_adena_amount"); currPlayer.set("red_stones", 0); @@ -1126,7 +1126,7 @@ public class SevenSigns */ public long addPlayerStoneContrib(int objectId, long blueCount, long greenCount, long redCount) { - final StatsSet currPlayer = _signsPlayerData.get(objectId); + final StatSet currPlayer = _signsPlayerData.get(objectId); final long contribScore = calcContributionScore(blueCount, greenCount, redCount); final long totalAncientAdena = currPlayer.getLong("ancient_adena_amount") + calcAncientAdenaReward(blueCount, greenCount, redCount); @@ -1493,7 +1493,7 @@ public class SevenSigns { for (PlayerInstance player : World.getInstance().getPlayers()) { - final StatsSet currPlayer = _signsPlayerData.get(player.getObjectId()); + final StatSet currPlayer = _signsPlayerData.get(player.getObjectId()); if (isSealValidationPeriod() || isCompResultsPeriod()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/SevenSignsFestival.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/SevenSignsFestival.java index abf2125c22..4f737a605a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/SevenSignsFestival.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/SevenSignsFestival.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party.MessageType; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.SpawnListener; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; @@ -780,10 +780,10 @@ public class SevenSignsFestival implements SpawnListener private final Map _duskFestivalScores = new HashMap<>(); /** - * _festivalData is essentially an instance of the seven_signs_festival table and should be treated as such. Data is initially accessed by the related Seven Signs cycle, with _signsCycle representing data for the current round of Festivals. The actual table data is stored as a series of StatsSet + * _festivalData is essentially an instance of the seven_signs_festival table and should be treated as such. Data is initially accessed by the related Seven Signs cycle, with _signsCycle representing data for the current round of Festivals. The actual table data is stored as a series of StatSet * constructs. These are accessed by the use of an offset based on the number of festivals, thus: offset = FESTIVAL_COUNT + festivalId (Data for Dawn is always accessed by offset > FESTIVAL_COUNT) */ - private final Map> _festivalData = new HashMap<>(); + private final Map> _festivalData = new HashMap<>(); protected SevenSignsFestival() { @@ -950,7 +950,7 @@ public class SevenSignsFestival implements SpawnListener int festivalId = rs.getInt("festivalId"); final String cabal = rs.getString("cabal"); - final StatsSet festivalDat = new StatsSet(); + final StatSet festivalDat = new StatSet(); festivalDat.set("festivalId", festivalId); festivalDat.set("cabal", cabal); festivalDat.set("cycle", festivalCycle); @@ -963,7 +963,7 @@ public class SevenSignsFestival implements SpawnListener festivalId += FESTIVAL_COUNT; } - final Map tempData = _festivalData.getOrDefault(festivalCycle, new HashMap<>()); + final Map tempData = _festivalData.getOrDefault(festivalCycle, new HashMap<>()); tempData.put(festivalId, festivalDat); _festivalData.put(festivalCycle, tempData); } @@ -1017,9 +1017,9 @@ public class SevenSignsFestival implements SpawnListener try (Connection con = DatabaseFactory.getConnection(); PreparedStatement psInsert = con.prepareStatement("REPLACE INTO seven_signs_festival (festivalId, cabal, cycle, date, score, members) VALUES (?,?,?,?,?,?)")) { - for (Map currCycleData : _festivalData.values()) + for (Map currCycleData : _festivalData.values()) { - for (StatsSet festivalDat : currCycleData.values()) + for (StatSet festivalDat : currCycleData.values()) { psInsert.setInt(1, festivalDat.getInt("festivalId")); psInsert.setString(2, festivalDat.getString("cabal")); @@ -1050,7 +1050,7 @@ public class SevenSignsFestival implements SpawnListener protected void rewardHighestRanked() { String[] partyMembers; - StatsSet overallData = getOverallHighestScoreData(FESTIVAL_LEVEL_MAX_31); + StatSet overallData = getOverallHighestScoreData(FESTIVAL_LEVEL_MAX_31); if (overallData != null) { partyMembers = overallData.getString("members").split(","); @@ -1172,7 +1172,7 @@ public class SevenSignsFestival implements SpawnListener _duskFestivalScores.clear(); // Set up a new data set for the current cycle of festivals - final Map newData = new HashMap<>(); + final Map newData = new HashMap<>(); for (int i = 0; i < (FESTIVAL_COUNT * 2); i++) { @@ -1183,8 +1183,8 @@ public class SevenSignsFestival implements SpawnListener festivalId -= FESTIVAL_COUNT; } - // Create a new StatsSet with "default" data for Dusk - final StatsSet tempStats = new StatsSet(); + // Create a new StatSet with "default" data for Dusk + final StatSet tempStats = new StatSet(); tempStats.set("festivalId", festivalId); tempStats.set("cycle", _signsCycle); tempStats.set("date", "0"); @@ -1465,9 +1465,9 @@ public class SevenSignsFestival implements SpawnListener * Returns a stats set containing the highest score this cycle for the the specified cabal and associated festival ID. * @param oracle * @param festivalId - * @return StatsSet festivalDat + * @return StatSet festivalDat */ - public StatsSet getHighestScoreData(int oracle, int festivalId) + public StatSet getHighestScoreData(int oracle, int festivalId) { int offsetId = festivalId; @@ -1478,7 +1478,7 @@ public class SevenSignsFestival implements SpawnListener // Attempt to retrieve existing score data (if found), otherwise create a // new blank data set and display a console warning. - StatsSet currData = null; + StatSet currData = null; try { @@ -1486,7 +1486,7 @@ public class SevenSignsFestival implements SpawnListener } catch (Exception e) { - currData = new StatsSet(); + currData = new StatSet(); currData.set("score", 0); currData.set("members", ""); } @@ -1497,16 +1497,16 @@ public class SevenSignsFestival implements SpawnListener /** * Returns a stats set containing the highest ever recorded score data for the specified festival. * @param festivalId - * @return StatsSet result + * @return StatSet result */ - public StatsSet getOverallHighestScoreData(int festivalId) + public StatSet getOverallHighestScoreData(int festivalId) { - StatsSet result = null; + StatSet result = null; int highestScore = 0; - for (Map currCycleData : _festivalData.values()) + for (Map currCycleData : _festivalData.values()) { - for (StatsSet currFestData : currCycleData.values()) + for (StatSet currFestData : currCycleData.values()) { final int currFestID = currFestData.getInt("festivalId"); final int festivalScore = currFestData.getInt("score"); @@ -1560,7 +1560,7 @@ public class SevenSignsFestival implements SpawnListener _duskFestivalScores.put(festivalId, offeringScore); } - final StatsSet currFestData = getHighestScoreData(oracle, festivalId); + final StatSet currFestData = getHighestScoreData(oracle, festivalId); // Check if this is the highest score for this level range so far for the player's cabal. if (offeringScore > thisCabalHighScore) @@ -1663,10 +1663,10 @@ public class SevenSignsFestival implements SpawnListener return 0; } - final Map festivalDataMap = _festivalData.get(_signsCycle); + final Map festivalDataMap = _festivalData.get(_signsCycle); if (festivalDataMap != null) { - for (StatsSet festivalData : festivalDataMap.values()) + for (StatSet festivalData : festivalDataMap.values()) { if (festivalData.getString("members").contains(playerName)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java index 8837d8386d..b933332550 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java @@ -32,7 +32,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.AdminCommandAccessRight; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -70,7 +70,7 @@ public class AdminData implements IXmlReader { NamedNodeMap attrs; Node attr; - StatsSet set; + StatSet set; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) { if ("list".equalsIgnoreCase(n.getNodeName())) @@ -79,7 +79,7 @@ public class AdminData implements IXmlReader { if ("access".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -95,7 +95,7 @@ public class AdminData implements IXmlReader } else if ("admin".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java index 1fdd8637de..2970bf8534 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java @@ -33,7 +33,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; @@ -45,7 +45,7 @@ public class DoorData implements IXmlReader { private static final Map> _groups = new HashMap<>(); private final Map _doors = new HashMap<>(); - private final Map _templates = new HashMap<>(); + private final Map _templates = new HashMap<>(); private final Map> _regions = new HashMap<>(); protected DoorData() @@ -74,7 +74,7 @@ public class DoorData implements IXmlReader if ("door".equalsIgnoreCase(b.getNodeName())) { final NamedNodeMap attrs = b.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.set("baseHpMax", 1); // Avoid doors without HP value created dead due to default value 0 in CreatureTemplate for (int i = 0; i < attrs.getLength(); i++) { @@ -91,7 +91,7 @@ public class DoorData implements IXmlReader LOGGER.info(getClass().getSimpleName() + ": Loaded " + _doors.size() + " door templates for " + _regions.size() + " regions."); } - public void insertCollisionData(StatsSet set) + public void insertCollisionData(StatSet set) { int posX; int posY; @@ -118,7 +118,7 @@ public class DoorData implements IXmlReader /** * @param set */ - private void makeDoor(StatsSet set) + private void makeDoor(StatSet set) { insertCollisionData(set); final DoorTemplate template = new DoorTemplate(set); @@ -128,7 +128,7 @@ public class DoorData implements IXmlReader putDoor(door, MapRegionManager.getInstance().getMapRegionLocId(door)); } - public StatsSet getDoorTemplate(int doorId) + public StatSet getDoorTemplate(int doorId) { return _templates.get(doorId); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java index 440a95c33e..1f65bf3cb4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -62,7 +62,7 @@ public class EnchantItemData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node att; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -74,7 +74,7 @@ public class EnchantItemData implements IXmlReader if ("enchant".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -105,7 +105,7 @@ public class EnchantItemData implements IXmlReader else if ("support".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java index 6fcad3662a..c57215f5da 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java @@ -30,7 +30,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.EnchantSkillGroup; import org.l2jmobius.gameserver.model.EnchantSkillGroup.EnchantSkillHolder; import org.l2jmobius.gameserver.model.EnchantSkillLearn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -98,7 +98,7 @@ public class EnchantSkillGroupsData implements IXmlReader if ("enchant".equalsIgnoreCase(b.getNodeName())) { attrs = b.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java index 57a16d6390..608f4702b8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.FakePlayerHolder; @@ -72,7 +72,7 @@ public class FakePlayerData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayer", fakePlayerNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerNode)); final int npcId = set.getInt("npcId"); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); final String name = template.getName(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java index a0ad168a72..51d9e32f03 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.FenceState; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldRegion; import org.l2jmobius.gameserver.model.actor.instance.FenceInstance; @@ -78,7 +78,7 @@ public class FenceData implements IXmlReader private void spawnFence(Node fenceNode) { - final StatsSet set = new StatsSet(parseAttributes(fenceNode)); + final StatSet set = new StatSet(parseAttributes(fenceNode)); spawnFence(set.getInt("x"), set.getInt("y"), set.getInt("z"), set.getString("name"), set.getInt("width"), set.getInt("length"), set.getInt("height"), 0, set.getEnum("state", FenceState.class, FenceState.CLOSED)); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/FishData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/FishData.java index 0efc17a16f..6e939300c1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/FishData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/FishData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.fishing.Fish; /** @@ -71,7 +71,7 @@ public class FishData implements IXmlReader { final NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/FishingMonstersData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/FishingMonstersData.java index aef9bc9eaf..9a0937989c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/FishingMonstersData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/FishingMonstersData.java @@ -25,7 +25,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.fishing.FishingMonster; /** @@ -64,7 +64,7 @@ public class FishingMonstersData implements IXmlReader if ("fishingMonster".equalsIgnoreCase(d.getNodeName())) { final NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/FishingRodsData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/FishingRodsData.java index a3e7aa2675..ce71960d03 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/FishingRodsData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/FishingRodsData.java @@ -25,7 +25,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.fishing.FishingRod; /** @@ -64,7 +64,7 @@ public class FishingRodsData implements IXmlReader if ("fishingRod".equalsIgnoreCase(d.getNodeName())) { final NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java index de839258cd..48b7b0b074 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.Henna; @@ -82,7 +82,7 @@ public class HennaData implements IXmlReader */ private void parseHenna(Node d) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final List wearClassIds = new ArrayList<>(); NamedNodeMap attrs = d.getAttributes(); Node attr; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java index 894856d113..13494a05cd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; @@ -91,7 +91,7 @@ public class InitialEquipmentData implements IXmlReader { if ("item".equalsIgnoreCase(c.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java index a3d1d83841..8a8b518d83 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java @@ -31,7 +31,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.file.filter.NumericNameFilter; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.multisell.Entry; @@ -168,14 +168,14 @@ public class MultisellData implements IXmlReader NamedNodeMap attrs; Node att; - StatsSet set; + StatSet set; for (n = first; n != null; n = n.getNextSibling()) { if ("ingredient".equalsIgnoreCase(n.getNodeName())) { attrs = n.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -186,7 +186,7 @@ public class MultisellData implements IXmlReader else if ("production".equalsIgnoreCase(n.getNodeName())) { attrs = n.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java index de8119c14b..13433dec76 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java @@ -40,7 +40,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.AISkillScope; import org.l2jmobius.gameserver.enums.DropType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -94,7 +94,7 @@ public class NpcData implements IXmlReader if ("npc".equalsIgnoreCase(listNode.getNodeName())) { NamedNodeMap attrs = listNode.getAttributes(); - final StatsSet set = new StatsSet(new HashMap<>()); + final StatSet set = new StatSet(new HashMap<>()); final int npcId = parseInteger(attrs, "id"); Map parameters = null; Map skills = null; @@ -521,7 +521,7 @@ public class NpcData implements IXmlReader template.set(set); } - template.setParameters(parameters != null ? new StatsSet(Collections.unmodifiableMap(parameters)) : StatsSet.EMPTY_STATSET); + template.setParameters(parameters != null ? new StatSet(Collections.unmodifiableMap(parameters)) : StatSet.EMPTY_STATSET); if (skills != null) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java index 3712cca6af..373f87ecfc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -79,7 +79,7 @@ public class NpcNameLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); NPC_NAME_LOCALISATIONS.get(_lang).put(set.getInt("id"), new String[] { set.getString("name"), diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java index 09e72fe7d6..968e176d86 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java @@ -28,7 +28,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.PetLevelData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * This class parse and hold all pet parameters.
    @@ -112,7 +112,7 @@ public class PetDataTable implements IXmlReader if (s.getNodeName().equals("stat")) { final int level = Integer.parseInt(s.getAttributes().getNamedItem("level").getNodeValue()); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (Node bean = s.getFirstChild(); bean != null; bean = bean.getNextSibling()) { if (bean.getNodeName().equals("set")) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java index 736cce15dd..f43a449483 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.base.ClassId; @@ -77,7 +77,7 @@ public class PlayerTemplateData implements IXmlReader } else if ("staticData".equalsIgnoreCase(d.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.set("classId", classId); final List creationPoints = new ArrayList<>(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java index cdbb85ca5c..585de145c8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.PrimeShopProductHolder; /** @@ -62,7 +62,7 @@ public class PrimeShopData implements IXmlReader { NamedNodeMap attrs; Node att; - StatsSet set = null; + StatSet set = null; for (Node a = doc.getFirstChild(); a != null; a = a.getNextSibling()) { if ("list".equalsIgnoreCase(a.getNodeName())) @@ -72,7 +72,7 @@ public class PrimeShopData implements IXmlReader if ("product".equalsIgnoreCase(b.getNodeName())) { attrs = b.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java index c7decad0f4..c7f2c9ed0c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java @@ -30,7 +30,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.RecipeInstance; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.RecipeStatInstance; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; /** @@ -79,7 +79,7 @@ public class RecipeData implements IXmlReader Node att; int id = -1; boolean haveRare = false; - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); att = attrs.getNamedItem("id"); if (att == null) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java index 053d9089ce..d6b28a5962 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; /** @@ -82,7 +82,7 @@ public class SendMessageLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); SEND_MESSAGE_LOCALISATIONS.get(_lang).put(set.getString("message").split(SPLIT_STRING), set.getString("translation").split(SPLIT_STRING)); })); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java index 8cfc0d9847..4b09c05b63 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.SiegeScheduleDate; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.util.Util; /** @@ -51,7 +51,7 @@ public class SiegeScheduleData implements IXmlReader LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded " + _scheduleData.size() + " siege schedulers."); if (_scheduleData.isEmpty()) { - _scheduleData.add(new SiegeScheduleDate(new StatsSet())); + _scheduleData.add(new SiegeScheduleDate(new StatSet())); LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Emergency Loaded: " + _scheduleData.size() + " default siege schedulers."); } } @@ -69,7 +69,7 @@ public class SiegeScheduleData implements IXmlReader { case "schedule": { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final NamedNodeMap attrs = cd.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java index 60f572be00..b0c54aa3d0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java @@ -38,7 +38,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.SkillLearn.SubClassData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.base.ClassId; @@ -183,7 +183,7 @@ public class SkillTreesData implements IXmlReader { if ("skill".equalsIgnoreCase(c.getNodeName())) { - final StatsSet learnSkillSet = new StatsSet(); + final StatSet learnSkillSet = new StatSet(); NamedNodeMap attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java index 46176f6f44..ca8e408ea8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java @@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; @@ -66,7 +66,7 @@ public class StaticObjectData implements IXmlReader if ("object".equalsIgnoreCase(d.getNodeName())) { final NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -83,9 +83,9 @@ public class StaticObjectData implements IXmlReader * Initialize an static object based on the stats set and add it to the map. * @param set the stats set to add. */ - private void addObject(StatsSet set) + private void addObject(StatSet set) { - final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatsSet()), set.getInt("id")); + final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatSet()), set.getInt("id")); obj.setType(set.getInt("type", 0)); obj.setName(set.getString("name")); obj.setMap(set.getString("texture", "none"), set.getInt("map_x", 0), set.getInt("map_y", 0)); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java index 0e3f8ccdf4..fbe944e3e6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java @@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.transform.Transform; import org.l2jmobius.gameserver.model.actor.transform.TransformLevelData; @@ -68,7 +68,7 @@ public class TransformData implements IXmlReader if ("transform".equalsIgnoreCase(d.getNodeName())) { NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -190,7 +190,7 @@ public class TransformData implements IXmlReader transform.setTemplate(isMale, templateData); } - final StatsSet levelsSet = new StatsSet(); + final StatSet levelsSet = new StatSet(); for (Node s = z.getFirstChild(); s != null; s = s.getNextSibling()) { if ("level".equals(s.getNodeName())) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/datatables/SpawnTable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/datatables/SpawnTable.java index 5a130b5d90..5a0394a57b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/datatables/SpawnTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/datatables/SpawnTable.java @@ -41,7 +41,7 @@ import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.DayNightSpawnManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -200,7 +200,7 @@ public class SpawnTable implements IXmlReader continue; } - final StatsSet spawnInfo = new StatsSet(); + final StatSet spawnInfo = new StatSet(); spawnInfo.set("npcTemplateid", templateId); spawnInfo.set("x", x); spawnInfo.set("y", y); @@ -251,11 +251,11 @@ public class SpawnTable implements IXmlReader /** * Creates NPC spawn - * @param spawnInfo StatsSet of spawn parameters + * @param spawnInfo StatSet of spawn parameters * @param aiData Map of specific AI parameters for this spawn * @return count NPC instances, spawned by this spawn */ - private int addSpawn(StatsSet spawnInfo, Map aiData) + private int addSpawn(StatSet spawnInfo, Map aiData) { Spawn spawnDat; int ret = 0; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/DocumentBase.java index 6c78e3cef5..197207e8ca 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/DocumentBase.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/DocumentBase.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.PlayerState; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionCategoryType; @@ -168,7 +168,7 @@ public abstract class DocumentBase protected abstract void parseDocument(Document doc); - protected abstract StatsSet getStatsSet(); + protected abstract StatSet getStatSet(); protected abstract String getTableValue(String name); @@ -292,14 +292,14 @@ public abstract class DocumentBase protected void attachEffect(Node n, Object template, Condition attachCond, EffectScope effectScope) { final NamedNodeMap attrs = n.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); set.set(att.getNodeName(), getValue(att.getNodeValue(), template)); } - final StatsSet parameters = parseParameters(n.getFirstChild(), template); + final StatSet parameters = parseParameters(n.getFirstChild(), template); final Condition applayCond = parseCondition(n.getFirstChild(), template); if (template instanceof IIdentifiable) @@ -337,9 +337,9 @@ public abstract class DocumentBase * @param template the effect template * @return the list of parameters if any, {@code null} otherwise */ - private StatsSet parseParameters(Node n, Object template) + private StatSet parseParameters(Node n, Object template) { - StatsSet parameters = null; + StatSet parameters = null; while ((n != null)) { // Parse all parameters. @@ -347,7 +347,7 @@ public abstract class DocumentBase { if (parameters == null) { - parameters = new StatsSet(); + parameters = new StatSet(); } final NamedNodeMap params = n.getAttributes(); for (int i = 0; i < params.getLength(); i++) @@ -358,7 +358,7 @@ public abstract class DocumentBase } n = n.getNextSibling(); } - return parameters == null ? StatsSet.EMPTY_STATSET : parameters; + return parameters == null ? StatSet.EMPTY_STATSET : parameters; } protected Condition parseCondition(Node n, Object template) @@ -1257,7 +1257,7 @@ public abstract class DocumentBase setTable(name, array.toArray(new String[array.size()])); } - protected void parseBeanSet(Node n, StatsSet set, Integer level) + protected void parseBeanSet(Node n, StatSet set, Integer level) { final String name = n.getAttributes().getNamedItem("name").getNodeValue().trim(); final String value = n.getAttributes().getNamedItem("val").getNodeValue().trim(); @@ -1272,7 +1272,7 @@ public abstract class DocumentBase } } - protected void setExtractableSkillData(StatsSet set, String value) + protected void setExtractableSkillData(StatSet set, String value) { set.set("capsuled_items_skill", value); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java index b1900ebd83..49f979e5f9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.gameserver.engines.DocumentBase; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.items.Item; @@ -48,7 +48,7 @@ public class DocumentItem extends DocumentBase } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return _currentItem.set; } @@ -102,7 +102,7 @@ public class DocumentItem extends DocumentBase _currentItem.id = itemId; _currentItem.name = itemName; _currentItem.type = className; - _currentItem.set = new StatsSet(); + _currentItem.set = new StatSet(); _currentItem.set.set("item_id", itemId); _currentItem.set.set("name", itemName); @@ -167,7 +167,7 @@ public class DocumentItem extends DocumentBase try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatsSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (Item) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java index f883526371..d2d838264e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.engines.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; public class ItemDataHolder @@ -24,7 +24,7 @@ public class ItemDataHolder int id; String type; String name; - StatsSet set; + StatSet set; int currentLevel; Item item; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/skills/DocumentSkill.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/skills/DocumentSkill.java index a047c817b3..83c391e630 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/skills/DocumentSkill.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/skills/DocumentSkill.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; import org.l2jmobius.gameserver.data.xml.impl.EnchantSkillGroupsData; import org.l2jmobius.gameserver.engines.DocumentBase; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.skills.EffectScope; import org.l2jmobius.gameserver.model.skills.Skill; @@ -51,7 +51,7 @@ public class DocumentSkill extends DocumentBase } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return _currentSkill.sets[_currentSkill.currentLevel]; } @@ -166,19 +166,19 @@ public class DocumentSkill extends DocumentBase _currentSkill.id = skillId; _currentSkill.name = skillName; - _currentSkill.sets = new StatsSet[lastLvl]; - _currentSkill.enchsets1 = new StatsSet[enchantLevels1]; - _currentSkill.enchsets2 = new StatsSet[enchantLevels2]; - _currentSkill.enchsets3 = new StatsSet[enchantLevels3]; - _currentSkill.enchsets4 = new StatsSet[enchantLevels4]; - _currentSkill.enchsets5 = new StatsSet[enchantLevels5]; - _currentSkill.enchsets6 = new StatsSet[enchantLevels6]; - _currentSkill.enchsets7 = new StatsSet[enchantLevels7]; - _currentSkill.enchsets8 = new StatsSet[enchantLevels8]; + _currentSkill.sets = new StatSet[lastLvl]; + _currentSkill.enchsets1 = new StatSet[enchantLevels1]; + _currentSkill.enchsets2 = new StatSet[enchantLevels2]; + _currentSkill.enchsets3 = new StatSet[enchantLevels3]; + _currentSkill.enchsets4 = new StatSet[enchantLevels4]; + _currentSkill.enchsets5 = new StatSet[enchantLevels5]; + _currentSkill.enchsets6 = new StatSet[enchantLevels6]; + _currentSkill.enchsets7 = new StatSet[enchantLevels7]; + _currentSkill.enchsets8 = new StatSet[enchantLevels8]; for (int i = 0; i < lastLvl; i++) { - _currentSkill.sets[i] = new StatsSet(); + _currentSkill.sets[i] = new StatSet(); _currentSkill.sets[i].set("skill_id", _currentSkill.id); _currentSkill.sets[i].set("level", i + 1); _currentSkill.sets[i].set("name", _currentSkill.name); @@ -217,7 +217,7 @@ public class DocumentSkill extends DocumentBase } for (int i = 0; i < enchantLevels1; i++) { - _currentSkill.enchsets1[i] = new StatsSet(); + _currentSkill.enchsets1[i] = new StatSet(); _currentSkill.enchsets1[i].set("skill_id", _currentSkill.id); // currentSkill.enchsets1[i] = currentSkill.sets[currentSkill.sets.length-1]; _currentSkill.enchsets1[i].set("level", i + 101); @@ -248,7 +248,7 @@ public class DocumentSkill extends DocumentBase for (int i = 0; i < enchantLevels2; i++) { - _currentSkill.enchsets2[i] = new StatsSet(); + _currentSkill.enchsets2[i] = new StatSet(); // currentSkill.enchsets2[i] = currentSkill.sets[currentSkill.sets.length-1]; _currentSkill.enchsets2[i].set("skill_id", _currentSkill.id); _currentSkill.enchsets2[i].set("level", i + 201); @@ -279,7 +279,7 @@ public class DocumentSkill extends DocumentBase for (int i = 0; i < enchantLevels3; i++) { - _currentSkill.enchsets3[i] = new StatsSet(); + _currentSkill.enchsets3[i] = new StatSet(); _currentSkill.enchsets3[i].set("skill_id", _currentSkill.id); _currentSkill.enchsets3[i].set("level", i + 301); _currentSkill.enchsets3[i].set("name", _currentSkill.name); @@ -308,7 +308,7 @@ public class DocumentSkill extends DocumentBase for (int i = 0; i < enchantLevels4; i++) { - _currentSkill.enchsets4[i] = new StatsSet(); + _currentSkill.enchsets4[i] = new StatSet(); _currentSkill.enchsets4[i].set("skill_id", _currentSkill.id); _currentSkill.enchsets4[i].set("level", i + 401); _currentSkill.enchsets4[i].set("name", _currentSkill.name); @@ -337,7 +337,7 @@ public class DocumentSkill extends DocumentBase for (int i = 0; i < enchantLevels5; i++) { - _currentSkill.enchsets5[i] = new StatsSet(); + _currentSkill.enchsets5[i] = new StatSet(); _currentSkill.enchsets5[i].set("skill_id", _currentSkill.id); _currentSkill.enchsets5[i].set("level", i + 501); _currentSkill.enchsets5[i].set("name", _currentSkill.name); @@ -366,7 +366,7 @@ public class DocumentSkill extends DocumentBase for (int i = 0; i < enchantLevels6; i++) { - _currentSkill.enchsets6[i] = new StatsSet(); + _currentSkill.enchsets6[i] = new StatSet(); _currentSkill.enchsets6[i].set("skill_id", _currentSkill.id); _currentSkill.enchsets6[i].set("level", i + 601); _currentSkill.enchsets6[i].set("name", _currentSkill.name); @@ -395,7 +395,7 @@ public class DocumentSkill extends DocumentBase for (int i = 0; i < enchantLevels7; i++) { - _currentSkill.enchsets7[i] = new StatsSet(); + _currentSkill.enchsets7[i] = new StatSet(); _currentSkill.enchsets7[i].set("skill_id", _currentSkill.id); _currentSkill.enchsets7[i].set("level", i + 701); _currentSkill.enchsets7[i].set("name", _currentSkill.name); @@ -424,7 +424,7 @@ public class DocumentSkill extends DocumentBase for (int i = 0; i < enchantLevels8; i++) { - _currentSkill.enchsets8[i] = new StatsSet(); + _currentSkill.enchsets8[i] = new StatSet(); _currentSkill.enchsets8[i].set("skill_id", _currentSkill.id); _currentSkill.enchsets8[i].set("level", i + 801); _currentSkill.enchsets8[i].set("name", _currentSkill.name); @@ -1527,7 +1527,7 @@ public class DocumentSkill extends DocumentBase { int count = 0; _currentSkill.currentSkills = new ArrayList<>(_currentSkill.sets.length + _currentSkill.enchsets1.length + _currentSkill.enchsets2.length + _currentSkill.enchsets3.length + _currentSkill.enchsets4.length + _currentSkill.enchsets5.length + _currentSkill.enchsets6.length + _currentSkill.enchsets7.length + _currentSkill.enchsets8.length); - StatsSet set; + StatSet set; for (int i = 0; i < _currentSkill.sets.length; i++) { set = _currentSkill.sets[i]; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/skills/SkillDataHolder.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/skills/SkillDataHolder.java index 47c757e65a..2b69cdab75 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/skills/SkillDataHolder.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/skills/SkillDataHolder.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.engines.skills; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.skills.Skill; /** @@ -29,15 +29,15 @@ public class SkillDataHolder { public int id; public String name; - public StatsSet[] sets; - public StatsSet[] enchsets1; - public StatsSet[] enchsets2; - public StatsSet[] enchsets3; - public StatsSet[] enchsets4; - public StatsSet[] enchsets5; - public StatsSet[] enchsets6; - public StatsSet[] enchsets7; - public StatsSet[] enchsets8; + public StatSet[] sets; + public StatSet[] enchsets1; + public StatSet[] enchsets2; + public StatSet[] enchsets3; + public StatSet[] enchsets4; + public StatSet[] enchsets5; + public StatSet[] enchsets6; + public StatSet[] enchsets7; + public StatSet[] enchsets8; public int currentLevel; public List skills = new ArrayList<>(); public List currentSkills = new ArrayList<>(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java index b56968efbc..c9ff14fcc4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.model.AirShipTeleportList; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShipInstance; @@ -45,13 +45,13 @@ public class AirShipManager private static final String UPDATE_DB = "UPDATE airships SET fuel=? WHERE owner_id=?"; private CreatureTemplate _airShipTemplate = null; - private final Map _airShipsInfo = new HashMap<>(); + private final Map _airShipsInfo = new HashMap<>(); private final Map _airShips = new HashMap<>(); private final Map _teleports = new HashMap<>(); protected AirShipManager() { - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", 9); npcDat.set("level", 0); npcDat.set("jClass", "boat"); @@ -106,7 +106,7 @@ public class AirShipManager public AirShipInstance getNewAirShip(int x, int y, int z, int heading, int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return null; @@ -142,7 +142,7 @@ public class AirShipManager return; } storeInDb(ship.getOwnerId()); - final StatsSet info = _airShipsInfo.get(ship.getOwnerId()); + final StatSet info = _airShipsInfo.get(ship.getOwnerId()); if (info != null) { info.set("fuel", ship.getFuel()); @@ -160,7 +160,7 @@ public class AirShipManager { return; } - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("fuel", 600); _airShipsInfo.put(ownerId, info); try (Connection con = DatabaseFactory.getConnection(); @@ -237,10 +237,10 @@ public class AirShipManager Statement s = con.createStatement(); ResultSet rs = s.executeQuery(LOAD_DB)) { - StatsSet info; + StatSet info; while (rs.next()) { - info = new StatsSet(); + info = new StatSet(); info.set("fuel", rs.getInt("fuel")); _airShipsInfo.put(rs.getInt("owner_id"), info); } @@ -258,7 +258,7 @@ public class AirShipManager private void storeInDb(int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java index 21cad620a8..364663990d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.BoatInstance; @@ -57,7 +57,7 @@ public class BoatManager return null; } - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", boatId); npcDat.set("level", 0); npcDat.set("jClass", "boat"); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CHSiegeManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CHSiegeManager.java index 0096466804..e4b667856a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CHSiegeManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CHSiegeManager.java @@ -25,7 +25,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -62,7 +62,7 @@ public class CHSiegeManager { final int id = rs.getInt("clanHallId"); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.set("id", id); set.set("name", rs.getString("name")); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index d46dee2069..c794faba83 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.enums.ManorMode; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; import org.l2jmobius.gameserver.model.SeedProduction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.entity.Castle; @@ -122,7 +122,7 @@ public class CastleManorManager implements IXmlReader, IStorable @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; NamedNodeMap attrs; Node att; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -138,7 +138,7 @@ public class CastleManorManager implements IXmlReader, IStorable { if ("crop".equalsIgnoreCase(c.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); set.set("castleId", castleId); attrs = c.getAttributes(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/ClanHallManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/ClanHallManager.java index 36bea62080..209a3c6ccf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/ClanHallManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/ClanHallManager.java @@ -27,7 +27,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.sql.impl.ClanTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.entity.ClanHall; @@ -70,7 +70,7 @@ public class ClanHallManager int lease; while (rs.next()) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); id = rs.getInt("id"); ownerId = rs.getInt("ownerId"); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index 3dd4e3f652..767bed6954 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.datatables.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.FakePlayerChatHolder; @@ -73,7 +73,7 @@ public class FakePlayerChatManager implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayerChat", fakePlayerChatNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerChatNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerChatNode)); MESSAGES.add(new FakePlayerChatHolder(set.getString("fpcName"), set.getString("searchMethod"), set.getString("searchText"), set.getString("answers"))); })); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java index 47384f5c76..bc7eb9fc0c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java @@ -36,7 +36,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.tasks.GrandBossManagerStoreTask; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; @@ -60,7 +60,7 @@ public class GrandBossManager implements IStorable protected static final Map BOSSES = new ConcurrentHashMap<>(); - protected static Map _storedInfo = new HashMap<>(); + protected static Map _storedInfo = new HashMap<>(); private final Map _bossStatus = new ConcurrentHashMap<>(); @@ -81,7 +81,7 @@ public class GrandBossManager implements IStorable { // Read all info from DB, and store it for AI to read and decide what to do // faster than accessing DB in real time - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); final int bossId = rs.getInt("boss_id"); info.set("loc_x", rs.getInt("loc_x")); info.set("loc_y", rs.getInt("loc_y")); @@ -215,12 +215,12 @@ public class GrandBossManager implements IStorable return BOSSES.get(bossId); } - public StatsSet getStatsSet(int bossId) + public StatSet getStatSet(int bossId) { return _storedInfo.get(bossId); } - public void setStatsSet(int bossId, StatsSet info) + public void setStatSet(int bossId, StatSet info) { _storedInfo.put(bossId, info); updateDb(bossId, false); @@ -252,10 +252,10 @@ public class GrandBossManager implements IStorable } } } - for (Entry e : _storedInfo.entrySet()) + for (Entry e : _storedInfo.entrySet()) { final GrandBossInstance boss = BOSSES.get(e.getKey()); - final StatsSet info = e.getValue(); + final StatSet info = e.getValue(); if ((boss == null) || (info == null)) { try (PreparedStatement update = con.prepareStatement(UPDATE_GRAND_BOSS_DATA2)) @@ -305,7 +305,7 @@ public class GrandBossManager implements IStorable try (Connection con = DatabaseFactory.getConnection()) { final GrandBossInstance boss = BOSSES.get(bossId); - final StatsSet info = _storedInfo.get(bossId); + final StatSet info = _storedInfo.get(bossId); if (statusOnly || (boss == null) || (info == null)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java index a970941207..a0e581d6f7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java @@ -36,7 +36,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.datatables.SpawnTable; import org.l2jmobius.gameserver.enums.RaidBossStatus; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.RaidBossInstance; /** @@ -49,7 +49,7 @@ public class RaidBossSpawnManager protected static final Map _bosses = new ConcurrentHashMap<>(); protected static final Map _spawns = new ConcurrentHashMap<>(); - protected static final Map _storedInfo = new ConcurrentHashMap<>(); + protected static final Map _storedInfo = new ConcurrentHashMap<>(); protected static final Map> _schedules = new ConcurrentHashMap<>(); /** @@ -131,7 +131,7 @@ public class RaidBossSpawnManager { raidboss.setRaidStatus(RaidBossStatus.ALIVE); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", raidboss.getCurrentHp()); info.set("currentMP", raidboss.getCurrentMp()); info.set("respawnTime", 0); @@ -154,7 +154,7 @@ public class RaidBossSpawnManager */ public void updateStatus(RaidBossInstance boss, boolean isBossDead) { - final StatsSet info = _storedInfo.get(boss.getId()); + final StatSet info = _storedInfo.get(boss.getId()); if (info == null) { return; @@ -225,7 +225,7 @@ public class RaidBossSpawnManager _bosses.put(bossId, raidboss); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", currentHP); info.set("currentMP", currentMP); info.set("respawnTime", 0); @@ -324,7 +324,7 @@ public class RaidBossSpawnManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE raidboss_spawnlist SET respawn_time = ?, currentHP = ?, currentMP = ? WHERE boss_id = ?")) { - for (Entry entry : _storedInfo.entrySet()) + for (Entry entry : _storedInfo.entrySet()) { final Integer bossId = entry.getKey(); if (bossId == null) @@ -343,7 +343,7 @@ public class RaidBossSpawnManager updateStatus(boss, false); } - final StatsSet info = entry.getValue(); + final StatSet info = entry.getValue(); if (info == null) { continue; @@ -429,7 +429,7 @@ public class RaidBossSpawnManager */ public void notifySpawnNightBoss(RaidBossInstance raidboss) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", raidboss.getCurrentHp()); info.set("currentMP", raidboss.getCurrentMp()); info.set("respawnTime", 0); @@ -475,7 +475,7 @@ public class RaidBossSpawnManager * Gets the stored info. * @return the stored info */ - public Map getStoredInfo() + public Map getStoredInfo() { return _storedInfo; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/AccessLevel.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/AccessLevel.java index 2ecfbd194e..ced434ddda 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/AccessLevel.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/AccessLevel.java @@ -52,7 +52,7 @@ public class AccessLevel /** Flag to gain exp in party */ private boolean _gainExp = false; - public AccessLevel(StatsSet set) + public AccessLevel(StatSet set) { _accessLevel = set.getInt("level"); _name = set.getString("name"); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java index 241f56554d..4ea90781a5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java @@ -27,7 +27,7 @@ public class AdminCommandAccessRight private final int _accessLevel; private final boolean _requireConfirm; - public AdminCommandAccessRight(StatsSet set) + public AdminCommandAccessRight(StatSet set) { _adminCommand = set.getString("command"); _requireConfirm = set.getBoolean("confirmDlg", false); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/EnchantSkillGroup.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/EnchantSkillGroup.java index e6a1588b02..9a31ac6536 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/EnchantSkillGroup.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/EnchantSkillGroup.java @@ -54,7 +54,7 @@ public class EnchantSkillGroup private final int _spCost; private final byte[] _rate; - public EnchantSkillHolder(StatsSet set) + public EnchantSkillHolder(StatSet set) { _level = set.getInt("level"); _adenaCost = set.getInt("adena", 0); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/PetLevelData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/PetLevelData.java index 16f1c1ff07..a302e51ce4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/PetLevelData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/PetLevelData.java @@ -46,7 +46,7 @@ public class PetLevelData private final double _slowFlySpeedOnRide; private final double _fastFlySpeedOnRide; - public PetLevelData(StatsSet set) + public PetLevelData(StatSet set) { _ownerExpTaken = set.getInt("get_exp_type"); _petMaxExp = set.getLong("exp"); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/RecipeList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/RecipeList.java index b2c7b9a612..f660608e0a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/RecipeList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/RecipeList.java @@ -68,7 +68,7 @@ public class RecipeList * @param set * @param haveRare */ - public RecipeList(StatsSet set, boolean haveRare) + public RecipeList(StatSet set, boolean haveRare) { _recipes = new RecipeInstance[0]; _statUse = new RecipeStatInstance[0]; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Seed.java index 08a7984914..32dc9a0ba3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Seed.java @@ -35,7 +35,7 @@ public class Seed private final int _seedReferencePrice; private final int _cropReferencePrice; - public Seed(StatsSet set) + public Seed(StatSet set) { _cropId = set.getInt("id"); _seedId = set.getInt("seedId"); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java index caa0d8162e..d854355fb0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java @@ -27,7 +27,7 @@ public class SiegeScheduleDate private final int _hour; private final int _maxConcurrent; - public SiegeScheduleDate(StatsSet set) + public SiegeScheduleDate(StatSet set) { _day = set.getInt("day", Calendar.SUNDAY); _hour = set.getInt("hour", 16); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/SkillLearn.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/SkillLearn.java index 0d612afbcd..a73c1853d3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/SkillLearn.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/SkillLearn.java @@ -79,7 +79,7 @@ public class SkillLearn * Constructor for SkillLearn. * @param set the set with the SkillLearn data. */ - public SkillLearn(StatsSet set) + public SkillLearn(StatSet set) { _skillName = set.getString("skillName"); _skillId = set.getInt("skillId"); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/StatSet.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/StatSet.java new file mode 100644 index 0000000000..ec175436cd --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/StatSet.java @@ -0,0 +1,968 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Supplier; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.stream.Collectors; + +import org.l2jmobius.commons.util.TimeUtil; +import org.l2jmobius.gameserver.model.holders.MinionHolder; +import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.interfaces.IParserAdvUtils; +import org.l2jmobius.gameserver.util.Util; + +/** + * This class is meant to hold a set of (key,value) pairs.
    + * They are stored as object but can be retrieved in any type wanted. As long as cast is available.
    + * @author mkizub + */ +public class StatSet implements IParserAdvUtils +{ + private static final Logger LOGGER = Logger.getLogger(StatSet.class.getName()); + /** Static empty immutable map, used to avoid multiple null checks over the source. */ + public static final StatSet EMPTY_STATSET = new StatSet(Collections.emptyMap()); + + private final Map _set; + + public StatSet() + { + this(ConcurrentHashMap::new); + } + + public StatSet(Supplier> mapFactory) + { + this(mapFactory.get()); + } + + public StatSet(Map map) + { + _set = map; + } + + /** + * Returns the set of values + * @return HashMap + */ + public Map getSet() + { + return _set; + } + + /** + * Add a set of couple values in the current set + * @param newSet : StatSet pointing out the list of couples to add in the current set + */ + public void merge(StatSet newSet) + { + _set.putAll(newSet.getSet()); + } + + /** + * Verifies if the stat set is empty. + * @return {@code true} if the stat set is empty, {@code false} otherwise + */ + public boolean isEmpty() + { + return _set.isEmpty(); + } + + /** + * Return the boolean value associated with key. + * @param key : String designating the key in the set + * @return boolean : value associated to the key + * @throws IllegalArgumentException : If value is not set or value is not boolean + */ + @Override + public boolean getBoolean(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Boolean value required, but not specified"); + } + if (val instanceof Boolean) + { + return ((Boolean) val).booleanValue(); + } + try + { + return Boolean.parseBoolean((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Boolean value required, but found: " + val); + } + } + + /** + * Return the boolean value associated with key.
    + * If no value is associated with key, or type of value is wrong, returns defaultValue. + * @param key : String designating the key in the entry set + * @return boolean : value associated to the key + */ + @Override + public boolean getBoolean(String key, boolean defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Boolean) + { + return ((Boolean) val).booleanValue(); + } + try + { + return Boolean.parseBoolean((String) val); + } + catch (Exception e) + { + return defaultValue; + } + } + + @Override + public byte getByte(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Byte value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).byteValue(); + } + try + { + return Byte.parseByte((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + + @Override + public byte getByte(String key, byte defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).byteValue(); + } + try + { + return Byte.parseByte((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + + public short increaseByte(String key, byte increaseWith) + { + final byte newValue = (byte) (getByte(key) + increaseWith); + set(key, newValue); + return newValue; + } + + public short increaseByte(String key, byte defaultValue, byte increaseWith) + { + final byte newValue = (byte) (getByte(key, defaultValue) + increaseWith); + set(key, newValue); + return newValue; + } + + public byte[] getByteArray(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Byte value required, but not specified"); + } + if (val instanceof Number) + { + return new byte[] + { + ((Number) val).byteValue() + }; + } + int c = 0; + final String[] vals = ((String) val).split(splitOn); + final byte[] result = new byte[vals.length]; + for (String v : vals) + { + try + { + result[c++] = Byte.parseByte(v); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + return result; + } + + public List getByteList(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final List result = new ArrayList<>(); + for (Byte i : getByteArray(key, splitOn)) + { + result.add(i); + } + return result; + } + + @Override + public short getShort(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Short value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).shortValue(); + } + try + { + return Short.parseShort((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Short value required, but found: " + val); + } + } + + @Override + public short getShort(String key, short defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).shortValue(); + } + try + { + return Short.parseShort((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Short value required, but found: " + val); + } + } + + public short increaseShort(String key, short increaseWith) + { + final short newValue = (short) (getShort(key) + increaseWith); + set(key, newValue); + return newValue; + } + + public short increaseShort(String key, short defaultValue, short increaseWith) + { + final short newValue = (short) (getShort(key, defaultValue) + increaseWith); + set(key, newValue); + return newValue; + } + + @Override + public int getInt(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Integer value required, but not specified: " + key + "!"); + } + + if (val instanceof Number) + { + return ((Number) val).intValue(); + } + + try + { + return Integer.parseInt((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val + "!"); + } + } + + @Override + public int getInt(String key, int defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).intValue(); + } + try + { + return Integer.parseInt((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val); + } + } + + public int increaseInt(String key, int increaseWith) + { + final int newValue = getInt(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public int increaseInt(String key, int defaultValue, int increaseWith) + { + final int newValue = getInt(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + public int[] getIntArray(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Integer value required, but not specified"); + } + if (val instanceof Number) + { + return new int[] + { + ((Number) val).intValue() + }; + } + int c = 0; + final String[] vals = ((String) val).split(splitOn); + final int[] result = new int[vals.length]; + for (String v : vals) + { + try + { + result[c++] = Integer.parseInt(v); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val); + } + } + return result; + } + + public List getIntegerList(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final List result = new ArrayList<>(); + for (int i : getIntArray(key, splitOn)) + { + result.add(i); + } + return result; + } + + @Override + public long getLong(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Long value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).longValue(); + } + try + { + return Long.parseLong((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Long value required, but found: " + val); + } + } + + @Override + public long getLong(String key, long defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).longValue(); + } + try + { + return Long.parseLong((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Long value required, but found: " + val); + } + } + + public long increaseLong(String key, long increaseWith) + { + final long newValue = getLong(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public long increaseLong(String key, long defaultValue, long increaseWith) + { + final long newValue = getLong(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public float getFloat(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Float value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).floatValue(); + } + try + { + return Float.parseFloat((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Float value required, but found: " + val); + } + } + + @Override + public float getFloat(String key, float defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).floatValue(); + } + try + { + return Float.parseFloat((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Float value required, but found: " + val); + } + } + + public float increaseFloat(String key, float increaseWith) + { + final float newValue = getFloat(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public float increaseFloat(String key, float defaultValue, float increaseWith) + { + final float newValue = getFloat(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public double getDouble(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Double value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).doubleValue(); + } + try + { + return Double.parseDouble((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Double value required, but found: " + val); + } + } + + @Override + public double getDouble(String key, double defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).doubleValue(); + } + try + { + return Double.parseDouble((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Double value required, but found: " + val); + } + } + + public double increaseDouble(String key, double increaseWith) + { + final double newValue = getDouble(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public double increaseDouble(String key, double defaultValue, double increaseWith) + { + final double newValue = getDouble(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public String getString(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("String value required, but not specified"); + } + return String.valueOf(val); + } + + @Override + public String getString(String key, String defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + return String.valueOf(val); + } + + @Override + public Duration getDuration(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("String value required, but not specified"); + } + return TimeUtil.parseDuration(String.valueOf(val)); + } + + @Override + public Duration getDuration(String key, Duration defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + return TimeUtil.parseDuration(String.valueOf(val)); + } + + @Override + @SuppressWarnings("unchecked") + public > T getEnum(String key, Class enumClass) + { + Objects.requireNonNull(key); + Objects.requireNonNull(enumClass); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but not specified"); + } + if (enumClass.isInstance(val)) + { + return (T) val; + } + try + { + return Enum.valueOf(enumClass, String.valueOf(val)); + } + catch (Exception e) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); + } + } + + @Override + @SuppressWarnings("unchecked") + public > T getEnum(String key, Class enumClass, T defaultValue) + { + Objects.requireNonNull(key); + Objects.requireNonNull(enumClass); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (enumClass.isInstance(val)) + { + return (T) val; + } + try + { + return Enum.valueOf(enumClass, String.valueOf(val)); + } + catch (Exception e) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); + } + } + + @SuppressWarnings("unchecked") + public A getObject(String name, Class type) + { + Objects.requireNonNull(name); + Objects.requireNonNull(type); + final Object obj = _set.get(name); + if ((obj == null) || !type.isAssignableFrom(obj.getClass())) + { + return null; + } + + return (A) obj; + } + + @SuppressWarnings("unchecked") + public A getObject(String name, Class type, A defaultValue) + { + Objects.requireNonNull(name); + Objects.requireNonNull(type); + final Object obj = _set.get(name); + if ((obj == null) || !type.isAssignableFrom(obj.getClass())) + { + return defaultValue; + } + + return (A) obj; + } + + public SkillHolder getSkillHolder(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof SkillHolder)) + { + return null; + } + + return (SkillHolder) obj; + } + + public Location getLocation(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof Location)) + { + return null; + } + return (Location) obj; + } + + @SuppressWarnings("unchecked") + public List getMinionList(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return Collections.emptyList(); + } + + return (List) obj; + } + + @SuppressWarnings("unchecked") + public List getList(String key, Class clazz) + { + Objects.requireNonNull(key); + Objects.requireNonNull(clazz); + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return null; + } + + final List originalList = (List) obj; + if (!originalList.isEmpty() && !originalList.stream().allMatch(clazz::isInstance)) + { + if (clazz.getSuperclass() == Enum.class) + { + throw new IllegalAccessError("Please use getEnumList if you want to get list of Enums!"); + } + + // Attempt to convert the list + final List convertedList = convertList(originalList, clazz); + if (convertedList == null) + { + LOGGER.log(Level.WARNING, "getList(\"" + key + "\", " + clazz.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); + return null; + } + + // Overwrite the existing list with proper generic type + _set.put(key, convertedList); + return convertedList; + } + return (List) obj; + } + + public List getList(String key, Class clazz, List defaultValue) + { + final List list = getList(key, clazz); + return list == null ? defaultValue : list; + } + + @SuppressWarnings("unchecked") + public > List getEnumList(String key, Class clazz) + { + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return null; + } + + final List originalList = (List) obj; + if (!originalList.isEmpty() && (obj.getClass().getGenericInterfaces()[0] != clazz) && originalList.stream().allMatch(name -> Util.isEnum(name.toString(), clazz))) + { + final List convertedList = originalList.stream().map(Object::toString).map(name -> Enum.valueOf(clazz, name)).map(clazz::cast).collect(Collectors.toList()); + + // Overwrite the existing list with proper generic type + _set.put(key, convertedList); + return convertedList; + } + return (List) obj; + } + + /** + * @param + * @param originalList + * @param clazz + * @return + */ + private List convertList(List originalList, Class clazz) + { + if (clazz == Integer.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isInteger)) + { + return originalList.stream().map(Object::toString).map(Integer::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + else if (clazz == Float.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isFloat)) + { + return originalList.stream().map(Object::toString).map(Float::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + else if (clazz == Double.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isDouble)) + { + return originalList.stream().map(Object::toString).map(Double::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + return null; + } + + @SuppressWarnings("unchecked") + public Map getMap(String key, Class keyClass, Class valueClass) + { + final Object obj = _set.get(key); + if (!(obj instanceof Map)) + { + return null; + } + + final Map originalList = (Map) obj; + if (!originalList.isEmpty() && ((!originalList.keySet().stream().allMatch(keyClass::isInstance)) || (!originalList.values().stream().allMatch(valueClass::isInstance)))) + { + LOGGER.log(Level.WARNING, "getMap(\"" + key + "\", " + keyClass.getSimpleName() + ", " + valueClass.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); + } + return (Map) obj; + } + + public StatSet set(String name, Object value) + { + if (value == null) + { + return this; + } + _set.put(name, value); + return this; + } + + public StatSet set(String key, boolean value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, byte value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, short value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, int value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, long value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, float value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, double value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, String value) + { + if (value == null) + { + return this; + } + _set.put(key, value); + return this; + } + + public StatSet set(String key, Enum value) + { + if (value == null) + { + return this; + } + _set.put(key, value); + return this; + } + + public static StatSet valueOf(String key, Object value) + { + final StatSet set = new StatSet(); + set.set(key, value); + return set; + } + + public void remove(String key) + { + _set.remove(key); + } + + public boolean contains(String name) + { + return _set.containsKey(name); + } + + @Override + public String toString() + { + return "StatSet{_set=" + _set + '}'; + } +} diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/StatsSet.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/StatsSet.java deleted file mode 100644 index 1062ae7f1b..0000000000 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/StatsSet.java +++ /dev/null @@ -1,968 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.ConcurrentHashMap; -import java.util.function.Supplier; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.stream.Collectors; - -import org.l2jmobius.commons.util.TimeUtil; -import org.l2jmobius.gameserver.model.holders.MinionHolder; -import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.interfaces.IParserAdvUtils; -import org.l2jmobius.gameserver.util.Util; - -/** - * This class is meant to hold a set of (key,value) pairs.
    - * They are stored as object but can be retrieved in any type wanted. As long as cast is available.
    - * @author mkizub - */ -public class StatsSet implements IParserAdvUtils -{ - private static final Logger LOGGER = Logger.getLogger(StatsSet.class.getName()); - /** Static empty immutable map, used to avoid multiple null checks over the source. */ - public static final StatsSet EMPTY_STATSET = new StatsSet(Collections.emptyMap()); - - private final Map _set; - - public StatsSet() - { - this(ConcurrentHashMap::new); - } - - public StatsSet(Supplier> mapFactory) - { - this(mapFactory.get()); - } - - public StatsSet(Map map) - { - _set = map; - } - - /** - * Returns the set of values - * @return HashMap - */ - public Map getSet() - { - return _set; - } - - /** - * Add a set of couple values in the current set - * @param newSet : StatsSet pointing out the list of couples to add in the current set - */ - public void merge(StatsSet newSet) - { - _set.putAll(newSet.getSet()); - } - - /** - * Verifies if the stat set is empty. - * @return {@code true} if the stat set is empty, {@code false} otherwise - */ - public boolean isEmpty() - { - return _set.isEmpty(); - } - - /** - * Return the boolean value associated with key. - * @param key : String designating the key in the set - * @return boolean : value associated to the key - * @throws IllegalArgumentException : If value is not set or value is not boolean - */ - @Override - public boolean getBoolean(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Boolean value required, but not specified"); - } - if (val instanceof Boolean) - { - return ((Boolean) val).booleanValue(); - } - try - { - return Boolean.parseBoolean((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Boolean value required, but found: " + val); - } - } - - /** - * Return the boolean value associated with key.
    - * If no value is associated with key, or type of value is wrong, returns defaultValue. - * @param key : String designating the key in the entry set - * @return boolean : value associated to the key - */ - @Override - public boolean getBoolean(String key, boolean defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Boolean) - { - return ((Boolean) val).booleanValue(); - } - try - { - return Boolean.parseBoolean((String) val); - } - catch (Exception e) - { - return defaultValue; - } - } - - @Override - public byte getByte(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Byte value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).byteValue(); - } - try - { - return Byte.parseByte((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - - @Override - public byte getByte(String key, byte defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).byteValue(); - } - try - { - return Byte.parseByte((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - - public short increaseByte(String key, byte increaseWith) - { - final byte newValue = (byte) (getByte(key) + increaseWith); - set(key, newValue); - return newValue; - } - - public short increaseByte(String key, byte defaultValue, byte increaseWith) - { - final byte newValue = (byte) (getByte(key, defaultValue) + increaseWith); - set(key, newValue); - return newValue; - } - - public byte[] getByteArray(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Byte value required, but not specified"); - } - if (val instanceof Number) - { - return new byte[] - { - ((Number) val).byteValue() - }; - } - int c = 0; - final String[] vals = ((String) val).split(splitOn); - final byte[] result = new byte[vals.length]; - for (String v : vals) - { - try - { - result[c++] = Byte.parseByte(v); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - return result; - } - - public List getByteList(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final List result = new ArrayList<>(); - for (Byte i : getByteArray(key, splitOn)) - { - result.add(i); - } - return result; - } - - @Override - public short getShort(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Short value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).shortValue(); - } - try - { - return Short.parseShort((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Short value required, but found: " + val); - } - } - - @Override - public short getShort(String key, short defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).shortValue(); - } - try - { - return Short.parseShort((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Short value required, but found: " + val); - } - } - - public short increaseShort(String key, short increaseWith) - { - final short newValue = (short) (getShort(key) + increaseWith); - set(key, newValue); - return newValue; - } - - public short increaseShort(String key, short defaultValue, short increaseWith) - { - final short newValue = (short) (getShort(key, defaultValue) + increaseWith); - set(key, newValue); - return newValue; - } - - @Override - public int getInt(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Integer value required, but not specified: " + key + "!"); - } - - if (val instanceof Number) - { - return ((Number) val).intValue(); - } - - try - { - return Integer.parseInt((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val + "!"); - } - } - - @Override - public int getInt(String key, int defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).intValue(); - } - try - { - return Integer.parseInt((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val); - } - } - - public int increaseInt(String key, int increaseWith) - { - final int newValue = getInt(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public int increaseInt(String key, int defaultValue, int increaseWith) - { - final int newValue = getInt(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - public int[] getIntArray(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Integer value required, but not specified"); - } - if (val instanceof Number) - { - return new int[] - { - ((Number) val).intValue() - }; - } - int c = 0; - final String[] vals = ((String) val).split(splitOn); - final int[] result = new int[vals.length]; - for (String v : vals) - { - try - { - result[c++] = Integer.parseInt(v); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val); - } - } - return result; - } - - public List getIntegerList(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final List result = new ArrayList<>(); - for (int i : getIntArray(key, splitOn)) - { - result.add(i); - } - return result; - } - - @Override - public long getLong(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Long value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).longValue(); - } - try - { - return Long.parseLong((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Long value required, but found: " + val); - } - } - - @Override - public long getLong(String key, long defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).longValue(); - } - try - { - return Long.parseLong((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Long value required, but found: " + val); - } - } - - public long increaseLong(String key, long increaseWith) - { - final long newValue = getLong(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public long increaseLong(String key, long defaultValue, long increaseWith) - { - final long newValue = getLong(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public float getFloat(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Float value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).floatValue(); - } - try - { - return Float.parseFloat((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Float value required, but found: " + val); - } - } - - @Override - public float getFloat(String key, float defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).floatValue(); - } - try - { - return Float.parseFloat((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Float value required, but found: " + val); - } - } - - public float increaseFloat(String key, float increaseWith) - { - final float newValue = getFloat(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public float increaseFloat(String key, float defaultValue, float increaseWith) - { - final float newValue = getFloat(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public double getDouble(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Double value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).doubleValue(); - } - try - { - return Double.parseDouble((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Double value required, but found: " + val); - } - } - - @Override - public double getDouble(String key, double defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).doubleValue(); - } - try - { - return Double.parseDouble((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Double value required, but found: " + val); - } - } - - public double increaseDouble(String key, double increaseWith) - { - final double newValue = getDouble(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public double increaseDouble(String key, double defaultValue, double increaseWith) - { - final double newValue = getDouble(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public String getString(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("String value required, but not specified"); - } - return String.valueOf(val); - } - - @Override - public String getString(String key, String defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - return String.valueOf(val); - } - - @Override - public Duration getDuration(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("String value required, but not specified"); - } - return TimeUtil.parseDuration(String.valueOf(val)); - } - - @Override - public Duration getDuration(String key, Duration defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - return TimeUtil.parseDuration(String.valueOf(val)); - } - - @Override - @SuppressWarnings("unchecked") - public > T getEnum(String key, Class enumClass) - { - Objects.requireNonNull(key); - Objects.requireNonNull(enumClass); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but not specified"); - } - if (enumClass.isInstance(val)) - { - return (T) val; - } - try - { - return Enum.valueOf(enumClass, String.valueOf(val)); - } - catch (Exception e) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); - } - } - - @Override - @SuppressWarnings("unchecked") - public > T getEnum(String key, Class enumClass, T defaultValue) - { - Objects.requireNonNull(key); - Objects.requireNonNull(enumClass); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (enumClass.isInstance(val)) - { - return (T) val; - } - try - { - return Enum.valueOf(enumClass, String.valueOf(val)); - } - catch (Exception e) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); - } - } - - @SuppressWarnings("unchecked") - public A getObject(String name, Class type) - { - Objects.requireNonNull(name); - Objects.requireNonNull(type); - final Object obj = _set.get(name); - if ((obj == null) || !type.isAssignableFrom(obj.getClass())) - { - return null; - } - - return (A) obj; - } - - @SuppressWarnings("unchecked") - public A getObject(String name, Class type, A defaultValue) - { - Objects.requireNonNull(name); - Objects.requireNonNull(type); - final Object obj = _set.get(name); - if ((obj == null) || !type.isAssignableFrom(obj.getClass())) - { - return defaultValue; - } - - return (A) obj; - } - - public SkillHolder getSkillHolder(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof SkillHolder)) - { - return null; - } - - return (SkillHolder) obj; - } - - public Location getLocation(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof Location)) - { - return null; - } - return (Location) obj; - } - - @SuppressWarnings("unchecked") - public List getMinionList(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return Collections.emptyList(); - } - - return (List) obj; - } - - @SuppressWarnings("unchecked") - public List getList(String key, Class clazz) - { - Objects.requireNonNull(key); - Objects.requireNonNull(clazz); - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return null; - } - - final List originalList = (List) obj; - if (!originalList.isEmpty() && !originalList.stream().allMatch(clazz::isInstance)) - { - if (clazz.getSuperclass() == Enum.class) - { - throw new IllegalAccessError("Please use getEnumList if you want to get list of Enums!"); - } - - // Attempt to convert the list - final List convertedList = convertList(originalList, clazz); - if (convertedList == null) - { - LOGGER.log(Level.WARNING, "getList(\"" + key + "\", " + clazz.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); - return null; - } - - // Overwrite the existing list with proper generic type - _set.put(key, convertedList); - return convertedList; - } - return (List) obj; - } - - public List getList(String key, Class clazz, List defaultValue) - { - final List list = getList(key, clazz); - return list == null ? defaultValue : list; - } - - @SuppressWarnings("unchecked") - public > List getEnumList(String key, Class clazz) - { - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return null; - } - - final List originalList = (List) obj; - if (!originalList.isEmpty() && (obj.getClass().getGenericInterfaces()[0] != clazz) && originalList.stream().allMatch(name -> Util.isEnum(name.toString(), clazz))) - { - final List convertedList = originalList.stream().map(Object::toString).map(name -> Enum.valueOf(clazz, name)).map(clazz::cast).collect(Collectors.toList()); - - // Overwrite the existing list with proper generic type - _set.put(key, convertedList); - return convertedList; - } - return (List) obj; - } - - /** - * @param - * @param originalList - * @param clazz - * @return - */ - private List convertList(List originalList, Class clazz) - { - if (clazz == Integer.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isInteger)) - { - return originalList.stream().map(Object::toString).map(Integer::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - else if (clazz == Float.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isFloat)) - { - return originalList.stream().map(Object::toString).map(Float::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - else if (clazz == Double.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isDouble)) - { - return originalList.stream().map(Object::toString).map(Double::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - return null; - } - - @SuppressWarnings("unchecked") - public Map getMap(String key, Class keyClass, Class valueClass) - { - final Object obj = _set.get(key); - if (!(obj instanceof Map)) - { - return null; - } - - final Map originalList = (Map) obj; - if (!originalList.isEmpty() && ((!originalList.keySet().stream().allMatch(keyClass::isInstance)) || (!originalList.values().stream().allMatch(valueClass::isInstance)))) - { - LOGGER.log(Level.WARNING, "getMap(\"" + key + "\", " + keyClass.getSimpleName() + ", " + valueClass.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); - } - return (Map) obj; - } - - public StatsSet set(String name, Object value) - { - if (value == null) - { - return this; - } - _set.put(name, value); - return this; - } - - public StatsSet set(String key, boolean value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, byte value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, short value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, int value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, long value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, float value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, double value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, String value) - { - if (value == null) - { - return this; - } - _set.put(key, value); - return this; - } - - public StatsSet set(String key, Enum value) - { - if (value == null) - { - return this; - } - _set.put(key, value); - return this; - } - - public static StatsSet valueOf(String key, Object value) - { - final StatsSet set = new StatsSet(); - set.set(key, value); - return set; - } - - public void remove(String key) - { - _set.remove(key); - } - - public boolean contains(String name) - { - return _set.containsKey(name); - } - - @Override - public String toString() - { - return "StatsSet{_set=" + _set + '}'; - } -} diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 1ad451eaa4..9b03729b90 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.Map; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; @@ -85,12 +85,12 @@ public class CreatureTemplate extends ListenersContainer /** The creature's race. */ private Race _race; - public CreatureTemplate(StatsSet set) + public CreatureTemplate(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { // Base stats _baseSTR = set.getInt("baseSTR", 0); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java index 6bd0412460..94a0d9c4b1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.actor.templates; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; @@ -57,7 +57,7 @@ public class DoorTemplate extends CreatureTemplate implements IIdentifiable private final int _clanhallId; private final boolean _stealth; - public DoorTemplate(StatsSet set) + public DoorTemplate(StatSet set) { super(set); _doorId = set.getInt("id"); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 70b58895e6..d864392f65 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.enums.AIType; import org.l2jmobius.gameserver.enums.DropType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.DropHolder; @@ -58,7 +58,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private boolean _usingServerSideName; private String _title; private boolean _usingServerSideTitle; - private StatsSet _parameters; + private StatSet _parameters; private Sex _sex; private int _chestId; private int _rhandId; @@ -110,15 +110,15 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable /** * Constructor of Creature. - * @param set The StatsSet object to transfer data to the method + * @param set The StatSet object to transfer data to the method */ - public NpcTemplate(StatsSet set) + public NpcTemplate(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _id = set.getInt("id"); @@ -293,12 +293,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _usingServerSideTitle; } - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } - public void setParameters(StatsSet set) + public void setParameters(StatSet set) { _parameters = set; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 2a370772f6..6eb8ed173d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -50,7 +50,7 @@ public class PlayerTemplate extends CreatureTemplate private final List _creationPoints; private final Map _baseSlotDef; - public PlayerTemplate(StatsSet set, List creationPoints) + public PlayerTemplate(StatSet set, List creationPoints) { super(set); _classId = ClassId.getClassId(set.getInt("classId")); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index 23101c3b38..4b0d6dcc97 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; @@ -47,7 +47,7 @@ public class Transform implements IIdentifiable private TransformTemplate _maleTemplate; private TransformTemplate _femaleTemplate; - public Transform(StatsSet set) + public Transform(StatSet set) { _id = set.getInt("id"); _displayId = set.getInt("displayId", _id); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java index 5ec55248b4..8bb71ac375 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.actor.transform; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -31,7 +31,7 @@ public class TransformLevelData private final double _levelMod; private Map _stats; - public TransformLevelData(StatsSet set) + public TransformLevelData(StatSet set) { _level = set.getInt("val"); _levelMod = set.getDouble("levelMod"); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 5923601287..8c9c1e94bb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -23,7 +23,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -53,7 +53,7 @@ public class TransformTemplate private ExBasicActionList _list; private final Map _data = new LinkedHashMap<>(100); - public TransformTemplate(StatsSet set) + public TransformTemplate(StatSet set) { _collisionRadius = set.getDouble("radius", 0); _collisionHeight = set.getDouble("height", 0); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java index f0a0718dc5..1e0ab77670 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -25,7 +25,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.EffectHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.skills.BuffInfo; @@ -56,7 +56,7 @@ public abstract class AbstractEffect * @param set the attributes * @param params the parameters */ - protected AbstractEffect(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + protected AbstractEffect(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { _attachCond = attachCond; _name = set.getString("name"); @@ -71,7 +71,7 @@ public abstract class AbstractEffect * @param params the parameters * @return the new effect */ - public static AbstractEffect createEffect(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public static AbstractEffect createEffect(Condition attachCond, Condition applyCond, StatSet set, StatSet params) { final String name = set.getString("name"); final Class handler = EffectHandler.getInstance().getHandler(name); @@ -84,7 +84,7 @@ public abstract class AbstractEffect final Constructor constructor; try { - constructor = handler.getConstructor(Condition.class, Condition.class, StatsSet.class, StatsSet.class); + constructor = handler.getConstructor(Condition.class, Condition.class, StatSet.class, StatSet.class); } catch (NoSuchMethodException | SecurityException e) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/ClanHall.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/ClanHall.java index 77e8ad82e8..22b22f95f2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/ClanHall.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/ClanHall.java @@ -29,7 +29,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.sql.impl.ClanTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -199,7 +199,7 @@ public abstract class ClanHall } } - public ClanHall(StatsSet set) + public ClanHall(StatSet set) { _clanHallId = set.getInt("id"); _name = set.getString("name"); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/Hero.java index fc0c3fca0c..ac14c1c77f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/Hero.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/Hero.java @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.data.xml.impl.ClassListData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -73,13 +73,13 @@ public class Hero // delete hero items private static final String DELETE_ITEMS = "DELETE FROM items WHERE item_id IN (6842, 6611, 6612, 6613, 6614, 6615, 6616, 6617, 6618, 6619, 6620, 6621, 9388, 9389, 9390) AND owner_id NOT IN (SELECT charId FROM characters WHERE accesslevel > 0)"; - private static final Map HEROES = new ConcurrentHashMap<>(); - private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); + private static final Map HEROES = new ConcurrentHashMap<>(); + private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); - private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); - private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); + private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); + private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); - private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); + private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); private static final Map HERO_MESSAGE = new ConcurrentHashMap<>(); public static final String COUNT = "count"; @@ -117,7 +117,7 @@ public class Hero { while (rset.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset.getInt(Olympiad.CLASS_ID)); @@ -136,7 +136,7 @@ public class Hero while (rset2.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset2.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset2.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset2.getInt(Olympiad.CLASS_ID)); @@ -158,7 +158,7 @@ public class Hero LOGGER.info("Hero System: Loaded " + COMPLETE_HEROS.size() + " all time Heroes."); } - private void processHeros(PreparedStatement ps, int charId, StatsSet hero) throws SQLException + private void processHeros(PreparedStatement ps, int charId, StatSet hero) throws SQLException { ps.setInt(1, charId); try (ResultSet rs = ps.executeQuery()) @@ -223,7 +223,7 @@ public class Hero public void loadDiary(int charId) { - final List diary = new ArrayList<>(); + final List diary = new ArrayList<>(); int diaryentries = 0; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement("SELECT * FROM heroes_diary WHERE charId=? ORDER BY time ASC")) @@ -233,7 +233,7 @@ public class Hero { while (rset.next()) { - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final long time = rset.getLong("time"); final int action = rset.getInt("action"); @@ -278,8 +278,8 @@ public class Hero public void loadFights(int charId) { - final List fights = new ArrayList<>(); - final StatsSet heroCountData = new StatsSet(); + final List fights = new ArrayList<>(); + final StatSet heroCountData = new StatSet(); final Calendar data = Calendar.getInstance(); data.set(Calendar.DAY_OF_MONTH, 1); data.set(Calendar.HOUR_OF_DAY, 0); @@ -325,7 +325,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charTwoClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -361,7 +361,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charOneClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -409,14 +409,14 @@ public class Hero } } - public Map getHeroes() + public Map getHeroes() { return HEROES; } public int getHeroByClass(int classid) { - for (Entry e : HEROES.entrySet()) + for (Entry e : HEROES.entrySet()) { if (e.getValue().getInt(Olympiad.CLASS_ID) == classid) { @@ -438,7 +438,7 @@ public class Hero { final int perpage = 10; - final List mainList = HERO_DIARY.get(charid); + final List mainList = HERO_DIARY.get(charid); if (mainList != null) { final NpcHtmlMessage diaryReply = new NpcHtmlMessage(); @@ -453,7 +453,7 @@ public class Hero if (!mainList.isEmpty()) { - final List list = new ArrayList<>(mainList); + final List list = new ArrayList<>(mainList); Collections.reverse(list); boolean color = true; @@ -463,7 +463,7 @@ public class Hero for (int i = (page - 1) * perpage; i < list.size(); i++) { breakat = i; - final StatsSet diaryEntry = list.get(i); + final StatSet diaryEntry = list.get(i); fList.append(""); if (color) { @@ -524,7 +524,7 @@ public class Hero int loss = 0; int draw = 0; - final List heroFights = HERO_FIGHTS.get(charid); + final List heroFights = HERO_FIGHTS.get(charid); if (heroFights != null) { final NpcHtmlMessage fightReply = new NpcHtmlMessage(); @@ -536,7 +536,7 @@ public class Hero if (!heroFights.isEmpty()) { - final StatsSet heroCount = HERO_COUNTS.get(charid); + final StatSet heroCount = HERO_COUNTS.get(charid); if (heroCount != null) { win = heroCount.getInt("victory"); @@ -551,7 +551,7 @@ public class Hero for (int i = (page - 1) * perpage; i < heroFights.size(); i++) { breakat = i; - final StatsSet fight = heroFights.get(i); + final StatSet fight = heroFights.get(i); fList.append(""); if (color) { @@ -609,7 +609,7 @@ public class Hero } } - public synchronized void computeNewHeroes(List newHeroes) + public synchronized void computeNewHeroes(List newHeroes) { updateHeroes(true); @@ -659,13 +659,13 @@ public class Hero return; } - for (StatsSet hero : newHeroes) + for (StatSet hero : newHeroes) { final int charId = hero.getInt(Olympiad.CHAR_ID); if (COMPLETE_HEROS.containsKey(charId)) { - final StatsSet oldHero = COMPLETE_HEROS.get(charId); + final StatSet oldHero = COMPLETE_HEROS.get(charId); final int count = oldHero.getInt(COUNT); oldHero.set(COUNT, count + 1); oldHero.set(PLAYED, 1); @@ -674,7 +674,7 @@ public class Hero } else { - final StatsSet newHero = new StatsSet(); + final StatSet newHero = new StatSet(); newHero.set(Olympiad.CHAR_NAME, hero.getString(Olympiad.CHAR_NAME)); newHero.set(Olympiad.CLASS_ID, hero.getInt(Olympiad.CLASS_ID)); newHero.set(COUNT, 1); @@ -700,9 +700,9 @@ public class Hero } else { - StatsSet hero; + StatSet hero; int heroId; - for (Entry entry : HEROES.entrySet()) + for (Entry entry : HEROES.entrySet()) { hero = entry.getValue(); heroId = entry.getKey(); @@ -787,13 +787,13 @@ public class Hero setDiaryData(charId, ACTION_RAID_KILLED, npcId); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (template == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -806,13 +806,13 @@ public class Hero setDiaryData(charId, ACTION_CASTLE_TAKEN, castleId); final Castle castle = CastleManager.getInstance().getCastleById(castleId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (castle == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -919,10 +919,10 @@ public class Hero */ public void claimHero(PlayerInstance player) { - StatsSet hero = HEROES.get(player.getObjectId()); + StatSet hero = HEROES.get(player.getObjectId()); if (hero == null) { - hero = new StatsSet(); + hero = new StatSet(); HEROES.put(player.getObjectId(), hero); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/clanhall/AuctionableHall.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/clanhall/AuctionableHall.java index b1f35bde04..071b07d51b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/clanhall/AuctionableHall.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/clanhall/AuctionableHall.java @@ -26,7 +26,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; import org.l2jmobius.gameserver.instancemanager.ClanHallManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -42,7 +42,7 @@ public class AuctionableHall extends ClanHall protected boolean _paid; final int _lease; - public AuctionableHall(StatsSet set) + public AuctionableHall(StatSet set) { super(set); _paidUntil = set.getLong("paidUntil"); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/clanhall/SiegableHall.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/clanhall/SiegableHall.java index c602b48ea7..aa5ac6f89f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/clanhall/SiegableHall.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/clanhall/SiegableHall.java @@ -24,7 +24,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.SiegeClan.SiegeClanType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -56,7 +56,7 @@ public class SiegableHall extends ClanHall private ClanHallSiegeEngine _siege; - public SiegableHall(StatsSet set) + public SiegableHall(StatSet set) { super(set); _siegeLength = set.getLong("siegeLenght"); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/fishing/Fish.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/fishing/Fish.java index 88856e5dc6..b0a4b7ff95 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/fishing/Fish.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/fishing/Fish.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.fishing; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * Class for the Fish object. @@ -42,7 +42,7 @@ public class Fish implements Cloneable private final double _cheatingProb; private final int _fishGrade; - public Fish(StatsSet set) + public Fish(StatSet set) { _fishId = set.getInt("fishId"); _itemId = set.getInt("itemId"); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/fishing/FishingMonster.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/fishing/FishingMonster.java index 2d27304dfb..569d1ec33a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/fishing/FishingMonster.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/fishing/FishingMonster.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.fishing; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * Class for the Fishing Monsters object. @@ -29,7 +29,7 @@ public class FishingMonster private final int _fishingMonsterId; private final int _probability; - public FishingMonster(StatsSet set) + public FishingMonster(StatSet set) { _userMinLevel = set.getInt("userMinLevel"); _userMaxLevel = set.getInt("userMaxLevel"); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/fishing/FishingRod.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/fishing/FishingRod.java index 3b7dc6d0fa..a39620ccf9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/fishing/FishingRod.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/fishing/FishingRod.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.fishing; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * Class for the Fishing Rod object. @@ -30,7 +30,7 @@ public class FishingRod private final String _fishingRodName; private final double _fishingRodDamage; - public FishingRod(StatsSet set) + public FishingRod(StatSet set) { _fishingRodId = set.getInt("fishingRodId"); _fishingRodItemId = set.getInt("fishingRodItemId"); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java index 16454d764a..d63d4eb775 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -52,7 +52,7 @@ public class FakePlayerHolder private final int _clanId; private final int _pledgeStatus; - public FakePlayerHolder(StatsSet set) + public FakePlayerHolder(StatSet set) { _classId = set.getInt("classId", 182); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 86a3d309ba..230025c67a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -43,7 +43,7 @@ import org.l2jmobius.gameserver.enums.InstanceRemoveBuffType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldRegion; @@ -73,9 +73,9 @@ public class Instance private boolean _allowRandomWalk = true; private final Collection _players = ConcurrentHashMap.newKeySet(); private final Collection _npcs = ConcurrentHashMap.newKeySet(); - private final Collection _doorTemplates = ConcurrentHashMap.newKeySet(); + private final Collection _doorTemplates = ConcurrentHashMap.newKeySet(); private final Map _doors = new ConcurrentHashMap<>(); - private final Collection _spawnTemplates = ConcurrentHashMap.newKeySet(); + private final Collection _spawnTemplates = ConcurrentHashMap.newKeySet(); private Collection _enterLocations = ConcurrentHashMap.newKeySet(); private Location _exitLocation = null; private boolean _allowSummon = true; @@ -245,9 +245,9 @@ public class Instance /** * Adds a door into the instance - * @param set - StatsSet for initializing door + * @param set - StatSet for initializing door */ - public void addDoor(StatsSet set) + public void addDoor(StatSet set) { if (_doorTemplates.contains(set)) { @@ -262,11 +262,11 @@ public class Instance */ public void spawnDoors() { - for (StatsSet template : _doorTemplates) + for (StatSet template : _doorTemplates) { // Create new door instance final int doorId = template.getInt("DoorId"); - final StatsSet doorTemplate = DoorData.getInstance().getDoorTemplate(doorId); + final StatSet doorTemplate = DoorData.getInstance().getDoorTemplate(doorId); final DoorInstance newdoor = new DoorInstance(new DoorTemplate(doorTemplate)); newdoor.setInstanceId(_id); newdoor.setCurrentHp(newdoor.getMaxHp()); @@ -420,7 +420,7 @@ public class Instance public List spawnGroup(String groupName) { final List spawnedNpcs = new ArrayList<>(); - for (StatsSet set : _spawnTemplates) + for (StatSet set : _spawnTemplates) { if (set.getString("spawnGroup").equals(groupName)) { @@ -569,7 +569,7 @@ public class Instance if ("door".equalsIgnoreCase(d.getNodeName())) { doorId = Integer.parseInt(d.getAttributes().getNamedItem("id").getNodeValue()); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.set("DoorId", doorId); for (Node bean = d.getFirstChild(); bean != null; bean = bean.getNextSibling()) { @@ -631,7 +631,7 @@ public class Instance allowRandomWalk = Boolean.parseBoolean(d.getAttributes().getNamedItem("allowRandomWalk").getNodeValue()); } - final StatsSet spawnSet = new StatsSet(); + final StatSet spawnSet = new StatSet(); spawnSet.set("spawnGroup", spawnGroup); spawnSet.set("npcId", npcId); spawnSet.set("x", x); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/InstanceWorld.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/InstanceWorld.java index 758567f7e0..08906b6b72 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/InstanceWorld.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/InstanceWorld.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; @@ -37,7 +37,7 @@ public class InstanceWorld { private Instance _instance; private final Set _players = ConcurrentHashMap.newKeySet(); - private final StatsSet _parameters = new StatsSet(); + private final StatSet _parameters = new StatSet(); /** * Sets the instance. @@ -110,7 +110,7 @@ public class InstanceWorld * Get instance world parameters. * @return instance parameters */ - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java index d97b75f419..c329766e9e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.itemauction; import java.util.Calendar; import java.util.concurrent.TimeUnit; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Forsaiken @@ -40,7 +40,7 @@ public class AuctionDateGenerator private int _hour_of_day; private int _minute_of_hour; - public AuctionDateGenerator(StatsSet config) + public AuctionDateGenerator(StatSet config) { _calendar = Calendar.getInstance(); _interval = config.getInt(FIELD_INTERVAL, -1); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 57a31cd5ac..6bcc634b46 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.itemauction; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.model.Augmentation; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; /** @@ -32,9 +32,9 @@ public class AuctionItem private final int _itemId; private final long _itemCount; - private final StatsSet _itemExtra; + private final StatSet _itemExtra; - public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatsSet itemExtra) + public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatSet itemExtra) { _auctionItemId = auctionItemId; _auctionLength = auctionLength; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 27840b4711..c4d350b8c5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -45,7 +45,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -85,7 +85,7 @@ public class ItemAuctionInstance _items = new ArrayList<>(); final NamedNodeMap nanode = node.getAttributes(); - final StatsSet generatorConfig = new StatsSet(); + final StatSet generatorConfig = new StatSet(); for (int i = nanode.getLength(); i-- > 0;) { final Node n = nanode.item(i); @@ -116,7 +116,7 @@ public class ItemAuctionInstance throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } - final StatsSet itemExtra = new StatsSet(); + final StatSet itemExtra = new StatSet(); final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Armor.java index 127ff02d8c..59403e35df 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Armor.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; @@ -34,15 +34,15 @@ public class Armor extends Item /** * Constructor for Armor. - * @param set the StatsSet designating the set of couples (key,value) characterizing the armor. + * @param set the StatSet designating the set of couples (key,value) characterizing the armor. */ - public Armor(StatsSet set) + public Armor(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/EtcItem.java index 38552b7d51..3746d54d2c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/EtcItem.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -36,15 +36,15 @@ public class EtcItem extends Item /** * Constructor for EtcItem. - * @param set StatsSet designating the set of couples (key,value) for description of the Etc + * @param set StatSet designating the set of couples (key,value) for description of the Etc */ - public EtcItem(StatsSet set) + public EtcItem(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Henna.java index 8dac2a1b6a..50b4611f63 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.items; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; /** @@ -42,7 +42,7 @@ public class Henna private final int _cancel_count; private final List _wear_class; - public Henna(StatsSet set) + public Henna(StatSet set) { _dyeId = set.getInt("dyeId"); _dyeItemId = set.getInt("dyeItemId"); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Item.java index c204b0f717..e96459fbc7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Item.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.ItemGrade; import org.l2jmobius.gameserver.model.Elementals; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; @@ -155,14 +155,14 @@ public abstract class Item extends ListenersContainer implements IIdentifiable /** * Constructor of the Item that fill class variables.
    *
    - * @param set : StatsSet corresponding to a set of couples (key,value) for description of the item + * @param set : StatSet corresponding to a set of couples (key,value) for description of the item */ - protected Item(StatsSet set) + protected Item(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { _itemId = set.getInt("item_id"); _displayId = set.getInt("displayId", _itemId); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java index dfe114707a..c632a41dfb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -29,7 +29,7 @@ public class PlayerItemTemplate extends ItemHolder /** * @param set the set containing the values for this object */ - public PlayerItemTemplate(StatsSet set) + public PlayerItemTemplate(StatSet set) { super(set.getInt("id"), set.getInt("count")); _equipped = set.getBoolean("equipped", false); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Weapon.java index db59da128c..1f9b4b1c3d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Weapon.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -69,15 +69,15 @@ public class Weapon extends Item /** * Constructor for Weapon. - * @param set the StatsSet designating the set of couples (key,value) characterizing the weapon. + * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. */ - public Weapon(StatsSet set) + public Weapon(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java index 1edb6aea57..912bf4d895 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.CrystalType; @@ -51,7 +51,7 @@ public abstract class AbstractEnchantItem private final int _maxEnchantLevel; private final double _bonusRate; - public AbstractEnchantItem(StatsSet set) + public AbstractEnchantItem(StatSet set) { _id = set.getInt("id"); if (getItem() == null) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java index 3da036859a..866e47b80a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java @@ -23,7 +23,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -40,7 +40,7 @@ public class EnchantScroll extends AbstractEnchantItem private final int _scrollGroupId; private Set _items; - public EnchantScroll(StatsSet set) + public EnchantScroll(StatSet set) { super(set); _scrollGroupId = set.getInt("scrollGroupId", 0); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java index f4f95738c7..e0314ae7f0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items.enchant; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.type.EtcItemType; /** @@ -26,7 +26,7 @@ public class EnchantSupportItem extends AbstractEnchantItem { private final boolean _isWeapon; - public EnchantSupportItem(StatsSet set) + public EnchantSupportItem(StatSet set) { super(set); _isWeapon = getItem().getItemType() == EtcItemType.SCRL_INC_ENCHANT_PROP_WP; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/multisell/Ingredient.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/multisell/Ingredient.java index 384d0ae554..cfd168fe63 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/multisell/Ingredient.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/multisell/Ingredient.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.multisell; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Armor; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.items.Weapon; @@ -36,7 +36,7 @@ public class Ingredient private Item _template = null; private ItemInfo _itemInfo = null; - public Ingredient(StatsSet set) + public Ingredient(StatSet set) { this(set.getInt("id"), set.getLong("count"), set.getInt("enchantmentLevel", 0), set.getBoolean("isTaxIngredient", false), set.getBoolean("maintainIngredient", false)); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 1ca32c28f7..f6e46dc7f0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -40,7 +40,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.entity.Hero; @@ -57,8 +57,8 @@ public class Olympiad extends ListenersContainer protected static final Logger LOGGER = Logger.getLogger(Olympiad.class.getName()); protected static final Logger LOGGER_OLYMPIAD = Logger.getLogger("olympiad"); - private static final Map NOBLES = new ConcurrentHashMap<>(); - private static final List HEROS_TO_BE = new ArrayList<>(); + private static final Map NOBLES = new ConcurrentHashMap<>(); + private static final List HEROS_TO_BE = new ArrayList<>(); private static final Map NOBLES_RANK = new HashMap<>(); public static final String OLYMPIAD_HTML_PATH = "data/html/olympiad/"; @@ -262,10 +262,10 @@ public class Olympiad extends ListenersContainer Statement s = con.createStatement(); ResultSet rset = s.executeQuery(OLYMPIAD_LOAD_NOBLES)) { - StatsSet statData; + StatSet statData; while (rset.next()) { - statData = new StatsSet(); + statData = new StatSet(); statData.set(CLASS_ID, rset.getInt(CLASS_ID)); statData.set(CHAR_NAME, rset.getString(CHAR_NAME)); statData.set(POINTS, rset.getInt(POINTS)); @@ -473,9 +473,9 @@ public class Olympiad extends ListenersContainer protected class OlympiadEndTask implements Runnable { - private final List _herosToBe; + private final List _herosToBe; - public OlympiadEndTask(List herosToBe) + public OlympiadEndTask(List herosToBe) { _herosToBe = herosToBe; } @@ -530,7 +530,7 @@ public class Olympiad extends ListenersContainer return NOBLES.size(); } - protected static StatsSet getNobleStats(int playerId) + protected static StatSet getNobleStats(int playerId) { return NOBLES.get(playerId); } @@ -849,7 +849,7 @@ public class Olympiad extends ListenersContainer } int currentPoints; - for (StatsSet nobleInfo : NOBLES.values()) + for (StatSet nobleInfo : NOBLES.values()) { currentPoints = nobleInfo.getInt(POINTS); currentPoints += WEEKLY_POINTS; @@ -867,7 +867,7 @@ public class Olympiad extends ListenersContainer return; } - for (StatsSet nobleInfo : NOBLES.values()) + for (StatSet nobleInfo : NOBLES.values()) { nobleInfo.set(COMP_DONE_WEEK, 0); nobleInfo.set(COMP_DONE_WEEK_CLASSED, 0); @@ -903,9 +903,9 @@ public class Olympiad extends ListenersContainer try (Connection con = DatabaseFactory.getConnection()) { - for (Entry entry : NOBLES.entrySet()) + for (Entry entry : NOBLES.entrySet()) { - final StatsSet nobleInfo = entry.getValue(); + final StatSet nobleInfo = entry.getValue(); if (nobleInfo == null) { @@ -1037,8 +1037,8 @@ public class Olympiad extends ListenersContainer if (NOBLES != null) { LOGGER_OLYMPIAD.info("Noble,charid,classid,compDone,points"); - StatsSet nobleInfo; - for (Entry entry : NOBLES.entrySet()) + StatSet nobleInfo; + for (Entry entry : NOBLES.entrySet()) { nobleInfo = entry.getValue(); if (nobleInfo == null) @@ -1059,8 +1059,8 @@ public class Olympiad extends ListenersContainer try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(OLYMPIAD_GET_HEROS)) { - StatsSet hero; - final List soulHounds = new ArrayList<>(); + StatSet hero; + final List soulHounds = new ArrayList<>(); for (int element : HERO_IDS) { ps.setInt(1, element); @@ -1069,7 +1069,7 @@ public class Olympiad extends ListenersContainer { if (rset.next()) { - hero = new StatsSet(); + hero = new StatSet(); hero.set(CLASS_ID, element); hero.set(CHAR_ID, rset.getInt(CHAR_ID)); hero.set(CHAR_NAME, rset.getString(CHAR_NAME)); @@ -1097,8 +1097,8 @@ public class Olympiad extends ListenersContainer } case 1: { - hero = new StatsSet(); - final StatsSet winner = soulHounds.get(0); + hero = new StatSet(); + final StatSet winner = soulHounds.get(0); hero.set(CLASS_ID, winner.getInt(CLASS_ID)); hero.set(CHAR_ID, winner.getInt(CHAR_ID)); hero.set(CHAR_NAME, winner.getString(CHAR_NAME)); @@ -1108,10 +1108,10 @@ public class Olympiad extends ListenersContainer } case 2: { - hero = new StatsSet(); - StatsSet winner; - final StatsSet hero1 = soulHounds.get(0); - final StatsSet hero2 = soulHounds.get(1); + hero = new StatSet(); + StatSet winner; + final StatSet hero1 = soulHounds.get(0); + final StatSet hero2 = soulHounds.get(1); final int hero1Points = hero1.getInt(POINTS); final int hero2Points = hero2.getInt(POINTS); final int hero1Comps = hero1.getInt(COMP_DONE); @@ -1194,7 +1194,7 @@ public class Olympiad extends ListenersContainer return 0; } - final StatsSet noble = NOBLES.get(objectId); + final StatSet noble = NOBLES.get(objectId); if ((noble == null) || (noble.getInt(POINTS) == 0)) { return 0; @@ -1381,7 +1381,7 @@ public class Olympiad extends ListenersContainer * @param data the stats set data to add. * @return the old stats set if the noble is already present, null otherwise. */ - protected static StatsSet addNobleStats(int charId, StatsSet data) + protected static StatSet addNobleStats(int charId, StatSet data) { return NOBLES.put(charId, data); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java index b536fc04dc..154a6e80e4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java @@ -26,7 +26,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -497,10 +497,10 @@ public class OlympiadManager return false; } - StatsSet statDat = Olympiad.getNobleStats(charId); + StatSet statDat = Olympiad.getNobleStats(charId); if (statDat == null) { - statDat = new StatsSet(); + statDat = new StatSet(); statDat.set(Olympiad.CLASS_ID, noble.getBaseClass()); statDat.set(Olympiad.CHAR_NAME, noble.getName()); statDat.set(Olympiad.POINTS, Olympiad.DEFAULT_POINTS); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/Participant.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/Participant.java index 31e7c393b9..1a204afe27 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/Participant.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/Participant.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.olympiad; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class Participant private final int baseClass; private boolean disconnected = false; private boolean defaulted = false; - private final StatsSet stats; + private final StatSet stats; public String clanName; public int clanId; @@ -125,7 +125,7 @@ public class Participant /** * @return the stats */ - public StatsSet getStats() + public StatSet getStats() { return stats; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/skills/Skill.java index 81083b9801..19d5f653be 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.ExtractableProductItem; import org.l2jmobius.gameserver.model.ExtractableSkill; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.BlockInstance; @@ -215,7 +215,7 @@ public class Skill implements IIdentifiable private final boolean _isPvPOnly; - public Skill(StatsSet set) + public Skill(StatSet set) { _id = set.getInt("skill_id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java index cc5bb04b47..1196102e51 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.variables; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.IRestorable; import org.l2jmobius.gameserver.model.interfaces.IStorable; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.interfaces.IStorable; /** * @author UnAfraid */ -public abstract class AbstractVariables extends StatsSet implements IRestorable, IStorable, IDeletable +public abstract class AbstractVariables extends StatSet implements IRestorable, IStorable, IDeletable { private final AtomicBoolean _hasChanges = new AtomicBoolean(false); @@ -41,42 +41,42 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, */ @Override - public StatsSet set(String name, boolean value) + public StatSet set(String name, boolean value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, double value) + public StatSet set(String name, double value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, Enum value) + public StatSet set(String name, Enum value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, int value) + public StatSet set(String name, int value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, long value) + public StatSet set(String name, long value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, String value) + public StatSet set(String name, String value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); @@ -89,7 +89,7 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, * @param markAsChanged * @return */ - public StatsSet set(String name, String value, boolean markAsChanged) + public StatSet set(String name, String value, boolean markAsChanged) { if (markAsChanged) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index b233b4b082..8d63964c86 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExHeroList implements IClientOutgoingPacket { - private final Map _heroList; + private final Map _heroList; public ExHeroList() { @@ -42,7 +42,7 @@ public class ExHeroList implements IClientOutgoingPacket OutgoingPackets.EX_HERO_LIST.writeId(packet); packet.writeD(_heroList.size()); - for (StatsSet hero : _heroList.values()) + for (StatSet hero : _heroList.values()) { packet.writeS(hero.getString(Olympiad.CHAR_NAME)); packet.writeD(hero.getInt(Olympiad.CLASS_ID)); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SSQStatus.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SSQStatus.java index 8cbe273b5f..3581d3af9e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SSQStatus.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SSQStatus.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.SevenSigns; import org.l2jmobius.gameserver.SevenSignsFestival; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -174,7 +174,7 @@ public class SSQStatus implements IClientOutgoingPacket // Dusk Score \\ packet.writeQ(duskScore); - StatsSet highScoreData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DUSK, i); + StatSet highScoreData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DUSK, i); String[] partyMembers = highScoreData.getString("members").split(","); if (partyMembers != null) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index b837d839d8..d12c29d422 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -138,7 +138,7 @@ public class Antharas extends AbstractNpcAI addAttackId(ANTHARAS, BOMBER, BEHEMOTH, TERASQUE); addKillId(ANTHARAS, TERASQUE, BEHEMOTH); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANTHARAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANTHARAS); final double curr_hp = info.getDouble("currentHP"); final double curr_mp = info.getDouble("currentMP"); final int loc_x = info.getInt("loc_x"); @@ -761,7 +761,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(PlayerInstance attacker, int damage) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Baium/Baium.java index a1e8eb99d5..2686236add 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -112,7 +112,7 @@ public class Baium extends AbstractNpcAI addSeeCreatureId(BAIUM); addSpellFinishedId(BAIUM); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(BAIUM); + final StatSet info = GrandBossManager.getInstance().getStatSet(BAIUM); switch (getStatus()) { @@ -666,7 +666,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Core/Core.java index bfa7212b8c..c1452bf9de 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; @@ -85,7 +85,7 @@ public class Core extends AbstractNpcAI registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR); _firstAttacked = false; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. @@ -205,9 +205,9 @@ public class Core extends AbstractNpcAI final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000; startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(CORE, info); + GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index 38eebefc7b..5e525a6caa 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -92,7 +92,7 @@ public class Orfen extends AbstractNpcAI registerMobs(mobs); _IsTeleported = false; ZONE = ZoneManager.getInstance().getZoneById(12013); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); final int status = GrandBossManager.getInstance().getBossStatus(ORFEN); if (status == DEAD) { @@ -327,9 +327,9 @@ public class Orfen extends AbstractNpcAI respawnTime *= 3600000; startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(ORFEN, info); + GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); startQuestTimer("despawn_minions", 20000, null, null); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index c2564917c7..b9fdddaaf7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; @@ -91,7 +91,7 @@ public class QueenAnt extends AbstractNpcAI addFactionCallId(NURSE); _zone = ZoneManager.getInstance().getZoneById(12012); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); final int status = GrandBossManager.getInstance().getBossStatus(QUEEN); if (status == DEAD) { @@ -367,9 +367,9 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("action", npc, null); cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(QUEEN, info); + GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); _larva.deleteMe(); _larva = null; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java index 25a584bdf9..1feccc805a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -101,7 +101,7 @@ public class CastleTeleporter extends AbstractNpcAI if (st.hasMoreTokens()) { final int unknowInt = Integer.parseInt(st.nextToken()); - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); Location teleLoc = null; switch (unknowInt) { @@ -191,7 +191,7 @@ public class CastleTeleporter extends AbstractNpcAI return htmltext; } - private Location getTeleportLocation(StatsSet npcParams, String paramName1, String paramName2, String paramName3) + private Location getTeleportLocation(StatSet npcParams, String paramName1, String paramName2, String paramName3) { final Location loc; if (getRandom(100) < 33) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java index f19f5dea69..c817501830 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java @@ -17,7 +17,7 @@ package ai.others.Servitors; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -52,7 +52,7 @@ public class TreeOfLife extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (player != null) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index d459bd2538..4f36bd6b51 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.zone.type.NoRestartZone; @@ -305,7 +305,7 @@ public class AdminGrandBoss implements IAdminCommandHandler } } - final StatsSet info = GrandBossManager.getInstance().getStatsSet(grandBossId); + final StatSet info = GrandBossManager.getInstance().getStatSet(grandBossId); final String bossRespawn = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(info.getLong("respawn_time")); final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java index f1109bf0e7..9489d8e1bb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java @@ -19,7 +19,7 @@ package handlers.admincommandhandlers; import java.util.StringTokenizer; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -114,7 +114,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.isNoble()) { - final StatsSet statDat = getPlayerSet(player); + final StatSet statDat = getPlayerSet(player); final int oldpoints = Olympiad.getInstance().getNoblePoints(player); final int points = Math.max(oldpoints + val, 0); if (points > 1000) @@ -155,7 +155,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.isNoble()) { - final StatsSet playerStat = Olympiad.getNobleStats(player.getObjectId()); + final StatSet playerStat = Olympiad.getNobleStats(player.getObjectId()); if (playerStat == null) { BuilderUtil.sendSysMessage(activeChar, "This player hasn't played on Olympiad yet!"); @@ -197,7 +197,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.isNoble()) { - final StatsSet statDat = getPlayerSet(player); + final StatSet statDat = getPlayerSet(player); final int oldpoints = Olympiad.getInstance().getNoblePoints(player); final int points = oldpoints - val; if ((points < 1) && (points > 1000)) @@ -237,12 +237,12 @@ public class AdminOlympiad implements IAdminCommandHandler return Integer.decode(token); } - private StatsSet getPlayerSet(PlayerInstance player) + private StatSet getPlayerSet(PlayerInstance player) { - StatsSet statDat = Olympiad.getNobleStats(player.getObjectId()); + StatSet statDat = Olympiad.getNobleStats(player.getObjectId()); if (statDat == null) { - statDat = new StatsSet(); + statDat = new StatSet(); statDat.set(Olympiad.CLASS_ID, player.getBaseClass()); statDat.set(Olympiad.CHAR_NAME, player.getName()); statDat.set(Olympiad.POINTS, Olympiad.DEFAULT_POINTS); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java index d8a3d6e5ce..6382651e6c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java @@ -19,7 +19,7 @@ package handlers.conditions; import java.util.List; import org.l2jmobius.gameserver.enums.CategoryType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -31,7 +31,7 @@ public class CategoryTypeCondition implements ICondition { private final List _categoryTypes; - public CategoryTypeCondition(StatsSet params) + public CategoryTypeCondition(StatSet params) { _categoryTypes = params.getEnumList("category", CategoryType.class); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java index b24cfa0f14..9a14cb6fa2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java @@ -16,7 +16,7 @@ */ package handlers.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -29,7 +29,7 @@ public class NpcLevelCondition implements ICondition private final int _minLevel; private final int _maxLevel; - public NpcLevelCondition(StatsSet params) + public NpcLevelCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java index afffe7a0c5..9e3deaa8ce 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java @@ -16,7 +16,7 @@ */ package handlers.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -29,7 +29,7 @@ public class PlayerLevelCondition implements ICondition private final int _minLevel; private final int _maxLevel; - public PlayerLevelCondition(StatsSet params) + public PlayerLevelCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 09f609dc37..0e81066579 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -32,7 +32,7 @@ public class AbnormalShield extends AbstractEffect { private final int _times; - public AbnormalShield(StatsSet params) + public AbnormalShield(StatSet params) { _times = params.getInt("times", -1); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 0496c9068d..9c508c8c52 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Objects; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class AbnormalTimeChange extends AbstractEffect private final int _time; private final int _mode; - public AbnormalTimeChange(StatsSet params) + public AbnormalTimeChange(StatSet params) { final String abnormals = params.getString("slot", null); if ((abnormals != null) && !abnormals.isEmpty()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 98f85c7b21..3f9132b8e3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -37,7 +37,7 @@ public class AbsorbDamage extends AbstractEffect private final double _damage; private static final Map _damageHolder = new ConcurrentHashMap<>(); - public AbsorbDamage(StatsSet params) + public AbsorbDamage(StatSet params) { _damage = params.getDouble("damage", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 26f51d5351..86fef7cf6d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; @@ -38,7 +38,7 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect private final int _hpPercent; private final Map _updates = new ConcurrentHashMap<>(); - protected AbstractConditionalHpEffect(StatsSet params, Stat stat) + protected AbstractConditionalHpEffect(StatSet params, Stat stat) { super(params, stat); _hpPercent = params.getInt("hpPercent", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java index 2e40124e39..f010f84271 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AbstractStatAddEffect extends AbstractEffect private final Stat _stat; protected final double _amount; - public AbstractStatAddEffect(StatsSet params, Stat stat) + public AbstractStatAddEffect(StatSet params, Stat stat) { _stat = stat; _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index da6a575c44..29e439684b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; @@ -42,12 +42,12 @@ public abstract class AbstractStatEffect extends AbstractEffect protected final StatModifierType _mode; protected final List _conditions = new ArrayList<>(); - public AbstractStatEffect(StatsSet params, Stat stat) + public AbstractStatEffect(StatSet params, Stat stat) { this(params, stat, stat); } - public AbstractStatEffect(StatsSet params, Stat mulStat, Stat addStat) + public AbstractStatEffect(StatSet params, Stat mulStat, Stat addStat) { _addStat = addStat; _mulStat = mulStat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java index 9811f395aa..33d08bff36 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AbstractStatPercentEffect extends AbstractEffect private final Stat _stat; protected final double _amount; - public AbstractStatPercentEffect(StatsSet params, Stat stat) + public AbstractStatPercentEffect(StatSet params, Stat stat) { _stat = stat; _amount = params.getDouble("amount", 1); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java index 539814ef2a..79c022a23c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class Accuracy extends AbstractStatEffect { - public Accuracy(StatsSet params) + public Accuracy(StatSet params) { super(params, Stat.ACCURACY_COMBAT); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index 0c1fcbd92b..48d69968c5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddHate extends AbstractEffect private final double _power; private final boolean _affectSummoner; - public AddHate(StatsSet params) + public AddHate(StatSet params) { _power = params.getDouble("power", 0); _affectSummoner = params.getBoolean("affectSummoner", false); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java index e90d5cc7f3..324927947a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddSkillBySkill extends AbstractEffect private final int _existingSkillLevel; private final SkillHolder _addedSkill; - public AddSkillBySkill(StatsSet params) + public AddSkillBySkill(StatSet params) { _existingSkillId = params.getInt("existingSkillId"); _existingSkillLevel = params.getInt("existingSkillLevel"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index bdd8314dd7..205bc82200 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddTeleportBookmarkSlot extends AbstractEffect { private final int _amount; - public AddTeleportBookmarkSlot(StatsSet params) + public AddTeleportBookmarkSlot(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java index c26ec5442f..658931ecb2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionCp extends AbstractStatAddEffect { - public AdditionalPotionCp(StatsSet params) + public AdditionalPotionCp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_CP); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java index 6b68e40f32..57d54c7d3b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionHp extends AbstractStatAddEffect { - public AdditionalPotionHp(StatsSet params) + public AdditionalPotionHp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_HP); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java index c9e1cc237e..007547ebe7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionMp extends AbstractStatAddEffect { - public AdditionalPotionMp(StatsSet params) + public AdditionalPotionMp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_MP); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java index f5cbb63465..9255ba1877 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AreaDamage extends AbstractStatAddEffect { - public AreaDamage(StatsSet params) + public AreaDamage(StatSet params) { super(params, Stat.DAMAGE_ZONE_VULN); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java index 2ded14e7ae..a5d56477f5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AttackAttribute extends AbstractEffect private final AttributeType _attribute; private final double _amount; - public AttackAttribute(StatsSet params) + public AttackAttribute(StatSet params) { _amount = params.getDouble("amount", 0); _attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java index ff58d09cc7..795366850d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class AttackAttributeAdd extends AbstractEffect { private final double _amount; - public AttackAttributeAdd(StatsSet params) + public AttackAttributeAdd(StatSet params) { _amount = params.getDouble("amount", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java index 37bfbf341a..fcd2b48c99 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class AttackBehind extends AbstractEffect { - public AttackBehind(StatsSet params) + public AttackBehind(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index 062c325a55..4136f5d530 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class AttackTrait extends AbstractEffect { private final Map _attackTraits = new EnumMap<>(TraitType.class); - public AttackTrait(StatsSet params) + public AttackTrait(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 02d6a8d78c..8ac42d45c3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -37,7 +37,7 @@ public class Backstab extends AbstractEffect private final double _criticalChance; private final boolean _overHit; - public Backstab(StatsSet params) + public Backstab(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Betray.java index 32e3c65c55..79e8bd3360 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Betray extends AbstractEffect { - public Betray(StatsSet params) + public Betray(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Blink.java index ba1caed6ac..56d3f628fd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -52,7 +52,7 @@ public class Blink extends AbstractEffect private final int _flyDelay; private final int _animationSpeed; - public Blink(StatsSet params) + public Blink(StatSet params) { _flyCourse = params.getInt("angle", 0); _flyRadius = params.getInt("range", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 8677f72407..596d4b752f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; */ public class BlinkSwap extends AbstractEffect { - public BlinkSwap(StatsSet params) + public BlinkSwap(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 7bec602aef..cea12039d2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -20,7 +20,7 @@ import java.util.Arrays; import java.util.Set; import java.util.stream.Collectors; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class BlockAbnormalSlot extends AbstractEffect { private final Set _blockAbnormalSlots; - public BlockAbnormalSlot(StatsSet params) + public BlockAbnormalSlot(StatSet params) { _blockAbnormalSlots = Arrays.stream(params.getString("slot").split(";")).map(slot -> Enum.valueOf(AbnormalType.class, slot)).collect(Collectors.toSet()); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index b4839ab322..348881f970 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -21,7 +21,7 @@ import java.util.Set; import org.l2jmobius.gameserver.datatables.BotReportTable; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class BlockAction extends AbstractEffect { private final Set _blockedActions = new HashSet<>(); - public BlockAction(StatsSet params) + public BlockAction(StatSet params) { final String[] actions = params.getString("blockedActions").split(","); for (String action : actions) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index 68f6586e3e..635d2735f9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -22,7 +22,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class BlockActions extends AbstractEffect { private final Set _allowedSkills; - public BlockActions(StatsSet params) + public BlockActions(StatSet params) { final String[] allowedSkills = params.getString("allowedSkills", "").split(";"); _allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 99af987208..3502d140d0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockChat extends AbstractEffect { - public BlockChat(StatsSet params) + public BlockChat(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java index 6160114414..a2b084c918 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; */ public class BlockControl extends AbstractEffect { - public BlockControl(StatsSet params) + public BlockControl(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java index 3d96329b6d..69b390ae8f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BlockEscape extends AbstractEffect { - public BlockEscape(StatsSet params) + public BlockEscape(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index 8bbd7ac018..85d89180e7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockMove extends AbstractEffect { - public BlockMove(StatsSet params) + public BlockMove(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index 316f82f855..9e28fc403a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockParty extends AbstractEffect { - public BlockParty(StatsSet params) + public BlockParty(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java index ae2ac8b035..d3235fc34f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BlockResurrection extends AbstractEffect { - public BlockResurrection(StatsSet params) + public BlockResurrection(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index f7f119691f..f2cc65b782 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -35,7 +35,7 @@ public class BlockSkill extends AbstractEffect { private final int[] _magicTypes; - public BlockSkill(StatsSet params) + public BlockSkill(StatSet params) { _magicTypes = params.getIntArray("magicTypes", ";"); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index d9b3d3a34d..9f0b7143d2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockTarget extends AbstractEffect { - public BlockTarget(StatsSet params) + public BlockTarget(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index bc4cbd6320..bef60ad003 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class Bluff extends AbstractEffect { private final int _chance; - public Bluff(StatsSet params) + public Bluff(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java index 2ace40a596..69583d613b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusDropAmount extends AbstractStatPercentEffect { - public BonusDropAmount(StatsSet params) + public BonusDropAmount(StatSet params) { super(params, Stat.BONUS_DROP_AMOUNT); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java index b81560b040..e63c8f79f4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusDropRate extends AbstractStatPercentEffect { - public BonusDropRate(StatsSet params) + public BonusDropRate(StatSet params) { super(params, Stat.BONUS_DROP_RATE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java index b984404cb2..e0fb54b162 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusSpoilRate extends AbstractStatPercentEffect { - public BonusSpoilRate(StatsSet params) + public BonusSpoilRate(StatSet params) { super(params, Stat.BONUS_SPOIL_RATE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Breath.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Breath.java index 859f341f3c..4235319f22 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Breath.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Breath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class Breath extends AbstractStatEffect { - public Breath(StatsSet params) + public Breath(StatSet params) { super(params, Stat.BREATH); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java index a6d25f3c36..4102506e6c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BuffBlock extends AbstractEffect { - public BuffBlock(StatsSet params) + public BuffBlock(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index de7497f8bf..4f470b06c7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class CallLearnedSkill extends AbstractEffect { private final int _skillId; - public CallLearnedSkill(StatsSet params) + public CallLearnedSkill(StatSet params) { _skillId = params.getInt("skillId"); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index e6096be4be..b41daf073c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CallParty extends AbstractEffect { - public CallParty(StatsSet params) + public CallParty(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index 0760fb675e..eb4bdf2349 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class CallPc extends AbstractEffect private final int _itemId; private final int _itemCount; - public CallPc(StatsSet params) + public CallPc(StatSet params) { _itemId = params.getInt("itemId", 0); _itemCount = params.getInt("itemCount", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index d6d5cb721d..0da3802665 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -35,7 +35,7 @@ public class CallRandomSkill extends AbstractEffect { private final List _skills = new ArrayList<>(); - public CallRandomSkill(StatsSet params) + public CallRandomSkill(StatSet params) { final String skills = params.getString("skills", null); if (skills != null) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index 99c1494223..f8e4b226c4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -35,7 +35,7 @@ public class CallSkill extends AbstractEffect private final SkillHolder _skill; private final int _skillLevelScaleTo; - public CallSkill(StatsSet params) + public CallSkill(StatSet params) { _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0)); _skillLevelScaleTo = params.getInt("skillLevelScaleTo", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index cec2706e81..4a18b31781 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.Collections; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ public class CallSkillOnActionTime extends AbstractEffect { private final SkillHolder _skill; - public CallSkillOnActionTime(StatsSet params) + public CallSkillOnActionTime(StatSet params) { _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0)); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index d48eb90fb3..32753a71a0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CallTargetParty extends AbstractEffect { - public CallTargetParty(StatsSet params) + public CallTargetParty(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index ef01f4a8ed..d4331bf5b7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ public class ChameleonRest extends AbstractEffect { private final double _power; - public ChameleonRest(StatsSet params) + public ChameleonRest(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index e3b846674d..37054f2fd0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; @@ -35,9 +35,9 @@ public class ChangeBody extends AbstractEffect { private final Set _transformations = new HashSet<>(); - public ChangeBody(StatsSet params) + public ChangeBody(StatSet params) { - for (StatsSet item : params.getList("templates", StatsSet.class)) + for (StatSet item : params.getList("templates", StatSet.class)) { _transformations.add(new TemplateChanceHolder(item.getInt(".templateId"), item.getInt(".minChance"), item.getInt(".maxChance"))); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 76c6e03aa6..6b6386909e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeFace extends AbstractEffect { private final int _value; - public ChangeFace(StatsSet params) + public ChangeFace(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java index cee3ac1a6f..304afa821c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; /** @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; */ public class ChangeFishingMastery extends AbstractEffect { - public ChangeFishingMastery(StatsSet params) + public ChangeFishingMastery(StatSet params) { } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index 0c583cbc13..64ac49f5d5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeHairColor extends AbstractEffect { private final int _value; - public ChangeHairColor(StatsSet params) + public ChangeHairColor(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index ad2efbe6a0..ae7d6c6da1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeHairStyle extends AbstractEffect { private final int _value; - public ChangeHairStyle(StatsSet params) + public ChangeHairStyle(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java index 2d536029fd..4d7c380c75 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class CheapShot extends AbstractEffect { - public CheapShot(StatsSet params) + public CheapShot(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index 5fa3df1676..0215ff6a5b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.SubclassInfoType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class ClassChange extends AbstractEffect private final int _index; private static final int IDENTITY_CRISIS_SKILL_ID = 1570; - public ClassChange(StatsSet params) + public ClassChange(StatSet params) { _index = params.getInt("index", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index ccf7598eff..e184022afc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.stats.Formulas; */ public class Compelling extends AbstractEffect { - public Compelling(StatsSet params) + public Compelling(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index b6aa30f604..f164ac6f3f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class Confuse extends AbstractEffect { private final int _chance; - public Confuse(StatsSet params) + public Confuse(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 25e29532eb..78293c1b0f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ConsumeBody extends AbstractEffect { - public ConsumeBody(StatsSet params) + public ConsumeBody(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index e915eb0391..6ddd0d72eb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class ConvertItem extends AbstractEffect { - public ConvertItem(StatsSet params) + public ConvertItem(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java index 9402fdb06d..857df659c0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CounterPhysicalSkill extends AbstractStatAddEffect { - public CounterPhysicalSkill(StatsSet params) + public CounterPhysicalSkill(StatSet params) { super(params, Stat.VENGEANCE_SKILL_PHYSICAL_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 67bca7fd1b..598682037b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Cp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Cp(StatsSet params) + public Cp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index e0cd52808e..37303b0e7a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class CpHeal extends AbstractEffect { private final double _power; - public CpHeal(StatsSet params) + public CpHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index e2e8ee3479..54de5adfc6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class CpHealOverTime extends AbstractEffect { private final double _power; - public CpHealOverTime(StatsSet params) + public CpHealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index 5665e937dc..b4a994d6df 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CpHealPercent extends AbstractEffect { private final double _power; - public CpHealPercent(StatsSet params) + public CpHealPercent(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java index 1cc851b2af..efb020bbd5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CpRegen extends AbstractStatEffect { - public CpRegen(StatsSet params) + public CpRegen(StatSet params) { super(params, Stat.REGENERATE_CP_RATE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java index 8983497026..0b93eef45e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CriticalDamage extends AbstractStatEffect { - public CriticalDamage(StatsSet params) + public CriticalDamage(StatSet params) { super(params, Stat.CRITICAL_DAMAGE, Stat.CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 7ef4f0ecb4..0630f087b7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.Position; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CriticalDamagePosition extends AbstractEffect private final double _amount; private final Position _position; - public CriticalDamagePosition(StatsSet params) + public CriticalDamagePosition(StatSet params) { _amount = params.getDouble("amount", 0); _position = params.getEnum("position", Position.class, Position.FRONT); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java index 01f49380eb..0d4bded60e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; public class CriticalRate extends AbstractConditionalHpEffect { - public CriticalRate(StatsSet params) + public CriticalRate(StatSet params) { super(params, Stat.CRITICAL_RATE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 863b385ca3..4d65fa84eb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.Position; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CriticalRatePositionBonus extends AbstractEffect private final double _amount; private final Position _position; - public CriticalRatePositionBonus(StatsSet params) + public CriticalRatePositionBonus(StatSet params) { _amount = params.getDouble("amount", 0); _position = params.getEnum("position", Position.class, Position.FRONT); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index 2e8ec38347..9d04575ae2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class CrystalGradeModify extends AbstractEffect { private final int _grade; - public CrystalGradeModify(StatsSet params) + public CrystalGradeModify(StatSet params) { _grade = params.getInt("grade", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java index 94ff8e64e2..79ee5b994e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CubicMastery extends AbstractStatAddEffect { - public CubicMastery(StatsSet params) + public CubicMastery(StatSet params) { super(params, Stat.MAX_CUBIC); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index 36abf0accf..e6bb53fdea 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class DamOverTime extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTime(StatsSet params) + public DamOverTime(StatSet params) { _canKill = params.getBoolean("canKill", false); _power = params.getDouble("power"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 13e57099e0..b5f25db4d8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class DamOverTimePercent extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTimePercent(StatsSet params) + public DamOverTimePercent(StatSet params) { _canKill = params.getBoolean("canKill", false); _power = params.getDouble("power"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java index dc7a45198f..c9567ea034 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ public class DamageBlock extends AbstractEffect private final boolean _blockHp; private final boolean _blockMp; - public DamageBlock(StatsSet params) + public DamageBlock(StatSet params) { final String type = params.getString("type", null); _blockHp = type.equalsIgnoreCase("BLOCK_HP"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java index bfa716eacc..9eb0b4e233 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DamageByAttackType; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -38,7 +38,7 @@ public class DamageByAttack extends AbstractEffect private final double _value; private final DamageByAttackType _type; - public DamageByAttack(StatsSet params) + public DamageByAttack(StatSet params) { _value = params.getDouble("amount"); _type = params.getEnum("type", DamageByAttackType.class, DamageByAttackType.NONE); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java index 5a7629482a..e823a9824a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DamageShield extends AbstractStatAddEffect { - public DamageShield(StatsSet params) + public DamageShield(StatSet params) { super(params, Stat.REFLECT_DAMAGE_PERCENT); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java index db1abe264d..3029a3f0aa 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DamageShieldResist extends AbstractStatAddEffect { - public DamageShieldResist(StatsSet params) + public DamageShieldResist(StatSet params) { super(params, Stat.REFLECT_DAMAGE_PERCENT_DEFENSE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index 8561ff46b0..369bd5483d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class DeathLink extends AbstractEffect { private final double _power; - public DeathLink(StatsSet params) + public DeathLink(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java index b948fad1fc..54261c6229 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class DebuffBlock extends AbstractEffect { - public DebuffBlock(StatsSet params) + public DebuffBlock(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java index 217ef3dfaa..4bc08271fa 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class DefenceAttribute extends AbstractEffect private final AttributeType _attribute; private final double _amount; - public DefenceAttribute(StatsSet params) + public DefenceAttribute(StatSet params) { _amount = params.getDouble("amount", 0); _attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java index 0c0c2e8d6a..daff53d9e1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceCriticalDamage extends AbstractStatEffect { - public DefenceCriticalDamage(StatsSet params) + public DefenceCriticalDamage(StatSet params) { super(params, Stat.DEFENCE_CRITICAL_DAMAGE, Stat.DEFENCE_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java index 131eb500ea..74a729e38c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceCriticalRate extends AbstractStatEffect { - public DefenceCriticalRate(StatsSet params) + public DefenceCriticalRate(StatSet params) { super(params, Stat.DEFENCE_CRITICAL_RATE, Stat.DEFENCE_CRITICAL_RATE_ADD); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java index 1abee78e08..c664939977 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceMagicCriticalDamage extends AbstractStatEffect { - public DefenceMagicCriticalDamage(StatsSet params) + public DefenceMagicCriticalDamage(StatSet params) { super(params, Stat.DEFENCE_MAGIC_CRITICAL_DAMAGE, Stat.DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java index 2146b89551..6594dda2b3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceMagicCriticalRate extends AbstractStatEffect { - public DefenceMagicCriticalRate(StatsSet params) + public DefenceMagicCriticalRate(StatSet params) { super(params, Stat.DEFENCE_MAGIC_CRITICAL_RATE, Stat.DEFENCE_MAGIC_CRITICAL_RATE_ADD); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index bd80f690cd..134ed56979 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class DefenceTrait extends AbstractEffect { private final Map _defenceTraits = new EnumMap<>(TraitType.class); - public DefenceTrait(StatsSet params) + public DefenceTrait(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index bab5e1a762..7cee616006 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class DeleteHate extends AbstractEffect { private final int _chance; - public DeleteHate(StatsSet params) + public DeleteHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index 85985653b8..f10f189e68 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class DeleteHateOfMe extends AbstractEffect { private final int _chance; - public DeleteHateOfMe(StatsSet params) + public DeleteHateOfMe(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index d3664ad00f..82833ac79d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class DeleteTopAgro extends AbstractEffect { private final int _chance; - public DeleteTopAgro(StatsSet params) + public DeleteTopAgro(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index ae1f2a5942..ba6dad4698 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DoorOpenType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DetectHiddenObjects extends AbstractEffect { - public DetectHiddenObjects(StatsSet params) + public DetectHiddenObjects(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Detection.java index 078360ff35..a20cbcb348 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Detection extends AbstractEffect { - public Detection(StatsSet params) + public Detection(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 8567a94d12..32ee715df7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DisableTargeting extends AbstractEffect { - public DisableTargeting(StatsSet params) + public DisableTargeting(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index fa06ec7221..5a80971f51 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Disarm extends AbstractEffect { - public Disarm(StatsSet params) + public Disarm(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index 0133906661..8b06598d83 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class Disarmor extends AbstractEffect private final Map _unequippedItems; // PlayerObjId, ItemObjId private final int _slot; - public Disarmor(StatsSet params) + public Disarmor(StatSet params) { _unequippedItems = new ConcurrentHashMap<>(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 95de0300bb..a652a023f5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DispelAll extends AbstractEffect { - public DispelAll(StatsSet params) + public DispelAll(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 88d979a0d9..040271d2a7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.List; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -38,7 +38,7 @@ public class DispelByCategory extends AbstractEffect private final int _rate; private final int _max; - public DispelByCategory(StatsSet params) + public DispelByCategory(StatSet params) { _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); _rate = params.getInt("rate", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index a6e4c7cd19..ab79e046b2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.EnumMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -37,7 +37,7 @@ public class DispelBySlot extends AbstractEffect private final String _dispel; private final Map _dispelAbnormals; - public DispelBySlot(StatsSet params) + public DispelBySlot(StatSet params) { _dispel = params.getString("dispel"); if ((_dispel != null) && !_dispel.isEmpty()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 1ba6612e23..d1341d10b9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class DispelBySlotMyself extends AbstractEffect { private final Set _dispelAbnormals; - public DispelBySlotMyself(StatsSet params) + public DispelBySlotMyself(StatSet params) { final String dispel = params.getString("dispel"); if ((dispel != null) && !dispel.isEmpty()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 845980e59d..b58723058e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -37,7 +37,7 @@ public class DispelBySlotProbability extends AbstractEffect private final Set _dispelAbnormals; private final int _rate; - public DispelBySlotProbability(StatsSet params) + public DispelBySlotProbability(StatSet params) { final String[] dispelEffects = params.getString("dispel").split(";"); _rate = params.getInt("rate", 100); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index 7acd9c4a6c..688d77a703 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -45,7 +45,7 @@ public class DoubleCast extends AbstractEffect private final Map> _addedToggles; - public DoubleCast(StatsSet params) + public DoubleCast(StatSet params) { _addedToggles = new HashMap<>(); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java index d7f067a2a0..d1e21edeb0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DuelistFury extends AbstractEffect { - public DuelistFury(StatsSet params) + public DuelistFury(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index 409fed6a23..de397bb5ff 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class EnableCloak extends AbstractEffect { - public EnableCloak(StatsSet params) + public EnableCloak(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index e855c4ba1a..2fe2bef99f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -43,7 +43,7 @@ public class EnergyAttack extends AbstractEffect private final boolean _overHit; private final double _pDefMod; - public EnergyAttack(StatsSet params) + public EnergyAttack(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getInt("criticalChance", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index a8f108573f..ae463ef2a4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class EnlargeAbnormalSlot extends AbstractEffect { private final int _slots; - public EnlargeAbnormalSlot(StatsSet params) + public EnlargeAbnormalSlot(StatSet params) { _slots = params.getInt("slots", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java index c43ea04413..c4073b1a47 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StorageType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class EnlargeSlot extends AbstractEffect private final StorageType _type; private final double _amount; - public EnlargeSlot(StatsSet params) + public EnlargeSlot(StatSet params) { _amount = params.getDouble("amount", 0); _type = params.getEnum("type", StorageType.class, StorageType.INVENTORY_NORMAL); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Escape.java index 936f82d8ce..f3a07c9d15 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class Escape extends AbstractEffect { private final TeleportWhereType _escapeType; - public Escape(StatsSet params) + public Escape(StatSet params) { _escapeType = params.getEnum("escapeType", TeleportWhereType.class, null); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java index 76dbc8171c..eb68d24af8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ExpModify extends AbstractStatAddEffect { - public ExpModify(StatsSet params) + public ExpModify(StatSet params) { super(params, Stat.BONUS_EXP); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java index bf11db6e4b..1100ca25be 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Faceoff extends AbstractEffect { - public Faceoff(StatsSet params) + public Faceoff(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index e256209e39..79f7b43503 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -34,7 +34,7 @@ public class FakeDeath extends AbstractEffect { private final double _power; - public FakeDeath(StatsSet params) + public FakeDeath(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index a94c75d310..780d5cefba 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -44,7 +44,7 @@ public class FatalBlow extends AbstractEffect private final double _abnormalPower; private final boolean _overHit; - public FatalBlow(StatsSet params) + public FatalBlow(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java index c8ff8f7acb..6e7597e63d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class FatalBlowRate extends AbstractEffect private final double _amount; private final StatModifierType _mode; - public FatalBlowRate(StatsSet params) + public FatalBlowRate(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 9731e75e5d..ec2659ea2c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DefenderInstance; import org.l2jmobius.gameserver.model.actor.instance.FortCommanderInstance; @@ -40,7 +40,7 @@ public class Fear extends AbstractEffect { private static final int FEAR_RANGE = 500; - public Fear(StatsSet params) + public Fear(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 5e04e46d60..94d9912bdf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.MountType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ public class Feed extends AbstractEffect private final int _ride; private final int _wyvern; - public Feed(StatsSet params) + public Feed(StatSet params) { _normal = params.getInt("normal", 0); _ride = params.getInt("ride", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java index 0b22a4d4c9..146e3b73e6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class FishingExpSpBonus extends AbstractStatPercentEffect { - public FishingExpSpBonus(StatsSet params) + public FishingExpSpBonus(StatSet params) { super(params, Stat.FISHING_EXP_SP_BONUS); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Flag.java index c1469eab19..2442cbdb35 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Flag extends AbstractEffect { - public Flag(StatsSet params) + public Flag(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index 0243f0f543..74a9754a95 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.BlockInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class FlipBlock extends AbstractEffect { - public FlipBlock(StatsSet params) + public FlipBlock(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 7fc7da5fe6..3412e4d36d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class FlyAway extends AbstractEffect { private final int _radius; - public FlyAway(StatsSet params) + public FlyAway(StatSet params) { _radius = params.getInt("radius"); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java index fd3216286d..590fbbcd44 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class FocusEnergy extends AbstractStatAddEffect { - public FocusEnergy(StatsSet params) + public FocusEnergy(StatSet params) { super(params, Stat.MAX_MOMENTUM); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index efbd93f304..19f0163e42 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class FocusMaxMomentum extends AbstractEffect { - public FocusMaxMomentum(StatsSet params) + public FocusMaxMomentum(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index 284d19ee5f..e8c18e9682 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -36,7 +36,7 @@ public class FocusMomentum extends AbstractEffect private final int _amount; private final int _maxCharges; - public FocusMomentum(StatsSet params) + public FocusMomentum(StatSet params) { _amount = params.getInt("amount", 1); _maxCharges = params.getInt("maxCharges", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 18a9864bbc..debd491cfe 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class FocusSouls extends AbstractEffect { private final int _charge; - public FocusSouls(StatsSet params) + public FocusSouls(StatSet params) { _charge = params.getInt("charge", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 8540ccd49c..23328db910 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Set; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class GetAgro extends AbstractEffect { - public GetAgro(StatsSet params) + public GetAgro(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java index 1ca8722709..e91002d04b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class GetDamageLimit extends AbstractStatAddEffect { - public GetDamageLimit(StatsSet params) + public GetDamageLimit(StatSet params) { super(params, Stat.DAMAGE_LIMIT); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 2dfd3bf8c4..439f3e8e3a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class GetMomentum extends AbstractEffect { private static int _ticks; - public GetMomentum(StatsSet params) + public GetMomentum(StatSet params) { _ticks = params.getInt("ticks", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index 7c1c0f3fa2..2c842101ed 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class GiveClanReputation extends AbstractEffect { private final int _reputation; - public GiveClanReputation(StatsSet params) + public GiveClanReputation(StatSet params) { _reputation = params.getInt("reputation", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index fd4d61fa73..9052c63154 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class GiveExpAndSp extends AbstractEffect private final int _xp; private final int _sp; - public GiveExpAndSp(StatsSet params) + public GiveExpAndSp(StatSet params) { _xp = params.getInt("xp", 0); _sp = params.getInt("sp", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index 3448e09797..9d41a4395b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ public class GiveFame extends AbstractEffect { private final int _fame; - public GiveFame(StatsSet params) + public GiveFame(StatSet params) { _fame = params.getInt("fame", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index c948fa0948..617a8ef88a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class GiveRecommendation extends AbstractEffect { private final int _amount; - public GiveRecommendation(StatsSet params) + public GiveRecommendation(StatSet params) { _amount = params.getInt("amount", 0); if (_amount == 0) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index 5fe06566c7..75a16fe828 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class GiveSp extends AbstractEffect { private final int _sp; - public GiveSp(StatsSet params) + public GiveSp(StatSet params) { _sp = params.getInt("sp", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index 5b1a04c165..ae7248c500 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class GiveXp extends AbstractEffect { private final int _xp; - public GiveXp(StatsSet params) + public GiveXp(StatSet params) { _xp = params.getInt("xp", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 17095c209a..5cf4994f32 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Grow extends AbstractEffect { - public Grow(StatsSet params) + public Grow(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index a2200e1a2f..350c8e659f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.UserInfoType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class HairAccessorySet extends AbstractEffect { - public HairAccessorySet(StatsSet params) + public HairAccessorySet(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index f881ed5027..1654fc650c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Harvesting extends AbstractEffect { - public Harvesting(StatsSet params) + public Harvesting(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java index ac1c9f49d8..097db6604a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HateAttack extends AbstractStatPercentEffect { - public HateAttack(StatsSet params) + public HateAttack(StatSet params) { super(params, Stat.HATE_ATTACK); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index 00f569eb17..9963ff1336 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlagInstance; @@ -34,7 +34,7 @@ public class HeadquarterCreate extends AbstractEffect private static final int HQ_NPC_ID = 35062; private final boolean _isAdvanced; - public HeadquarterCreate(StatsSet params) + public HeadquarterCreate(StatSet params) { _isAdvanced = params.getBoolean("isAdvanced", false); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 4c2218df9b..d2848a6242 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -40,7 +40,7 @@ public class Heal extends AbstractEffect { private final double _power; - public Heal(StatsSet params) + public Heal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java index 5a7457d3df..a9f75ab036 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HealEffect extends AbstractStatEffect { - public HealEffect(StatsSet params) + public HealEffect(StatSet params) { super(params, Stat.HEAL_EFFECT, Stat.HEAL_EFFECT_ADD); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 86e28dc8b4..da76f33058 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class HealOverTime extends AbstractEffect { private final double _power; - public HealOverTime(StatsSet params) + public HealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index 6c9c8986bb..8b1c821a0a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class HealPercent extends AbstractEffect { private final int _power; - public HealPercent(StatsSet params) + public HealPercent(StatSet params) { _power = params.getInt("power", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Hide.java index e431277964..d02898bac5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Hide extends AbstractEffect { - public Hide(StatsSet params) + public Hide(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index e7e5f3f91b..78fa1c9392 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.GameTimeController; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HitAtNight extends AbstractStatEffect { - public HitAtNight(StatsSet params) + public HitAtNight(StatSet params) { super(params, Stat.HIT_AT_NIGHT); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java index 1fd98e7aa9..f14b922308 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HitNumber extends AbstractStatEffect { - public HitNumber(StatsSet params) + public HitNumber(StatSet params) { super(params, Stat.ATTACK_COUNT_MAX); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 3611fd7d74..c2426f8d11 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Hp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Hp(StatsSet params) + public Hp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index 3d125565fe..6244c76428 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class HpByLevel extends AbstractEffect { private final double _power; - public HpByLevel(StatsSet params) + public HpByLevel(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index f9d9d0beeb..af3726c17f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -40,7 +40,7 @@ public class HpCpHeal extends AbstractEffect { private final double _power; - public HpCpHeal(StatsSet params) + public HpCpHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java index 0394dab996..6f96c2dcb3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class HpCpHealCritical extends AbstractEffect { - public HpCpHealCritical(StatsSet params) + public HpCpHealCritical(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 554b1cec79..7cf47c3a65 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class HpDrain extends AbstractEffect private final double _power; private final double _percentage; - public HpDrain(StatsSet params) + public HpDrain(StatSet params) { _power = params.getDouble("power", 0); _percentage = params.getDouble("percentage", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java index cb1d2bc3a7..b170bc62ba 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HpRegen extends AbstractStatEffect { - public HpRegen(StatsSet params) + public HpRegen(StatSet params) { super(params, Stat.REGENERATE_HP_RATE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 235e89a79b..f346fbaad8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class HpToOwner extends AbstractEffect private final double _power; private final int _stealAmount; - public HpToOwner(StatsSet params) + public HpToOwner(StatSet params) { _power = params.getDouble("power"); _stealAmount = params.getInt("stealAmount"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java index 9829519da9..c659684ae8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class IgnoreDeath extends AbstractEffect { - public IgnoreDeath(StatsSet params) + public IgnoreDeath(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index f7c9baa155..44dceba10e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ImmobilePetBuff extends AbstractEffect { - public ImmobilePetBuff(StatsSet params) + public ImmobilePetBuff(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java index a60fc45d15..a03eff933a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ public class InstantKillResist extends AbstractEffect { private final int _amount; - public InstantKillResist(StatsSet params) + public InstantKillResist(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java index 7e1fc8abe4..265a9aab97 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class JewelSlot extends AbstractStatAddEffect { - public JewelSlot(StatsSet params) + public JewelSlot(StatSet params) { super(params, Stat.BROOCH_JEWELS); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 3d5ff2dda3..a34d7cc5b3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class KarmaCount extends AbstractEffect private final int _amount; private final int _mode; - public KarmaCount(StatsSet params) + public KarmaCount(StatSet params) { _amount = params.getInt("amount", 0); switch (params.getString("mode", "DIFF")) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index dd58d33685..3af09931f8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -45,7 +45,7 @@ public class KnockBack extends AbstractEffect private final boolean _knockDown; private final FlyType _type; - public KnockBack(StatsSet params) + public KnockBack(StatSet params) { _distance = params.getInt("distance", 50); _speed = params.getInt("speed", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index 7bfac989cf..1affb1b141 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -38,7 +38,7 @@ public class Lethal extends AbstractEffect private final double _fullLethal; private final double _halfLethal; - public Lethal(StatsSet params) + public Lethal(StatSet params) { _fullLethal = params.getDouble("fullLethal", 0); _halfLethal = params.getDouble("halfLethal", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java index aeb42458a6..43b17877ad 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitCp extends AbstractStatEffect { - public LimitCp(StatsSet params) + public LimitCp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_CP); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java index cf76ec482a..45d8f37355 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitHp extends AbstractStatEffect { - public LimitHp(StatsSet params) + public LimitHp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_HP); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java index f5eda36ba6..8d31633d0a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitMp extends AbstractStatEffect { - public LimitMp(StatsSet params) + public LimitMp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_MP); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Lucky.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Lucky.java index 3775d2361d..4ff5ea9a01 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Lucky.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Lucky.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Lucky extends AbstractEffect { - public Lucky(StatsSet params) + public Lucky(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MAtk.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MAtk.java index 5f9ad5f32b..38c2fc9067 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MAtk.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MAtk.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MAtk extends AbstractStatEffect { - public MAtk(StatsSet params) + public MAtk(StatSet params) { super(params, Stat.MAGIC_ATTACK); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java index 2b9ae2e9e6..393d0d2d30 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicAccuracy extends AbstractStatEffect { - public MagicAccuracy(StatsSet params) + public MagicAccuracy(StatSet params) { super(params, Stat.ACCURACY_MAGIC); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java index 123706eb55..b9a58b09f3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicCriticalDamage extends AbstractStatEffect { - public MagicCriticalDamage(StatsSet params) + public MagicCriticalDamage(StatSet params) { super(params, Stat.MAGIC_CRITICAL_DAMAGE, Stat.MAGIC_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java index 0c10014e50..c9fa9a4240 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicCriticalRate extends AbstractStatEffect { - public MagicCriticalRate(StatsSet params) + public MagicCriticalRate(StatSet params) { super(params, Stat.MAGIC_CRITICAL_RATE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index e8b6f5e8bf..5281bf8445 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class MagicMpCost extends AbstractEffect private final int _magicType; private final double _amount; - public MagicMpCost(StatsSet params) + public MagicMpCost(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index ed4a3fca8b..283a99176c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class MagicalAbnormalDispelAttack extends AbstractEffect private final double _power; private final AbnormalType _abnormalType; - public MagicalAbnormalDispelAttack(StatsSet params) + public MagicalAbnormalDispelAttack(StatSet params) { _power = params.getDouble("power", 0); _abnormalType = AbnormalType.getAbnormalType(params.getString("abnormalType", null)); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java index 8234db1c43..be6403077c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAbnormalResist extends AbstractStatAddEffect { - public MagicalAbnormalResist(StatsSet params) + public MagicalAbnormalResist(StatSet params) { super(params, Stat.ABNORMAL_RESIST_MAGICAL); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index 4e938809f1..25c7d25954 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -37,7 +37,7 @@ public class MagicalAttack extends AbstractEffect private final boolean _overHit; private final double _debuffModifier; - public MagicalAttack(StatsSet params) + public MagicalAttack(StatSet params) { _power = params.getDouble("power", 0); _overHit = params.getBoolean("overHit", false); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 424480b76c..11c387780e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class MagicalAttackByAbnormal extends AbstractEffect { private final double _power; - public MagicalAttackByAbnormal(StatsSet params) + public MagicalAttackByAbnormal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9c3e263a05..348e904025 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -40,7 +40,7 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect private final double _power; private final Set _abnormals; - public MagicalAttackByAbnormalSlot(StatsSet params) + public MagicalAttackByAbnormalSlot(StatSet params) { _power = params.getDouble("power", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 49dd351046..de55dd0fcd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -38,7 +38,7 @@ public class MagicalAttackMp extends AbstractEffect private final boolean _critical; private final double _criticalLimit; - public MagicalAttackMp(StatsSet params) + public MagicalAttackMp(StatSet params) { _power = params.getDouble("power"); _critical = params.getBoolean("critical"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 4414b36fa7..93ac560169 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class MagicalAttackRange extends AbstractEffect private final double _power; private final double _shieldDefPercent; - public MagicalAttackRange(StatsSet params) + public MagicalAttackRange(StatSet params) { _power = params.getDouble("power"); _shieldDefPercent = params.getDouble("shieldDefPercent", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java index 2e304e5f8b..1cf39ed501 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAttackSpeed extends AbstractStatEffect { - public MagicalAttackSpeed(StatsSet params) + public MagicalAttackSpeed(StatSet params) { super(params, Stat.MAGIC_ATTACK_SPEED); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 9a3a776e32..880d71f0c5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class MagicalDamOverTime extends AbstractEffect private final double _power; private final boolean _canKill; - public MagicalDamOverTime(StatsSet params) + public MagicalDamOverTime(StatSet params) { _power = params.getDouble("power", 0); _canKill = params.getBoolean("canKill", false); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java index 80fdf87050..9b4e6061aa 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalDefence extends AbstractStatEffect { - public MagicalDefence(StatsSet params) + public MagicalDefence(StatSet params) { super(params, Stat.MAGICAL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java index c3c7c404f3..4e83b80e8b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalEvasion extends AbstractStatEffect { - public MagicalEvasion(StatsSet params) + public MagicalEvasion(StatSet params) { super(params, Stat.MAGIC_EVASION_RATE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java index 6253af7373..bf419a19f7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalSkillPower extends AbstractStatEffect { - public MagicalSkillPower(StatsSet params) + public MagicalSkillPower(StatSet params) { super(params, Stat.MAGICAL_SKILL_POWER, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index d0047fedef..f4388dc16f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class MagicalSoulAttack extends AbstractEffect { private final double _power; - public MagicalSoulAttack(StatsSet params) + public MagicalSoulAttack(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java index fcc143cd4b..688243d9e1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ManaCharge extends AbstractStatAddEffect { - public ManaCharge(StatsSet params) + public ManaCharge(StatSet params) { super(params, Stat.MANA_CHARGE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index 0c84b4ab61..b889e6e824 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class ManaDamOverTime extends AbstractEffect { private final double _power; - public ManaDamOverTime(StatsSet params) + public ManaDamOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index f48011c9a2..94286df1c8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -34,7 +34,7 @@ public class ManaHeal extends AbstractEffect { private final double _power; - public ManaHeal(StatsSet params) + public ManaHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index bfdfa54380..61f15449a0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -35,7 +35,7 @@ public class ManaHealByLevel extends AbstractEffect { private final double _power; - public ManaHealByLevel(StatsSet params) + public ManaHealByLevel(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 46937a8dd0..e505c9e7a2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class ManaHealOverTime extends AbstractEffect { private final double _power; - public ManaHealOverTime(StatsSet params) + public ManaHealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 101961d1c4..71085da549 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class ManaHealPercent extends AbstractEffect { private final double _power; - public ManaHealPercent(StatsSet params) + public ManaHealPercent(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 7c9c63e3ad..07d15d826c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxCp extends AbstractStatEffect { private final boolean _heal; - public MaxCp(StatsSet params) + public MaxCp(StatSet params) { super(params, Stat.MAX_CP); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 6d2c3449bd..85867bca96 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxHp extends AbstractStatEffect { private final boolean _heal; - public MaxHp(StatsSet params) + public MaxHp(StatSet params) { super(params, Stat.MAX_HP); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index e554c63055..9ca46fda8d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxMp extends AbstractStatEffect { private final boolean _heal; - public MaxMp(StatsSet params) + public MaxMp(StatSet params) { super(params, Stat.MAX_MP); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 39cf62a95b..c27284e5f6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -43,7 +43,7 @@ public class ModifyVital extends AbstractEffect private final int _mp; private final int _cp; - public ModifyVital(StatsSet params) + public ModifyVital(StatSet params) { _type = params.getEnum("type", ModifyType.class); if (_type != ModifyType.SET) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 29ee88f805..095d130f7f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Mp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Mp(StatsSet params) + public Mp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index 76d858ad8e..b13d7824d0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class MpConsumePerLevel extends AbstractEffect { private final double _power; - public MpConsumePerLevel(StatsSet params) + public MpConsumePerLevel(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java index 2051009805..ae7bf0c48c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpRegen extends AbstractStatEffect { - public MpRegen(StatsSet params) + public MpRegen(StatSet params) { super(params, Stat.REGENERATE_MP_RATE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MpShield.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MpShield.java index 82e307a562..a4eb3e663f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MpShield.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MpShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpShield extends AbstractStatAddEffect { - public MpShield(StatsSet params) + public MpShield(StatSet params) { super(params, Stat.MANA_SHIELD_PERCENT); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java index af2ce119cc..366e96b18f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpVampiricAttack extends AbstractStatAddEffect { - public MpVampiricAttack(StatsSet params) + public MpVampiricAttack(StatSet params) { super(params, Stat.ABSORB_MANA_DAMAGE_PERCENT); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mute.java index a7f2f76e23..7e5b5a528f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Mute extends AbstractEffect { - public Mute(StatsSet params) + public Mute(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java index 3cc4cae96f..513dc46ec7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class NoblesseBless extends AbstractEffect { - public NoblesseBless(StatsSet params) + public NoblesseBless(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index bb0f02af5c..05f8c6a99b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpenChest extends AbstractEffect { - public OpenChest(StatsSet params) + public OpenChest(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 15cd9c2a64..de0414fd23 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.RecipeController; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpenCommonRecipeBook extends AbstractEffect { - public OpenCommonRecipeBook(StatsSet params) + public OpenCommonRecipeBook(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 21dd337982..7b5effc6b4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class OpenDoor extends AbstractEffect private final int _chance; private final boolean _isItem; - public OpenDoor(StatsSet params) + public OpenDoor(StatSet params) { _chance = params.getInt("chance", 0); _isItem = params.getBoolean("isItem", false); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index b99a8f9757..3526fa5fdc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.RecipeController; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpenDwarfRecipeBook extends AbstractEffect { - public OpenDwarfRecipeBook(StatsSet params) + public OpenDwarfRecipeBook(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PAtk.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PAtk.java index c353d03a00..7f10b9dcc7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PAtk.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PAtk.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PAtk extends AbstractConditionalHpEffect { - public PAtk(StatsSet params) + public PAtk(StatSet params) { super(params, Stat.PHYSICAL_ATTACK); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Passive.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Passive.java index cef680ca21..27ce15bb60 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Passive.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Passive.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Passive extends AbstractEffect { - public Passive(StatsSet params) + public Passive(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java index 05f55c7dac..1a9f29424f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAbnormalResist extends AbstractStatAddEffect { - public PhysicalAbnormalResist(StatsSet params) + public PhysicalAbnormalResist(StatSet params) { super(params, Stat.ABNORMAL_RESIST_PHYSICAL); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 098770705b..7e5fb14465 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -52,7 +52,7 @@ public class PhysicalAttack extends AbstractEffect private final Set _abnormals; private final double _abnormalPowerMod; - public PhysicalAttack(StatsSet params) + public PhysicalAttack(StatSet params) { _power = params.getDouble("power", 0); _pAtkMod = params.getDouble("pAtkMod", 1.0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index d325c3d5ed..f191867614 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -38,7 +38,7 @@ public class PhysicalAttackHpLink extends AbstractEffect private final double _criticalChance; private final boolean _overHit; - public PhysicalAttackHpLink(StatsSet params) + public PhysicalAttackHpLink(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index dc575c2c75..fe087a1bcc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class PhysicalAttackMute extends AbstractEffect { - public PhysicalAttackMute(StatsSet params) + public PhysicalAttackMute(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java index 112b41eb36..2093d45264 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAttackRange extends AbstractStatEffect { - public PhysicalAttackRange(StatsSet params) + public PhysicalAttackRange(StatSet params) { super(params, Stat.PHYSICAL_ATTACK_RANGE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index d3c2dcfaf2..5d66bd4c87 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ public class PhysicalAttackSaveHp extends AbstractEffect private final boolean _overHit; private final double _saveHp; - public PhysicalAttackSaveHp(StatsSet params) + public PhysicalAttackSaveHp(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java index 167b859572..cdf34eb6f6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAttackSpeed extends AbstractStatEffect { - public PhysicalAttackSpeed(StatsSet params) + public PhysicalAttackSpeed(StatSet params) { super(params, Stat.PHYSICAL_ATTACK_SPEED); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 61bed5561b..a1a6818a00 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class PhysicalAttackWeaponBonus extends AbstractEffect private final Map _weaponBonus = new EnumMap<>(WeaponType.class); - public PhysicalAttackWeaponBonus(StatsSet params) + public PhysicalAttackWeaponBonus(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java index fa3925e725..078c3673b9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalDefence extends AbstractConditionalHpEffect { - public PhysicalDefence(StatsSet params) + public PhysicalDefence(StatSet params) { super(params, Stat.PHYSICAL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java index 812c641ac8..9714220e1b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalEvasion extends AbstractConditionalHpEffect { - public PhysicalEvasion(StatsSet params) + public PhysicalEvasion(StatSet params) { super(params, Stat.EVASION_RATE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index b337fed6cb..fe7cf853c8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class PhysicalMute extends AbstractEffect { - public PhysicalMute(StatsSet params) + public PhysicalMute(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java index 0fd835f4e3..1b843dda3d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class PhysicalShieldAngleAll extends AbstractEffect { - public PhysicalShieldAngleAll(StatsSet params) + public PhysicalShieldAngleAll(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java index 9d3f051659..507eb57326 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalSkillPower extends AbstractStatEffect { - public PhysicalSkillPower(StatsSet params) + public PhysicalSkillPower(StatSet params) { super(params, Stat.PHYSICAL_SKILL_POWER, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index a958116ff7..9ceccea4cc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -42,7 +42,7 @@ public class PhysicalSoulAttack extends AbstractEffect private final boolean _ignoreShieldDefence; private final boolean _overHit; - public PhysicalSoulAttack(StatsSet params) + public PhysicalSoulAttack(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index e95e09ab90..fd2b23a2ae 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class PkCount extends AbstractEffect { private final int _amount; - public PkCount(StatsSet params) + public PkCount(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index 2d64d05406..b51d6a7961 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class Plunder extends AbstractEffect { - public Plunder(StatsSet params) + public Plunder(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index fd61584af1..3e885274b3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PolearmSingleTarget extends AbstractEffect { - public PolearmSingleTarget(StatsSet params) + public PolearmSingleTarget(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java index 86f2e2cee8..b2fb920379 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class ProtectDeathPenalty extends AbstractEffect { - public ProtectDeathPenalty(StatsSet params) + public ProtectDeathPenalty(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java index 890b8980bd..6664b36bae 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ProtectionBlessing extends AbstractEffect { - public ProtectionBlessing(StatsSet params) + public ProtectionBlessing(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index 6de78c2c82..62c480716d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class PullBack extends AbstractEffect private final int _animationSpeed; private final FlyType _type; - public PullBack(StatsSet params) + public PullBack(StatSet params) { _speed = params.getInt("speed", 0); _delay = params.getInt("delay", _speed); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java index 1019c56778..84a72299f3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveMagicalSkillDamageBonus extends AbstractStatPercentEffect { - public PveMagicalSkillDamageBonus(StatsSet params) + public PveMagicalSkillDamageBonus(StatSet params) { super(params, Stat.PVE_MAGICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java index 8da698c746..70870aa45c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveMagicalSkillDefenceBonus(StatsSet params) + public PveMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java index c7a82d4ded..8f60ea025c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalAttackDamageBonus extends AbstractStatPercentEffect { - public PvePhysicalAttackDamageBonus(StatsSet params) + public PvePhysicalAttackDamageBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_ATTACK_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java index 0717fe525b..ea01a4e1d8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PvePhysicalAttackDefenceBonus(StatsSet params) + public PvePhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java index 878f942877..1e8b9e76c4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvePhysicalSkillDamageBonus(StatsSet params) + public PvePhysicalSkillDamageBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java index bdfa0dcc67..b1dbb0b217 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvePhysicalSkillDefenceBonus(StatsSet params) + public PvePhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java index 94fdc26015..fbe3119ba8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveRaidMagicalSkillDefenceBonus(StatsSet params) + public PveRaidMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java index f54d849752..83352e1b2f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidPhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PveRaidPhysicalAttackDefenceBonus(StatsSet params) + public PveRaidPhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java index 0a344f96de..be05bec159 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidPhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveRaidPhysicalSkillDefenceBonus(StatsSet params) + public PveRaidPhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java index 542c019420..2f0153189a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpMagicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvpMagicalSkillDamageBonus(StatsSet params) + public PvpMagicalSkillDamageBonus(StatSet params) { super(params, Stat.PVP_MAGICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java index bb006280fc..41ad3b7749 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvpMagicalSkillDefenceBonus(StatsSet params) + public PvpMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVP_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java index 483d7b02e4..23488ea000 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalAttackDamageBonus extends AbstractStatPercentEffect { - public PvpPhysicalAttackDamageBonus(StatsSet params) + public PvpPhysicalAttackDamageBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_ATTACK_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java index 40c3a22ea2..ff942b3d4d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PvpPhysicalAttackDefenceBonus(StatsSet params) + public PvpPhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java index 225c7c1e39..19a7c96003 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvpPhysicalSkillDamageBonus(StatsSet params) + public PvpPhysicalSkillDamageBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java index ea2d1fa126..211d14c5e3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvpPhysicalSkillDefenceBonus(StatsSet params) + public PvpPhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 8a01583374..e500b487af 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -36,7 +36,7 @@ public class RandomizeHate extends AbstractEffect { private final int _chance; - public RandomizeHate(StatsSet params) + public RandomizeHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index 8b2801ee6c..18b07bd2d7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class RealDamage extends AbstractEffect { private final double _power; - public RealDamage(StatsSet params) + public RealDamage(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java index 4372c15bcf..86738fae0f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class RearDamage extends AbstractStatPercentEffect { - public RearDamage(StatsSet params) + public RearDamage(StatSet params) { super(params, Stat.REAR_DAMAGE_RATE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 31c7a4e4b3..82ed18faa1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RebalanceHP extends AbstractEffect { - public RebalanceHP(StatsSet params) + public RebalanceHP(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index 09d307be02..979809b533 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RebalanceHPSummon extends AbstractEffect { - public RebalanceHPSummon(StatsSet params) + public RebalanceHPSummon(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 7599b691ac..e76328929a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class RecoverVitalityInPeaceZone extends AbstractEffect private final double _amount; private final int _ticks; - public RecoverVitalityInPeaceZone(StatsSet params) + public RecoverVitalityInPeaceZone(StatSet params) { _amount = params.getDouble("amount", 0); _ticks = params.getInt("ticks", 10); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java index 824044ae21..e52b5abafb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ReduceCancel extends AbstractStatEffect { - public ReduceCancel(StatsSet params) + public ReduceCancel(StatSet params) { super(params, Stat.ATTACK_CANCEL); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index ecc7a10d31..be9188f3b0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -33,7 +33,7 @@ public class ReduceDamage extends AbstractEffect { private final double _amount; - public ReduceDamage(StatsSet params) + public ReduceDamage(StatSet params) { _amount = params.getDouble("amount"); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java index 8534a94fc6..7b8862f608 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ReduceDropType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -32,7 +32,7 @@ public class ReduceDropPenalty extends AbstractEffect private final double _deathPenalty; private final ReduceDropType _type; - public ReduceDropPenalty(StatsSet params) + public ReduceDropPenalty(StatSet params) { _exp = params.getDouble("exp", 0); _deathPenalty = params.getDouble("deathPenalty", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java index c15f7301b9..6436b488e0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ReflectMagic extends AbstractStatAddEffect { - public ReflectMagic(StatsSet params) + public ReflectMagic(StatSet params) { super(params, Stat.VENGEANCE_SKILL_MAGIC_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java index bf1d555351..583191fd4c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.BasicProperty; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ReflectSkill extends AbstractEffect private final Stat _stat; private final double _amount; - public ReflectSkill(StatsSet params) + public ReflectSkill(StatSet params) { _stat = params.getEnum("type", BasicProperty.class, BasicProperty.PHYSICAL) == BasicProperty.PHYSICAL ? Stat.REFLECT_SKILL_PHYSIC : Stat.REFLECT_SKILL_MAGIC; _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index e850ea6be9..77b96e4205 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class RefuelAirship extends AbstractEffect { private final int _value; - public RefuelAirship(StatsSet params) + public RefuelAirship(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Relax.java index c8c61fe47e..e2ba4420db 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ public class Relax extends AbstractEffect { private final double _power; - public Relax(StatsSet params) + public Relax(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 9678dc1174..0613c17234 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class ResetInstanceEntry extends AbstractEffect { private final Set _instanceId; - public ResetInstanceEntry(StatsSet params) + public ResetInstanceEntry(StatSet params) { final String instanceIds = params.getString("instanceId", null); if ((instanceIds != null) && !instanceIds.isEmpty()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java index 940c731208..f15ff56189 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ResistAbnormalByCategory extends AbstractEffect private final DispelSlotType _slot; private final double _amount; - public ResistAbnormalByCategory(StatsSet params) + public ResistAbnormalByCategory(StatSet params) { _amount = params.getDouble("amount", 0); _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.DEBUFF); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java index dae38e5246..2e29b5cc8e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ResistDDMagic extends AbstractStatPercentEffect { - public ResistDDMagic(StatsSet params) + public ResistDDMagic(StatSet params) { super(params, Stat.MAGIC_SUCCESS_RES); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java index af2b203aad..d08fcb262a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ResistDispelByCategory extends AbstractEffect private final DispelSlotType _slot; private final double _amount; - public ResistDispelByCategory(StatsSet params) + public ResistDispelByCategory(StatSet params) { _amount = params.getDouble("amount", 0); _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index af1e40bea8..cd03f1a74a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -34,7 +34,7 @@ public class ResistSkill extends AbstractEffect { private final List _skills = new ArrayList<>(); - public ResistSkill(StatsSet params) + public ResistSkill(StatSet params) { for (int i = 1;; i++) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index feb5885fb0..6f887a07cf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class Restoration extends AbstractEffect private final int _itemCount; private final int _itemEnchantmentLevel; - public Restoration(StatsSet params) + public Restoration(StatSet params) { _itemId = params.getInt("itemId", 0); _itemCount = params.getInt("itemCount", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 37cd974643..0baf0aaae6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -25,7 +25,7 @@ import java.util.Map.Entry; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.ExtractableProductItem; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,12 +47,12 @@ public class RestorationRandom extends AbstractEffect { private final List _products = new ArrayList<>(); - public RestorationRandom(StatsSet params) + public RestorationRandom(StatSet params) { - for (StatsSet group : params.getList("items", StatsSet.class)) + for (StatSet group : params.getList("items", StatSet.class)) { final List items = new ArrayList<>(); - for (StatsSet item : group.getList(".", StatsSet.class)) + for (StatSet item : group.getList(".", StatSet.class)) { items.add(new RestorationItemHolder(item.getInt(".id"), item.getInt(".count"), item.getInt(".minEnchant", 0), item.getInt(".maxEnchant", 0))); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index f9c10b7ff2..9b287dd419 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class Resurrection extends AbstractEffect { private final int _power; - public Resurrection(StatsSet params) + public Resurrection(StatSet params) { _power = params.getInt("power", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 18d8bdb0bd..6ef063ce91 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -39,7 +39,7 @@ public class ResurrectionSpecial extends AbstractEffect private final int _power; private final Set _instanceId; - public ResurrectionSpecial(StatsSet params) + public ResurrectionSpecial(StatSet params) { _power = params.getInt("power", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index e4d66b43d3..0e7391681b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class Reuse extends AbstractEffect private final int _magicType; private final double _amount; - public Reuse(StatsSet params) + public Reuse(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index 3716fc1922..e17cd7cc25 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ReuseSkillById extends AbstractEffect { private final int _skillId; - public ReuseSkillById(StatsSet params) + public ReuseSkillById(StatSet params) { _skillId = params.getInt("skillId", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Root.java index 1ca3492949..b6876e8e13 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Root extends AbstractEffect { - public Root(StatsSet params) + public Root(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index 66fc8d82c8..4c7ee53239 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class SacrificeSummon extends AbstractEffect { - public SacrificeSummon(StatsSet params) + public SacrificeSummon(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java index d00856c9bd..683f45bb55 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SafeFallHeight extends AbstractStatEffect { - public SafeFallHeight(StatsSet params) + public SafeFallHeight(StatSet params) { super(params, Stat.FALL); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 7f6bf69ee3..797aa95263 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -33,7 +33,7 @@ public class SendSystemMessageToClan extends AbstractEffect { private final SystemMessage _message; - public SendSystemMessageToClan(StatsSet params) + public SendSystemMessageToClan(StatSet params) { final int id = params.getInt("id", 0); _message = new SystemMessage(id); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java index 7acbf846df..a0508d73b1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class ServitorShare extends AbstractEffect { private final Map _sharedStats = new EnumMap<>(Stat.class); - public ServitorShare(StatsSet params) + public ServitorShare(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 01dfd87c71..6e8187feae 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SetHp extends AbstractEffect private final double _amount; private final StatModifierType _mode; - public SetHp(StatsSet params) + public SetHp(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index 805d18160b..fae21baa51 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SetSkill extends AbstractEffect private final int _skillId; private final int _skillLvl; - public SetSkill(StatsSet params) + public SetSkill(StatSet params) { _skillId = params.getInt("skillId", 0); _skillLvl = params.getInt("skillLvl", 1); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java index a93bb5f253..354cb42b55 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ShieldDefence extends AbstractStatEffect { - public ShieldDefence(StatsSet params) + public ShieldDefence(StatSet params) { super(params, Stat.SHIELD_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java index f28d0e4ad2..1fdee75f69 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ShieldDefenceRate extends AbstractStatEffect { - public ShieldDefenceRate(StatsSet params) + public ShieldDefenceRate(StatSet params) { super(params, Stat.SHIELD_DEFENCE_RATE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java index 1d649082dc..533b631f10 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class SilentMove extends AbstractEffect { - public SilentMove(StatsSet params) + public SilentMove(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java index 89dad85514..7c929a7fe8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class SkillCritical extends AbstractEffect { private final BaseStat _stat; - public SkillCritical(StatsSet params) + public SkillCritical(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java index 369bef11f5..8f054f973b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillCriticalDamage extends AbstractStatEffect { - public SkillCriticalDamage(StatsSet params) + public SkillCriticalDamage(StatSet params) { super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java index c91f2d6b49..88ecf69e77 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillCriticalProbability extends AbstractStatPercentEffect { - public SkillCriticalProbability(StatsSet params) + public SkillCriticalProbability(StatSet params) { super(params, Stat.SKILL_CRITICAL_PROBABILITY); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 7b98a9e180..1664ea1827 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class SkillEvasion extends AbstractEffect private final int _magicType; private final double _amount; - public SkillEvasion(StatsSet params) + public SkillEvasion(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java index 9cc62532b4..2880d0ccef 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillPowerAdd extends AbstractStatAddEffect { - public SkillPowerAdd(StatsSet params) + public SkillPowerAdd(StatSet params) { super(params, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 9578c88f91..7156fff2df 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SkillTurning extends AbstractEffect private final int _chance; private final boolean _staticChance; - public SkillTurning(StatsSet params) + public SkillTurning(StatSet params) { _chance = params.getInt("chance", 100); _staticChance = params.getBoolean("staticChance", false); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 45b02206a4..04691304ed 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SkillTurningOverTime extends AbstractEffect private final int _chance; private final boolean _staticChance; - public SkillTurningOverTime(StatsSet params) + public SkillTurningOverTime(StatSet params) { _chance = params.getInt("chance", 100); _staticChance = params.getBoolean("staticChance", false); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index c1dd92cedb..b919c7acac 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -36,7 +36,7 @@ public class SoulBlow extends AbstractEffect private final double _chanceBoost; private final boolean _overHit; - public SoulBlow(StatsSet params) + public SoulBlow(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 8471aa236c..4f63a84081 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; @@ -40,7 +40,7 @@ public class SoulEating extends AbstractEffect private final int _expNeeded; private final int _maxSouls; - public SoulEating(StatsSet params) + public SoulEating(StatSet params) { _expNeeded = params.getInt("expNeeded"); _maxSouls = params.getInt("maxSouls"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a7d5c2628a..ad261845eb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Seed; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Sow extends AbstractEffect { - public Sow(StatsSet params) + public Sow(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SpModify.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SpModify.java index 24d124ecce..c3bc6193e9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SpModify.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SpModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SpModify extends AbstractStatAddEffect { - public SpModify(StatsSet params) + public SpModify(StatSet params) { super(params, Stat.BONUS_SP); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 0718408ca2..890438d65f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.enums.SpeedType; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -36,7 +36,7 @@ public class Speed extends AbstractEffect private final StatModifierType _mode; private List _speedType; - public Speed(StatsSet params) + public Speed(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index 91b91ad05e..db247775f3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SphericBarrier extends AbstractStatAddEffect { - public SphericBarrier(StatsSet params) + public SphericBarrier(StatSet params) { super(params, Stat.SPHERIC_BARRIER_RANGE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index d13eaf1c2e..385240377f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class Spoil extends AbstractEffect { - public Spoil(StatsSet params) + public Spoil(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index b63c24dc20..22c4132b63 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -36,7 +36,7 @@ public class StatBonusSkillCritical extends AbstractEffect private final BaseStat _stat; private final Condition _armorTypeCondition; - public StatBonusSkillCritical(StatsSet params) + public StatBonusSkillCritical(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.DEX); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index 41a20bfafe..49280eb774 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -36,7 +36,7 @@ public class StatBonusSpeed extends AbstractEffect private final BaseStat _stat; private final Condition _armorTypeCondition; - public StatBonusSpeed(StatsSet params) + public StatBonusSpeed(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.DEX); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index a007b118b2..bcf691e360 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class StatByMoveType extends AbstractEffect private final MoveType _type; private final double _value; - public StatByMoveType(StatsSet params) + public StatByMoveType(StatSet params) { _stat = params.getEnum("stat", Stat.class); _type = params.getEnum("type", MoveType.class); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StatUp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StatUp.java index b961ec8484..7abb1367af 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StatUp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StatUp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class StatUp extends AbstractEffect private final BaseStat _stat; private final double _amount; - public StatUp(StatsSet params) + public StatUp(StatSet params) { _amount = params.getDouble("amount", 0); _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index 0720057c19..23239887a7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.List; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -39,7 +39,7 @@ public class StealAbnormal extends AbstractEffect private final int _rate; private final int _max; - public StealAbnormal(StatsSet params) + public StealAbnormal(StatSet params) { _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); _rate = params.getInt("rate", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Summon.java index cd7bfabef8..62daa5ffdf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.ServitorInstance; @@ -43,7 +43,7 @@ public class Summon extends AbstractEffect private final int _lifeTime; private final int _consumeItemInterval; - public Summon(StatsSet params) + public Summon(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index 8929e1f2b0..50c025e572 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class SummonAgathion extends AbstractEffect { private final int _npcId; - public SummonAgathion(StatsSet params) + public SummonAgathion(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index 7716d58f16..49b816f272 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.CubicData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; @@ -42,7 +42,7 @@ public class SummonCubic extends AbstractEffect private final int _cubicId; private final int _cubicLvl; - public SummonCubic(StatsSet params) + public SummonCubic(StatSet params) { _cubicId = params.getInt("cubicId", -1); _cubicLvl = params.getInt("cubicLvl", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index d0a2a82738..13d5a2eac7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoppelgangerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ public class SummonHallucination extends AbstractEffect private final int _npcId; private final int _npcCount; - public SummonHallucination(StatsSet params) + public SummonHallucination(StatSet params) { _despawnDelay = params.getInt("despawnDelay", 20000); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index bcd050e084..d61a6e5c02 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.ServitorInstance; @@ -43,7 +43,7 @@ public class SummonMulti extends AbstractEffect private final int _consumeItemInterval; private final int _summonPoints; - public SummonMulti(StatsSet params) + public SummonMulti(StatSet params) { _npcId = params.getInt("npcId"); _expMultiplier = params.getFloat("expMultiplier", 1); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index 6f4090eef0..eaff214b7c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DecoyInstance; @@ -48,7 +48,7 @@ public class SummonNpc extends AbstractEffect private final boolean _isSummonSpawn; private final boolean _singleInstance; // Only one instance of this NPC is allowed. - public SummonNpc(StatsSet params) + public SummonNpc(StatSet params) { _despawnDelay = params.getInt("despawnDelay", 20000); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 5ef621819e..534a41ee16 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.data.xml.impl.PetDataTable; import org.l2jmobius.gameserver.model.PetData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PetItemList; */ public class SummonPet extends AbstractEffect { - public SummonPet(StatsSet params) + public SummonPet(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java index 7dd690587c..b1d5ec38cb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SummonPoints extends AbstractStatAddEffect { - public SummonPoints(StatsSet params) + public SummonPoints(StatSet params) { super(params, Stat.MAX_SUMMON_POINTS); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index d8a47b670f..ac1ddaa16a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; @@ -35,7 +35,7 @@ public class SummonTrap extends AbstractEffect private final int _despawnTime; private final int _npcId; - public SummonTrap(StatsSet params) + public SummonTrap(StatSet params) { _despawnTime = params.getInt("despawnTime", 0); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 84f6d070a8..3196bb949d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Collection; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Sweeper extends AbstractEffect { - public Sweeper(StatsSet params) + public Sweeper(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 559dfc6437..ec29554f2d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ public class Synergy extends AbstractEffect private final int _skillLevelScaleTo; private final int _minSlot; - public Synergy(StatsSet params) + public Synergy(StatSet params) { final String requiredSlots = params.getString("requiredSlots", null); if ((requiredSlots != null) && !requiredSlots.isEmpty()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index e35516fef5..39ed981bbf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Castle; @@ -33,7 +33,7 @@ public class TakeCastle extends AbstractEffect { private final CastleSide _side; - public TakeCastle(StatsSet params) + public TakeCastle(StatSet params) { _side = params.getEnum("side", CastleSide.class); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 77fd9ec103..3be2bf5593 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Castle; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TakeCastleStart extends AbstractEffect { - public TakeCastleStart(StatsSet params) + public TakeCastleStart(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 70842191a7..18749c1aef 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Fort; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TakeFort extends AbstractEffect { - public TakeFort(StatsSet params) + public TakeFort(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 0eb23f6733..77355f9683 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TakeFortStart extends AbstractEffect { - public TakeFortStart(StatsSet params) + public TakeFortStart(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index cec32755ed..dd8e09278f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class TalismanSlot extends AbstractEffect { private final int _slots; - public TalismanSlot(StatsSet params) + public TalismanSlot(StatSet params) { _slots = params.getInt("slots", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 281b5322fd..32a126f499 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class TargetCancel extends AbstractEffect { private final int _chance; - public TargetCancel(StatsSet params) + public TargetCancel(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index b4463de391..86ff70c9ca 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMe extends AbstractEffect { - public TargetMe(StatsSet params) + public TargetMe(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index 11e581113e..e68a1e1faf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class TargetMeProbability extends AbstractEffect { private final int _chance; - public TargetMeProbability(StatsSet params) + public TargetMeProbability(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 6c30519678..9ca01faf50 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -32,7 +32,7 @@ public class Teleport extends AbstractEffect { private final Location _loc; - public Teleport(StatsSet params) + public Teleport(StatSet params) { _loc = new Location(params.getInt("x", 0), params.getInt("y", 0), params.getInt("z", 0)); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index e0e715818c..bdc53208d5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -38,7 +38,7 @@ public class TeleportToNpc extends AbstractEffect private final int _npcId; private final boolean _party; - public TeleportToNpc(StatsSet params) + public TeleportToNpc(StatSet params) { _npcId = params.getInt("npcId"); _party = params.getBoolean("party", false); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index c84c559322..4f4275fd41 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TeleportToPlayer extends AbstractEffect { - public TeleportToPlayer(StatsSet params) + public TeleportToPlayer(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index 1c9af0f535..b2d6b663de 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class TeleportToSummon extends AbstractEffect { private final double _maxDistance; - public TeleportToSummon(StatsSet params) + public TeleportToSummon(StatSet params) { _maxDistance = params.getDouble("distance", -1); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index e550302b02..c4bf787a10 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class TeleportToTarget extends AbstractEffect { - public TeleportToTarget(StatsSet params) + public TeleportToTarget(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index ba1c55c615..ff63eea817 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class TransferDamageToPlayer extends AbstractStatAddEffect { - public TransferDamageToPlayer(StatsSet params) + public TransferDamageToPlayer(StatSet params) { super(params, Stat.TRANSFER_DAMAGE_TO_PLAYER); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java index b084bfc1cb..c87d5f0554 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class TransferDamageToSummon extends AbstractStatAddEffect { - public TransferDamageToSummon(StatsSet params) + public TransferDamageToSummon(StatSet params) { super(params, Stat.TRANSFER_DAMAGE_SUMMON_PERCENT); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index e9f0292113..48bc5e3a1c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -34,7 +34,7 @@ public class TransferHate extends AbstractEffect { private final int _chance; - public TransferHate(StatsSet params) + public TransferHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 2ddf95a4db..bf593eaed8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Transformation extends AbstractEffect { private final List _id; - public Transformation(StatsSet params) + public Transformation(StatSet params) { final String ids = params.getString("transformationId", null); if ((ids != null) && !ids.isEmpty()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 103ccdf8ce..2b4af0a1d3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class TrapDetect extends AbstractEffect { private final int _power; - public TrapDetect(StatsSet params) + public TrapDetect(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index eb7b073b36..c4a6c6aed9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.TrapAction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class TrapRemove extends AbstractEffect { private final int _power; - public TrapRemove(StatsSet params) + public TrapRemove(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 6df3874ab1..8fb87050b1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -59,7 +59,7 @@ public class TriggerSkillByAttack extends AbstractEffect * @param params */ - public TriggerSkillByAttack(StatsSet params) + public TriggerSkillByAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index ae6a3bc89f..78366b8047 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillByAvoid extends AbstractEffect /** * @param params */ - public TriggerSkillByAvoid(StatsSet params) + public TriggerSkillByAvoid(StatSet params) { _chance = params.getInt("chance", 100); _skill = new SkillHolder(params.getInt("skillId", 0), params.getInt("skillLevel", 0)); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index c24fb95246..9fe53c0622 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -48,7 +48,7 @@ public class TriggerSkillByDamage extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillByDamage(StatsSet params) + public TriggerSkillByDamage(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c086507336..8b84350293 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillByDeathBlow extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillByDeathBlow(StatsSet params) + public TriggerSkillByDeathBlow(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index a9bfcc320c..11802645f2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -37,7 +37,7 @@ public class TriggerSkillByKill extends AbstractEffect private final int _chance; private final SkillHolder _skill; - public TriggerSkillByKill(StatsSet params) + public TriggerSkillByKill(StatSet params) { _chance = params.getInt("chance", 100); _skill = new SkillHolder(params.getInt("skillId", 0), params.getInt("skillLevel", 0)); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 2893d46f33..7f2d3f9fa7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -52,7 +52,7 @@ public class TriggerSkillByMagicType extends AbstractEffect * @param params */ - public TriggerSkillByMagicType(StatsSet params) + public TriggerSkillByMagicType(StatSet params) { _chance = params.getInt("chance", 100); _magicTypes = params.getIntArray("magicTypes", ";"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 1524e3d4f4..b77da803f5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillBySkill extends AbstractEffect private final int _skillLevelScaleTo; private final TargetType _targetType; - public TriggerSkillBySkill(StatsSet params) + public TriggerSkillBySkill(StatSet params) { _castSkillId = params.getInt("castSkillId"); _chance = params.getInt("chance", 100); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index ec2124c44e..7bb68baec9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -53,7 +53,7 @@ public class TriggerSkillBySkillAttack extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillBySkillAttack(StatsSet params) + public TriggerSkillBySkillAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 3f58619f0a..c209decfb3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -69,7 +69,7 @@ public class TwoHandedBluntBonus extends AbstractEffect private final double _speedAmount; private final StatModifierType _speedMode; - public TwoHandedBluntBonus(StatsSet params) + public TwoHandedBluntBonus(StatSet params) { _pAtkAmount = params.getDouble("pAtkAmount", 0); _pAtkMode = params.getEnum("pAtkMode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index b2c50c4b88..344456a925 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -69,7 +69,7 @@ public class TwoHandedSwordBonus extends AbstractEffect private final double _speedAmount; private final StatModifierType _speedMode; - public TwoHandedSwordBonus(StatsSet params) + public TwoHandedSwordBonus(StatSet params) { _pAtkAmount = params.getDouble("pAtkAmount", 0); _pAtkMode = params.getEnum("pAtkMode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 01ae8122ec..20b418c29b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ public class Unsummon extends AbstractEffect { private final int _chance; - public Unsummon(StatsSet params) + public Unsummon(StatSet params) { _chance = params.getInt("chance", -1); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 57eb89196d..f73f0f57f0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; */ public class UnsummonAgathion extends AbstractEffect { - public UnsummonAgathion(StatsSet params) + public UnsummonAgathion(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index a4fdc2c0aa..0779d018cc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class UnsummonServitors extends AbstractEffect { - public UnsummonServitors(StatsSet params) + public UnsummonServitors(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index dbb0c700b5..ac33fcba0d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Untargetable extends AbstractEffect { - public Untargetable(StatsSet params) + public Untargetable(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java index ac6cae3d05..1c85196fe0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class VampiricAttack extends AbstractEffect private final double _amount; private final double _sum; - public VampiricAttack(StatsSet params) + public VampiricAttack(StatSet params) { _amount = params.getDouble("amount"); _sum = _amount * params.getDouble("chance"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java index ab724714e1..571ca55bbe 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ public class VampiricDefence extends AbstractEffect { private final int _amount; - public VampiricDefence(StatsSet params) + public VampiricDefence(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java index f8b9d76f3a..caaa8d02b4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class VitalityExpRate extends AbstractStatPercentEffect { - public VitalityExpRate(StatsSet params) + public VitalityExpRate(StatSet params) { super(params, Stat.VITALITY_EXP_RATE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index cba2b14c35..385595e03d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class VitalityPointUp extends AbstractEffect { private final int _value; - public VitalityPointUp(StatsSet params) + public VitalityPointUp(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java index 86612955dd..72f78ec177 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class VitalityPointsRate extends AbstractStatPercentEffect { - public VitalityPointsRate(StatsSet params) + public VitalityPointsRate(StatSet params) { super(params, Stat.VITALITY_CONSUME_RATE); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java index 09500b3823..bf20bd5018 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WeightLimit extends AbstractStatEffect { - public WeightLimit(StatsSet params) + public WeightLimit(StatSet params) { super(params, Stat.WEIGHT_LIMIT); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java index f9be68f493..6020399f85 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WeightPenalty extends AbstractStatAddEffect { - public WeightPenalty(StatsSet params) + public WeightPenalty(StatSet params) { super(params, Stat.WEIGHT_PENALTY); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java index bdf9aca48d..81eb9a9688 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WorldChatPoints extends AbstractStatEffect { - public WorldChatPoints(StatsSet params) + public WorldChatPoints(StatSet params) { super(params, Stat.WORLD_CHAT_POINTS); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java index 5a3842921d..127dadf9d2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class BuildAdvanceBaseSkillCondition implements ISkillCondition { - public BuildAdvanceBaseSkillCondition(StatsSet params) + public BuildAdvanceBaseSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java index 9328638400..b479302f61 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class BuildCampSkillCondition implements ISkillCondition { - public BuildCampSkillCondition(StatsSet params) + public BuildCampSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java index c1220c828a..aca51bafbf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanAddMaxEntranceInzoneSkillCondition implements ISkillCondition { - public CanAddMaxEntranceInzoneSkillCondition(StatsSet params) + public CanAddMaxEntranceInzoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java index eddd45771c..6ac3c2e199 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ public class CanBookmarkAddSlotSkillCondition implements ISkillCondition { private final int _teleportBookmarkSlots; - public CanBookmarkAddSlotSkillCondition(StatsSet params) + public CanBookmarkAddSlotSkillCondition(StatSet params) { _teleportBookmarkSlots = params.getInt("teleportBookmarkSlots"); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java index 30fdb7f36f..ee1bf96e69 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanChangeVitalItemCountSkillCondition implements ISkillCondition { - public CanChangeVitalItemCountSkillCondition(StatsSet params) + public CanChangeVitalItemCountSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java index da553a6d9f..48e28e7af7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanEnchantAttributeSkillCondition implements ISkillCondition { - public CanEnchantAttributeSkillCondition(StatsSet params) + public CanEnchantAttributeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java index c14f1ffe64..2908994776 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanMountForEventSkillCondition implements ISkillCondition { - public CanMountForEventSkillCondition(StatsSet params) + public CanMountForEventSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java index d07aa9a622..9dc5f99592 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShipInstance; @@ -31,7 +31,7 @@ public class CanRefuelAirshipSkillCondition implements ISkillCondition { private final int _amount; - public CanRefuelAirshipSkillCondition(StatsSet params) + public CanRefuelAirshipSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java index d451f3c997..67206b47bd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanRestoreVitalPointSkillCondition implements ISkillCondition { - public CanRestoreVitalPointSkillCondition(StatsSet params) + public CanRestoreVitalPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java index 7e519025b0..49232af88f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CanSummonCubicSkillCondition implements ISkillCondition { - public CanSummonCubicSkillCondition(StatsSet params) + public CanSummonCubicSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java index 8b550d164c..33541e82a8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class CanSummonMultiSkillCondition implements ISkillCondition { private final int _summonPoints; - public CanSummonMultiSkillCondition(StatsSet params) + public CanSummonMultiSkillCondition(StatSet params) { _summonPoints = params.getInt("summonPoints"); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java index aa9579e92a..b06ba00f32 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.CharSummonTable; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; */ public class CanSummonPetSkillCondition implements ISkillCondition { - public CanSummonPetSkillCondition(StatsSet params) + public CanSummonPetSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java index ea41a2e22e..3655e158cb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanSummonSiegeGolemSkillCondition implements ISkillCondition { - public CanSummonSiegeGolemSkillCondition(StatsSet params) + public CanSummonSiegeGolemSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java index 460d72a743..e07ce75c8f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanSummonSkillCondition implements ISkillCondition { - public CanSummonSkillCondition(StatsSet params) + public CanSummonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java index 309da529c9..bd8838d02f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanTransformInDominionSkillCondition implements ISkillCondition { - public CanTransformInDominionSkillCondition(StatsSet params) + public CanTransformInDominionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java index 81297944f1..2f4d780cab 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class CanTransformSkillCondition implements ISkillCondition // TODO: What to do with this? // private final int _transformId; - public CanTransformSkillCondition(StatsSet params) + public CanTransformSkillCondition(StatSet params) { // _transformId = params.getInt("transformId"); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java index 800d0375be..771873a553 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanUntransformSkillCondition implements ISkillCondition { - public CanUntransformSkillCondition(StatsSet params) + public CanUntransformSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java index e651b3b1d5..ffe2e4a026 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class CanUseInBattlefieldSkillCondition implements ISkillCondition { - public CanUseInBattlefieldSkillCondition(StatsSet params) + public CanUseInBattlefieldSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java index 5ff751abce..ba030b97a4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanUseInDragonLairSkillCondition implements ISkillCondition { - public CanUseInDragonLairSkillCondition(StatsSet params) + public CanUseInDragonLairSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java index 4d914c28fe..8a0cb18ac7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class CanUseSwoopCannonSkillCondition implements ISkillCondition { - public CanUseSwoopCannonSkillCondition(StatsSet params) + public CanUseSwoopCannonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java index 6a2d832a4c..e9996580fc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanUseVitalityConsumeItemSkillCondition implements ISkillCondition { - public CanUseVitalityConsumeItemSkillCondition(StatsSet params) + public CanUseVitalityConsumeItemSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java index f694956e7e..48dafb46c3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class CannotUseInTransformSkillCondition implements ISkillCondition { private final int _transformId; - public CannotUseInTransformSkillCondition(StatsSet params) + public CannotUseInTransformSkillCondition(StatSet params) { _transformId = params.getInt("transformId", -1); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java index 141c69322f..6591233504 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -32,7 +32,7 @@ public class CheckLevelSkillCondition implements ISkillCondition private final int _maxLevel; private final SkillConditionAffectType _affectType; - public CheckLevelSkillCondition(StatsSet params) + public CheckLevelSkillCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java index 15163a3373..d72f463c4e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class CheckSexSkillCondition implements ISkillCondition { private final boolean _isFemale; - public CheckSexSkillCondition(StatsSet params) + public CheckSexSkillCondition(StatSet params) { _isFemale = params.getBoolean("isFemale"); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java index 8dee11ef9c..12e49c23a7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConsumeBodySkillCondition implements ISkillCondition { - public ConsumeBodySkillCondition(StatsSet params) + public ConsumeBodySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java index c24da9ebcd..ba1b1cdd5f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class EnergySavedSkillCondition implements ISkillCondition { private final int _amount; - public EnergySavedSkillCondition(StatsSet params) + public EnergySavedSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 192f3487e2..cbaf72bb00 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -35,7 +35,7 @@ public class EquipArmorSkillCondition implements ISkillCondition { private int _armorTypesMask = 0; - public EquipArmorSkillCondition(StatsSet params) + public EquipArmorSkillCondition(StatSet params) { final List armorTypes = params.getEnumList("armorType", ArmorType.class); if (armorTypes != null) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index e5f22008fa..708b4dd1d4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class EquipShieldSkillCondition implements ISkillCondition { - public EquipShieldSkillCondition(StatsSet params) + public EquipShieldSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 4561945254..f733f81f62 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -33,7 +33,7 @@ public class EquipWeaponSkillCondition implements ISkillCondition { private int _weaponTypesMask = 0; - public EquipWeaponSkillCondition(StatsSet params) + public EquipWeaponSkillCondition(StatSet params) { final List weaponTypes = params.getEnumList("weaponType", WeaponType.class); if (weaponTypes != null) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java index 5f77215218..e36c06fa11 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class NotFearedSkillCondition implements ISkillCondition { - public NotFearedSkillCondition(StatsSet params) + public NotFearedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java index b9096cc1a9..b6e7bcd826 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class NotInUnderwaterSkillCondition implements ISkillCondition { - public NotInUnderwaterSkillCondition(StatsSet params) + public NotInUnderwaterSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index eee6ec73e9..18d8dc8a11 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -35,7 +35,7 @@ public class Op2hWeaponSkillCondition implements ISkillCondition { private final List _weaponTypes = new ArrayList<>(); - public Op2hWeaponSkillCondition(StatsSet params) + public Op2hWeaponSkillCondition(StatSet params) { final List weaponTypes = params.getList("weaponType", String.class); if (weaponTypes != null) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 3b91f36fe4..6223172dbc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; - public OpAffectedBySkillSkillCondition(StatsSet params) + public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java index 2eb561291e..3818df4736 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAgathionEnergySkillCondition implements ISkillCondition { - public OpAgathionEnergySkillCondition(StatsSet params) + public OpAgathionEnergySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java index 76a7ebc5a8..ee2b415021 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.enums.SkillConditionAlignment; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -32,7 +32,7 @@ public class OpAlignmentSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final SkillConditionAlignment _alignment; - public OpAlignmentSkillCondition(StatsSet params) + public OpAlignmentSkillCondition(StatSet params) { _affectType = params.getEnum("affectType", SkillConditionAffectType.class); _alignment = params.getEnum("alignment", SkillConditionAlignment.class); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index 1c83d18f4e..bcc6715bb2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -33,7 +33,7 @@ public class OpBlinkSkillCondition implements ISkillCondition private final int _angle; private final int _range; - public OpBlinkSkillCondition(StatsSet params) + public OpBlinkSkillCondition(StatSet params) { switch (params.getEnum("direction", Position.class)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java index 5215f86ae6..fde0c7f0f8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpCallPcSkillCondition implements ISkillCondition { - public OpCallPcSkillCondition(StatsSet params) + public OpCallPcSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java index dddafec6f0..1de2a32550 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCanEscapeSkillCondition implements ISkillCondition { - public OpCanEscapeSkillCondition(StatsSet params) + public OpCanEscapeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java index 3f1685a1e0..a87fd8adb6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCanNotUseAirshipSkillCondition implements ISkillCondition { - public OpCanNotUseAirshipSkillCondition(StatsSet params) + public OpCanNotUseAirshipSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java index 8eec19a568..ac7a81c015 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCannotUseTargetWithPrivateStoreSkillCondition implements ISkillCondition { - public OpCannotUseTargetWithPrivateStoreSkillCondition(StatsSet params) + public OpCannotUseTargetWithPrivateStoreSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 91de0adc8c..4030b79d00 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Weapon; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpChangeWeaponSkillCondition implements ISkillCondition { - public OpChangeWeaponSkillCondition(StatsSet params) + public OpChangeWeaponSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java index c2de03de1e..3e304e7d9d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.AbnormalType; @@ -34,7 +34,7 @@ public class OpCheckAbnormalSkillCondition implements ISkillCondition private final boolean _hasAbnormal; private final SkillConditionAffectType _affectType; - public OpCheckAbnormalSkillCondition(StatsSet params) + public OpCheckAbnormalSkillCondition(StatSet params) { _type = params.getEnum("type", AbnormalType.class); _level = params.getInt("level"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java index 65084182b1..c70b58dc50 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCheckAccountTypeSkillCondition implements ISkillCondition { - public OpCheckAccountTypeSkillCondition(StatsSet params) + public OpCheckAccountTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java index 3d4f0a58a0..11eb804274 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpCheckCastRangeSkillCondition implements ISkillCondition { private final int _distance; - public OpCheckCastRangeSkillCondition(StatsSet params) + public OpCheckCastRangeSkillCondition(StatSet params) { _distance = params.getInt("distance"); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java index 7e2e391595..03af1ac63d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.ClassId; @@ -35,7 +35,7 @@ public class OpCheckClassListSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final boolean _isWithin; - public OpCheckClassListSkillCondition(StatsSet params) + public OpCheckClassListSkillCondition(StatSet params) { _classIds = params.getEnumList("classIds", ClassId.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java index 9f779f937a..9702804304 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.ClassId; @@ -33,7 +33,7 @@ public class OpCheckClassSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final boolean _isWithin; - public OpCheckClassSkillCondition(StatsSet params) + public OpCheckClassSkillCondition(StatSet params) { _classId = params.getEnum("classId", ClassId.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java index 3bf6b65dc8..ad997dced7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckCrtEffectSkillCondition implements ISkillCondition { - public OpCheckCrtEffectSkillCondition(StatsSet params) + public OpCheckCrtEffectSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java index 144dc95daa..1d5a3adff9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class OpCheckFlagSkillCondition implements ISkillCondition { - public OpCheckFlagSkillCondition(StatsSet params) + public OpCheckFlagSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java index 75af2ab89a..2e0c07d040 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckOnGoingEventCampaignSkillCondition implements ISkillCondition { - public OpCheckOnGoingEventCampaignSkillCondition(StatsSet params) + public OpCheckOnGoingEventCampaignSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java index c64f7c6722..f11569f43c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckPcbangPointSkillCondition implements ISkillCondition { - public OpCheckPcbangPointSkillCondition(StatsSet params) + public OpCheckPcbangPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java index 252519f7ff..997a4d0fec 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.data.xml.impl.ClanHallData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -35,7 +35,7 @@ public class OpCheckResidenceSkillCondition implements ISkillCondition private final List _residencesId; private final boolean _isWithin; - public OpCheckResidenceSkillCondition(StatsSet params) + public OpCheckResidenceSkillCondition(StatSet params) { _residencesId = params.getList("residencesId", Integer.class); _isWithin = params.getBoolean("isWithin"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java index 6abeed7d35..3a1bcf424c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -34,7 +34,7 @@ public class OpCheckSkillListSkillCondition implements ISkillCondition private final List _skillIds; private final SkillConditionAffectType _affectType; - public OpCheckSkillListSkillCondition(StatsSet params) + public OpCheckSkillListSkillCondition(StatSet params) { _skillIds = params.getList("skillIds", Integer.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java index 984338b2c0..af563d983f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpCheckSkillSkillCondition implements ISkillCondition private final int _skillId; private final SkillConditionAffectType _affectType; - public OpCheckSkillSkillCondition(StatsSet params) + public OpCheckSkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java index ea882c3635..5d85a2dbdb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionCompanionType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpCompanionSkillCondition implements ISkillCondition { private final SkillConditionCompanionType _type; - public OpCompanionSkillCondition(StatsSet params) + public OpCompanionSkillCondition(StatSet params) { _type = params.getEnum("type", SkillConditionCompanionType.class); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java index 069b9d1759..464853c00c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpEnchantRangeSkillCondition implements ISkillCondition { - public OpEnchantRangeSkillCondition(StatsSet params) + public OpEnchantRangeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java index 99f22bb16a..e12f3ae007 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class OpEncumberedSkillCondition implements ISkillCondition private final int _slotsPercent; private final int _weightPercent; - public OpEncumberedSkillCondition(StatsSet params) + public OpEncumberedSkillCondition(StatSet params) { _slotsPercent = params.getInt("slotsPercent"); _weightPercent = params.getInt("weightPercent"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java index 187dfba744..49cf8e2cb8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpEnergyMaxSkillCondition implements ISkillCondition { private final int _amount; - public OpEnergyMaxSkillCondition(StatsSet params) + public OpEnergyMaxSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 75bdf465e0..82eb70b770 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class OpEquipItemSkillCondition implements ISkillCondition private final int _itemId; private final SkillConditionAffectType _affectType; - public OpEquipItemSkillCondition(StatsSet params) + public OpEquipItemSkillCondition(StatSet params) { _itemId = params.getInt("itemId"); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java index 2c4576c2fa..fa6e82082b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ public class OpExistNpcSkillCondition implements ISkillCondition private final int _range; private final boolean _isAround; - public OpExistNpcSkillCondition(StatsSet params) + public OpExistNpcSkillCondition(StatSet params) { _npcIds = params.getList("npcIds", Integer.class); _range = params.getInt("range"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java index 27cc3e90a9..8299b40047 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingCastSkillCondition implements ISkillCondition { - public OpFishingCastSkillCondition(StatsSet params) + public OpFishingCastSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java index 84cc031a24..4b43eb834e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingPumpingSkillCondition implements ISkillCondition { - public OpFishingPumpingSkillCondition(StatsSet params) + public OpFishingPumpingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java index 86aa667bee..a6a400f96f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingReelingSkillCondition implements ISkillCondition { - public OpFishingReelingSkillCondition(StatsSet params) + public OpFishingReelingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java index d22733df7e..50e6dafb82 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpHaveSummonSkillCondition implements ISkillCondition { - public OpHaveSummonSkillCondition(StatsSet params) + public OpHaveSummonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 2e854ca2b8..cceb4e937b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { private final int _npcId; - public OpHaveSummonedNpcSkillCondition(StatsSet params) + public OpHaveSummonedNpcSkillCondition(StatSet params) { _npcId = params.getInt("npcId"); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java index 16932ce531..374a75bfab 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.impl.ClanHallData; import org.l2jmobius.gameserver.enums.ResidenceType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -34,7 +34,7 @@ public class OpHomeSkillCondition implements ISkillCondition { private final ResidenceType _type; - public OpHomeSkillCondition(StatsSet params) + public OpHomeSkillCondition(StatSet params) { _type = params.getEnum("type", ResidenceType.class); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java index 9482a0bf55..62ad48bdcc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpInSiegeTimeSkillCondition implements ISkillCondition { - public OpInSiegeTimeSkillCondition(StatsSet params) + public OpInSiegeTimeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java index 1bffdacd6c..f2fb298398 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -30,7 +30,7 @@ public class OpInstantzoneSkillCondition implements ISkillCondition { private final int _instanceId; - public OpInstantzoneSkillCondition(StatsSet params) + public OpInstantzoneSkillCondition(StatSet params) { _instanceId = params.getInt("instanceId"); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java index 76703cc53b..7418ef9b64 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpMainjobSkillCondition implements ISkillCondition { - public OpMainjobSkillCondition(StatsSet params) + public OpMainjobSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java index d4c9f1f331..3c81369bbb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNeedAgathionSkillCondition implements ISkillCondition { - public OpNeedAgathionSkillCondition(StatsSet params) + public OpNeedAgathionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java index 96f6774f25..e7a477b0ee 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; @@ -34,7 +34,7 @@ public class OpNeedSummonOrPetSkillCondition implements ISkillCondition { private final List _npcIds = new ArrayList<>(); - public OpNeedSummonOrPetSkillCondition(StatsSet params) + public OpNeedSummonOrPetSkillCondition(StatSet params) { final List npcIds = params.getList("npcIds", String.class); if (npcIds != null) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java index 9701002065..ae1edfd719 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotCursedSkillCondition implements ISkillCondition { - public OpNotCursedSkillCondition(StatsSet params) + public OpNotCursedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java index bf909425d8..1de79f388a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpNotInPeacezoneSkillCondition implements ISkillCondition { - public OpNotInPeacezoneSkillCondition(StatsSet params) + public OpNotInPeacezoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java index 0752ba4a6a..0d3e4cb4dd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotInstantzoneSkillCondition implements ISkillCondition { - public OpNotInstantzoneSkillCondition(StatsSet params) + public OpNotInstantzoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java index 45891cd0ac..7ea02159ba 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotOlympiadSkillCondition implements ISkillCondition { - public OpNotOlympiadSkillCondition(StatsSet params) + public OpNotOlympiadSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java index 5c5d293ae8..2397a68e99 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpNotTerritorySkillCondition implements ISkillCondition { - public OpNotTerritorySkillCondition(StatsSet params) + public OpNotTerritorySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java index 874872bb2e..d9f8c1fa3b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpPeacezoneSkillCondition implements ISkillCondition { - public OpPeacezoneSkillCondition(StatsSet params) + public OpPeacezoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java index c20c4665bb..08d6bb095a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpPkcountSkillCondition implements ISkillCondition { private final SkillConditionAffectType _affectType; - public OpPkcountSkillCondition(StatsSet params) + public OpPkcountSkillCondition(StatSet params) { _affectType = params.getEnum("affectType", SkillConditionAffectType.class); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java index 879fc88c4c..d393c5ddc3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -30,7 +30,7 @@ public class OpPledgeSkillCondition implements ISkillCondition { private final int _level; - public OpPledgeSkillCondition(StatsSet params) + public OpPledgeSkillCondition(StatSet params) { _level = params.getInt("level"); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java index 9adc89b98d..adf16f8feb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpRestartPointSkillCondition implements ISkillCondition { - public OpRestartPointSkillCondition(StatsSet params) + public OpRestartPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java index bbd1d9d7d1..6874091ba2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class OpResurrectionSkillCondition implements ISkillCondition { - public OpResurrectionSkillCondition(StatsSet params) + public OpResurrectionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java index 8bbf796ad2..566f935a50 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpSiegeHammerSkillCondition implements ISkillCondition { - public OpSiegeHammerSkillCondition(StatsSet params) + public OpSiegeHammerSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java index be3ad18e05..cbfc1a25b2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition private final int _skillId; private final boolean _hasLearned; - public OpSkillAcquireSkillCondition(StatsSet params) + public OpSkillAcquireSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _hasLearned = params.getBoolean("hasLearned"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java index c8789d28e4..a8382b83b3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpSkillSkillCondition implements ISkillCondition private final int _skillLevel; private final boolean _hasLearned; - public OpSkillSkillCondition(StatsSet params) + public OpSkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _skillLevel = params.getInt("skillLevel"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java index 5127071683..a3d188f3eb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpSocialClassSkillCondition implements ISkillCondition { private final int _socialClass; - public OpSocialClassSkillCondition(StatsSet params) + public OpSocialClassSkillCondition(StatSet params) { _socialClass = params.getInt("socialClass"); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java index b9d37d18c0..c86984a218 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class OpSoulMaxSkillCondition implements ISkillCondition { - public OpSoulMaxSkillCondition(StatsSet params) + public OpSoulMaxSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java index 4780c13a58..0faa676bbe 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpSubjobSkillCondition implements ISkillCondition { - public OpSubjobSkillCondition(StatsSet params) + public OpSubjobSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java index 17a9a1a9e3..a14192847a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.concurrent.atomic.AtomicBoolean; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpSweeperSkillCondition implements ISkillCondition { - public OpSweeperSkillCondition(StatsSet params) + public OpSweeperSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java index b36585bf00..c4b3923e92 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTargetAllItemTypeSkillCondition implements ISkillCondition { - public OpTargetAllItemTypeSkillCondition(StatsSet params) + public OpTargetAllItemTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 6b85389d62..5492e96e1a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTargetArmorTypeSkillCondition implements ISkillCondition { - public OpTargetArmorTypeSkillCondition(StatsSet params) + public OpTargetArmorTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java index 0c0090fbc4..97e07a1822 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpTargetDoorSkillCondition implements ISkillCondition { private final List _doorIds; - public OpTargetDoorSkillCondition(StatsSet params) + public OpTargetDoorSkillCondition(StatSet params) { _doorIds = params.getList("doorIds", Integer.class); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java index 6fbc3cda10..eaabf4a73d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpTargetMyPledgeAcademySkillCondition implements ISkillCondition { - public OpTargetMyPledgeAcademySkillCondition(StatsSet params) + public OpTargetMyPledgeAcademySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java index d5820600dd..14a744613d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpTargetNpcSkillCondition implements ISkillCondition { private final List _npcId; - public OpTargetNpcSkillCondition(StatsSet params) + public OpTargetNpcSkillCondition(StatSet params) { _npcId = params.getList("npcIds", Integer.class); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java index 854225a75a..b0c5e50ae3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpTargetPcSkillCondition implements ISkillCondition { - public OpTargetPcSkillCondition(StatsSet params) + public OpTargetPcSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index 7faecb2ffd..62fd4b365f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Weapon; @@ -34,7 +34,7 @@ public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition { private final List _weaponTypes = new ArrayList<>(); - public OpTargetWeaponAttackTypeSkillCondition(StatsSet params) + public OpTargetWeaponAttackTypeSkillCondition(StatSet params) { final List weaponTypes = params.getList("weaponType", String.class); if (weaponTypes != null) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java index 8451365885..e114c03412 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTerritorySkillCondition implements ISkillCondition { - public OpTerritorySkillCondition(StatsSet params) + public OpTerritorySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java index 13f287687e..fde1293086 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpUnlockSkillCondition implements ISkillCondition { - public OpUnlockSkillCondition(StatsSet params) + public OpUnlockSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java index 8cc76a34bb..46dea5bbcb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpUseFirecrackerSkillCondition implements ISkillCondition { - public OpUseFirecrackerSkillCondition(StatsSet params) + public OpUseFirecrackerSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java index f3b54bbad7..651dade274 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpUsePraseedSkillCondition implements ISkillCondition { - public OpUsePraseedSkillCondition(StatsSet params) + public OpUsePraseedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java index 890b0fcd5f..dd57df0e13 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.MountType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpWyvernSkillCondition implements ISkillCondition { - public OpWyvernSkillCondition(StatsSet params) + public OpWyvernSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java index 49085b6674..8590262afc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class PossessHolythingSkillCondition implements ISkillCondition { - public PossessHolythingSkillCondition(StatsSet params) + public PossessHolythingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java index 8b0fb55554..38b5644fb1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class RemainCpPerSkillCondition implements ISkillCondition private final int _amount; private final SkillConditionPercentType _percentType; - public RemainCpPerSkillCondition(StatsSet params) + public RemainCpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java index 612367a233..1ad96100ad 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -33,7 +33,7 @@ public class RemainHpPerSkillCondition implements ISkillCondition private final SkillConditionPercentType _percentType; private final SkillConditionAffectType _affectType; - public RemainHpPerSkillCondition(StatsSet params) + public RemainHpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java index 5455c1587a..39085349d9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class RemainMpPerSkillCondition implements ISkillCondition private final int _amount; private final SkillConditionPercentType _percentType; - public RemainMpPerSkillCondition(StatsSet params) + public RemainMpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java index 7de47f103f..6e9e5ad821 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class SoulSavedSkillCondition implements ISkillCondition { private final int _amount; - public SoulSavedSkillCondition(StatsSet params) + public SoulSavedSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java index 0b75a5a623..f4bdbaaecb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class TargetItemCrystalTypeSkillCondition implements ISkillCondition { - public TargetItemCrystalTypeSkillCondition(StatsSet params) + public TargetItemCrystalTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java index 51502ff209..604a41f904 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.MentorManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMyMenteeSkillCondition implements ISkillCondition { - public TargetMyMenteeSkillCondition(StatsSet params) + public TargetMyMenteeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java index fc621365a9..4bfb496634 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class TargetMyPartySkillCondition implements ISkillCondition { private final boolean _includeMe; - public TargetMyPartySkillCondition(StatsSet params) + public TargetMyPartySkillCondition(StatSet params) { _includeMe = params.getBoolean("includeMe"); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java index 9ebec0e691..d44a1bc8a9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMyPledgeSkillCondition implements ISkillCondition { - public TargetMyPledgeSkillCondition(StatsSet params) + public TargetMyPledgeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java index f4da8d6079..5045aa3848 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class TargetRaceSkillCondition implements ISkillCondition { private final Race _race; - public TargetRaceSkillCondition(StatsSet params) + public TargetRaceSkillCondition(StatSet params) { _race = params.getEnum("race", Race.class); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java index b1d0ec8553..7e9236b634 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.ActionDataHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -57,7 +57,7 @@ public class ActionData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "action", actionNode -> { - final ActionDataHolder holder = new ActionDataHolder(new StatsSet(parseAttributes(actionNode))); + final ActionDataHolder holder = new ActionDataHolder(new StatSet(parseAttributes(actionNode))); _actionData.put(holder.getId(), holder); })); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java index 36002572b0..f7762ab07b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java @@ -32,7 +32,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.AdminCommandAccessRight; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -72,7 +72,7 @@ public class AdminData implements IXmlReader { NamedNodeMap attrs; Node attr; - StatsSet set; + StatSet set; AccessLevel level; AdminCommandAccessRight command; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -83,7 +83,7 @@ public class AdminData implements IXmlReader { if ("access".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -99,7 +99,7 @@ public class AdminData implements IXmlReader } else if ("admin".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index 6d25769eab..817f0cabde 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; @@ -83,7 +83,7 @@ public class AppearanceItemData implements IXmlReader { if ("appearance_stone".equalsIgnoreCase(d.getNodeName())) { - final AppearanceStone stone = new AppearanceStone(new StatsSet(parseAttributes(d))); + final AppearanceStone stone = new AppearanceStone(new StatSet(parseAttributes(d))); for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) { switch (c.getNodeName()) @@ -120,7 +120,7 @@ public class AppearanceItemData implements IXmlReader } case "visual": { - stone.addVisualId(new AppearanceHolder(new StatsSet(parseAttributes(c)))); + stone.addVisualId(new AppearanceHolder(new StatSet(parseAttributes(c)))); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java index 6c96d3874a..6eac3240e7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -64,7 +64,7 @@ public class AttendanceRewardData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "item", rewardNode -> { - final StatsSet set = new StatsSet(parseAttributes(rewardNode)); + final StatSet set = new StatSet(parseAttributes(rewardNode)); final int itemId = set.getInt("id"); final int itemCount = set.getInt("count"); if (ItemTable.getInstance().getTemplate(itemId) == null) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java index 891d19fcf2..3054b0e7ef 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.beautyshop.BeautyData; import org.l2jmobius.gameserver.model.beautyshop.BeautyItem; @@ -56,7 +56,7 @@ public class BeautyShopData implements IXmlReader public void parseDocument(Document doc, File f) { NamedNodeMap attrs; - StatsSet set; + StatSet set; Node att; Race race = null; Sex sex = null; @@ -92,7 +92,7 @@ public class BeautyShopData implements IXmlReader if ("hair".equalsIgnoreCase(a.getNodeName())) { attrs = a.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -105,7 +105,7 @@ public class BeautyShopData implements IXmlReader if ("color".equalsIgnoreCase(g.getNodeName())) { attrs = g.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -119,7 +119,7 @@ public class BeautyShopData implements IXmlReader else if ("face".equalsIgnoreCase(a.getNodeName())) { attrs = a.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java index 37e977c51e..530a5d975a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java @@ -34,7 +34,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.entity.ClanHall; @@ -66,7 +66,7 @@ public class ClanHallData implements IXmlReader final List doors = new ArrayList<>(); final List npcs = new ArrayList<>(); final List teleports = new ArrayList<>(); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); for (Node listNode = doc.getFirstChild(); listNode != null; listNode = listNode.getNextSibling()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java index ae608cefb6..f1a23734e0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.combination.CombinationItem; import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; @@ -57,7 +57,7 @@ public class CombinationItemsData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "item", itemNode -> { - final CombinationItem item = new CombinationItem(new StatsSet(parseAttributes(itemNode))); + final CombinationItem item = new CombinationItem(new StatSet(parseAttributes(itemNode))); forEach(itemNode, "reward", rewardNode -> { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java index 038738b138..4af039b48d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.CubicSkill; import org.l2jmobius.gameserver.model.cubic.ICubicConditionHolder; @@ -61,7 +61,7 @@ public class CubicData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - forEach(doc, "list", listNode -> forEach(listNode, "cubic", cubicNode -> parseTemplate(cubicNode, new CubicTemplate(new StatsSet(parseAttributes(cubicNode)))))); + forEach(doc, "list", listNode -> forEach(listNode, "cubic", cubicNode -> parseTemplate(cubicNode, new CubicTemplate(new StatSet(parseAttributes(cubicNode)))))); } /** @@ -137,7 +137,7 @@ public class CubicData implements IXmlReader { forEach(cubicNode, "skill", skillNode -> { - final CubicSkill skill = new CubicSkill(new StatsSet(parseAttributes(skillNode))); + final CubicSkill skill = new CubicSkill(new StatSet(parseAttributes(skillNode))); forEach(cubicNode, "conditions", conditionNode -> parseConditions(cubicNode, template, skill)); template.getSkills().add(skill); }); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java index 3d19bee079..ede9b72202 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -62,7 +62,7 @@ public class DailyMissionData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "reward", rewardNode -> { - final StatsSet set = new StatsSet(parseAttributes(rewardNode)); + final StatSet set = new StatSet(parseAttributes(rewardNode)); final List items = new ArrayList<>(1); forEach(rewardNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> @@ -80,14 +80,14 @@ public class DailyMissionData implements IXmlReader // Initial values in case handler doesn't exists set.set("handler", ""); - set.set("params", StatsSet.EMPTY_STATSET); + set.set("params", StatSet.EMPTY_STATSET); // Parse handler and parameters forEach(rewardNode, "handler", handlerNode -> { set.set("handler", parseString(handlerNode.getAttributes(), "name")); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); set.set("params", params); forEach(handlerNode, "param", paramNode -> params.set(parseString(paramNode.getAttributes(), "name"), paramNode.getTextContent())); }); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java index 835eab4fe9..53248de524 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java @@ -35,7 +35,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -51,7 +51,7 @@ public class DoorData implements IXmlReader // Info holders private final Map> _groups = new HashMap<>(); private final Map _doors = new HashMap<>(); - private final Map _templates = new HashMap<>(); + private final Map _templates = new HashMap<>(); private final Map> _regions = new HashMap<>(); protected DoorData() @@ -75,9 +75,9 @@ public class DoorData implements IXmlReader LOGGER.info(getClass().getSimpleName() + ": Loaded " + _doors.size() + " Door Templates for " + _regions.size() + " regions."); } - public StatsSet parseDoor(Node doorNode) + public StatSet parseDoor(Node doorNode) { - final StatsSet params = new StatsSet(parseAttributes(doorNode)); + final StatSet params = new StatSet(parseAttributes(doorNode)); params.set("baseHpMax", 1); // Avoid doors without HP value created dead due to default value 0 in CreatureTemplate forEach(doorNode, IXmlReader::isNode, innerDoorNode -> @@ -115,7 +115,7 @@ public class DoorData implements IXmlReader /** * @param set */ - private void applyCollisions(StatsSet set) + private void applyCollisions(StatSet set) { // Insert Collision data if (set.contains("nodeX_0") && set.contains("nodeY_0") && set.contains("nodeX_1") && set.contains("nodeY_1")) @@ -142,7 +142,7 @@ public class DoorData implements IXmlReader * @param set * @return */ - public DoorInstance spawnDoor(StatsSet set) + public DoorInstance spawnDoor(StatSet set) { // Create door template + door instance final DoorTemplate template = new DoorTemplate(set); @@ -183,7 +183,7 @@ public class DoorData implements IXmlReader return door; } - public StatsSet getDoorTemplate(int doorId) + public StatSet getDoorTemplate(int doorId) { return _templates.get(doorId); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java index eca42a9a34..637ef1e953 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -64,7 +64,7 @@ public class EnchantItemData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node att; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -76,7 +76,7 @@ public class EnchantItemData implements IXmlReader if ("enchant".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -107,7 +107,7 @@ public class EnchantItemData implements IXmlReader else if ("support".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java index 46701fd777..bb1e8026b7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.SkillEnchantType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.EnchantSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -69,10 +69,10 @@ public class EnchantSkillGroupsData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "enchant", enchantNode -> { - final EnchantSkillHolder enchantSkillHolder = new EnchantSkillHolder(new StatsSet(parseAttributes(enchantNode))); + final EnchantSkillHolder enchantSkillHolder = new EnchantSkillHolder(new StatSet(parseAttributes(enchantNode))); forEach(enchantNode, "sps", spsNode -> forEach(spsNode, "sp", spNode -> enchantSkillHolder.addSp(parseEnum(spNode.getAttributes(), SkillEnchantType.class, "type"), parseInteger(spNode.getAttributes(), "amount")))); forEach(enchantNode, "chances", chancesNode -> forEach(chancesNode, "chance", chanceNode -> enchantSkillHolder.addChance(parseEnum(chanceNode.getAttributes(), SkillEnchantType.class, "type"), parseInteger(chanceNode.getAttributes(), "value")))); - forEach(enchantNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> enchantSkillHolder.addRequiredItem(parseEnum(itemNode.getAttributes(), SkillEnchantType.class, "type"), new ItemHolder(new StatsSet(parseAttributes(itemNode)))))); + forEach(enchantNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> enchantSkillHolder.addRequiredItem(parseEnum(itemNode.getAttributes(), SkillEnchantType.class, "type"), new ItemHolder(new StatSet(parseAttributes(itemNode)))))); _enchantSkillHolders.put(parseInteger(enchantNode.getAttributes(), "level"), enchantSkillHolder); })); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java index a8bb0397ac..037af7e1ae 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java @@ -34,7 +34,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.eventengine.AbstractEventManager; import org.l2jmobius.gameserver.model.eventengine.EventMethodNotification; import org.l2jmobius.gameserver.model.eventengine.EventScheduler; @@ -156,7 +156,7 @@ public class EventEngineData implements IXmlReader */ private void parseVariables(AbstractEventManager eventManager, Node innerNode) { - final StatsSet variables = new StatsSet(LinkedHashMap::new); + final StatSet variables = new StatSet(LinkedHashMap::new); for (Node variableNode = innerNode.getFirstChild(); variableNode != null; variableNode = variableNode.getNextSibling()) { if ("variable".equals(variableNode.getNodeName())) @@ -188,7 +188,7 @@ public class EventEngineData implements IXmlReader { if ("schedule".equals(scheduleNode.getNodeName())) { - final StatsSet params = new StatsSet(LinkedHashMap::new); + final StatSet params = new StatSet(LinkedHashMap::new); final NamedNodeMap attrs = scheduleNode.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -235,7 +235,7 @@ public class EventEngineData implements IXmlReader } else if ("conditionalSchedule".equals(scheduleNode.getNodeName())) { - final StatsSet params = new StatsSet(LinkedHashMap::new); + final StatSet params = new StatSet(LinkedHashMap::new); final NamedNodeMap attrs = scheduleNode.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -346,7 +346,7 @@ public class EventEngineData implements IXmlReader * @param variableNode */ @SuppressWarnings("unchecked") - private void parseListVariables(AbstractEventManager eventManager, StatsSet variables, Node variableNode) + private void parseListVariables(AbstractEventManager eventManager, StatSet variables, Node variableNode) { final String name = parseString(variableNode.getAttributes(), "name"); final String type = parseString(variableNode.getAttributes(), "type"); @@ -419,7 +419,7 @@ public class EventEngineData implements IXmlReader * @param variableNode */ @SuppressWarnings("unchecked") - private void parseMapVariables(AbstractEventManager eventManager, StatsSet variables, Node variableNode) + private void parseMapVariables(AbstractEventManager eventManager, StatSet variables, Node variableNode) { final String name = parseString(variableNode.getAttributes(), "name"); final String keyType = parseString(variableNode.getAttributes(), "keyType"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java index db19c5fdff..0724877d9d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.ConditionHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.ICondition; import org.l2jmobius.gameserver.model.holders.ExtendDropDataHolder; import org.l2jmobius.gameserver.model.holders.ExtendDropItemHolder; @@ -62,7 +62,7 @@ public class ExtendDropData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "drop", dropNode -> { - final StatsSet set = new StatsSet(parseAttributes(dropNode)); + final StatSet set = new StatSet(parseAttributes(dropNode)); final List items = new ArrayList<>(1); forEach(dropNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> @@ -80,8 +80,8 @@ public class ExtendDropData implements IXmlReader forEach(dropNode, "conditions", conditionsNode -> forEach(conditionsNode, "condition", conditionNode -> { final String conditionName = parseString(conditionNode.getAttributes(), "name"); - final StatsSet params = (StatsSet) parseValue(conditionNode); - final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); + final StatSet params = (StatSet) parseValue(conditionNode); + final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); if (conditionFunction != null) { conditions.add(conditionFunction.apply(params)); @@ -109,7 +109,7 @@ public class ExtendDropData implements IXmlReader private Object parseValue(Node node) { - StatsSet statsSet = null; + StatSet statSet = null; List list = null; Object text = null; for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) @@ -145,12 +145,12 @@ public class ExtendDropData implements IXmlReader final Object value = parseValue(node); if (value != null) { - if (statsSet == null) + if (statSet == null) { - statsSet = new StatsSet(); + statSet = new StatSet(); } - statsSet.set(nodeName, value); + statSet.set(nodeName, value); } } } @@ -161,9 +161,9 @@ public class ExtendDropData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", list); + statSet.set(".", list); } else { @@ -176,16 +176,16 @@ public class ExtendDropData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", text); + statSet.set(".", text); } else { return text; } } - return statsSet; + return statSet; } public ExtendDropDataHolder getExtendDropById(int id) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java index 57a16d6390..608f4702b8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.FakePlayerHolder; @@ -72,7 +72,7 @@ public class FakePlayerData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayer", fakePlayerNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerNode)); final int npcId = set.getInt("npcId"); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); final String name = template.getName(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java index 18cc499b71..a5ade27c03 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.FenceState; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldRegion; import org.l2jmobius.gameserver.model.actor.instance.FenceInstance; @@ -79,7 +79,7 @@ public class FenceData implements IXmlReader private void spawnFence(Node fenceNode) { - final StatsSet set = new StatsSet(parseAttributes(fenceNode)); + final StatSet set = new StatSet(parseAttributes(fenceNode)); spawnFence(set.getInt("x"), set.getInt("y"), set.getInt("z"), set.getString("name"), set.getInt("width"), set.getInt("length"), set.getInt("height"), 0, set.getEnum("state", FenceState.class, FenceState.CLOSED)); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java index 67dd4e396b..02efb756f2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.Henna; import org.l2jmobius.gameserver.model.skills.Skill; @@ -86,7 +86,7 @@ public class HennaData implements IXmlReader */ private void parseHenna(Node d) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final List wearClassIds = new ArrayList<>(); final List skills = new ArrayList<>(); NamedNodeMap attrs = d.getAttributes(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java index 03ad8ab79e..d81e85948d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; @@ -93,7 +93,7 @@ public class InitialEquipmentData implements IXmlReader { if ("item".equalsIgnoreCase(c.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java index 72080aa4ac..54b1909d60 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemPointHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; @@ -55,17 +55,17 @@ public class LuckyGameData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "luckygame", rewardNode -> { - final LuckyGameDataHolder holder = new LuckyGameDataHolder(new StatsSet(parseAttributes(rewardNode))); + final LuckyGameDataHolder holder = new LuckyGameDataHolder(new StatSet(parseAttributes(rewardNode))); forEach(rewardNode, "common_reward", commonRewardNode -> forEach(commonRewardNode, "item", itemNode -> { - final StatsSet stats = new StatsSet(parseAttributes(itemNode)); + final StatSet stats = new StatSet(parseAttributes(itemNode)); holder.addCommonReward(new ItemChanceHolder(stats.getInt("id"), stats.getDouble("chance"), stats.getLong("count"))); })); forEach(rewardNode, "unique_reward", uniqueRewardNode -> forEach(uniqueRewardNode, "item", itemNode -> { - holder.addUniqueReward(new ItemPointHolder(new StatsSet(parseAttributes(itemNode)))); + holder.addUniqueReward(new ItemPointHolder(new StatSet(parseAttributes(itemNode)))); })); forEach(rewardNode, "modify_reward", uniqueRewardNode -> @@ -74,7 +74,7 @@ public class LuckyGameData implements IXmlReader holder.setMaxModifyRewardGame(parseInteger(uniqueRewardNode.getAttributes(), "max_game")); forEach(uniqueRewardNode, "item", itemNode -> { - final StatsSet stats = new StatsSet(parseAttributes(itemNode)); + final StatSet stats = new StatSet(parseAttributes(itemNode)); holder.addModifyReward(new ItemChanceHolder(stats.getInt("id"), stats.getDouble("chance"), stats.getLong("count"))); }); }); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java index 75bb48ed37..190653cdec 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java @@ -35,7 +35,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.SpecialItemType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; @@ -90,7 +90,7 @@ public class MultisellData implements IXmlReader { forEach(doc, "list", listNode -> { - final StatsSet set = new StatsSet(parseAttributes(listNode)); + final StatSet set = new StatSet(parseAttributes(listNode)); final int listId = Integer.parseInt(f.getName().substring(0, f.getName().length() - 4)); final List entries = new ArrayList<>(listNode.getChildNodes().getLength()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java index 3a990d0145..bda5bbcf7f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.enums.AISkillScope; import org.l2jmobius.gameserver.enums.DropType; import org.l2jmobius.gameserver.enums.MpRewardAffectType; import org.l2jmobius.gameserver.enums.MpRewardType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.DropHolder; @@ -95,7 +95,7 @@ public class NpcData implements IXmlReader if ("npc".equalsIgnoreCase(listNode.getNodeName())) { NamedNodeMap attrs = listNode.getAttributes(); - final StatsSet set = new StatsSet(new HashMap<>()); + final StatSet set = new StatSet(new HashMap<>()); final int npcId = parseInteger(attrs, "id"); Map parameters = null; Map skills = null; @@ -514,11 +514,11 @@ public class NpcData implements IXmlReader if (parameters != null) { // Using unmodifiable map parameters of template are not meant to be changed at runtime. - template.setParameters(new StatsSet(Collections.unmodifiableMap(parameters))); + template.setParameters(new StatSet(Collections.unmodifiableMap(parameters))); } else { - template.setParameters(StatsSet.EMPTY_STATSET); + template.setParameters(StatSet.EMPTY_STATSET); } if (skills != null) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java index 3712cca6af..373f87ecfc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -79,7 +79,7 @@ public class NpcNameLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); NPC_NAME_LOCALISATIONS.get(_lang).put(set.getInt("id"), new String[] { set.getString("name"), diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 55dcd539aa..36c5897ecd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.EffectHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; @@ -71,7 +71,7 @@ public class OptionData implements IXmlReader forEach(innerNode, "effect", effectNode -> { final String name = parseString(effectNode.getAttributes(), "name"); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); forEach(effectNode, IXmlReader::isNode, paramNode -> params.set(paramNode.getNodeName(), SkillData.getInstance().parseValue(paramNode, true, false, Collections.emptyMap()))); option.addEffect(EffectHandler.getInstance().getHandlerFactory(name).apply(params)); }); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java index b1bb74baf6..c893725bc3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.PetLevelData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * This class parse and hold all pet parameters.
    @@ -116,7 +116,7 @@ public class PetDataTable implements IXmlReader if (s.getNodeName().equals("stat")) { final int level = Integer.parseInt(s.getAttributes().getNamedItem("level").getNodeValue()); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (Node bean = s.getFirstChild(); bean != null; bean = bean.getNextSibling()) { if (bean.getNodeName().equals("set")) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java index ab1cb3b257..b646782547 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.base.ClassId; @@ -83,7 +83,7 @@ public class PlayerTemplateData implements IXmlReader } else if ("staticData".equalsIgnoreCase(d.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.set("classId", classId); final List creationPoints = new ArrayList<>(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java index 34a04edd9b..35b879e73f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; @@ -83,7 +83,7 @@ public class PrimeShopData implements IXmlReader { NamedNodeMap attrs = d.getAttributes(); Node att; - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java index b7ed4c8fba..43e5d84784 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.RecipeInstance; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.RecipeStatInstance; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; /** @@ -82,7 +82,7 @@ public class RecipeData implements IXmlReader Node att; int id = -1; boolean haveRare = false; - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); att = attrs.getNamedItem("id"); if (att == null) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java index 796f5ae085..9a8397e085 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java @@ -29,7 +29,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate; /** @@ -60,7 +60,7 @@ public class ResidenceFunctionsData implements IXmlReader forEach(doc, "list", list -> forEach(list, "function", func -> { final NamedNodeMap attrs = func.getAttributes(); - final StatsSet set = new StatsSet(HashMap::new); + final StatSet set = new StatSet(HashMap::new); for (int i = 0; i < attrs.getLength(); i++) { final Node node = attrs.item(i); @@ -69,7 +69,7 @@ public class ResidenceFunctionsData implements IXmlReader forEach(func, "function", levelNode -> { final NamedNodeMap levelAttrs = levelNode.getAttributes(); - final StatsSet levelSet = new StatsSet(HashMap::new); + final StatSet levelSet = new StatSet(HashMap::new); levelSet.merge(set); for (int i = 0; i < levelAttrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java index 053d9089ce..d6b28a5962 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; /** @@ -82,7 +82,7 @@ public class SendMessageLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); SEND_MESSAGE_LOCALISATIONS.get(_lang).put(set.getString("message").split(SPLIT_STRING), set.getString("translation").split(SPLIT_STRING)); })); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java index e473030c56..c3eda1f3b8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.actor.instance.ShuttleInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; @@ -72,7 +72,7 @@ public class ShuttleData implements IXmlReader public void parseDocument(Document doc, File f) { NamedNodeMap attrs; - StatsSet set; + StatSet set; Node att; ShuttleDataHolder data; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -84,7 +84,7 @@ public class ShuttleData implements IXmlReader if ("shuttle".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -164,7 +164,7 @@ public class ShuttleData implements IXmlReader { for (ShuttleDataHolder data : _shuttles.values()) { - final ShuttleInstance shuttle = new ShuttleInstance(new CreatureTemplate(new StatsSet())); + final ShuttleInstance shuttle = new ShuttleInstance(new CreatureTemplate(new StatSet())); shuttle.setData(data); shuttle.setHeading(data.getLocation().getHeading()); shuttle.setLocationInvisible(data.getLocation()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java index 9db0b5f64b..ba000649f2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.SiegeScheduleDate; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.util.Util; /** @@ -54,7 +54,7 @@ public class SiegeScheduleData implements IXmlReader LOGGER.info(getClass().getSimpleName() + ": Loaded " + _scheduleData.size() + " siege schedulers."); if (_scheduleData.isEmpty()) { - _scheduleData.add(new SiegeScheduleDate(new StatsSet())); + _scheduleData.add(new SiegeScheduleDate(new StatSet())); LOGGER.info(getClass().getSimpleName() + ": Emergency loaded " + _scheduleData.size() + " default siege schedulers."); } } @@ -72,7 +72,7 @@ public class SiegeScheduleData implements IXmlReader { case "schedule": { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final NamedNodeMap attrs = cd.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java index cc019c4dbb..2592b3ed97 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java @@ -40,7 +40,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.EffectHandler; import org.l2jmobius.gameserver.handler.SkillConditionHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.EffectScope; @@ -67,9 +67,9 @@ public class SkillData implements IXmlReader private final Integer _toLevel; private final Integer _fromSubLevel; private final Integer _toSubLevel; - private final Map> _info; + private final Map> _info; - public NamedParamInfo(String name, Integer fromLevel, Integer toLevel, Integer fromSubLevel, Integer toSubLevel, Map> info) + public NamedParamInfo(String name, Integer fromLevel, Integer toLevel, Integer fromSubLevel, Integer toSubLevel, Map> info) { _name = name; _fromLevel = fromLevel; @@ -104,7 +104,7 @@ public class SkillData implements IXmlReader return _toSubLevel; } - public Map> getInfo() + public Map> getInfo() { return _info; } @@ -241,8 +241,8 @@ public class SkillData implements IXmlReader { NamedNodeMap attributes = listNode.getAttributes(); final Map> levels = new HashMap<>(); - final Map> skillInfo = new HashMap<>(); - final StatsSet generalSkillInfo = skillInfo.computeIfAbsent(-1, k -> new HashMap<>()).computeIfAbsent(-1, k -> new StatsSet()); + final Map> skillInfo = new HashMap<>(); + final StatSet generalSkillInfo = skillInfo.computeIfAbsent(-1, k -> new HashMap<>()).computeIfAbsent(-1, k -> new StatSet()); parseAttributes(attributes, "", generalSkillInfo); @@ -321,7 +321,7 @@ public class SkillData implements IXmlReader { return; } - subLevelMap.forEach((subLevel, statsSet) -> + subLevelMap.forEach((subLevel, statSet) -> { if (subLevel == -1) { @@ -339,7 +339,7 @@ public class SkillData implements IXmlReader { return; } - subLevelMap.forEach((subLevel, statsSet) -> + subLevelMap.forEach((subLevel, statSet) -> { if (subLevel == -1) { @@ -371,31 +371,31 @@ public class SkillData implements IXmlReader levels.forEach((level, subLevels) -> subLevels.forEach(subLevel -> { - final StatsSet statsSet = Optional.ofNullable(skillInfo.getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatsSet::new); - skillInfo.getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(statsSet.getSet()::putIfAbsent); - skillInfo.getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(statsSet.getSet()::putIfAbsent); - statsSet.set(".level", level); - statsSet.set(".subLevel", subLevel); - final Skill skill = new Skill(statsSet); + final StatSet statSet = Optional.ofNullable(skillInfo.getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatSet::new); + skillInfo.getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(statSet.getSet()::putIfAbsent); + skillInfo.getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(statSet.getSet()::putIfAbsent); + statSet.set(".level", level); + statSet.set(".subLevel", subLevel); + final Skill skill = new Skill(statSet); forEachNamedParamInfoParam(effectParamInfo, level, subLevel, ((effectScope, params) -> { final String effectName = params.getString(".name"); params.remove(".name"); try { - final Function effectFunction = EffectHandler.getInstance().getHandlerFactory(effectName); + final Function effectFunction = EffectHandler.getInstance().getHandlerFactory(effectName); if (effectFunction != null) { skill.addEffect(effectScope, effectFunction.apply(params)); } else { - LOGGER.warning(getClass().getSimpleName() + ": Missing effect for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]"); + LOGGER.warning(getClass().getSimpleName() + ": Missing effect for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]"); } } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading effect for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading effect for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]", e); } })); @@ -405,19 +405,19 @@ public class SkillData implements IXmlReader params.remove(".name"); try { - final Function conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName); + final Function conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName); if (conditionFunction != null) { skill.addCondition(skillConditionScope, conditionFunction.apply(params)); } else { - LOGGER.warning(getClass().getSimpleName() + ": Missing condition for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + skillConditionScope + "] Effect Name[" + conditionName + "]"); + LOGGER.warning(getClass().getSimpleName() + ": Missing condition for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + skillConditionScope + "] Effect Name[" + conditionName + "]"); } } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading condition for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Condition Scope[" + skillConditionScope + "] Condition Name[" + conditionName + "]", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading condition for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Condition Scope[" + skillConditionScope + "] Condition Name[" + conditionName + "]", e); } })); @@ -434,16 +434,16 @@ public class SkillData implements IXmlReader } } - private void forEachNamedParamInfoParam(Map> paramInfo, int level, int subLevel, BiConsumer consumer) + private void forEachNamedParamInfoParam(Map> paramInfo, int level, int subLevel, BiConsumer consumer) { paramInfo.forEach((scope, namedParamInfos) -> namedParamInfos.forEach(namedParamInfo -> { if ((((namedParamInfo.getFromLevel() == null) && (namedParamInfo.getToLevel() == null)) || ((namedParamInfo.getFromLevel() <= level) && (namedParamInfo.getToLevel() >= level))) // && (((namedParamInfo.getFromSubLevel() == null) && (namedParamInfo.getToSubLevel() == null)) || ((namedParamInfo.getFromSubLevel() <= subLevel) && (namedParamInfo.getToSubLevel() >= subLevel)))) { - final StatsSet params = Optional.ofNullable(namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatsSet::new); - namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); - namedParamInfo.getInfo().getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); + final StatSet params = Optional.ofNullable(namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatSet::new); + namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); + namedParamInfo.getInfo().getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); params.set(".name", namedParamInfo.getName()); consumer.accept(scope, params); } @@ -460,7 +460,7 @@ public class SkillData implements IXmlReader final Integer subLevel = parseInteger(attributes, "subLevel"); final Integer fromSubLevel = parseInteger(attributes, "fromSubLevel", subLevel); final Integer toSubLevel = parseInteger(attributes, "toSubLevel", subLevel); - final Map> info = new HashMap<>(); + final Map> info = new HashMap<>(); for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) { if (!node.getNodeName().equals("#text")) @@ -471,7 +471,7 @@ public class SkillData implements IXmlReader return new NamedParamInfo(name, fromLevel, toLevel, fromSubLevel, toSubLevel, info); } - private void parseInfo(Node node, Map>> variableValues, Map> info) + private void parseInfo(Node node, Map>> variableValues, Map> info) { Map> values = parseValues(node); final Object generalValue = values.getOrDefault(-1, Collections.emptyMap()).get(-1); @@ -492,7 +492,7 @@ public class SkillData implements IXmlReader } } - values.forEach((level, subLevelMap) -> subLevelMap.forEach((subLevel, value) -> info.computeIfAbsent(level, k -> new HashMap<>()).computeIfAbsent(subLevel, k -> new StatsSet()).set(node.getNodeName(), value))); + values.forEach((level, subLevelMap) -> subLevelMap.forEach((subLevel, value) -> info.computeIfAbsent(level, k -> new HashMap<>()).computeIfAbsent(subLevel, k -> new StatSet()).set(node.getNodeName(), value))); } private Map> parseValues(Node node) @@ -535,7 +535,7 @@ public class SkillData implements IXmlReader variables.put("index", (i - fromLevel) + 1d); variables.put("subIndex", (j - fromSubLevel) + 1d); final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1); - if ((base != null) && !(base instanceof StatsSet)) + if ((base != null) && !(base instanceof StatSet)) { variables.put("base", Double.parseDouble(String.valueOf(base))); } @@ -555,13 +555,13 @@ public class SkillData implements IXmlReader Object parseValue(Node node, boolean blockValue, boolean parseAttributes, Map variables) { - StatsSet statsSet = null; + StatSet statSet = null; List list = null; Object text = null; if (parseAttributes && (!node.getNodeName().equals("value") || !blockValue) && (node.getAttributes().getLength() > 0)) { - statsSet = new StatsSet(); - parseAttributes(node.getAttributes(), "", statsSet, variables); + statSet = new StatSet(); + parseAttributes(node.getAttributes(), "", statSet, variables); } for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) { @@ -604,12 +604,12 @@ public class SkillData implements IXmlReader final Object value = parseValue(node, false, true, variables); if (value != null) { - if (statsSet == null) + if (statSet == null) { - statsSet = new StatsSet(); + statSet = new StatSet(); } - statsSet.set(nodeName, value); + statSet.set(nodeName, value); } } } @@ -620,9 +620,9 @@ public class SkillData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", list); + statSet.set(".", list); } else { @@ -635,30 +635,30 @@ public class SkillData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", text); + statSet.set(".", text); } else { return text; } } - return statsSet; + return statSet; } - private void parseAttributes(NamedNodeMap attributes, String prefix, StatsSet statsSet, Map variables) + private void parseAttributes(NamedNodeMap attributes, String prefix, StatSet statSet, Map variables) { for (int i = 0; i < attributes.getLength(); i++) { final Node attributeNode = attributes.item(i); - statsSet.set(prefix + "." + attributeNode.getNodeName(), parseNodeValue(attributeNode.getNodeValue(), variables)); + statSet.set(prefix + "." + attributeNode.getNodeName(), parseNodeValue(attributeNode.getNodeValue(), variables)); } } - private void parseAttributes(NamedNodeMap attributes, String prefix, StatsSet statsSet) + private void parseAttributes(NamedNodeMap attributes, String prefix, StatSet statSet) { - parseAttributes(attributes, prefix, statsSet, Collections.emptyMap()); + parseAttributes(attributes, prefix, statSet, Collections.emptyMap()); } private Object parseNodeValue(String value, Map variables) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java index fdd0012ffe..d23d1ebee3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.SubclassType; import org.l2jmobius.gameserver.model.SkillLearn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.base.ClassId; @@ -229,7 +229,7 @@ public class SkillTreesData implements IXmlReader { if ("skill".equalsIgnoreCase(c.getNodeName())) { - final StatsSet learnSkillSet = new StatsSet(); + final StatSet learnSkillSet = new StatSet(); attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java index 87915d89eb..78c22d1e7d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java @@ -36,7 +36,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.ChanceLocation; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.MinionHolder; import org.l2jmobius.gameserver.model.interfaces.IParameterized; @@ -169,7 +169,7 @@ public class SpawnsData implements IXmlReader public void parseSpawn(Node spawnsNode, File file, Collection spawns) { - final SpawnTemplate spawnTemplate = new SpawnTemplate(new StatsSet(parseAttributes(spawnsNode)), file); + final SpawnTemplate spawnTemplate = new SpawnTemplate(new StatSet(parseAttributes(spawnsNode)), file); SpawnGroup defaultGroup = null; for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling()) { @@ -185,7 +185,7 @@ public class SpawnsData implements IXmlReader { if (defaultGroup == null) { - defaultGroup = new SpawnGroup(StatsSet.EMPTY_STATSET); + defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET); } parseNpc(innerNode, spawnTemplate, defaultGroup); } @@ -244,7 +244,7 @@ public class SpawnsData implements IXmlReader private void parseGroup(Node n, SpawnTemplate spawnTemplate) { - final SpawnGroup group = new SpawnGroup(new StatsSet(parseAttributes(n))); + final SpawnGroup group = new SpawnGroup(new StatSet(parseAttributes(n))); forEach(n, IXmlReader::isNode, npcNode -> { switch (npcNode.getNodeName()) @@ -271,7 +271,7 @@ public class SpawnsData implements IXmlReader */ private void parseNpc(Node n, SpawnTemplate spawnTemplate, SpawnGroup group) { - final NpcSpawnTemplate npcTemplate = new NpcSpawnTemplate(spawnTemplate, group, new StatsSet(parseAttributes(n))); + final NpcSpawnTemplate npcTemplate = new NpcSpawnTemplate(spawnTemplate, group, new StatSet(parseAttributes(n))); final NpcTemplate template = NpcData.getInstance().getTemplate(npcTemplate.getId()); if (template == null) { @@ -332,10 +332,10 @@ public class SpawnsData implements IXmlReader * @param n * @param npcTemplate */ - private void parseParameters(Node n, IParameterized npcTemplate) + private void parseParameters(Node n, IParameterized npcTemplate) { final Map params = parseParameters(n); - npcTemplate.setParameters(!params.isEmpty() ? new StatsSet(Collections.unmodifiableMap(params)) : StatsSet.EMPTY_STATSET); + npcTemplate.setParameters(!params.isEmpty() ? new StatSet(Collections.unmodifiableMap(params)) : StatSet.EMPTY_STATSET); } /** @@ -344,7 +344,7 @@ public class SpawnsData implements IXmlReader */ private void parseMinions(Node n, NpcSpawnTemplate npcTemplate) { - forEach(n, "minion", minionNode -> npcTemplate.addMinion(new MinionHolder(new StatsSet(parseAttributes(minionNode))))); + forEach(n, "minion", minionNode -> npcTemplate.addMinion(new MinionHolder(new StatSet(parseAttributes(minionNode))))); } /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java index 98d333446c..ef93935404 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; @@ -69,7 +69,7 @@ public class StaticObjectData implements IXmlReader if ("object".equalsIgnoreCase(d.getNodeName())) { final NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -86,9 +86,9 @@ public class StaticObjectData implements IXmlReader * Initialize an static object based on the stats set and add it to the map. * @param set the stats set to add. */ - private void addObject(StatsSet set) + private void addObject(StatSet set) { - final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatsSet()), set.getInt("id")); + final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatSet()), set.getInt("id")); obj.setType(set.getInt("type", 0)); obj.setName(set.getString("name")); obj.setMap(set.getString("texture", "none"), set.getInt("map_x", 0), set.getInt("map_y", 0)); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java index 7c8c9a538d..487bae9dea 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.TeleportType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.teleporter.TeleportHolder; /** @@ -74,7 +74,7 @@ public class TeleportersData implements IXmlReader final String name = parseString(nodeAttrs, "name", type.name()); // Parse locations final TeleportHolder holder = new TeleportHolder(name, type); - forEach(node, "location", location -> holder.registerLocation(new StatsSet(parseAttributes(location)))); + forEach(node, "location", location -> holder.registerLocation(new StatSet(parseAttributes(location)))); // Register holder if (teleList.putIfAbsent(name, holder) != null) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java index b6b3bf2e90..c2f5f94adb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java @@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.transform.Transform; import org.l2jmobius.gameserver.model.actor.transform.TransformLevelData; import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate; @@ -70,7 +70,7 @@ public class TransformData implements IXmlReader if ("transform".equalsIgnoreCase(d.getNodeName())) { NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -192,7 +192,7 @@ public class TransformData implements IXmlReader transform.setTemplate(isMale, templateData); } - final StatsSet levelsSet = new StatsSet(); + final StatSet levelsSet = new StatSet(); for (Node s = z.getFirstChild(); s != null; s = s.getNextSibling()) { if ("level".equals(s.getNodeName())) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/engines/DocumentBase.java index ba3fc7f6b4..d178b10006 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/engines/DocumentBase.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/engines/DocumentBase.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.PlayerState; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionCategoryType; @@ -178,7 +178,7 @@ public abstract class DocumentBase protected abstract void parseDocument(Document doc); - protected abstract StatsSet getStatsSet(); + protected abstract StatSet getStatSet(); protected abstract String getTableValue(String name); @@ -1245,7 +1245,7 @@ public abstract class DocumentBase setTable(name, array.toArray(new String[array.size()])); } - protected void parseBeanSet(Node n, StatsSet set, Integer level) + protected void parseBeanSet(Node n, StatSet set, Integer level) { final String name = n.getAttributes().getNamedItem("name").getNodeValue().trim(); final String value = n.getAttributes().getNamedItem("val").getNodeValue().trim(); @@ -1260,7 +1260,7 @@ public abstract class DocumentBase } } - protected void setExtractableSkillData(StatsSet set, String value) + protected void setExtractableSkillData(StatSet set, String value) { set.set("capsuled_items_skill", value); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java index e8c77b206e..46f8f9be1f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java @@ -21,7 +21,7 @@ import java.io.File; import org.w3c.dom.Document; import org.w3c.dom.Node; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; /** @@ -41,7 +41,7 @@ public class DocumentBaseGeneral extends DocumentBase } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return null; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java index 3ea7f41bb6..419552cf68 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.engines.DocumentBase; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -57,7 +57,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return _currentItem.set; } @@ -111,7 +111,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader _currentItem.id = itemId; _currentItem.name = itemName; _currentItem.type = className; - _currentItem.set = new StatsSet(); + _currentItem.set = new StatSet(); _currentItem.set.set("item_id", itemId); _currentItem.set.set("name", itemName); _currentItem.set.set("additionalName", additionalName); @@ -218,7 +218,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatsSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (Item) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java index 56e5b21a9f..967c1fc34d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.engines.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; public class ItemDataHolder @@ -24,7 +24,7 @@ public class ItemDataHolder int id; String type; String name; - StatsSet set; + StatSet set; int currentLevel; Item item; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/ConditionHandler.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/ConditionHandler.java index 47f24d690d..b53f170fb3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/ConditionHandler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/ConditionHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.ICondition; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class ConditionHandler { - private final Map> _conditionHandlerFactories = new HashMap<>(); + private final Map> _conditionHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _conditionHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _conditionHandlerFactories.get(name); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/EffectHandler.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/EffectHandler.java index a58de8efb4..328265d9db 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/EffectHandler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/EffectHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class EffectHandler { - private final Map> _effectHandlerFactories = new HashMap<>(); + private final Map> _effectHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _effectHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _effectHandlerFactories.get(name); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java index a6e2275d04..32438040e0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class SkillConditionHandler { - private final Map> _skillConditionHandlerFactories = new HashMap<>(); + private final Map> _skillConditionHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _skillConditionHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _skillConditionHandlerFactories.get(name); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java index 6992dd5366..65a8c52d7e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.model.AirShipTeleportList; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShipInstance; @@ -45,13 +45,13 @@ public class AirShipManager private static final String UPDATE_DB = "UPDATE airships SET fuel=? WHERE owner_id=?"; private CreatureTemplate _airShipTemplate = null; - private final Map _airShipsInfo = new HashMap<>(); + private final Map _airShipsInfo = new HashMap<>(); private final Map _airShips = new HashMap<>(); private final Map _teleports = new HashMap<>(); protected AirShipManager() { - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", 9); npcDat.set("level", 0); npcDat.set("jClass", "boat"); @@ -113,7 +113,7 @@ public class AirShipManager public AirShipInstance getNewAirShip(int x, int y, int z, int heading, int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return null; @@ -147,7 +147,7 @@ public class AirShipManager if (ship.getOwnerId() != 0) { storeInDb(ship.getOwnerId()); - final StatsSet info = _airShipsInfo.get(ship.getOwnerId()); + final StatSet info = _airShipsInfo.get(ship.getOwnerId()); if (info != null) { info.set("fuel", ship.getFuel()); @@ -164,7 +164,7 @@ public class AirShipManager { if (!_airShipsInfo.containsKey(ownerId)) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("fuel", 600); _airShipsInfo.put(ownerId, info); @@ -264,10 +264,10 @@ public class AirShipManager Statement s = con.createStatement(); ResultSet rs = s.executeQuery(LOAD_DB)) { - StatsSet info; + StatSet info; while (rs.next()) { - info = new StatsSet(); + info = new StatSet(); info.set("fuel", rs.getInt("fuel")); _airShipsInfo.put(rs.getInt("owner_id"), info); } @@ -285,7 +285,7 @@ public class AirShipManager private void storeInDb(int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java index 2db10dd045..e5c610b3f2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.BoatInstance; @@ -57,7 +57,7 @@ public class BoatManager return null; } - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", boatId); npcDat.set("level", 0); npcDat.set("jClass", "boat"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 99a9678ece..56f08422cd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.enums.ManorMode; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; import org.l2jmobius.gameserver.model.SeedProduction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.entity.Castle; @@ -126,7 +126,7 @@ public class CastleManorManager implements IXmlReader, IStorable @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; NamedNodeMap attrs; Node att; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -142,7 +142,7 @@ public class CastleManorManager implements IXmlReader, IStorable { if ("crop".equalsIgnoreCase(c.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); set.set("castleId", castleId); attrs = c.getAttributes(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java index dacc09ecf1..640e2e60de 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java @@ -27,7 +27,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosState; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -181,7 +181,7 @@ public class CeremonyOfChaosManager extends AbstractEventManager _npcs = new ConcurrentHashMap<>(); protected final Map _spawns = new ConcurrentHashMap<>(); - protected final Map _storedInfo = new ConcurrentHashMap<>(); + protected final Map _storedInfo = new ConcurrentHashMap<>(); protected final Map> _schedules = new ConcurrentHashMap<>(); /** @@ -161,7 +161,7 @@ public class DBSpawnManager { npc.setDBStatus(RaidBossStatus.ALIVE); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getCurrentHp()); info.set("currentMP", npc.getCurrentMp()); info.set("respawnTime", 0); @@ -181,7 +181,7 @@ public class DBSpawnManager */ public void updateStatus(Npc npc, boolean isNpcDead) { - final StatsSet info = _storedInfo.get(npc.getId()); + final StatSet info = _storedInfo.get(npc.getId()); if (info == null) { return; @@ -254,7 +254,7 @@ public class DBSpawnManager _npcs.put(npcId, npc); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", currentHP); info.set("currentMP", currentMP); info.set("respawnTime", 0); @@ -316,7 +316,7 @@ public class DBSpawnManager } npc.setDBStatus(RaidBossStatus.ALIVE); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", 0); @@ -401,7 +401,7 @@ public class DBSpawnManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("UPDATE npc_respawns SET respawnTime = ?, currentHP = ?, currentMP = ? WHERE id = ?")) { - for (Entry entry : _storedInfo.entrySet()) + for (Entry entry : _storedInfo.entrySet()) { final Integer npcId = entry.getKey(); if (npcId == null) @@ -420,7 +420,7 @@ public class DBSpawnManager updateStatus(npc, false); } - final StatsSet info = entry.getValue(); + final StatSet info = entry.getValue(); if (info == null) { continue; @@ -529,7 +529,7 @@ public class DBSpawnManager */ public void notifySpawnNightNpc(Npc npc) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getCurrentHp()); info.set("currentMP", npc.getCurrentMp()); info.set("respawnTime", 0); @@ -572,7 +572,7 @@ public class DBSpawnManager * Gets the stored info. * @return the stored info */ - public Map getStoredInfo() + public Map getStoredInfo() { return _storedInfo; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index 3dd4e3f652..767bed6954 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.datatables.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.FakePlayerChatHolder; @@ -73,7 +73,7 @@ public class FakePlayerChatManager implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayerChat", fakePlayerChatNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerChatNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerChatNode)); MESSAGES.add(new FakePlayerChatHolder(set.getString("fpcName"), set.getString("searchMethod"), set.getString("searchText"), set.getString("answers"))); })); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java index 3bc57b3856..f91a16f65a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java @@ -33,7 +33,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.tasks.GrandBossManagerStoreTask; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; import org.l2jmobius.gameserver.model.interfaces.IStorable; @@ -51,7 +51,7 @@ public class GrandBossManager implements IStorable protected static Map _bosses = new ConcurrentHashMap<>(); - protected static Map _storedInfo = new HashMap<>(); + protected static Map _storedInfo = new HashMap<>(); private final Map _bossStatus = new HashMap<>(); @@ -72,7 +72,7 @@ public class GrandBossManager implements IStorable final int bossId = rs.getInt("boss_id"); if (NpcData.getInstance().getTemplate(bossId) != null) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("loc_x", rs.getInt("loc_x")); info.set("loc_y", rs.getInt("loc_y")); info.set("loc_z", rs.getInt("loc_z")); @@ -136,12 +136,12 @@ public class GrandBossManager implements IStorable return _bosses.get(bossId); } - public StatsSet getStatsSet(int bossId) + public StatSet getStatSet(int bossId) { return _storedInfo.get(bossId); } - public void setStatsSet(int bossId, StatsSet info) + public void setStatSet(int bossId, StatSet info) { _storedInfo.put(bossId, info); updateDb(bossId, false); @@ -152,10 +152,10 @@ public class GrandBossManager implements IStorable { try (Connection con = DatabaseFactory.getConnection()) { - for (Entry e : _storedInfo.entrySet()) + for (Entry e : _storedInfo.entrySet()) { final GrandBossInstance boss = _bosses.get(e.getKey()); - final StatsSet info = e.getValue(); + final StatSet info = e.getValue(); if ((boss == null) || (info == null)) { try (PreparedStatement update = con.prepareStatement(UPDATE_GRAND_BOSS_DATA2)) @@ -205,7 +205,7 @@ public class GrandBossManager implements IStorable try (Connection con = DatabaseFactory.getConnection()) { final GrandBossInstance boss = _bosses.get(bossId); - final StatsSet info = _storedInfo.get(bossId); + final StatSet info = _storedInfo.get(bossId); if (statusOnly || (boss == null) || (info == null)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index d77642378f..29e517b0cd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.enums.InstanceReenterType; import org.l2jmobius.gameserver.enums.InstanceRemoveBuffType; import org.l2jmobius.gameserver.enums.InstanceTeleportType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.holders.InstanceReenterTimeHolder; @@ -151,7 +151,7 @@ public class InstanceManager implements IXmlReader return; } - final InstanceTemplate template = new InstanceTemplate(new StatsSet(parseAttributes(instanceNode))); + final InstanceTemplate template = new InstanceTemplate(new StatSet(parseAttributes(instanceNode))); // Update name if wasn't provided if (template.getName() == null) @@ -241,10 +241,10 @@ public class InstanceManager implements IXmlReader { if (doorNode.getNodeName().equals("door")) { - final StatsSet parsedSet = DoorData.getInstance().parseDoor(doorNode); - final StatsSet mergedSet = new StatsSet(); + final StatSet parsedSet = DoorData.getInstance().parseDoor(doorNode); + final StatSet mergedSet = new StatSet(); final int doorId = parsedSet.getInt("id"); - final StatsSet templateSet = DoorData.getInstance().getDoorTemplate(doorId); + final StatSet templateSet = DoorData.getInstance().getDoorTemplate(doorId); if (templateSet != null) { mergedSet.merge(templateSet); @@ -324,14 +324,14 @@ public class InstanceManager implements IXmlReader final boolean onlyLeader = parseBoolean(attrs, "onlyLeader", false); final boolean showMessageAndHtml = parseBoolean(attrs, "showMessageAndHtml", false); // Load parameters - StatsSet params = null; + StatSet params = null; for (Node f = conditionNode.getFirstChild(); f != null; f = f.getNextSibling()) { if (f.getNodeName().equals("param")) { if (params == null) { - params = new StatsSet(); + params = new StatSet(); } params.set(parseString(f.getAttributes(), "name"), parseString(f.getAttributes(), "value")); @@ -341,14 +341,14 @@ public class InstanceManager implements IXmlReader // If none parameters found then set empty StatSet if (params == null) { - params = StatsSet.EMPTY_STATSET; + params = StatSet.EMPTY_STATSET; } // Now when everything is loaded register condition to template try { final Class clazz = Class.forName("org.l2jmobius.gameserver.model.instancezone.conditions.Condition" + type); - final Constructor constructor = clazz.getConstructor(InstanceTemplate.class, StatsSet.class, boolean.class, boolean.class); + final Constructor constructor = clazz.getConstructor(InstanceTemplate.class, StatSet.class, boolean.class, boolean.class); conditions.add((Condition) constructor.newInstance(template, params, onlyLeader, showMessageAndHtml)); } catch (Exception ex) @@ -378,7 +378,7 @@ public class InstanceManager implements IXmlReader */ public Instance createInstance() { - return new Instance(getNewInstanceId(), new InstanceTemplate(StatsSet.EMPTY_STATSET), null); + return new Instance(getNewInstanceId(), new InstanceTemplate(StatSet.EMPTY_STATSET), null); } /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/AccessLevel.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/AccessLevel.java index 772c1fe77e..72b77905e1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/AccessLevel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/AccessLevel.java @@ -52,7 +52,7 @@ public class AccessLevel /** Flag to gain exp in party */ private boolean _gainExp = false; - public AccessLevel(StatsSet set) + public AccessLevel(StatSet set) { _accessLevel = set.getInt("level"); _name = set.getString("name"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ActionDataHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ActionDataHolder.java index 4887bedba8..ca6d9ee685 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ActionDataHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ActionDataHolder.java @@ -25,7 +25,7 @@ public class ActionDataHolder private final String _handler; private final int _optionId; - public ActionDataHolder(StatsSet set) + public ActionDataHolder(StatSet set) { _id = set.getInt("id"); _handler = set.getString("handler"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java index 656119098e..3f88e455d7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java @@ -27,7 +27,7 @@ public class AdminCommandAccessRight private final int _accessLevel; private final boolean _requireConfirm; - public AdminCommandAccessRight(StatsSet set) + public AdminCommandAccessRight(StatSet set) { _adminCommand = set.getString("command"); _requireConfirm = set.getBoolean("confirmDlg", false); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index 5223b47ae9..cead2c2ce9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -36,12 +36,12 @@ public class DailyMissionDataHolder private final List _rewardsItems; private final List _classRestriction; private final int _requiredCompletions; - private final StatsSet _params; + private final StatSet _params; private final boolean _dailyReset; private final boolean _isOneTime; private final AbstractDailyMissionHandler _handler; - public DailyMissionDataHolder(StatsSet set) + public DailyMissionDataHolder(StatSet set) { final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); @@ -50,7 +50,7 @@ public class DailyMissionDataHolder _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); - _params = set.getObject("params", StatsSet.class); + _params = set.getObject("params", StatSet.class); _dailyReset = set.getBoolean("dailyReset", true); _isOneTime = set.getBoolean("isOneTime", true); _handler = handler != null ? handler.apply(this) : null; @@ -81,7 +81,7 @@ public class DailyMissionDataHolder return _requiredCompletions; } - public StatsSet getParams() + public StatSet getParams() { return _params; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Location.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Location.java index 1c61740e4d..024c71075f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Location.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Location.java @@ -49,7 +49,7 @@ public class Location implements IPositionable this(obj.getX(), obj.getY(), obj.getZ(), obj.getHeading()); } - public Location(StatsSet set) + public Location(StatSet set) { _x = set.getInt("x"); _y = set.getInt("y"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/PetLevelData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/PetLevelData.java index e46b215b5f..7cad1a225a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/PetLevelData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/PetLevelData.java @@ -46,7 +46,7 @@ public class PetLevelData private final double _slowFlySpeedOnRide; private final double _fastFlySpeedOnRide; - public PetLevelData(StatsSet set) + public PetLevelData(StatSet set) { _ownerExpTaken = set.getInt("get_exp_type"); _petMaxExp = set.getLong("exp"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/RecipeList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/RecipeList.java index 9e4a3b2387..a81bbb1802 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/RecipeList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/RecipeList.java @@ -68,7 +68,7 @@ public class RecipeList * @param set * @param haveRare */ - public RecipeList(StatsSet set, boolean haveRare) + public RecipeList(StatSet set, boolean haveRare) { _recipes = new RecipeInstance[0]; _statUse = new RecipeStatInstance[0]; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Seed.java index 6d31ffc60f..54ef8acd9f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Seed.java @@ -35,7 +35,7 @@ public class Seed private final int _seedReferencePrice; private final int _cropReferencePrice; - public Seed(StatsSet set) + public Seed(StatSet set) { _cropId = set.getInt("id"); _seedId = set.getInt("seedId"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java index 78897cf4f1..4de77df228 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java @@ -27,7 +27,7 @@ public class SiegeScheduleDate private final int _hour; private final int _maxConcurrent; - public SiegeScheduleDate(StatsSet set) + public SiegeScheduleDate(StatSet set) { _day = set.getInt("day", Calendar.SUNDAY); _hour = set.getInt("hour", 16); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/SkillLearn.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/SkillLearn.java index e2ccdd6331..00f53c0cb9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/SkillLearn.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/SkillLearn.java @@ -58,7 +58,7 @@ public class SkillLearn * Constructor for SkillLearn. * @param set the set with the SkillLearn data. */ - public SkillLearn(StatsSet set) + public SkillLearn(StatSet set) { _skillName = set.getString("skillName"); _skillId = set.getInt("skillId"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/StatSet.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/StatSet.java new file mode 100644 index 0000000000..3c824d9fa4 --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/StatSet.java @@ -0,0 +1,968 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Supplier; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.stream.Collectors; + +import org.l2jmobius.commons.util.TimeUtil; +import org.l2jmobius.gameserver.model.holders.MinionHolder; +import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.interfaces.IParserAdvUtils; +import org.l2jmobius.gameserver.util.Util; + +/** + * This class is meant to hold a set of (key,value) pairs.
    + * They are stored as object but can be retrieved in any type wanted. As long as cast is available.
    + * @author mkizub + */ +public class StatSet implements IParserAdvUtils +{ + private static final Logger LOGGER = Logger.getLogger(StatSet.class.getName()); + /** Static empty immutable map, used to avoid multiple null checks over the source. */ + public static final StatSet EMPTY_STATSET = new StatSet(Collections.emptyMap()); + + private final Map _set; + + public StatSet() + { + this(ConcurrentHashMap::new); + } + + public StatSet(Supplier> mapFactory) + { + this(mapFactory.get()); + } + + public StatSet(Map map) + { + _set = map; + } + + /** + * Returns the set of values + * @return HashMap + */ + public Map getSet() + { + return _set; + } + + /** + * Add a set of couple values in the current set + * @param newSet : StatSet pointing out the list of couples to add in the current set + */ + public void merge(StatSet newSet) + { + _set.putAll(newSet.getSet()); + } + + /** + * Verifies if the stat set is empty. + * @return {@code true} if the stat set is empty, {@code false} otherwise + */ + public boolean isEmpty() + { + return _set.isEmpty(); + } + + /** + * Return the boolean value associated with key. + * @param key : String designating the key in the set + * @return boolean : value associated to the key + * @throws IllegalArgumentException : If value is not set or value is not boolean + */ + @Override + public boolean getBoolean(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Boolean value required, but not specified"); + } + if (val instanceof Boolean) + { + return ((Boolean) val).booleanValue(); + } + try + { + return Boolean.parseBoolean((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Boolean value required, but found: " + val); + } + } + + /** + * Return the boolean value associated with key.
    + * If no value is associated with key, or type of value is wrong, returns defaultValue. + * @param key : String designating the key in the entry set + * @return boolean : value associated to the key + */ + @Override + public boolean getBoolean(String key, boolean defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Boolean) + { + return ((Boolean) val).booleanValue(); + } + try + { + return Boolean.parseBoolean((String) val); + } + catch (Exception e) + { + return defaultValue; + } + } + + @Override + public byte getByte(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Byte value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).byteValue(); + } + try + { + return Byte.parseByte((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + + @Override + public byte getByte(String key, byte defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).byteValue(); + } + try + { + return Byte.parseByte((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + + public short increaseByte(String key, byte increaseWith) + { + final byte newValue = (byte) (getByte(key) + increaseWith); + set(key, newValue); + return newValue; + } + + public short increaseByte(String key, byte defaultValue, byte increaseWith) + { + final byte newValue = (byte) (getByte(key, defaultValue) + increaseWith); + set(key, newValue); + return newValue; + } + + public byte[] getByteArray(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Byte value required, but not specified"); + } + if (val instanceof Number) + { + return new byte[] + { + ((Number) val).byteValue() + }; + } + int c = 0; + final String[] vals = ((String) val).split(splitOn); + final byte[] result = new byte[vals.length]; + for (String v : vals) + { + try + { + result[c++] = Byte.parseByte(v); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + return result; + } + + public List getByteList(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final List result = new ArrayList<>(); + for (Byte i : getByteArray(key, splitOn)) + { + result.add(i); + } + return result; + } + + @Override + public short getShort(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Short value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).shortValue(); + } + try + { + return Short.parseShort((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Short value required, but found: " + val); + } + } + + @Override + public short getShort(String key, short defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).shortValue(); + } + try + { + return Short.parseShort((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Short value required, but found: " + val); + } + } + + public short increaseShort(String key, short increaseWith) + { + final short newValue = (short) (getShort(key) + increaseWith); + set(key, newValue); + return newValue; + } + + public short increaseShort(String key, short defaultValue, short increaseWith) + { + final short newValue = (short) (getShort(key, defaultValue) + increaseWith); + set(key, newValue); + return newValue; + } + + @Override + public int getInt(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Integer value required, but not specified: " + key + "!"); + } + + if (val instanceof Number) + { + return ((Number) val).intValue(); + } + + try + { + return Integer.parseInt((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val + "!"); + } + } + + @Override + public int getInt(String key, int defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).intValue(); + } + try + { + return Integer.parseInt((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val); + } + } + + public int increaseInt(String key, int increaseWith) + { + final int newValue = getInt(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public int increaseInt(String key, int defaultValue, int increaseWith) + { + final int newValue = getInt(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + public int[] getIntArray(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Integer value required, but not specified"); + } + if (val instanceof Number) + { + return new int[] + { + ((Number) val).intValue() + }; + } + int c = 0; + final String[] vals = ((String) val).split(splitOn); + final int[] result = new int[vals.length]; + for (String v : vals) + { + try + { + result[c++] = Integer.parseInt(v); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val); + } + } + return result; + } + + public List getIntegerList(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final List result = new ArrayList<>(); + for (int i : getIntArray(key, splitOn)) + { + result.add(i); + } + return result; + } + + @Override + public long getLong(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Long value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).longValue(); + } + try + { + return Long.parseLong((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Long value required, but found: " + val); + } + } + + @Override + public long getLong(String key, long defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).longValue(); + } + try + { + return Long.parseLong((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Long value required, but found: " + val); + } + } + + public long increaseLong(String key, long increaseWith) + { + final long newValue = getLong(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public long increaseLong(String key, long defaultValue, long increaseWith) + { + final long newValue = getLong(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public float getFloat(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Float value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).floatValue(); + } + try + { + return Float.parseFloat((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Float value required, but found: " + val); + } + } + + @Override + public float getFloat(String key, float defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).floatValue(); + } + try + { + return Float.parseFloat((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Float value required, but found: " + val); + } + } + + public float increaseFloat(String key, float increaseWith) + { + final float newValue = getFloat(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public float increaseFloat(String key, float defaultValue, float increaseWith) + { + final float newValue = getFloat(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public double getDouble(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Double value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).doubleValue(); + } + try + { + return Double.parseDouble((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Double value required, but found: " + val); + } + } + + @Override + public double getDouble(String key, double defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).doubleValue(); + } + try + { + return Double.parseDouble((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Double value required, but found: " + val); + } + } + + public double increaseDouble(String key, double increaseWith) + { + final double newValue = getDouble(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public double increaseDouble(String key, double defaultValue, double increaseWith) + { + final double newValue = getDouble(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public String getString(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("String value required, but not specified"); + } + return String.valueOf(val); + } + + @Override + public String getString(String key, String defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + return String.valueOf(val); + } + + @Override + public Duration getDuration(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("String value required, but not specified"); + } + return TimeUtil.parseDuration(String.valueOf(val)); + } + + @Override + public Duration getDuration(String key, Duration defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + return TimeUtil.parseDuration(String.valueOf(val)); + } + + @Override + @SuppressWarnings("unchecked") + public > T getEnum(String key, Class enumClass) + { + Objects.requireNonNull(key); + Objects.requireNonNull(enumClass); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but not specified"); + } + if (enumClass.isInstance(val)) + { + return (T) val; + } + try + { + return Enum.valueOf(enumClass, String.valueOf(val)); + } + catch (Exception e) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); + } + } + + @Override + @SuppressWarnings("unchecked") + public > T getEnum(String key, Class enumClass, T defaultValue) + { + Objects.requireNonNull(key); + Objects.requireNonNull(enumClass); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (enumClass.isInstance(val)) + { + return (T) val; + } + try + { + return Enum.valueOf(enumClass, String.valueOf(val)); + } + catch (Exception e) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); + } + } + + @SuppressWarnings("unchecked") + public A getObject(String name, Class type) + { + Objects.requireNonNull(name); + Objects.requireNonNull(type); + final Object obj = _set.get(name); + if ((obj == null) || !type.isAssignableFrom(obj.getClass())) + { + return null; + } + + return (A) obj; + } + + @SuppressWarnings("unchecked") + public A getObject(String name, Class type, A defaultValue) + { + Objects.requireNonNull(name); + Objects.requireNonNull(type); + final Object obj = _set.get(name); + if ((obj == null) || !type.isAssignableFrom(obj.getClass())) + { + return defaultValue; + } + + return (A) obj; + } + + public SkillHolder getSkillHolder(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof SkillHolder)) + { + return null; + } + + return (SkillHolder) obj; + } + + public Location getLocation(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof Location)) + { + return null; + } + return (Location) obj; + } + + @SuppressWarnings("unchecked") + public List getMinionList(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return Collections.emptyList(); + } + + return (List) obj; + } + + @SuppressWarnings("unchecked") + public List getList(String key, Class clazz) + { + Objects.requireNonNull(key); + Objects.requireNonNull(clazz); + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return null; + } + + final List originalList = (List) obj; + if (!originalList.isEmpty() && !originalList.stream().allMatch(clazz::isInstance)) + { + if (clazz.getSuperclass() == Enum.class) + { + throw new IllegalAccessError("Please use getEnumList if you want to get list of Enums!"); + } + + // Attempt to convert the list + final List convertedList = convertList(originalList, clazz); + if (convertedList == null) + { + LOGGER.log(Level.WARNING, "getList(\"" + key + "\", " + clazz.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); + return null; + } + + // Overwrite the existing list with proper generic type + _set.put(key, convertedList); + return convertedList; + } + return (List) obj; + } + + public List getList(String key, Class clazz, List defaultValue) + { + final List list = getList(key, clazz); + return list == null ? defaultValue : list; + } + + @SuppressWarnings("unchecked") + public > List getEnumList(String key, Class clazz) + { + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return null; + } + + final List originalList = (List) obj; + if (!originalList.isEmpty() && (obj.getClass().getGenericInterfaces()[0] != clazz) && originalList.stream().allMatch(name -> Util.isEnum(name.toString(), clazz))) + { + final List convertedList = originalList.stream().map(Object::toString).map(name -> Enum.valueOf(clazz, name)).map(clazz::cast).collect(Collectors.toList()); + + // Overwrite the existing list with proper generic type + _set.put(key, convertedList); + return convertedList; + } + return (List) obj; + } + + /** + * @param + * @param originalList + * @param clazz + * @return + */ + private List convertList(List originalList, Class clazz) + { + if (clazz == Integer.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isInteger)) + { + return originalList.stream().map(Object::toString).map(Integer::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + else if (clazz == Float.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isFloat)) + { + return originalList.stream().map(Object::toString).map(Float::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + else if (clazz == Double.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isDouble)) + { + return originalList.stream().map(Object::toString).map(Double::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + return null; + } + + @SuppressWarnings("unchecked") + public Map getMap(String key, Class keyClass, Class valueClass) + { + final Object obj = _set.get(key); + if (!(obj instanceof Map)) + { + return null; + } + + final Map originalList = (Map) obj; + if (!originalList.isEmpty() && ((!originalList.keySet().stream().allMatch(keyClass::isInstance)) || (!originalList.values().stream().allMatch(valueClass::isInstance)))) + { + LOGGER.log(Level.WARNING, "getMap(\"" + key + "\", " + keyClass.getSimpleName() + ", " + valueClass.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); + } + return (Map) obj; + } + + public StatSet set(String name, Object value) + { + if (value == null) + { + return this; + } + _set.put(name, value); + return this; + } + + public StatSet set(String key, boolean value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, byte value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, short value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, int value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, long value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, float value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, double value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, String value) + { + if (value == null) + { + return this; + } + _set.put(key, value); + return this; + } + + public StatSet set(String key, Enum value) + { + if (value == null) + { + return this; + } + _set.put(key, value); + return this; + } + + public static StatSet valueOf(String key, Object value) + { + final StatSet set = new StatSet(); + set.set(key, value); + return set; + } + + public void remove(String key) + { + _set.remove(key); + } + + public boolean contains(String name) + { + return _set.containsKey(name); + } + + @Override + public String toString() + { + return "StatSet{_set=" + _set + '}'; + } +} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/StatsSet.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/StatsSet.java deleted file mode 100644 index 5ce013ebd2..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/StatsSet.java +++ /dev/null @@ -1,968 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.ConcurrentHashMap; -import java.util.function.Supplier; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.stream.Collectors; - -import org.l2jmobius.commons.util.TimeUtil; -import org.l2jmobius.gameserver.model.holders.MinionHolder; -import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.interfaces.IParserAdvUtils; -import org.l2jmobius.gameserver.util.Util; - -/** - * This class is meant to hold a set of (key,value) pairs.
    - * They are stored as object but can be retrieved in any type wanted. As long as cast is available.
    - * @author mkizub - */ -public class StatsSet implements IParserAdvUtils -{ - private static final Logger LOGGER = Logger.getLogger(StatsSet.class.getName()); - /** Static empty immutable map, used to avoid multiple null checks over the source. */ - public static final StatsSet EMPTY_STATSET = new StatsSet(Collections.emptyMap()); - - private final Map _set; - - public StatsSet() - { - this(ConcurrentHashMap::new); - } - - public StatsSet(Supplier> mapFactory) - { - this(mapFactory.get()); - } - - public StatsSet(Map map) - { - _set = map; - } - - /** - * Returns the set of values - * @return HashMap - */ - public Map getSet() - { - return _set; - } - - /** - * Add a set of couple values in the current set - * @param newSet : StatsSet pointing out the list of couples to add in the current set - */ - public void merge(StatsSet newSet) - { - _set.putAll(newSet.getSet()); - } - - /** - * Verifies if the stat set is empty. - * @return {@code true} if the stat set is empty, {@code false} otherwise - */ - public boolean isEmpty() - { - return _set.isEmpty(); - } - - /** - * Return the boolean value associated with key. - * @param key : String designating the key in the set - * @return boolean : value associated to the key - * @throws IllegalArgumentException : If value is not set or value is not boolean - */ - @Override - public boolean getBoolean(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Boolean value required, but not specified"); - } - if (val instanceof Boolean) - { - return ((Boolean) val).booleanValue(); - } - try - { - return Boolean.parseBoolean((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Boolean value required, but found: " + val); - } - } - - /** - * Return the boolean value associated with key.
    - * If no value is associated with key, or type of value is wrong, returns defaultValue. - * @param key : String designating the key in the entry set - * @return boolean : value associated to the key - */ - @Override - public boolean getBoolean(String key, boolean defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Boolean) - { - return ((Boolean) val).booleanValue(); - } - try - { - return Boolean.parseBoolean((String) val); - } - catch (Exception e) - { - return defaultValue; - } - } - - @Override - public byte getByte(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Byte value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).byteValue(); - } - try - { - return Byte.parseByte((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - - @Override - public byte getByte(String key, byte defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).byteValue(); - } - try - { - return Byte.parseByte((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - - public short increaseByte(String key, byte increaseWith) - { - final byte newValue = (byte) (getByte(key) + increaseWith); - set(key, newValue); - return newValue; - } - - public short increaseByte(String key, byte defaultValue, byte increaseWith) - { - final byte newValue = (byte) (getByte(key, defaultValue) + increaseWith); - set(key, newValue); - return newValue; - } - - public byte[] getByteArray(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Byte value required, but not specified"); - } - if (val instanceof Number) - { - return new byte[] - { - ((Number) val).byteValue() - }; - } - int c = 0; - final String[] vals = ((String) val).split(splitOn); - final byte[] result = new byte[vals.length]; - for (String v : vals) - { - try - { - result[c++] = Byte.parseByte(v); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - return result; - } - - public List getByteList(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final List result = new ArrayList<>(); - for (Byte i : getByteArray(key, splitOn)) - { - result.add(i); - } - return result; - } - - @Override - public short getShort(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Short value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).shortValue(); - } - try - { - return Short.parseShort((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Short value required, but found: " + val); - } - } - - @Override - public short getShort(String key, short defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).shortValue(); - } - try - { - return Short.parseShort((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Short value required, but found: " + val); - } - } - - public short increaseShort(String key, short increaseWith) - { - final short newValue = (short) (getShort(key) + increaseWith); - set(key, newValue); - return newValue; - } - - public short increaseShort(String key, short defaultValue, short increaseWith) - { - final short newValue = (short) (getShort(key, defaultValue) + increaseWith); - set(key, newValue); - return newValue; - } - - @Override - public int getInt(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Integer value required, but not specified: " + key + "!"); - } - - if (val instanceof Number) - { - return ((Number) val).intValue(); - } - - try - { - return Integer.parseInt((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val + "!"); - } - } - - @Override - public int getInt(String key, int defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).intValue(); - } - try - { - return Integer.parseInt((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val); - } - } - - public int increaseInt(String key, int increaseWith) - { - final int newValue = getInt(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public int increaseInt(String key, int defaultValue, int increaseWith) - { - final int newValue = getInt(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - public int[] getIntArray(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Integer value required, but not specified"); - } - if (val instanceof Number) - { - return new int[] - { - ((Number) val).intValue() - }; - } - int c = 0; - final String[] vals = ((String) val).split(splitOn); - final int[] result = new int[vals.length]; - for (String v : vals) - { - try - { - result[c++] = Integer.parseInt(v); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val); - } - } - return result; - } - - public List getIntegerList(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final List result = new ArrayList<>(); - for (int i : getIntArray(key, splitOn)) - { - result.add(i); - } - return result; - } - - @Override - public long getLong(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Long value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).longValue(); - } - try - { - return Long.parseLong((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Long value required, but found: " + val); - } - } - - @Override - public long getLong(String key, long defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).longValue(); - } - try - { - return Long.parseLong((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Long value required, but found: " + val); - } - } - - public long increaseLong(String key, long increaseWith) - { - final long newValue = getLong(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public long increaseLong(String key, long defaultValue, long increaseWith) - { - final long newValue = getLong(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public float getFloat(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Float value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).floatValue(); - } - try - { - return Float.parseFloat((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Float value required, but found: " + val); - } - } - - @Override - public float getFloat(String key, float defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).floatValue(); - } - try - { - return Float.parseFloat((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Float value required, but found: " + val); - } - } - - public float increaseFloat(String key, float increaseWith) - { - final float newValue = getFloat(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public float increaseFloat(String key, float defaultValue, float increaseWith) - { - final float newValue = getFloat(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public double getDouble(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Double value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).doubleValue(); - } - try - { - return Double.parseDouble((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Double value required, but found: " + val); - } - } - - @Override - public double getDouble(String key, double defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).doubleValue(); - } - try - { - return Double.parseDouble((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Double value required, but found: " + val); - } - } - - public double increaseDouble(String key, double increaseWith) - { - final double newValue = getDouble(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public double increaseDouble(String key, double defaultValue, double increaseWith) - { - final double newValue = getDouble(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public String getString(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("String value required, but not specified"); - } - return String.valueOf(val); - } - - @Override - public String getString(String key, String defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - return String.valueOf(val); - } - - @Override - public Duration getDuration(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("String value required, but not specified"); - } - return TimeUtil.parseDuration(String.valueOf(val)); - } - - @Override - public Duration getDuration(String key, Duration defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - return TimeUtil.parseDuration(String.valueOf(val)); - } - - @Override - @SuppressWarnings("unchecked") - public > T getEnum(String key, Class enumClass) - { - Objects.requireNonNull(key); - Objects.requireNonNull(enumClass); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but not specified"); - } - if (enumClass.isInstance(val)) - { - return (T) val; - } - try - { - return Enum.valueOf(enumClass, String.valueOf(val)); - } - catch (Exception e) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); - } - } - - @Override - @SuppressWarnings("unchecked") - public > T getEnum(String key, Class enumClass, T defaultValue) - { - Objects.requireNonNull(key); - Objects.requireNonNull(enumClass); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (enumClass.isInstance(val)) - { - return (T) val; - } - try - { - return Enum.valueOf(enumClass, String.valueOf(val)); - } - catch (Exception e) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); - } - } - - @SuppressWarnings("unchecked") - public A getObject(String name, Class type) - { - Objects.requireNonNull(name); - Objects.requireNonNull(type); - final Object obj = _set.get(name); - if ((obj == null) || !type.isAssignableFrom(obj.getClass())) - { - return null; - } - - return (A) obj; - } - - @SuppressWarnings("unchecked") - public A getObject(String name, Class type, A defaultValue) - { - Objects.requireNonNull(name); - Objects.requireNonNull(type); - final Object obj = _set.get(name); - if ((obj == null) || !type.isAssignableFrom(obj.getClass())) - { - return defaultValue; - } - - return (A) obj; - } - - public SkillHolder getSkillHolder(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof SkillHolder)) - { - return null; - } - - return (SkillHolder) obj; - } - - public Location getLocation(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof Location)) - { - return null; - } - return (Location) obj; - } - - @SuppressWarnings("unchecked") - public List getMinionList(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return Collections.emptyList(); - } - - return (List) obj; - } - - @SuppressWarnings("unchecked") - public List getList(String key, Class clazz) - { - Objects.requireNonNull(key); - Objects.requireNonNull(clazz); - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return null; - } - - final List originalList = (List) obj; - if (!originalList.isEmpty() && !originalList.stream().allMatch(clazz::isInstance)) - { - if (clazz.getSuperclass() == Enum.class) - { - throw new IllegalAccessError("Please use getEnumList if you want to get list of Enums!"); - } - - // Attempt to convert the list - final List convertedList = convertList(originalList, clazz); - if (convertedList == null) - { - LOGGER.log(Level.WARNING, "getList(\"" + key + "\", " + clazz.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); - return null; - } - - // Overwrite the existing list with proper generic type - _set.put(key, convertedList); - return convertedList; - } - return (List) obj; - } - - public List getList(String key, Class clazz, List defaultValue) - { - final List list = getList(key, clazz); - return list == null ? defaultValue : list; - } - - @SuppressWarnings("unchecked") - public > List getEnumList(String key, Class clazz) - { - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return null; - } - - final List originalList = (List) obj; - if (!originalList.isEmpty() && (obj.getClass().getGenericInterfaces()[0] != clazz) && originalList.stream().allMatch(name -> Util.isEnum(name.toString(), clazz))) - { - final List convertedList = originalList.stream().map(Object::toString).map(name -> Enum.valueOf(clazz, name)).map(clazz::cast).collect(Collectors.toList()); - - // Overwrite the existing list with proper generic type - _set.put(key, convertedList); - return convertedList; - } - return (List) obj; - } - - /** - * @param - * @param originalList - * @param clazz - * @return - */ - private List convertList(List originalList, Class clazz) - { - if (clazz == Integer.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isInteger)) - { - return originalList.stream().map(Object::toString).map(Integer::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - else if (clazz == Float.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isFloat)) - { - return originalList.stream().map(Object::toString).map(Float::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - else if (clazz == Double.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isDouble)) - { - return originalList.stream().map(Object::toString).map(Double::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - return null; - } - - @SuppressWarnings("unchecked") - public Map getMap(String key, Class keyClass, Class valueClass) - { - final Object obj = _set.get(key); - if (!(obj instanceof Map)) - { - return null; - } - - final Map originalList = (Map) obj; - if (!originalList.isEmpty() && ((!originalList.keySet().stream().allMatch(keyClass::isInstance)) || (!originalList.values().stream().allMatch(valueClass::isInstance)))) - { - LOGGER.log(Level.WARNING, "getMap(\"" + key + "\", " + keyClass.getSimpleName() + ", " + valueClass.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); - } - return (Map) obj; - } - - public StatsSet set(String name, Object value) - { - if (value == null) - { - return this; - } - _set.put(name, value); - return this; - } - - public StatsSet set(String key, boolean value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, byte value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, short value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, int value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, long value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, float value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, double value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, String value) - { - if (value == null) - { - return this; - } - _set.put(key, value); - return this; - } - - public StatsSet set(String key, Enum value) - { - if (value == null) - { - return this; - } - _set.put(key, value); - return this; - } - - public static StatsSet valueOf(String key, Object value) - { - final StatsSet set = new StatsSet(); - set.set(key, value); - return set; - } - - public void remove(String key) - { - _set.remove(key); - } - - public boolean contains(String name) - { - return _set.containsKey(name); - } - - @Override - public String toString() - { - return "StatsSet{_set=" + _set + '}'; - } -} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Npc.java index 74109a5102..9efcc7d9c8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.MpRewardTask; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.FishermanInstance; @@ -148,7 +148,7 @@ public class Npc extends Creature private NpcStringId _titleString; private NpcStringId _nameString; - private StatsSet _params; + private StatSet _params; private RaidBossStatus _raidStatus; /** Contains information about local tax payments. */ @@ -1756,7 +1756,7 @@ public class Npc extends Creature /** * @return the parameters of the npc merged with the spawn parameters (if there are any) */ - public StatsSet getParameters() + public StatSet getParameters() { if (_params != null) { @@ -1768,10 +1768,10 @@ public class Npc extends Creature final NpcSpawnTemplate npcSpawnTemplate = _spawn.getNpcSpawnTemplate(); if ((npcSpawnTemplate != null) && (npcSpawnTemplate.getParameters() != null) && !npcSpawnTemplate.getParameters().isEmpty()) { - final StatsSet params = getTemplate().getParameters(); + final StatSet params = getTemplate().getParameters(); if ((params != null) && !params.getSet().isEmpty()) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.merge(params); set.merge(npcSpawnTemplate.getParameters()); _params = set; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index c8cbb989c0..a4d95ae3fc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -21,7 +21,7 @@ import java.util.EnumMap; import java.util.Map; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; @@ -49,12 +49,12 @@ public class CreatureTemplate extends ListenersContainer /** The creature's race. */ private Race _race; - public CreatureTemplate(StatsSet set) + public CreatureTemplate(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { // Base stats _baseValues.put(Stat.STAT_STR, set.getDouble("baseSTR", 0)); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java index 86441c678c..14f0e9cae8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.CubicInstance; @@ -46,7 +46,7 @@ public class CubicTemplate implements ICubicConditionHolder private final List _conditions = new ArrayList<>(); public List _skills = new ArrayList<>(); - public CubicTemplate(StatsSet set) + public CubicTemplate(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java index c40883ac75..410040bc86 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.templates; import org.l2jmobius.gameserver.enums.DoorOpenType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -57,7 +57,7 @@ public class DoorTemplate extends CreatureTemplate implements IIdentifiable private final boolean _stealth; private final boolean _isInverted; - public DoorTemplate(StatsSet set) + public DoorTemplate(StatSet set) { super(set); _doorId = set.getInt("id"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 1eedf5be50..92f55589e8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.enums.MpRewardAffectType; import org.l2jmobius.gameserver.enums.MpRewardType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -63,7 +63,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private boolean _usingServerSideName; private String _title; private boolean _usingServerSideTitle; - private StatsSet _parameters; + private StatSet _parameters; private Sex _sex; private int _chestId; private int _rhandId; @@ -123,15 +123,15 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable /** * Constructor of Creature. - * @param set The StatsSet object to transfer data to the method + * @param set The StatSet object to transfer data to the method */ - public NpcTemplate(StatsSet set) + public NpcTemplate(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _id = set.getInt("id"); @@ -320,12 +320,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _usingServerSideTitle; } - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } - public void setParameters(StatsSet set) + public void setParameters(StatSet set) { _parameters = set; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 50292b8bc8..28458aa09e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -50,7 +50,7 @@ public class PlayerTemplate extends CreatureTemplate private final List _creationPoints; private final Map _baseSlotDef; - public PlayerTemplate(StatsSet set, List creationPoints) + public PlayerTemplate(StatSet set, List creationPoints) { super(set); _classId = ClassId.getClassId(set.getInt("classId")); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index aa28a0f648..260da48365 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -23,7 +23,7 @@ import java.util.Objects; import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import org.l2jmobius.gameserver.enums.InventoryBlockType; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -57,7 +57,7 @@ public class Transform implements IIdentifiable private TransformTemplate _maleTemplate; private TransformTemplate _femaleTemplate; - public Transform(StatsSet set) + public Transform(StatSet set) { _id = set.getInt("id"); _displayId = set.getInt("displayId", _id); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java index 5660852a01..729998503f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.actor.transform; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -31,7 +31,7 @@ public class TransformLevelData private final double _levelMod; private Map _stats; - public TransformLevelData(StatsSet set) + public TransformLevelData(StatSet set) { _level = set.getInt("val"); _levelMod = set.getDouble("levelMod"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 4de84b8bdc..7aca059f91 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -23,7 +23,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -49,7 +49,7 @@ public class TransformTemplate private ExBasicActionList _list; private final Map _data = new LinkedHashMap<>(100); - public TransformTemplate(StatsSet set) + public TransformTemplate(StatSet set) { _collisionRadius = set.contains("radius") ? set.getDouble("radius") : null; _collisionHeight = set.contains("height") ? set.getDouble("height") : null; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java index d808a6b8bf..02550d2818 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -36,7 +36,7 @@ public class AlchemyCraftData private ItemHolder _productionSuccess; private ItemHolder _productionFailure; - public AlchemyCraftData(StatsSet set) + public AlchemyCraftData(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java index 0bd061d3c4..79dd6c0207 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.beautyshop; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -32,7 +32,7 @@ public class BeautyItem private final int _beautyShopTicket; private final Map _colors = new HashMap<>(); - public BeautyItem(StatsSet set) + public BeautyItem(StatSet set) { _id = set.getInt("id"); _adena = set.getInt("adena", 0); @@ -60,7 +60,7 @@ public class BeautyItem return _beautyShopTicket; } - public void addColor(StatsSet set) + public void addColor(StatSet set) { final BeautyItem color = new BeautyItem(set); _colors.put(set.getInt("id"), color); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index e0d1486962..1c341e0c31 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party.MessageType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.appearance.PlayerAppearance; @@ -244,7 +244,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent player.teleToLocation(_instance.getEnterLocations().get(index++), 0, _instance); } - getTimers().addTimer("match_start_countdown", StatsSet.valueOf("time", 60), 100, null, null); + getTimers().addTimer("match_start_countdown", StatSet.valueOf("time", 60), 100, null, null); getTimers().addTimer("teleport_message1", 10000, null, null); getTimers().addTimer("teleport_message2", 14000, null, null); @@ -394,7 +394,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent } } getTimers().cancelTimer("update", null, null); - getTimers().addTimer("match_end_countdown", StatsSet.valueOf("time", 30), 30 * 1000, null, null); + getTimers().addTimer("match_end_countdown", StatSet.valueOf("time", 30), 30 * 1000, null, null); EventDispatcher.getInstance().notifyEvent(new OnCeremonyOfChaosMatchResult(winners, members)); } @@ -487,7 +487,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java index 39f9196d93..371f8dc459 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.conditions.ICubicCondition; @@ -38,7 +38,7 @@ public class CubicSkill extends SkillHolder implements ICubicConditionHolder private final List _conditions = new ArrayList<>(); private final boolean _targetDebuff; - public CubicSkill(StatsSet set) + public CubicSkill(StatSet set) { super(set.getInt("id"), set.getInt("level")); _triggerRate = set.getInt("triggerRate", 100); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/entity/ClanHall.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/entity/ClanHall.java index 8da77477fd..22af370709 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/entity/ClanHall.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/entity/ClanHall.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -75,7 +75,7 @@ public class ClanHall extends AbstractResidence private static final String LOAD_CLANHALL = "SELECT * FROM clanhall WHERE id=?"; private static final String UPDATE_CLANHALL = "UPDATE clanhall SET ownerId=?,paidUntil=? WHERE id=?"; - public ClanHall(StatsSet params) + public ClanHall(StatSet params) { super(params.getInt("id")); // Set static parameters diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/entity/Hero.java index ef005ff325..aee8b019ee 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/entity/Hero.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/entity/Hero.java @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.data.xml.impl.ClassListData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -74,13 +74,13 @@ public class Hero // delete hero items private static final String DELETE_ITEMS = "DELETE FROM items WHERE item_id IN (30392, 30393, 30394, 30395, 30396, 30397, 30398, 30399, 30400, 30401, 30402, 30403, 30404, 30405, 30372, 30373, 6842, 6611, 6612, 6613, 6614, 6615, 6616, 6617, 6618, 6619, 6620, 6621, 9388, 9389, 9390) AND owner_id NOT IN (SELECT charId FROM characters WHERE accesslevel > 0)"; - private static final Map HEROES = new ConcurrentHashMap<>(); - private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); + private static final Map HEROES = new ConcurrentHashMap<>(); + private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); - private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); - private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); + private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); + private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); - private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); + private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); private static final Map HERO_MESSAGE = new ConcurrentHashMap<>(); public static final String COUNT = "count"; @@ -118,7 +118,7 @@ public class Hero { while (rset.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset.getInt(Olympiad.CLASS_ID)); @@ -137,7 +137,7 @@ public class Hero while (rset2.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset2.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset2.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset2.getInt(Olympiad.CLASS_ID)); @@ -159,7 +159,7 @@ public class Hero LOGGER.info("Hero System: Loaded " + COMPLETE_HEROS.size() + " all time Heroes."); } - private void processHeros(PreparedStatement ps, int charId, StatsSet hero) throws SQLException + private void processHeros(PreparedStatement ps, int charId, StatSet hero) throws SQLException { ps.setInt(1, charId); try (ResultSet rs = ps.executeQuery()) @@ -224,7 +224,7 @@ public class Hero public void loadDiary(int charId) { - final List diary = new ArrayList<>(); + final List diary = new ArrayList<>(); int diaryentries = 0; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement("SELECT * FROM heroes_diary WHERE charId=? ORDER BY time ASC")) @@ -234,7 +234,7 @@ public class Hero { while (rset.next()) { - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final long time = rset.getLong("time"); final int action = rset.getInt("action"); @@ -279,8 +279,8 @@ public class Hero public void loadFights(int charId) { - final List fights = new ArrayList<>(); - final StatsSet heroCountData = new StatsSet(); + final List fights = new ArrayList<>(); + final StatSet heroCountData = new StatSet(); final Calendar data = Calendar.getInstance(); data.set(Calendar.DAY_OF_MONTH, 1); data.set(Calendar.HOUR_OF_DAY, 0); @@ -326,7 +326,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charTwoClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -362,7 +362,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charOneClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -410,14 +410,14 @@ public class Hero } } - public Map getHeroes() + public Map getHeroes() { return HEROES; } public int getHeroByClass(int classid) { - for (Entry e : HEROES.entrySet()) + for (Entry e : HEROES.entrySet()) { if (e.getValue().getInt(Olympiad.CLASS_ID) == classid) { @@ -438,7 +438,7 @@ public class Hero public void showHeroDiary(PlayerInstance player, int heroclass, int charid, int page) { final int perpage = 10; - final List mainList = HERO_DIARY.get(charid); + final List mainList = HERO_DIARY.get(charid); if (mainList != null) { final NpcHtmlMessage diaryReply = new NpcHtmlMessage(); @@ -453,7 +453,7 @@ public class Hero if (!mainList.isEmpty()) { - final List list = new ArrayList<>(mainList); + final List list = new ArrayList<>(mainList); Collections.reverse(list); boolean color = true; @@ -463,7 +463,7 @@ public class Hero for (int i = (page - 1) * perpage; i < list.size(); i++) { breakat = i; - final StatsSet diaryEntry = list.get(i); + final StatSet diaryEntry = list.get(i); fList.append(""); if (color) { @@ -524,7 +524,7 @@ public class Hero int loss = 0; int draw = 0; - final List heroFights = HERO_FIGHTS.get(charid); + final List heroFights = HERO_FIGHTS.get(charid); if (heroFights != null) { final NpcHtmlMessage fightReply = new NpcHtmlMessage(); @@ -536,7 +536,7 @@ public class Hero if (!heroFights.isEmpty()) { - final StatsSet heroCount = HERO_COUNTS.get(charid); + final StatSet heroCount = HERO_COUNTS.get(charid); if (heroCount != null) { win = heroCount.getInt("victory"); @@ -551,7 +551,7 @@ public class Hero for (int i = (page - 1) * perpage; i < heroFights.size(); i++) { breakat = i; - final StatsSet fight = heroFights.get(i); + final StatSet fight = heroFights.get(i); fList.append(""); if (color) { @@ -609,7 +609,7 @@ public class Hero } } - public synchronized void computeNewHeroes(List newHeroes) + public synchronized void computeNewHeroes(List newHeroes) { updateHeroes(true); @@ -659,13 +659,13 @@ public class Hero return; } - for (StatsSet hero : newHeroes) + for (StatSet hero : newHeroes) { final int charId = hero.getInt(Olympiad.CHAR_ID); if (COMPLETE_HEROS.containsKey(charId)) { - final StatsSet oldHero = COMPLETE_HEROS.get(charId); + final StatSet oldHero = COMPLETE_HEROS.get(charId); final int count = oldHero.getInt(COUNT); oldHero.set(COUNT, count + 1); oldHero.set(PLAYED, 1); @@ -674,7 +674,7 @@ public class Hero } else { - final StatsSet newHero = new StatsSet(); + final StatSet newHero = new StatSet(); newHero.set(Olympiad.CHAR_NAME, hero.getString(Olympiad.CHAR_NAME)); newHero.set(Olympiad.CLASS_ID, hero.getInt(Olympiad.CLASS_ID)); newHero.set(COUNT, 1); @@ -700,9 +700,9 @@ public class Hero } else { - StatsSet hero; + StatSet hero; int heroId; - for (Entry entry : HEROES.entrySet()) + for (Entry entry : HEROES.entrySet()) { hero = entry.getValue(); heroId = entry.getKey(); @@ -787,13 +787,13 @@ public class Hero setDiaryData(charId, ACTION_RAID_KILLED, npcId); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (template == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -806,13 +806,13 @@ public class Hero setDiaryData(charId, ACTION_CASTLE_TAKEN, castleId); final Castle castle = CastleManager.getInstance().getCastleById(castleId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (castle == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -922,10 +922,10 @@ public class Hero */ public void claimHero(PlayerInstance player) { - StatsSet hero = HEROES.get(player.getObjectId()); + StatSet hero = HEROES.get(player.getObjectId()); if (hero == null) { - hero = new StatsSet(); + hero = new StatSet(); HEROES.put(player.getObjectId(), hero); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java index f1263e8d44..c52f487402 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java @@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.atomic.AtomicReference; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.eventengine.drop.IEventDrop; import org.l2jmobius.gameserver.model.events.AbstractScript; @@ -42,7 +42,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout public abstract class AbstractEventManager>extends AbstractScript { private String _name; - private StatsSet _variables = StatsSet.EMPTY_STATSET; + private StatSet _variables = StatSet.EMPTY_STATSET; private Set _schedulers = Collections.emptySet(); private Set _conditionalSchedulers = Collections.emptySet(); private Map _rewards = Collections.emptyMap(); @@ -67,14 +67,14 @@ public abstract class AbstractEventManager>extends Ab /* ********************** */ - public StatsSet getVariables() + public StatSet getVariables() { return _variables; } - public void setVariables(StatsSet variables) + public void setVariables(StatSet variables) { - _variables = new StatsSet(Collections.unmodifiableMap(variables.getSet())); + _variables = new StatSet(Collections.unmodifiableMap(variables.getSet())); } /* ********************** */ diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java index 59c64b812c..e41af41d1a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.util.cron4j.PastPredictor; import org.l2jmobius.gameserver.util.cron4j.Predictor; @@ -45,7 +45,7 @@ public class EventScheduler private List _notifications; private ScheduledFuture _task; - public EventScheduler(AbstractEventManager manager, StatsSet set) + public EventScheduler(AbstractEventManager manager, StatSet set) { _eventManager = manager; _name = set.getString("name", ""); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 4fc2d3b8b0..819c3bf34d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -50,7 +50,7 @@ import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -181,12 +181,12 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime onTimerCancel(holder.getEvent(), holder.getParams(), holder.getNpc(), holder.getPlayer()); } - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { LOGGER.warning("[" + getClass().getSimpleName() + "]: Timer event arrived at non overriden onTimerEvent method event: " + event + " npc: " + npc + " player: " + player); } - public void onTimerCancel(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerCancel(String event, StatSet params, Npc npc, PlayerInstance player) { } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java index 400fb64b6e..861c4a9b31 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java @@ -24,7 +24,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.timers.IEventTimerCancel; @@ -69,7 +69,7 @@ public class TimerExecutor * @param eventTimer * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - public boolean addTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) + public boolean addTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) { return addTimer(new TimerHolder<>(event, params, time, npc, player, false, eventTimer, _cancelListener, this)); } @@ -95,7 +95,7 @@ public class TimerExecutor * @param player * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - public boolean addTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player) + public boolean addTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player) { return addTimer(event, params, time, npc, player, _eventListener); } @@ -123,7 +123,7 @@ public class TimerExecutor * @param eventTimer * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - private boolean addRepeatingTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) + private boolean addRepeatingTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) { return addTimer(new TimerHolder<>(event, params, time, npc, player, true, eventTimer, _cancelListener, this)); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java index ab8fa150ca..0fcafba759 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java @@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.gameserver.instancemanager.TimersManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.TimerExecutor; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.events.TimerExecutor; public class TimerHolder implements Runnable { private final T _event; - private final StatsSet _params; + private final StatSet _params; private final long _time; private final Npc _npc; private final PlayerInstance _player; @@ -44,7 +44,7 @@ public class TimerHolder implements Runnable private final TimerExecutor _postExecutor; private final ScheduledFuture _task; - public TimerHolder(T event, StatsSet params, long time, Npc npc, PlayerInstance player, boolean isRepeating, IEventTimerEvent eventScript, IEventTimerCancel cancelScript, TimerExecutor postExecutor) + public TimerHolder(T event, StatSet params, long time, Npc npc, PlayerInstance player, boolean isRepeating, IEventTimerEvent eventScript, IEventTimerCancel cancelScript, TimerExecutor postExecutor) { Objects.requireNonNull(event, getClass().getSimpleName() + ": \"event\" cannot be null!"); Objects.requireNonNull(eventScript, getClass().getSimpleName() + ": \"script\" cannot be null!"); @@ -73,7 +73,7 @@ public class TimerHolder implements Runnable /** * @return the parameters of this timer */ - public StatsSet getParams() + public StatSet getParams() { return _params; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index 4a017eaaa2..78b7d0eaa3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; @@ -37,7 +37,7 @@ public class AppearanceHolder private final AppearanceTargetType _targetType; private final Integer _bodyPart; - public AppearanceHolder(StatsSet set) + public AppearanceHolder(StatSet set) { _visualId = set.getInt("id", 0); _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java index 29740873cd..0f9488448d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Nik @@ -43,7 +43,7 @@ public class AttachSkillHolder extends SkillHolder return _requiredSkillLevel; } - public static AttachSkillHolder fromStatsSet(StatsSet set) + public static AttachSkillHolder fromStatSet(StatSet set) { return new AttachSkillHolder(set.getInt("skillId"), set.getInt("skillLevel", 1), set.getInt("requiredSkillId"), set.getInt("requiredSkillLevel", 1)); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java index cc41724532..57b6d47c40 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Set; import org.l2jmobius.gameserver.enums.SkillEnchantType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -36,7 +36,7 @@ public class EnchantSkillHolder private final Map _chance = new EnumMap<>(SkillEnchantType.class); private final Map> _requiredItems = new EnumMap<>(SkillEnchantType.class); - public EnchantSkillHolder(StatsSet set) + public EnchantSkillHolder(StatSet set) { _level = set.getInt("level"); _enchantFailLevel = set.getInt("enchantFailLevel"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java index e6706c8467..33d14e4345 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Map; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -36,7 +36,7 @@ public class ExtendDropDataHolder private final List _conditions; private final Map _systemMessages; - public ExtendDropDataHolder(StatsSet set) + public ExtendDropDataHolder(StatSet set) { _id = set.getInt("id"); _items = set.getList("items", ExtendDropItemHolder.class); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java index 16454d764a..d63d4eb775 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -52,7 +52,7 @@ public class FakePlayerHolder private final int _clanId; private final int _pledgeStatus; - public FakePlayerHolder(StatsSet set) + public FakePlayerHolder(StatSet set) { _classId = set.getInt("classId", 182); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java index a9c72776cd..86af0c1405 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -29,7 +29,7 @@ public class ItemHolder implements IIdentifiable private final int _id; private final long _count; - public ItemHolder(StatsSet set) + public ItemHolder(StatSet set) { _id = set.getInt("id"); _count = set.getLong("count"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java index 5b581c4cfe..a54dfa8300 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -25,7 +25,7 @@ public class ItemPointHolder extends ItemHolder { private final int _points; - public ItemPointHolder(StatsSet params) + public ItemPointHolder(StatSet params) { this(params.getInt("id"), params.getLong("count"), params.getInt("points")); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java index 22c6c327eb..0ba78224d3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.holders; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -34,7 +34,7 @@ public class LuckyGameDataHolder private int _minModifyRewardGame; private int _maxModifyRewardGame; - public LuckyGameDataHolder(StatsSet params) + public LuckyGameDataHolder(StatSet params) { _index = params.getInt("index"); _turningPoints = params.getInt("turning_point"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java index f77e380e8d..9fa8c99654 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.holders; import java.time.Duration; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -32,7 +32,7 @@ public class MinionHolder implements IIdentifiable private final long _respawnTime; private final int _weightPoint; - public MinionHolder(StatsSet set) + public MinionHolder(StatSet set) { _id = set.getInt("id"); _count = set.getInt("count", 1); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java index f4173594d1..36ac70176d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -52,7 +52,7 @@ public class MultisellListHolder implements IIdentifiable } @SuppressWarnings("unchecked") - public MultisellListHolder(StatsSet set) + public MultisellListHolder(StatSet set) { _listId = set.getInt("listId"); _isChanceMultisell = set.getBoolean("isChanceMultisell", false); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index f1b98ee9ac..ecd1069283 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -45,7 +45,7 @@ import org.l2jmobius.gameserver.enums.InstanceReenterType; import org.l2jmobius.gameserver.enums.InstanceTeleportType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -87,7 +87,7 @@ public class Instance implements IIdentifiable, INamable private final Set _players = ConcurrentHashMap.newKeySet(); // Players inside instance private final Set _npcs = ConcurrentHashMap.newKeySet(); // Spawned NPCs inside instance private final Map _doors = new HashMap<>(); // Spawned doors inside instance - private final StatsSet _parameters = new StatsSet(); + private final StatSet _parameters = new StatSet(); // Timers private final Map> _ejectDeadTasks = new ConcurrentHashMap<>(); private ScheduledFuture _cleanUpTask = null; @@ -171,7 +171,7 @@ public class Instance implements IIdentifiable, INamable * Get instance world parameters. * @return instance parameters */ - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } @@ -1020,7 +1020,7 @@ public class Instance implements IIdentifiable, INamable * Get parameters from instance template.
    * @return template parameters */ - public StatsSet getTemplateParameters() + public StatSet getTemplateParameters() { return _template.getParameters(); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 2a196f73ef..b53b0a819d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.AbstractPlayerGroup; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -71,7 +71,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl private float _spRate = Config.RATE_INSTANCE_SP; private float _expPartyRate = Config.RATE_INSTANCE_PARTY_XP; private float _spPartyRate = Config.RATE_INSTANCE_PARTY_SP; - private StatsSet _parameters = StatsSet.EMPTY_STATSET; + private StatSet _parameters = StatSet.EMPTY_STATSET; private final Map _doors = new HashMap<>(); private final List _spawns = new ArrayList<>(); // Locations @@ -92,7 +92,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl /** * @param set */ - public InstanceTemplate(StatsSet set) + public InstanceTemplate(StatSet set) { _templateId = set.getInt("id", 0); _name = set.getString("name", null); @@ -178,7 +178,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (!set.isEmpty()) { - _parameters = new StatsSet(Collections.unmodifiableMap(set)); + _parameters = new StatSet(Collections.unmodifiableMap(set)); } } @@ -469,7 +469,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl * Get instance template parameters. * @return parameters of template */ - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java index 3b67ff72f4..3627959662 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; import java.util.function.BiConsumer; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public abstract class Condition { private final InstanceTemplate _template; - private final StatsSet _parameters; + private final StatSet _parameters; private final boolean _leaderOnly; private final boolean _showMessageAndHtml; private SystemMessageId _systemMsg = null; @@ -46,7 +46,7 @@ public abstract class Condition * @param onlyLeader flag which means if only leader should be affected (leader means player who wants to enter not group leader!) * @param showMessageAndHtml if {@code true} and HTML message is defined then both are send, otherwise only HTML or message is send */ - public Condition(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public Condition(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { _template = template; _parameters = parameters; @@ -58,7 +58,7 @@ public abstract class Condition * Gets parameters of condition. * @return set of parameters */ - protected final StatsSet getParameters() + protected final StatSet getParameters() { return _parameters; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java index e379741b59..c27d92d662 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionCommandChannel extends Condition { - public ConditionCommandChannel(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionCommandChannel(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_CANNOT_ENTER_BECAUSE_YOU_ARE_NOT_ASSOCIATED_WITH_THE_CURRENT_COMMAND_CHANNEL); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java index ed434e3524..a828dcceae 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.model.AbstractPlayerGroup; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionCommandChannelLeader extends Condition { - public ConditionCommandChannelLeader(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionCommandChannelLeader(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java index d2a60816d0..423a37a94e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionDistance extends Condition { - public ConditionDistance(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionDistance(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); setSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED, (message, player) -> message.addString(player.getName())); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java index 3dc78a98c7..8aa68b7e08 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionGroupMax extends Condition { - public ConditionGroupMax(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionGroupMax(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_CANNOT_ENTER_DUE_TO_THE_PARTY_HAVING_EXCEEDED_THE_LIMIT); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java index f7930b1d8c..fde9d13439 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionGroupMin extends Condition { - public ConditionGroupMin(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionGroupMin(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_MUST_HAVE_A_MINIMUM_OF_S1_PEOPLE_TO_ENTER_THIS_INSTANCED_ZONE, (msg, player) -> msg.addInt(getLimit())); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 3088d8ae64..53fee609aa 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.enums.ResidenceType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; */ public class ConditionHasResidence extends Condition { - public ConditionHasResidence(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionHasResidence(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); } @@ -43,7 +43,7 @@ public class ConditionHasResidence extends Condition return false; } - final StatsSet params = getParameters(); + final StatSet params = getParameters(); final int id = params.getInt("id"); boolean test = false; switch (params.getEnum("type", ResidenceType.class)) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java index 4e1c407325..eed350db38 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -32,7 +32,7 @@ public class ConditionItem extends Condition private final long _count; private final boolean _take; - public ConditionItem(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionItem(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Load params diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java index 7d509a20c7..b38f8c0e2c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -32,7 +32,7 @@ public class ConditionLevel extends Condition private final int _min; private final int _max; - public ConditionLevel(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionLevel(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Load params diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java index b91deeffdb..d71e6d0a39 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; */ public class ConditionNoParty extends Condition { - public ConditionNoParty(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionNoParty(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java index dd31bf3ca5..5bf768a03e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionParty extends Condition { - public ConditionParty(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionParty(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java index 524a59675a..0363715536 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionPartyLeader extends Condition { - public ConditionPartyLeader(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionPartyLeader(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java index 481cb251ce..48d7fc7981 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.instancemanager.QuestManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionQuest extends Condition { - public ConditionQuest(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionQuest(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Set message diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 899b17aff9..a073129734 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionReenter extends Condition { - public ConditionReenter(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionReenter(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); setSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET, (message, player) -> message.addString(player.getName())); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java index ec255025c3..fafafe5604 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.itemauction; import java.util.Calendar; import java.util.concurrent.TimeUnit; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Forsaiken @@ -40,7 +40,7 @@ public class AuctionDateGenerator private int _hour_of_day; private int _minute_of_hour; - public AuctionDateGenerator(StatsSet config) + public AuctionDateGenerator(StatSet config) { _calendar = Calendar.getInstance(); _interval = config.getInt(FIELD_INTERVAL, -1); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 64bf0a6ff1..cb554e4dce 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.itemauction; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.idfactory.IdFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,9 +34,9 @@ public class AuctionItem private final int _itemId; private final long _itemCount; @SuppressWarnings("unused") - private final StatsSet _itemExtra; + private final StatSet _itemExtra; - public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatsSet itemExtra) + public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatSet itemExtra) { _auctionItemId = auctionItemId; _auctionLength = auctionLength; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 6dff6e3a4d..dc3a7f6f6b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -44,7 +44,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -84,7 +84,7 @@ public class ItemAuctionInstance _items = new ArrayList<>(); final NamedNodeMap nanode = node.getAttributes(); - final StatsSet generatorConfig = new StatsSet(); + final StatSet generatorConfig = new StatSet(); for (int i = nanode.getLength(); i-- > 0;) { final Node n = nanode.item(i); @@ -115,7 +115,7 @@ public class ItemAuctionInstance throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } - final StatsSet itemExtra = new StatsSet(); + final StatSet itemExtra = new StatSet(); final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Armor.java index ac707b015b..c87f7ed45e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Armor.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.type.ArmorType; /** @@ -28,15 +28,15 @@ public class Armor extends Item /** * Constructor for Armor. - * @param set the StatsSet designating the set of couples (key,value) characterizing the armor. + * @param set the StatSet designating the set of couples (key,value) characterizing the armor. */ - public Armor(StatsSet set) + public Armor(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/EtcItem.java index 86d7291595..a902860c0d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/EtcItem.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -38,15 +38,15 @@ public class EtcItem extends Item /** * Constructor for EtcItem. - * @param set StatsSet designating the set of couples (key,value) for description of the Etc + * @param set StatSet designating the set of couples (key,value) for description of the Etc */ - public EtcItem(StatsSet set) + public EtcItem(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Henna.java index 921fa10dfb..87cea36031 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; @@ -44,7 +44,7 @@ public class Henna private final List _skills; private final List _wear_class; - public Henna(StatsSet set) + public Henna(StatSet set) { _dyeId = set.getInt("dyeId"); _dyeItemId = set.getInt("dyeItemId"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Item.java index 5a362bd454..926f0ad8bd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Item.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.enums.ItemGrade; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; @@ -175,14 +175,14 @@ public abstract class Item extends ListenersContainer implements IIdentifiable /** * Constructor of the Item that fill class variables.
    *
    - * @param set : StatsSet corresponding to a set of couples (key,value) for description of the item + * @param set : StatSet corresponding to a set of couples (key,value) for description of the item */ - protected Item(StatsSet set) + protected Item(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { _itemId = set.getInt("item_id"); _displayId = set.getInt("displayId", _itemId); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java index ab196007a8..3ca228cbe5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -29,7 +29,7 @@ public class PlayerItemTemplate extends ItemHolder /** * @param set the set containing the values for this object */ - public PlayerItemTemplate(StatsSet set) + public PlayerItemTemplate(StatSet set) { super(set.getInt("id"), set.getInt("count")); _equipped = set.getBoolean("equipped", false); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Weapon.java index 16f0c47287..5f9f8507bd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Weapon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.items; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ItemSkillType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -58,15 +58,15 @@ public class Weapon extends Item /** * Constructor for Weapon. - * @param set the StatsSet designating the set of couples (key,value) characterizing the weapon. + * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. */ - public Weapon(StatsSet set) + public Weapon(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java index 422054b245..aa1f33acce 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java @@ -23,7 +23,7 @@ import java.util.List; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -54,7 +54,7 @@ public class AppearanceStone private List _racesNot; private List _allVisualIds; - public AppearanceStone(StatsSet set) + public AppearanceStone(StatSet set) { _id = set.getInt("id"); _visualId = set.getInt("visualId", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java index f3b53f1a67..a2897ba911 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.items.combination; import java.util.EnumMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -31,7 +31,7 @@ public class CombinationItem private final int _chance; private final Map _rewards = new EnumMap<>(CombinationItemType.class); - public CombinationItem(StatsSet set) + public CombinationItem(StatSet set) { _itemOne = set.getInt("one"); _itemTwo = set.getInt("two"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java index 1cde38a6d6..a7f1326bd8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.CrystalType; @@ -59,7 +59,7 @@ public abstract class AbstractEnchantItem private final int _maxEnchantLevel; private final double _bonusRate; - public AbstractEnchantItem(StatsSet set) + public AbstractEnchantItem(StatSet set) { _id = set.getInt("id"); if (getItem() == null) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java index b6b34cc667..7329d8728e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -40,7 +40,7 @@ public class EnchantScroll extends AbstractEnchantItem private final int _scrollGroupId; private Set _items; - public EnchantScroll(StatsSet set) + public EnchantScroll(StatSet set) { super(set); _scrollGroupId = set.getInt("scrollGroupId", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java index c02095428b..978e38d533 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items.enchant; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.items.type.ItemType; @@ -30,7 +30,7 @@ public class EnchantSupportItem extends AbstractEnchantItem private final boolean _isGiant; private final ItemType type; - public EnchantSupportItem(StatsSet set) + public EnchantSupportItem(StatSet set) { super(set); type = getItem().getItemType(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index c965e15d4c..36efcc2103 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -45,7 +45,7 @@ import org.l2jmobius.gameserver.data.xml.impl.ClassListData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.ClassId; @@ -63,7 +63,7 @@ public class Olympiad extends ListenersContainer protected static final Logger LOGGER = Logger.getLogger(Olympiad.class.getName()); protected static final Logger LOGGER_OLYMPIAD = Logger.getLogger("olympiad"); - private static final Map NOBLES = new ConcurrentHashMap<>(); + private static final Map NOBLES = new ConcurrentHashMap<>(); private static final Map NOBLES_RANK = new HashMap<>(); public static final String OLYMPIAD_HTML_PATH = "data/html/olympiad/"; @@ -228,10 +228,10 @@ public class Olympiad extends ListenersContainer PreparedStatement statement = con.prepareStatement(OLYMPIAD_LOAD_NOBLES); ResultSet rset = statement.executeQuery()) { - StatsSet statData; + StatSet statData; while (rset.next()) { - statData = new StatsSet(); + statData = new StatSet(); statData.set(CLASS_ID, rset.getInt(CLASS_ID)); statData.set(CHAR_NAME, rset.getString(CHAR_NAME)); statData.set(POINTS, rset.getInt(POINTS)); @@ -454,7 +454,7 @@ public class Olympiad extends ListenersContainer saveNobleData(); _period = 1; - final List heroesToBe = sortHerosToBe(); + final List heroesToBe = sortHerosToBe(); Hero.getInstance().resetData(); Hero.getInstance().computeNewHeroes(heroesToBe); @@ -488,7 +488,7 @@ public class Olympiad extends ListenersContainer return NOBLES.size(); } - public static StatsSet getNobleStats(int playerId) + public static StatSet getNobleStats(int playerId) { return NOBLES.get(playerId); } @@ -787,7 +787,7 @@ public class Olympiad extends ListenersContainer } int currentPoints; - for (StatsSet nobleInfo : NOBLES.values()) + for (StatSet nobleInfo : NOBLES.values()) { currentPoints = nobleInfo.getInt(POINTS); currentPoints += WEEKLY_POINTS; @@ -805,7 +805,7 @@ public class Olympiad extends ListenersContainer return; } - for (StatsSet nobleInfo : NOBLES.values()) + for (StatSet nobleInfo : NOBLES.values()) { nobleInfo.set(COMP_DONE_WEEK, 0); } @@ -838,9 +838,9 @@ public class Olympiad extends ListenersContainer try (Connection con = DatabaseFactory.getConnection()) { - for (Entry entry : NOBLES.entrySet()) + for (Entry entry : NOBLES.entrySet()) { - final StatsSet nobleInfo = entry.getValue(); + final StatSet nobleInfo = entry.getValue(); if (nobleInfo == null) { @@ -953,7 +953,7 @@ public class Olympiad extends ListenersContainer } } - protected List sortHerosToBe() + protected List sortHerosToBe() { if (_period != 1) { @@ -961,8 +961,8 @@ public class Olympiad extends ListenersContainer } LOGGER_OLYMPIAD.info("Noble,charid,classid,compDone,points"); - StatsSet nobleInfo; - for (Entry entry : NOBLES.entrySet()) + StatSet nobleInfo; + for (Entry entry : NOBLES.entrySet()) { nobleInfo = entry.getValue(); if (nobleInfo == null) @@ -979,12 +979,12 @@ public class Olympiad extends ListenersContainer LOGGER_OLYMPIAD.info(charName + "," + charId + "," + classId + "," + compDone + "," + points); } - final List heroesToBe = new LinkedList<>(); + final List heroesToBe = new LinkedList<>(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(OLYMPIAD_GET_HEROS)) { - StatsSet hero; + StatSet hero; for (int element : HERO_IDS) { // Classic can have 2nd and 3rd class competitors, but only 1 hero @@ -996,7 +996,7 @@ public class Olympiad extends ListenersContainer { if (rset.next()) { - hero = new StatsSet(); + hero = new StatSet(); hero.set(CLASS_ID, element); // save the 3rd class title hero.set(CHAR_ID, rset.getInt(CHAR_ID)); hero.set(CHAR_NAME, rset.getString(CHAR_NAME)); @@ -1050,7 +1050,7 @@ public class Olympiad extends ListenersContainer return 0; } - final StatsSet noble = NOBLES.get(objectId); + final StatSet noble = NOBLES.get(objectId); if ((noble == null) || (noble.getInt(POINTS) == 0)) { return 0; @@ -1100,7 +1100,7 @@ public class Olympiad extends ListenersContainer { if (!NOBLES.containsKey(player.getObjectId())) { - final StatsSet statDat = new StatsSet(); + final StatSet statDat = new StatSet(); statDat.set(CLASS_ID, player.getBaseClass()); statDat.set(CHAR_NAME, player.getName()); statDat.set(POINTS, DEFAULT_POINTS); @@ -1207,7 +1207,7 @@ public class Olympiad extends ListenersContainer * @param data the stats set data to add. * @return the old stats set if the noble is already present, null otherwise. */ - public static StatsSet addNobleStats(int charId, StatsSet data) + public static StatSet addNobleStats(int charId, StatSet data) { return NOBLES.put(charId, data); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/Participant.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/Participant.java index 670066ac32..b6d879b902 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/Participant.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/Participant.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.olympiad; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class Participant private final int baseClass; private boolean disconnected = false; private boolean defaulted = false; - private final StatsSet stats; + private final StatSet stats; public String clanName; public int clanId; @@ -125,7 +125,7 @@ public class Participant /** * @return the stats */ - public StatsSet getStats() + public StatSet getStats() { return stats; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java index 4d5231ca5d..c1fb0f88f6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.primeshop; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -49,7 +49,7 @@ public class PrimeShopGroup private final int _availableCount; private final List _items; - public PrimeShopGroup(StatsSet set, List items) + public PrimeShopGroup(StatSet set, List items) { _brId = set.getInt("id"); _category = set.getInt("cat", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java index d150ec98cd..88795e0721 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.residences; import java.time.Duration; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -33,7 +33,7 @@ public class ResidenceFunctionTemplate private final Duration _duration; private final double _value; - public ResidenceFunctionTemplate(StatsSet set) + public ResidenceFunctionTemplate(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java index 4f15efda0b..b19f8e59d5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; /** @@ -34,7 +34,7 @@ public class ShuttleDataHolder private final List _stops = new ArrayList<>(2); private final List _routes = new ArrayList<>(2); - public ShuttleDataHolder(StatsSet set) + public ShuttleDataHolder(StatSet set) { _id = set.getInt("id"); _loc = new Location(set); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/Skill.java index c44b45a781..0e97466a3a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.handler.IAffectScopeHandler; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.CubicInstance; @@ -210,7 +210,7 @@ public class Skill implements IIdentifiable private final SkillBuffType _buffType; private final boolean _displayInList; - public Skill(StatsSet set) + public Skill(StatSet set) { _id = set.getInt(".id"); _level = set.getInt(".level"); @@ -391,7 +391,7 @@ public class Skill implements IIdentifiable _toggleGroupId = set.getInt("toggleGroupId", -1); _attachToggleGroupId = set.getInt("attachToggleGroupId", -1); - _attachSkills = set.getList("attachSkillList", StatsSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatsSet).collect(Collectors.toList()); + _attachSkills = set.getList("attachSkillList", StatSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatSet).collect(Collectors.toList()); final String abnormalResist = set.getString("abnormalResists", null); if (abnormalResist != null) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java index bfc25bddde..39b738dbca 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.ChanceLocation; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory; /** * @author UnAfraid */ -public class NpcSpawnTemplate implements Cloneable, IParameterized +public class NpcSpawnTemplate implements Cloneable, IParameterized { private static final Logger LOGGER = Logger.getLogger(NpcSpawnTemplate.class.getName()); @@ -56,7 +56,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized private final Duration _respawnTimeRandom; private List _locations; private SpawnTerritory _zone; - private StatsSet _parameters; + private StatSet _parameters; private final boolean _spawnAnimation; private final boolean _saveInDB; private final String _dbName; @@ -82,7 +82,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized _minions = template._minions; } - public NpcSpawnTemplate(SpawnTemplate spawnTemplate, SpawnGroup group, StatsSet set) + public NpcSpawnTemplate(SpawnTemplate spawnTemplate, SpawnGroup group, StatSet set) { _spawnTemplate = spawnTemplate; _group = group; @@ -128,14 +128,14 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized mergeParameters(spawnTemplate, group); } - private StatsSet mergeParameters(SpawnTemplate spawnTemplate, SpawnGroup group) + private StatSet mergeParameters(SpawnTemplate spawnTemplate, SpawnGroup group) { if ((_parameters == null) && (spawnTemplate.getParameters() == null) && (group.getParameters() == null)) { return null; } - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); if (spawnTemplate.getParameters() != null) { set.merge(spawnTemplate.getParameters()); @@ -206,13 +206,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized } @Override - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } @Override - public void setParameters(StatsSet parameters) + public void setParameters(StatSet parameters) { if (_parameters == null) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java index 6723863c93..7ceb2d46af 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IParameterized; import org.l2jmobius.gameserver.model.interfaces.ITerritorized; @@ -31,16 +31,16 @@ import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory; /** * @author UnAfraid */ -public class SpawnGroup implements Cloneable, ITerritorized, IParameterized +public class SpawnGroup implements Cloneable, ITerritorized, IParameterized { private final String _name; private final boolean _spawnByDefault; private List _territories; private List _bannedTerritories; private final List _spawns = new ArrayList<>(); - private StatsSet _parameters; + private StatSet _parameters; - public SpawnGroup(StatsSet set) + public SpawnGroup(StatSet set) { this(set.getString("name", null), set.getBoolean("spawnByDefault", true)); } @@ -104,13 +104,13 @@ public class SpawnGroup implements Cloneable, ITerritorized, IParameterized +public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized { private final String _name; private final String _ai; @@ -45,9 +45,9 @@ public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized _territories; private List _bannedTerritories; private final List _groups = new ArrayList<>(); - private StatsSet _parameters; + private StatSet _parameters; - public SpawnTemplate(StatsSet set, File file) + public SpawnTemplate(StatSet set, File file) { this(set.getString("name", null), set.getString("ai", null), set.getBoolean("spawnByDefault", true), file); } @@ -128,13 +128,13 @@ public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized _castleId; - public TeleportLocation(int id, StatsSet set) + public TeleportLocation(int id, StatSet set) { super(set); _id = id; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java index 916ae0790c..33cf6ac3bc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.variables; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.IRestorable; import org.l2jmobius.gameserver.model.interfaces.IStorable; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.interfaces.IStorable; /** * @author UnAfraid */ -public abstract class AbstractVariables extends StatsSet implements IRestorable, IStorable, IDeletable +public abstract class AbstractVariables extends StatSet implements IRestorable, IStorable, IDeletable { private final AtomicBoolean _hasChanges = new AtomicBoolean(false); @@ -41,42 +41,42 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, */ @Override - public StatsSet set(String name, boolean value) + public StatSet set(String name, boolean value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, double value) + public StatSet set(String name, double value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, Enum value) + public StatSet set(String name, Enum value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, int value) + public StatSet set(String name, int value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, long value) + public StatSet set(String name, long value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, String value) + public StatSet set(String name, String value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); @@ -89,7 +89,7 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, * @param markAsChanged * @return */ - public StatsSet set(String name, String value, boolean markAsChanged) + public StatSet set(String name, String value, boolean markAsChanged) { if (markAsChanged) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index 5c03122a62..4d97f0017a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExHeroList implements IClientOutgoingPacket { - private final Map _heroList; + private final Map _heroList; public ExHeroList() { @@ -42,7 +42,7 @@ public class ExHeroList implements IClientOutgoingPacket OutgoingPackets.EX_HERO_LIST.writeId(packet); packet.writeD(_heroList.size()); - for (StatsSet hero : _heroList.values()) + for (StatSet hero : _heroList.values()) { packet.writeS(hero.getString(Olympiad.CHAR_NAME)); packet.writeD(hero.getInt(Olympiad.CLASS_ID)); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/BypassParser.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/BypassParser.java index 414125bdeb..a80323ba1f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/BypassParser.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/BypassParser.java @@ -20,12 +20,12 @@ import java.util.LinkedHashMap; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid */ -public class BypassParser extends StatsSet +public class BypassParser extends StatSet { private static final String ALLOWED_CHARS = "a-zA-Z0-9-_`!@#%^&*()\\[\\]|\\\\/"; private static final Pattern PATTERN = Pattern.compile(String.format("([%s]*)=('([%s ]*)'|[%s]*)", ALLOWED_CHARS, ALLOWED_CHARS, ALLOWED_CHARS)); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index b837d839d8..d12c29d422 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -138,7 +138,7 @@ public class Antharas extends AbstractNpcAI addAttackId(ANTHARAS, BOMBER, BEHEMOTH, TERASQUE); addKillId(ANTHARAS, TERASQUE, BEHEMOTH); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANTHARAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANTHARAS); final double curr_hp = info.getDouble("currentHP"); final double curr_mp = info.getDouble("currentMP"); final int loc_x = info.getInt("loc_x"); @@ -761,7 +761,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(PlayerInstance attacker, int damage) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Baium/Baium.java index a1e8eb99d5..2686236add 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -112,7 +112,7 @@ public class Baium extends AbstractNpcAI addSeeCreatureId(BAIUM); addSpellFinishedId(BAIUM); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(BAIUM); + final StatSet info = GrandBossManager.getInstance().getStatSet(BAIUM); switch (getStatus()) { @@ -666,7 +666,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Core/Core.java index bfa7212b8c..c1452bf9de 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; @@ -85,7 +85,7 @@ public class Core extends AbstractNpcAI registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR); _firstAttacked = false; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. @@ -205,9 +205,9 @@ public class Core extends AbstractNpcAI final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000; startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(CORE, info); + GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index 38eebefc7b..5e525a6caa 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -92,7 +92,7 @@ public class Orfen extends AbstractNpcAI registerMobs(mobs); _IsTeleported = false; ZONE = ZoneManager.getInstance().getZoneById(12013); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); final int status = GrandBossManager.getInstance().getBossStatus(ORFEN); if (status == DEAD) { @@ -327,9 +327,9 @@ public class Orfen extends AbstractNpcAI respawnTime *= 3600000; startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(ORFEN, info); + GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); startQuestTimer("despawn_minions", 20000, null, null); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index c2564917c7..b9fdddaaf7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; @@ -91,7 +91,7 @@ public class QueenAnt extends AbstractNpcAI addFactionCallId(NURSE); _zone = ZoneManager.getInstance().getZoneById(12012); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); final int status = GrandBossManager.getInstance().getBossStatus(QUEEN); if (status == DEAD) { @@ -367,9 +367,9 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("action", npc, null); cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(QUEEN, info); + GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); _larva.deleteMe(); _larva = null; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java index 0964b5fd44..a322a608f2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java @@ -18,7 +18,7 @@ package ai.bosses.Zaken; import org.l2jmobius.Config; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -48,7 +48,7 @@ public class Zaken extends AbstractNpcAI { addKillId(ZAKEN); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ZAKEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN); final int status = GrandBossManager.getInstance().getBossStatus(ZAKEN); if (status == DEAD) { @@ -96,9 +96,9 @@ public class Zaken extends AbstractNpcAI final long respawnTime = (Config.ZAKEN_SPAWN_INTERVAL + getRandom(-Config.ZAKEN_SPAWN_RANDOM, Config.ZAKEN_SPAWN_RANDOM)) * 3600000; startQuestTimer("zaken_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ZAKEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(ZAKEN, info); + GrandBossManager.getInstance().setStatSet(ZAKEN, info); return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java index 25a584bdf9..1feccc805a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -101,7 +101,7 @@ public class CastleTeleporter extends AbstractNpcAI if (st.hasMoreTokens()) { final int unknowInt = Integer.parseInt(st.nextToken()); - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); Location teleLoc = null; switch (unknowInt) { @@ -191,7 +191,7 @@ public class CastleTeleporter extends AbstractNpcAI return htmltext; } - private Location getTeleportLocation(StatsSet npcParams, String paramName1, String paramName2, String paramName3) + private Location getTeleportLocation(StatSet npcParams, String paramName1, String paramName2, String paramName3) { final Location loc; if (getRandom(100) < 33) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java index f19f5dea69..c817501830 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java @@ -17,7 +17,7 @@ package ai.others.Servitors; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -52,7 +52,7 @@ public class TreeOfLife extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (player != null) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index d459bd2538..4f36bd6b51 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.zone.type.NoRestartZone; @@ -305,7 +305,7 @@ public class AdminGrandBoss implements IAdminCommandHandler } } - final StatsSet info = GrandBossManager.getInstance().getStatsSet(grandBossId); + final StatSet info = GrandBossManager.getInstance().getStatSet(grandBossId); final String bossRespawn = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(info.getLong("respawn_time")); final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java index f1109bf0e7..9489d8e1bb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java @@ -19,7 +19,7 @@ package handlers.admincommandhandlers; import java.util.StringTokenizer; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -114,7 +114,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.isNoble()) { - final StatsSet statDat = getPlayerSet(player); + final StatSet statDat = getPlayerSet(player); final int oldpoints = Olympiad.getInstance().getNoblePoints(player); final int points = Math.max(oldpoints + val, 0); if (points > 1000) @@ -155,7 +155,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.isNoble()) { - final StatsSet playerStat = Olympiad.getNobleStats(player.getObjectId()); + final StatSet playerStat = Olympiad.getNobleStats(player.getObjectId()); if (playerStat == null) { BuilderUtil.sendSysMessage(activeChar, "This player hasn't played on Olympiad yet!"); @@ -197,7 +197,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.isNoble()) { - final StatsSet statDat = getPlayerSet(player); + final StatSet statDat = getPlayerSet(player); final int oldpoints = Olympiad.getInstance().getNoblePoints(player); final int points = oldpoints - val; if ((points < 1) && (points > 1000)) @@ -237,12 +237,12 @@ public class AdminOlympiad implements IAdminCommandHandler return Integer.decode(token); } - private StatsSet getPlayerSet(PlayerInstance player) + private StatSet getPlayerSet(PlayerInstance player) { - StatsSet statDat = Olympiad.getNobleStats(player.getObjectId()); + StatSet statDat = Olympiad.getNobleStats(player.getObjectId()); if (statDat == null) { - statDat = new StatsSet(); + statDat = new StatSet(); statDat.set(Olympiad.CLASS_ID, player.getBaseClass()); statDat.set(Olympiad.CHAR_NAME, player.getName()); statDat.set(Olympiad.POINTS, Olympiad.DEFAULT_POINTS); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java index d8a3d6e5ce..6382651e6c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java @@ -19,7 +19,7 @@ package handlers.conditions; import java.util.List; import org.l2jmobius.gameserver.enums.CategoryType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -31,7 +31,7 @@ public class CategoryTypeCondition implements ICondition { private final List _categoryTypes; - public CategoryTypeCondition(StatsSet params) + public CategoryTypeCondition(StatSet params) { _categoryTypes = params.getEnumList("category", CategoryType.class); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java index b24cfa0f14..9a14cb6fa2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java @@ -16,7 +16,7 @@ */ package handlers.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -29,7 +29,7 @@ public class NpcLevelCondition implements ICondition private final int _minLevel; private final int _maxLevel; - public NpcLevelCondition(StatsSet params) + public NpcLevelCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java index afffe7a0c5..9e3deaa8ce 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java @@ -16,7 +16,7 @@ */ package handlers.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -29,7 +29,7 @@ public class PlayerLevelCondition implements ICondition private final int _minLevel; private final int _maxLevel; - public PlayerLevelCondition(StatsSet params) + public PlayerLevelCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 09f609dc37..0e81066579 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -32,7 +32,7 @@ public class AbnormalShield extends AbstractEffect { private final int _times; - public AbnormalShield(StatsSet params) + public AbnormalShield(StatSet params) { _times = params.getInt("times", -1); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 0496c9068d..9c508c8c52 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Objects; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class AbnormalTimeChange extends AbstractEffect private final int _time; private final int _mode; - public AbnormalTimeChange(StatsSet params) + public AbnormalTimeChange(StatSet params) { final String abnormals = params.getString("slot", null); if ((abnormals != null) && !abnormals.isEmpty()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 98f85c7b21..3f9132b8e3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -37,7 +37,7 @@ public class AbsorbDamage extends AbstractEffect private final double _damage; private static final Map _damageHolder = new ConcurrentHashMap<>(); - public AbsorbDamage(StatsSet params) + public AbsorbDamage(StatSet params) { _damage = params.getDouble("damage", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 26f51d5351..86fef7cf6d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; @@ -38,7 +38,7 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect private final int _hpPercent; private final Map _updates = new ConcurrentHashMap<>(); - protected AbstractConditionalHpEffect(StatsSet params, Stat stat) + protected AbstractConditionalHpEffect(StatSet params, Stat stat) { super(params, stat); _hpPercent = params.getInt("hpPercent", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java index 2e40124e39..f010f84271 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AbstractStatAddEffect extends AbstractEffect private final Stat _stat; protected final double _amount; - public AbstractStatAddEffect(StatsSet params, Stat stat) + public AbstractStatAddEffect(StatSet params, Stat stat) { _stat = stat; _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index da6a575c44..29e439684b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; @@ -42,12 +42,12 @@ public abstract class AbstractStatEffect extends AbstractEffect protected final StatModifierType _mode; protected final List _conditions = new ArrayList<>(); - public AbstractStatEffect(StatsSet params, Stat stat) + public AbstractStatEffect(StatSet params, Stat stat) { this(params, stat, stat); } - public AbstractStatEffect(StatsSet params, Stat mulStat, Stat addStat) + public AbstractStatEffect(StatSet params, Stat mulStat, Stat addStat) { _addStat = addStat; _mulStat = mulStat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java index 9811f395aa..33d08bff36 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AbstractStatPercentEffect extends AbstractEffect private final Stat _stat; protected final double _amount; - public AbstractStatPercentEffect(StatsSet params, Stat stat) + public AbstractStatPercentEffect(StatSet params, Stat stat) { _stat = stat; _amount = params.getDouble("amount", 1); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java index 539814ef2a..79c022a23c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class Accuracy extends AbstractStatEffect { - public Accuracy(StatsSet params) + public Accuracy(StatSet params) { super(params, Stat.ACCURACY_COMBAT); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index 0c1fcbd92b..48d69968c5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddHate extends AbstractEffect private final double _power; private final boolean _affectSummoner; - public AddHate(StatsSet params) + public AddHate(StatSet params) { _power = params.getDouble("power", 0); _affectSummoner = params.getBoolean("affectSummoner", false); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java index e90d5cc7f3..324927947a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddSkillBySkill extends AbstractEffect private final int _existingSkillLevel; private final SkillHolder _addedSkill; - public AddSkillBySkill(StatsSet params) + public AddSkillBySkill(StatSet params) { _existingSkillId = params.getInt("existingSkillId"); _existingSkillLevel = params.getInt("existingSkillLevel"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index bdd8314dd7..205bc82200 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddTeleportBookmarkSlot extends AbstractEffect { private final int _amount; - public AddTeleportBookmarkSlot(StatsSet params) + public AddTeleportBookmarkSlot(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java index c26ec5442f..658931ecb2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionCp extends AbstractStatAddEffect { - public AdditionalPotionCp(StatsSet params) + public AdditionalPotionCp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_CP); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java index 6b68e40f32..57d54c7d3b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionHp extends AbstractStatAddEffect { - public AdditionalPotionHp(StatsSet params) + public AdditionalPotionHp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_HP); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java index c9e1cc237e..007547ebe7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionMp extends AbstractStatAddEffect { - public AdditionalPotionMp(StatsSet params) + public AdditionalPotionMp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_MP); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java index f5cbb63465..9255ba1877 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AreaDamage extends AbstractStatAddEffect { - public AreaDamage(StatsSet params) + public AreaDamage(StatSet params) { super(params, Stat.DAMAGE_ZONE_VULN); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java index 2ded14e7ae..a5d56477f5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AttackAttribute extends AbstractEffect private final AttributeType _attribute; private final double _amount; - public AttackAttribute(StatsSet params) + public AttackAttribute(StatSet params) { _amount = params.getDouble("amount", 0); _attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java index ff58d09cc7..795366850d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class AttackAttributeAdd extends AbstractEffect { private final double _amount; - public AttackAttributeAdd(StatsSet params) + public AttackAttributeAdd(StatSet params) { _amount = params.getDouble("amount", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java index 37bfbf341a..fcd2b48c99 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class AttackBehind extends AbstractEffect { - public AttackBehind(StatsSet params) + public AttackBehind(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index 062c325a55..4136f5d530 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class AttackTrait extends AbstractEffect { private final Map _attackTraits = new EnumMap<>(TraitType.class); - public AttackTrait(StatsSet params) + public AttackTrait(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 02d6a8d78c..8ac42d45c3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -37,7 +37,7 @@ public class Backstab extends AbstractEffect private final double _criticalChance; private final boolean _overHit; - public Backstab(StatsSet params) + public Backstab(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Betray.java index 32e3c65c55..79e8bd3360 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Betray extends AbstractEffect { - public Betray(StatsSet params) + public Betray(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Blink.java index ba1caed6ac..56d3f628fd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -52,7 +52,7 @@ public class Blink extends AbstractEffect private final int _flyDelay; private final int _animationSpeed; - public Blink(StatsSet params) + public Blink(StatSet params) { _flyCourse = params.getInt("angle", 0); _flyRadius = params.getInt("range", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 8677f72407..596d4b752f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; */ public class BlinkSwap extends AbstractEffect { - public BlinkSwap(StatsSet params) + public BlinkSwap(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 7bec602aef..cea12039d2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -20,7 +20,7 @@ import java.util.Arrays; import java.util.Set; import java.util.stream.Collectors; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class BlockAbnormalSlot extends AbstractEffect { private final Set _blockAbnormalSlots; - public BlockAbnormalSlot(StatsSet params) + public BlockAbnormalSlot(StatSet params) { _blockAbnormalSlots = Arrays.stream(params.getString("slot").split(";")).map(slot -> Enum.valueOf(AbnormalType.class, slot)).collect(Collectors.toSet()); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index b4839ab322..348881f970 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -21,7 +21,7 @@ import java.util.Set; import org.l2jmobius.gameserver.datatables.BotReportTable; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class BlockAction extends AbstractEffect { private final Set _blockedActions = new HashSet<>(); - public BlockAction(StatsSet params) + public BlockAction(StatSet params) { final String[] actions = params.getString("blockedActions").split(","); for (String action : actions) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index 68f6586e3e..635d2735f9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -22,7 +22,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class BlockActions extends AbstractEffect { private final Set _allowedSkills; - public BlockActions(StatsSet params) + public BlockActions(StatSet params) { final String[] allowedSkills = params.getString("allowedSkills", "").split(";"); _allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 99af987208..3502d140d0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockChat extends AbstractEffect { - public BlockChat(StatsSet params) + public BlockChat(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java index 6160114414..a2b084c918 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; */ public class BlockControl extends AbstractEffect { - public BlockControl(StatsSet params) + public BlockControl(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java index 3d96329b6d..69b390ae8f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BlockEscape extends AbstractEffect { - public BlockEscape(StatsSet params) + public BlockEscape(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index 8bbd7ac018..85d89180e7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockMove extends AbstractEffect { - public BlockMove(StatsSet params) + public BlockMove(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index 316f82f855..9e28fc403a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockParty extends AbstractEffect { - public BlockParty(StatsSet params) + public BlockParty(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java index ae2ac8b035..d3235fc34f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BlockResurrection extends AbstractEffect { - public BlockResurrection(StatsSet params) + public BlockResurrection(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index f7f119691f..f2cc65b782 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -35,7 +35,7 @@ public class BlockSkill extends AbstractEffect { private final int[] _magicTypes; - public BlockSkill(StatsSet params) + public BlockSkill(StatSet params) { _magicTypes = params.getIntArray("magicTypes", ";"); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index d9b3d3a34d..9f0b7143d2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockTarget extends AbstractEffect { - public BlockTarget(StatsSet params) + public BlockTarget(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index bc4cbd6320..bef60ad003 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class Bluff extends AbstractEffect { private final int _chance; - public Bluff(StatsSet params) + public Bluff(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java index 2ace40a596..69583d613b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusDropAmount extends AbstractStatPercentEffect { - public BonusDropAmount(StatsSet params) + public BonusDropAmount(StatSet params) { super(params, Stat.BONUS_DROP_AMOUNT); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java index b81560b040..e63c8f79f4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusDropRate extends AbstractStatPercentEffect { - public BonusDropRate(StatsSet params) + public BonusDropRate(StatSet params) { super(params, Stat.BONUS_DROP_RATE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java index b984404cb2..e0fb54b162 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusSpoilRate extends AbstractStatPercentEffect { - public BonusSpoilRate(StatsSet params) + public BonusSpoilRate(StatSet params) { super(params, Stat.BONUS_SPOIL_RATE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Breath.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Breath.java index 859f341f3c..4235319f22 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Breath.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Breath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class Breath extends AbstractStatEffect { - public Breath(StatsSet params) + public Breath(StatSet params) { super(params, Stat.BREATH); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java index a6d25f3c36..4102506e6c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BuffBlock extends AbstractEffect { - public BuffBlock(StatsSet params) + public BuffBlock(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index de7497f8bf..4f470b06c7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class CallLearnedSkill extends AbstractEffect { private final int _skillId; - public CallLearnedSkill(StatsSet params) + public CallLearnedSkill(StatSet params) { _skillId = params.getInt("skillId"); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index e6096be4be..b41daf073c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CallParty extends AbstractEffect { - public CallParty(StatsSet params) + public CallParty(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index 0760fb675e..eb4bdf2349 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class CallPc extends AbstractEffect private final int _itemId; private final int _itemCount; - public CallPc(StatsSet params) + public CallPc(StatSet params) { _itemId = params.getInt("itemId", 0); _itemCount = params.getInt("itemCount", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index d6d5cb721d..0da3802665 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -35,7 +35,7 @@ public class CallRandomSkill extends AbstractEffect { private final List _skills = new ArrayList<>(); - public CallRandomSkill(StatsSet params) + public CallRandomSkill(StatSet params) { final String skills = params.getString("skills", null); if (skills != null) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index 99c1494223..f8e4b226c4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -35,7 +35,7 @@ public class CallSkill extends AbstractEffect private final SkillHolder _skill; private final int _skillLevelScaleTo; - public CallSkill(StatsSet params) + public CallSkill(StatSet params) { _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0)); _skillLevelScaleTo = params.getInt("skillLevelScaleTo", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index cec2706e81..4a18b31781 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.Collections; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ public class CallSkillOnActionTime extends AbstractEffect { private final SkillHolder _skill; - public CallSkillOnActionTime(StatsSet params) + public CallSkillOnActionTime(StatSet params) { _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0)); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index d48eb90fb3..32753a71a0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CallTargetParty extends AbstractEffect { - public CallTargetParty(StatsSet params) + public CallTargetParty(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index ef01f4a8ed..d4331bf5b7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ public class ChameleonRest extends AbstractEffect { private final double _power; - public ChameleonRest(StatsSet params) + public ChameleonRest(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index e3b846674d..37054f2fd0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; @@ -35,9 +35,9 @@ public class ChangeBody extends AbstractEffect { private final Set _transformations = new HashSet<>(); - public ChangeBody(StatsSet params) + public ChangeBody(StatSet params) { - for (StatsSet item : params.getList("templates", StatsSet.class)) + for (StatSet item : params.getList("templates", StatSet.class)) { _transformations.add(new TemplateChanceHolder(item.getInt(".templateId"), item.getInt(".minChance"), item.getInt(".maxChance"))); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 76c6e03aa6..6b6386909e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeFace extends AbstractEffect { private final int _value; - public ChangeFace(StatsSet params) + public ChangeFace(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java index cee3ac1a6f..304afa821c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; /** @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; */ public class ChangeFishingMastery extends AbstractEffect { - public ChangeFishingMastery(StatsSet params) + public ChangeFishingMastery(StatSet params) { } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index 0c583cbc13..64ac49f5d5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeHairColor extends AbstractEffect { private final int _value; - public ChangeHairColor(StatsSet params) + public ChangeHairColor(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index ad2efbe6a0..ae7d6c6da1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeHairStyle extends AbstractEffect { private final int _value; - public ChangeHairStyle(StatsSet params) + public ChangeHairStyle(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java index 2d536029fd..4d7c380c75 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class CheapShot extends AbstractEffect { - public CheapShot(StatsSet params) + public CheapShot(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index 5fa3df1676..0215ff6a5b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.SubclassInfoType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class ClassChange extends AbstractEffect private final int _index; private static final int IDENTITY_CRISIS_SKILL_ID = 1570; - public ClassChange(StatsSet params) + public ClassChange(StatSet params) { _index = params.getInt("index", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index ccf7598eff..e184022afc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.stats.Formulas; */ public class Compelling extends AbstractEffect { - public Compelling(StatsSet params) + public Compelling(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index b6aa30f604..f164ac6f3f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class Confuse extends AbstractEffect { private final int _chance; - public Confuse(StatsSet params) + public Confuse(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 25e29532eb..78293c1b0f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ConsumeBody extends AbstractEffect { - public ConsumeBody(StatsSet params) + public ConsumeBody(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index e915eb0391..6ddd0d72eb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class ConvertItem extends AbstractEffect { - public ConvertItem(StatsSet params) + public ConvertItem(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java index 9402fdb06d..857df659c0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CounterPhysicalSkill extends AbstractStatAddEffect { - public CounterPhysicalSkill(StatsSet params) + public CounterPhysicalSkill(StatSet params) { super(params, Stat.VENGEANCE_SKILL_PHYSICAL_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 67bca7fd1b..598682037b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Cp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Cp(StatsSet params) + public Cp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index e0cd52808e..37303b0e7a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class CpHeal extends AbstractEffect { private final double _power; - public CpHeal(StatsSet params) + public CpHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index e2e8ee3479..54de5adfc6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class CpHealOverTime extends AbstractEffect { private final double _power; - public CpHealOverTime(StatsSet params) + public CpHealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index 5665e937dc..b4a994d6df 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CpHealPercent extends AbstractEffect { private final double _power; - public CpHealPercent(StatsSet params) + public CpHealPercent(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java index 1cc851b2af..efb020bbd5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CpRegen extends AbstractStatEffect { - public CpRegen(StatsSet params) + public CpRegen(StatSet params) { super(params, Stat.REGENERATE_CP_RATE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java index 8983497026..0b93eef45e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CriticalDamage extends AbstractStatEffect { - public CriticalDamage(StatsSet params) + public CriticalDamage(StatSet params) { super(params, Stat.CRITICAL_DAMAGE, Stat.CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 7ef4f0ecb4..0630f087b7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.Position; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CriticalDamagePosition extends AbstractEffect private final double _amount; private final Position _position; - public CriticalDamagePosition(StatsSet params) + public CriticalDamagePosition(StatSet params) { _amount = params.getDouble("amount", 0); _position = params.getEnum("position", Position.class, Position.FRONT); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java index 01f49380eb..0d4bded60e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; public class CriticalRate extends AbstractConditionalHpEffect { - public CriticalRate(StatsSet params) + public CriticalRate(StatSet params) { super(params, Stat.CRITICAL_RATE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 863b385ca3..4d65fa84eb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.Position; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CriticalRatePositionBonus extends AbstractEffect private final double _amount; private final Position _position; - public CriticalRatePositionBonus(StatsSet params) + public CriticalRatePositionBonus(StatSet params) { _amount = params.getDouble("amount", 0); _position = params.getEnum("position", Position.class, Position.FRONT); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index 2e8ec38347..9d04575ae2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class CrystalGradeModify extends AbstractEffect { private final int _grade; - public CrystalGradeModify(StatsSet params) + public CrystalGradeModify(StatSet params) { _grade = params.getInt("grade", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java index 94ff8e64e2..79ee5b994e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CubicMastery extends AbstractStatAddEffect { - public CubicMastery(StatsSet params) + public CubicMastery(StatSet params) { super(params, Stat.MAX_CUBIC); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index 36abf0accf..e6bb53fdea 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class DamOverTime extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTime(StatsSet params) + public DamOverTime(StatSet params) { _canKill = params.getBoolean("canKill", false); _power = params.getDouble("power"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 13e57099e0..b5f25db4d8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class DamOverTimePercent extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTimePercent(StatsSet params) + public DamOverTimePercent(StatSet params) { _canKill = params.getBoolean("canKill", false); _power = params.getDouble("power"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java index dc7a45198f..c9567ea034 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ public class DamageBlock extends AbstractEffect private final boolean _blockHp; private final boolean _blockMp; - public DamageBlock(StatsSet params) + public DamageBlock(StatSet params) { final String type = params.getString("type", null); _blockHp = type.equalsIgnoreCase("BLOCK_HP"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java index bfa716eacc..9eb0b4e233 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DamageByAttackType; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -38,7 +38,7 @@ public class DamageByAttack extends AbstractEffect private final double _value; private final DamageByAttackType _type; - public DamageByAttack(StatsSet params) + public DamageByAttack(StatSet params) { _value = params.getDouble("amount"); _type = params.getEnum("type", DamageByAttackType.class, DamageByAttackType.NONE); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java index 5a7629482a..e823a9824a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DamageShield extends AbstractStatAddEffect { - public DamageShield(StatsSet params) + public DamageShield(StatSet params) { super(params, Stat.REFLECT_DAMAGE_PERCENT); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java index db1abe264d..3029a3f0aa 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DamageShieldResist extends AbstractStatAddEffect { - public DamageShieldResist(StatsSet params) + public DamageShieldResist(StatSet params) { super(params, Stat.REFLECT_DAMAGE_PERCENT_DEFENSE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index 8561ff46b0..369bd5483d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class DeathLink extends AbstractEffect { private final double _power; - public DeathLink(StatsSet params) + public DeathLink(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java index b948fad1fc..54261c6229 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class DebuffBlock extends AbstractEffect { - public DebuffBlock(StatsSet params) + public DebuffBlock(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java index 217ef3dfaa..4bc08271fa 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class DefenceAttribute extends AbstractEffect private final AttributeType _attribute; private final double _amount; - public DefenceAttribute(StatsSet params) + public DefenceAttribute(StatSet params) { _amount = params.getDouble("amount", 0); _attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java index 0c0c2e8d6a..daff53d9e1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceCriticalDamage extends AbstractStatEffect { - public DefenceCriticalDamage(StatsSet params) + public DefenceCriticalDamage(StatSet params) { super(params, Stat.DEFENCE_CRITICAL_DAMAGE, Stat.DEFENCE_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java index 131eb500ea..74a729e38c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceCriticalRate extends AbstractStatEffect { - public DefenceCriticalRate(StatsSet params) + public DefenceCriticalRate(StatSet params) { super(params, Stat.DEFENCE_CRITICAL_RATE, Stat.DEFENCE_CRITICAL_RATE_ADD); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java index 1abee78e08..c664939977 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceMagicCriticalDamage extends AbstractStatEffect { - public DefenceMagicCriticalDamage(StatsSet params) + public DefenceMagicCriticalDamage(StatSet params) { super(params, Stat.DEFENCE_MAGIC_CRITICAL_DAMAGE, Stat.DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java index 2146b89551..6594dda2b3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceMagicCriticalRate extends AbstractStatEffect { - public DefenceMagicCriticalRate(StatsSet params) + public DefenceMagicCriticalRate(StatSet params) { super(params, Stat.DEFENCE_MAGIC_CRITICAL_RATE, Stat.DEFENCE_MAGIC_CRITICAL_RATE_ADD); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index bd80f690cd..134ed56979 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class DefenceTrait extends AbstractEffect { private final Map _defenceTraits = new EnumMap<>(TraitType.class); - public DefenceTrait(StatsSet params) + public DefenceTrait(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index bab5e1a762..7cee616006 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class DeleteHate extends AbstractEffect { private final int _chance; - public DeleteHate(StatsSet params) + public DeleteHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index 85985653b8..f10f189e68 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class DeleteHateOfMe extends AbstractEffect { private final int _chance; - public DeleteHateOfMe(StatsSet params) + public DeleteHateOfMe(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index d3664ad00f..82833ac79d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class DeleteTopAgro extends AbstractEffect { private final int _chance; - public DeleteTopAgro(StatsSet params) + public DeleteTopAgro(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index ae1f2a5942..ba6dad4698 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DoorOpenType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DetectHiddenObjects extends AbstractEffect { - public DetectHiddenObjects(StatsSet params) + public DetectHiddenObjects(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Detection.java index 078360ff35..a20cbcb348 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Detection extends AbstractEffect { - public Detection(StatsSet params) + public Detection(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 8567a94d12..32ee715df7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DisableTargeting extends AbstractEffect { - public DisableTargeting(StatsSet params) + public DisableTargeting(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index fa06ec7221..5a80971f51 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Disarm extends AbstractEffect { - public Disarm(StatsSet params) + public Disarm(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index 0133906661..8b06598d83 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class Disarmor extends AbstractEffect private final Map _unequippedItems; // PlayerObjId, ItemObjId private final int _slot; - public Disarmor(StatsSet params) + public Disarmor(StatSet params) { _unequippedItems = new ConcurrentHashMap<>(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 95de0300bb..a652a023f5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DispelAll extends AbstractEffect { - public DispelAll(StatsSet params) + public DispelAll(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 88d979a0d9..040271d2a7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.List; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -38,7 +38,7 @@ public class DispelByCategory extends AbstractEffect private final int _rate; private final int _max; - public DispelByCategory(StatsSet params) + public DispelByCategory(StatSet params) { _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); _rate = params.getInt("rate", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index a6e4c7cd19..ab79e046b2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.EnumMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -37,7 +37,7 @@ public class DispelBySlot extends AbstractEffect private final String _dispel; private final Map _dispelAbnormals; - public DispelBySlot(StatsSet params) + public DispelBySlot(StatSet params) { _dispel = params.getString("dispel"); if ((_dispel != null) && !_dispel.isEmpty()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 1ba6612e23..d1341d10b9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class DispelBySlotMyself extends AbstractEffect { private final Set _dispelAbnormals; - public DispelBySlotMyself(StatsSet params) + public DispelBySlotMyself(StatSet params) { final String dispel = params.getString("dispel"); if ((dispel != null) && !dispel.isEmpty()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 845980e59d..b58723058e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -37,7 +37,7 @@ public class DispelBySlotProbability extends AbstractEffect private final Set _dispelAbnormals; private final int _rate; - public DispelBySlotProbability(StatsSet params) + public DispelBySlotProbability(StatSet params) { final String[] dispelEffects = params.getString("dispel").split(";"); _rate = params.getInt("rate", 100); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index 7acd9c4a6c..688d77a703 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -45,7 +45,7 @@ public class DoubleCast extends AbstractEffect private final Map> _addedToggles; - public DoubleCast(StatsSet params) + public DoubleCast(StatSet params) { _addedToggles = new HashMap<>(); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java index d7f067a2a0..d1e21edeb0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DuelistFury extends AbstractEffect { - public DuelistFury(StatsSet params) + public DuelistFury(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index 409fed6a23..de397bb5ff 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class EnableCloak extends AbstractEffect { - public EnableCloak(StatsSet params) + public EnableCloak(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index e855c4ba1a..2fe2bef99f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -43,7 +43,7 @@ public class EnergyAttack extends AbstractEffect private final boolean _overHit; private final double _pDefMod; - public EnergyAttack(StatsSet params) + public EnergyAttack(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getInt("criticalChance", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index a8f108573f..ae463ef2a4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class EnlargeAbnormalSlot extends AbstractEffect { private final int _slots; - public EnlargeAbnormalSlot(StatsSet params) + public EnlargeAbnormalSlot(StatSet params) { _slots = params.getInt("slots", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java index c43ea04413..c4073b1a47 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StorageType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class EnlargeSlot extends AbstractEffect private final StorageType _type; private final double _amount; - public EnlargeSlot(StatsSet params) + public EnlargeSlot(StatSet params) { _amount = params.getDouble("amount", 0); _type = params.getEnum("type", StorageType.class, StorageType.INVENTORY_NORMAL); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Escape.java index 936f82d8ce..f3a07c9d15 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class Escape extends AbstractEffect { private final TeleportWhereType _escapeType; - public Escape(StatsSet params) + public Escape(StatSet params) { _escapeType = params.getEnum("escapeType", TeleportWhereType.class, null); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java index 76dbc8171c..eb68d24af8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ExpModify extends AbstractStatAddEffect { - public ExpModify(StatsSet params) + public ExpModify(StatSet params) { super(params, Stat.BONUS_EXP); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java index bf11db6e4b..1100ca25be 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Faceoff extends AbstractEffect { - public Faceoff(StatsSet params) + public Faceoff(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index e256209e39..79f7b43503 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -34,7 +34,7 @@ public class FakeDeath extends AbstractEffect { private final double _power; - public FakeDeath(StatsSet params) + public FakeDeath(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index a94c75d310..780d5cefba 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -44,7 +44,7 @@ public class FatalBlow extends AbstractEffect private final double _abnormalPower; private final boolean _overHit; - public FatalBlow(StatsSet params) + public FatalBlow(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java index c8ff8f7acb..6e7597e63d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class FatalBlowRate extends AbstractEffect private final double _amount; private final StatModifierType _mode; - public FatalBlowRate(StatsSet params) + public FatalBlowRate(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 9731e75e5d..ec2659ea2c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DefenderInstance; import org.l2jmobius.gameserver.model.actor.instance.FortCommanderInstance; @@ -40,7 +40,7 @@ public class Fear extends AbstractEffect { private static final int FEAR_RANGE = 500; - public Fear(StatsSet params) + public Fear(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 5e04e46d60..94d9912bdf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.MountType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ public class Feed extends AbstractEffect private final int _ride; private final int _wyvern; - public Feed(StatsSet params) + public Feed(StatSet params) { _normal = params.getInt("normal", 0); _ride = params.getInt("ride", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java index 0b22a4d4c9..146e3b73e6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class FishingExpSpBonus extends AbstractStatPercentEffect { - public FishingExpSpBonus(StatsSet params) + public FishingExpSpBonus(StatSet params) { super(params, Stat.FISHING_EXP_SP_BONUS); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Flag.java index c1469eab19..2442cbdb35 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Flag extends AbstractEffect { - public Flag(StatsSet params) + public Flag(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index 0243f0f543..74a9754a95 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.BlockInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class FlipBlock extends AbstractEffect { - public FlipBlock(StatsSet params) + public FlipBlock(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 7fc7da5fe6..3412e4d36d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class FlyAway extends AbstractEffect { private final int _radius; - public FlyAway(StatsSet params) + public FlyAway(StatSet params) { _radius = params.getInt("radius"); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java index fd3216286d..590fbbcd44 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class FocusEnergy extends AbstractStatAddEffect { - public FocusEnergy(StatsSet params) + public FocusEnergy(StatSet params) { super(params, Stat.MAX_MOMENTUM); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index efbd93f304..19f0163e42 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class FocusMaxMomentum extends AbstractEffect { - public FocusMaxMomentum(StatsSet params) + public FocusMaxMomentum(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index 284d19ee5f..e8c18e9682 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -36,7 +36,7 @@ public class FocusMomentum extends AbstractEffect private final int _amount; private final int _maxCharges; - public FocusMomentum(StatsSet params) + public FocusMomentum(StatSet params) { _amount = params.getInt("amount", 1); _maxCharges = params.getInt("maxCharges", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 18a9864bbc..debd491cfe 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class FocusSouls extends AbstractEffect { private final int _charge; - public FocusSouls(StatsSet params) + public FocusSouls(StatSet params) { _charge = params.getInt("charge", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 8540ccd49c..23328db910 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Set; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class GetAgro extends AbstractEffect { - public GetAgro(StatsSet params) + public GetAgro(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java index 1ca8722709..e91002d04b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class GetDamageLimit extends AbstractStatAddEffect { - public GetDamageLimit(StatsSet params) + public GetDamageLimit(StatSet params) { super(params, Stat.DAMAGE_LIMIT); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 2dfd3bf8c4..439f3e8e3a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class GetMomentum extends AbstractEffect { private static int _ticks; - public GetMomentum(StatsSet params) + public GetMomentum(StatSet params) { _ticks = params.getInt("ticks", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index 7c1c0f3fa2..2c842101ed 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class GiveClanReputation extends AbstractEffect { private final int _reputation; - public GiveClanReputation(StatsSet params) + public GiveClanReputation(StatSet params) { _reputation = params.getInt("reputation", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index fd4d61fa73..9052c63154 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class GiveExpAndSp extends AbstractEffect private final int _xp; private final int _sp; - public GiveExpAndSp(StatsSet params) + public GiveExpAndSp(StatSet params) { _xp = params.getInt("xp", 0); _sp = params.getInt("sp", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index 3448e09797..9d41a4395b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ public class GiveFame extends AbstractEffect { private final int _fame; - public GiveFame(StatsSet params) + public GiveFame(StatSet params) { _fame = params.getInt("fame", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index c948fa0948..617a8ef88a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class GiveRecommendation extends AbstractEffect { private final int _amount; - public GiveRecommendation(StatsSet params) + public GiveRecommendation(StatSet params) { _amount = params.getInt("amount", 0); if (_amount == 0) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index 5fe06566c7..75a16fe828 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class GiveSp extends AbstractEffect { private final int _sp; - public GiveSp(StatsSet params) + public GiveSp(StatSet params) { _sp = params.getInt("sp", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index 5b1a04c165..ae7248c500 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class GiveXp extends AbstractEffect { private final int _xp; - public GiveXp(StatsSet params) + public GiveXp(StatSet params) { _xp = params.getInt("xp", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 17095c209a..5cf4994f32 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Grow extends AbstractEffect { - public Grow(StatsSet params) + public Grow(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index a2200e1a2f..350c8e659f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.UserInfoType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class HairAccessorySet extends AbstractEffect { - public HairAccessorySet(StatsSet params) + public HairAccessorySet(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index f881ed5027..1654fc650c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Harvesting extends AbstractEffect { - public Harvesting(StatsSet params) + public Harvesting(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java index ac1c9f49d8..097db6604a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HateAttack extends AbstractStatPercentEffect { - public HateAttack(StatsSet params) + public HateAttack(StatSet params) { super(params, Stat.HATE_ATTACK); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index 00f569eb17..9963ff1336 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlagInstance; @@ -34,7 +34,7 @@ public class HeadquarterCreate extends AbstractEffect private static final int HQ_NPC_ID = 35062; private final boolean _isAdvanced; - public HeadquarterCreate(StatsSet params) + public HeadquarterCreate(StatSet params) { _isAdvanced = params.getBoolean("isAdvanced", false); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 4c2218df9b..d2848a6242 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -40,7 +40,7 @@ public class Heal extends AbstractEffect { private final double _power; - public Heal(StatsSet params) + public Heal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java index 5a7457d3df..a9f75ab036 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HealEffect extends AbstractStatEffect { - public HealEffect(StatsSet params) + public HealEffect(StatSet params) { super(params, Stat.HEAL_EFFECT, Stat.HEAL_EFFECT_ADD); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 86e28dc8b4..da76f33058 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class HealOverTime extends AbstractEffect { private final double _power; - public HealOverTime(StatsSet params) + public HealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index 6c9c8986bb..8b1c821a0a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class HealPercent extends AbstractEffect { private final int _power; - public HealPercent(StatsSet params) + public HealPercent(StatSet params) { _power = params.getInt("power", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Hide.java index e431277964..d02898bac5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Hide extends AbstractEffect { - public Hide(StatsSet params) + public Hide(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index e7e5f3f91b..78fa1c9392 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.GameTimeController; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HitAtNight extends AbstractStatEffect { - public HitAtNight(StatsSet params) + public HitAtNight(StatSet params) { super(params, Stat.HIT_AT_NIGHT); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java index 1fd98e7aa9..f14b922308 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HitNumber extends AbstractStatEffect { - public HitNumber(StatsSet params) + public HitNumber(StatSet params) { super(params, Stat.ATTACK_COUNT_MAX); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 3611fd7d74..c2426f8d11 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Hp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Hp(StatsSet params) + public Hp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index 3d125565fe..6244c76428 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class HpByLevel extends AbstractEffect { private final double _power; - public HpByLevel(StatsSet params) + public HpByLevel(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index f9d9d0beeb..af3726c17f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -40,7 +40,7 @@ public class HpCpHeal extends AbstractEffect { private final double _power; - public HpCpHeal(StatsSet params) + public HpCpHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java index 0394dab996..6f96c2dcb3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class HpCpHealCritical extends AbstractEffect { - public HpCpHealCritical(StatsSet params) + public HpCpHealCritical(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 554b1cec79..7cf47c3a65 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class HpDrain extends AbstractEffect private final double _power; private final double _percentage; - public HpDrain(StatsSet params) + public HpDrain(StatSet params) { _power = params.getDouble("power", 0); _percentage = params.getDouble("percentage", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java index cb1d2bc3a7..b170bc62ba 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HpRegen extends AbstractStatEffect { - public HpRegen(StatsSet params) + public HpRegen(StatSet params) { super(params, Stat.REGENERATE_HP_RATE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 235e89a79b..f346fbaad8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class HpToOwner extends AbstractEffect private final double _power; private final int _stealAmount; - public HpToOwner(StatsSet params) + public HpToOwner(StatSet params) { _power = params.getDouble("power"); _stealAmount = params.getInt("stealAmount"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java index 9829519da9..c659684ae8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class IgnoreDeath extends AbstractEffect { - public IgnoreDeath(StatsSet params) + public IgnoreDeath(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index f7c9baa155..44dceba10e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ImmobilePetBuff extends AbstractEffect { - public ImmobilePetBuff(StatsSet params) + public ImmobilePetBuff(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java index a60fc45d15..a03eff933a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ public class InstantKillResist extends AbstractEffect { private final int _amount; - public InstantKillResist(StatsSet params) + public InstantKillResist(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java index 7e1fc8abe4..265a9aab97 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class JewelSlot extends AbstractStatAddEffect { - public JewelSlot(StatsSet params) + public JewelSlot(StatSet params) { super(params, Stat.BROOCH_JEWELS); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 3d5ff2dda3..a34d7cc5b3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class KarmaCount extends AbstractEffect private final int _amount; private final int _mode; - public KarmaCount(StatsSet params) + public KarmaCount(StatSet params) { _amount = params.getInt("amount", 0); switch (params.getString("mode", "DIFF")) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index dd58d33685..3af09931f8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -45,7 +45,7 @@ public class KnockBack extends AbstractEffect private final boolean _knockDown; private final FlyType _type; - public KnockBack(StatsSet params) + public KnockBack(StatSet params) { _distance = params.getInt("distance", 50); _speed = params.getInt("speed", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index 7bfac989cf..1affb1b141 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -38,7 +38,7 @@ public class Lethal extends AbstractEffect private final double _fullLethal; private final double _halfLethal; - public Lethal(StatsSet params) + public Lethal(StatSet params) { _fullLethal = params.getDouble("fullLethal", 0); _halfLethal = params.getDouble("halfLethal", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java index aeb42458a6..43b17877ad 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitCp extends AbstractStatEffect { - public LimitCp(StatsSet params) + public LimitCp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_CP); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java index cf76ec482a..45d8f37355 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitHp extends AbstractStatEffect { - public LimitHp(StatsSet params) + public LimitHp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_HP); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java index f5eda36ba6..8d31633d0a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitMp extends AbstractStatEffect { - public LimitMp(StatsSet params) + public LimitMp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_MP); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Lucky.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Lucky.java index 3775d2361d..4ff5ea9a01 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Lucky.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Lucky.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Lucky extends AbstractEffect { - public Lucky(StatsSet params) + public Lucky(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MAtk.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MAtk.java index 5f9ad5f32b..38c2fc9067 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MAtk.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MAtk.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MAtk extends AbstractStatEffect { - public MAtk(StatsSet params) + public MAtk(StatSet params) { super(params, Stat.MAGIC_ATTACK); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java index 2b9ae2e9e6..393d0d2d30 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicAccuracy extends AbstractStatEffect { - public MagicAccuracy(StatsSet params) + public MagicAccuracy(StatSet params) { super(params, Stat.ACCURACY_MAGIC); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java index 123706eb55..b9a58b09f3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicCriticalDamage extends AbstractStatEffect { - public MagicCriticalDamage(StatsSet params) + public MagicCriticalDamage(StatSet params) { super(params, Stat.MAGIC_CRITICAL_DAMAGE, Stat.MAGIC_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java index 0c10014e50..c9fa9a4240 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicCriticalRate extends AbstractStatEffect { - public MagicCriticalRate(StatsSet params) + public MagicCriticalRate(StatSet params) { super(params, Stat.MAGIC_CRITICAL_RATE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index e8b6f5e8bf..5281bf8445 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class MagicMpCost extends AbstractEffect private final int _magicType; private final double _amount; - public MagicMpCost(StatsSet params) + public MagicMpCost(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index ed4a3fca8b..283a99176c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class MagicalAbnormalDispelAttack extends AbstractEffect private final double _power; private final AbnormalType _abnormalType; - public MagicalAbnormalDispelAttack(StatsSet params) + public MagicalAbnormalDispelAttack(StatSet params) { _power = params.getDouble("power", 0); _abnormalType = AbnormalType.getAbnormalType(params.getString("abnormalType", null)); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java index 8234db1c43..be6403077c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAbnormalResist extends AbstractStatAddEffect { - public MagicalAbnormalResist(StatsSet params) + public MagicalAbnormalResist(StatSet params) { super(params, Stat.ABNORMAL_RESIST_MAGICAL); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index 4e938809f1..25c7d25954 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -37,7 +37,7 @@ public class MagicalAttack extends AbstractEffect private final boolean _overHit; private final double _debuffModifier; - public MagicalAttack(StatsSet params) + public MagicalAttack(StatSet params) { _power = params.getDouble("power", 0); _overHit = params.getBoolean("overHit", false); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 424480b76c..11c387780e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class MagicalAttackByAbnormal extends AbstractEffect { private final double _power; - public MagicalAttackByAbnormal(StatsSet params) + public MagicalAttackByAbnormal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9c3e263a05..348e904025 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -40,7 +40,7 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect private final double _power; private final Set _abnormals; - public MagicalAttackByAbnormalSlot(StatsSet params) + public MagicalAttackByAbnormalSlot(StatSet params) { _power = params.getDouble("power", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 49dd351046..de55dd0fcd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -38,7 +38,7 @@ public class MagicalAttackMp extends AbstractEffect private final boolean _critical; private final double _criticalLimit; - public MagicalAttackMp(StatsSet params) + public MagicalAttackMp(StatSet params) { _power = params.getDouble("power"); _critical = params.getBoolean("critical"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 4414b36fa7..93ac560169 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class MagicalAttackRange extends AbstractEffect private final double _power; private final double _shieldDefPercent; - public MagicalAttackRange(StatsSet params) + public MagicalAttackRange(StatSet params) { _power = params.getDouble("power"); _shieldDefPercent = params.getDouble("shieldDefPercent", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java index 2e304e5f8b..1cf39ed501 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAttackSpeed extends AbstractStatEffect { - public MagicalAttackSpeed(StatsSet params) + public MagicalAttackSpeed(StatSet params) { super(params, Stat.MAGIC_ATTACK_SPEED); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 9a3a776e32..880d71f0c5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class MagicalDamOverTime extends AbstractEffect private final double _power; private final boolean _canKill; - public MagicalDamOverTime(StatsSet params) + public MagicalDamOverTime(StatSet params) { _power = params.getDouble("power", 0); _canKill = params.getBoolean("canKill", false); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java index 80fdf87050..9b4e6061aa 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalDefence extends AbstractStatEffect { - public MagicalDefence(StatsSet params) + public MagicalDefence(StatSet params) { super(params, Stat.MAGICAL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java index c3c7c404f3..4e83b80e8b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalEvasion extends AbstractStatEffect { - public MagicalEvasion(StatsSet params) + public MagicalEvasion(StatSet params) { super(params, Stat.MAGIC_EVASION_RATE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java index 6253af7373..bf419a19f7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalSkillPower extends AbstractStatEffect { - public MagicalSkillPower(StatsSet params) + public MagicalSkillPower(StatSet params) { super(params, Stat.MAGICAL_SKILL_POWER, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index d0047fedef..f4388dc16f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class MagicalSoulAttack extends AbstractEffect { private final double _power; - public MagicalSoulAttack(StatsSet params) + public MagicalSoulAttack(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java index fcc143cd4b..688243d9e1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ManaCharge extends AbstractStatAddEffect { - public ManaCharge(StatsSet params) + public ManaCharge(StatSet params) { super(params, Stat.MANA_CHARGE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index 0c84b4ab61..b889e6e824 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class ManaDamOverTime extends AbstractEffect { private final double _power; - public ManaDamOverTime(StatsSet params) + public ManaDamOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index f48011c9a2..94286df1c8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -34,7 +34,7 @@ public class ManaHeal extends AbstractEffect { private final double _power; - public ManaHeal(StatsSet params) + public ManaHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index bfdfa54380..61f15449a0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -35,7 +35,7 @@ public class ManaHealByLevel extends AbstractEffect { private final double _power; - public ManaHealByLevel(StatsSet params) + public ManaHealByLevel(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 46937a8dd0..e505c9e7a2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class ManaHealOverTime extends AbstractEffect { private final double _power; - public ManaHealOverTime(StatsSet params) + public ManaHealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 101961d1c4..71085da549 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class ManaHealPercent extends AbstractEffect { private final double _power; - public ManaHealPercent(StatsSet params) + public ManaHealPercent(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 7c9c63e3ad..07d15d826c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxCp extends AbstractStatEffect { private final boolean _heal; - public MaxCp(StatsSet params) + public MaxCp(StatSet params) { super(params, Stat.MAX_CP); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 6d2c3449bd..85867bca96 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxHp extends AbstractStatEffect { private final boolean _heal; - public MaxHp(StatsSet params) + public MaxHp(StatSet params) { super(params, Stat.MAX_HP); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index e554c63055..9ca46fda8d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxMp extends AbstractStatEffect { private final boolean _heal; - public MaxMp(StatsSet params) + public MaxMp(StatSet params) { super(params, Stat.MAX_MP); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 39cf62a95b..c27284e5f6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -43,7 +43,7 @@ public class ModifyVital extends AbstractEffect private final int _mp; private final int _cp; - public ModifyVital(StatsSet params) + public ModifyVital(StatSet params) { _type = params.getEnum("type", ModifyType.class); if (_type != ModifyType.SET) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 29ee88f805..095d130f7f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Mp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Mp(StatsSet params) + public Mp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index 76d858ad8e..b13d7824d0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class MpConsumePerLevel extends AbstractEffect { private final double _power; - public MpConsumePerLevel(StatsSet params) + public MpConsumePerLevel(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java index 2051009805..ae7bf0c48c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpRegen extends AbstractStatEffect { - public MpRegen(StatsSet params) + public MpRegen(StatSet params) { super(params, Stat.REGENERATE_MP_RATE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MpShield.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MpShield.java index 82e307a562..a4eb3e663f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MpShield.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MpShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpShield extends AbstractStatAddEffect { - public MpShield(StatsSet params) + public MpShield(StatSet params) { super(params, Stat.MANA_SHIELD_PERCENT); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java index af2ce119cc..366e96b18f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpVampiricAttack extends AbstractStatAddEffect { - public MpVampiricAttack(StatsSet params) + public MpVampiricAttack(StatSet params) { super(params, Stat.ABSORB_MANA_DAMAGE_PERCENT); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Mute.java index a7f2f76e23..7e5b5a528f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Mute extends AbstractEffect { - public Mute(StatsSet params) + public Mute(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java index 3cc4cae96f..513dc46ec7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class NoblesseBless extends AbstractEffect { - public NoblesseBless(StatsSet params) + public NoblesseBless(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index bb0f02af5c..05f8c6a99b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpenChest extends AbstractEffect { - public OpenChest(StatsSet params) + public OpenChest(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 15cd9c2a64..de0414fd23 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.RecipeController; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpenCommonRecipeBook extends AbstractEffect { - public OpenCommonRecipeBook(StatsSet params) + public OpenCommonRecipeBook(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 21dd337982..7b5effc6b4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class OpenDoor extends AbstractEffect private final int _chance; private final boolean _isItem; - public OpenDoor(StatsSet params) + public OpenDoor(StatSet params) { _chance = params.getInt("chance", 0); _isItem = params.getBoolean("isItem", false); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index b99a8f9757..3526fa5fdc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.RecipeController; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpenDwarfRecipeBook extends AbstractEffect { - public OpenDwarfRecipeBook(StatsSet params) + public OpenDwarfRecipeBook(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PAtk.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PAtk.java index c353d03a00..7f10b9dcc7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PAtk.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PAtk.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PAtk extends AbstractConditionalHpEffect { - public PAtk(StatsSet params) + public PAtk(StatSet params) { super(params, Stat.PHYSICAL_ATTACK); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Passive.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Passive.java index cef680ca21..27ce15bb60 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Passive.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Passive.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Passive extends AbstractEffect { - public Passive(StatsSet params) + public Passive(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java index 05f55c7dac..1a9f29424f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAbnormalResist extends AbstractStatAddEffect { - public PhysicalAbnormalResist(StatsSet params) + public PhysicalAbnormalResist(StatSet params) { super(params, Stat.ABNORMAL_RESIST_PHYSICAL); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 098770705b..7e5fb14465 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -52,7 +52,7 @@ public class PhysicalAttack extends AbstractEffect private final Set _abnormals; private final double _abnormalPowerMod; - public PhysicalAttack(StatsSet params) + public PhysicalAttack(StatSet params) { _power = params.getDouble("power", 0); _pAtkMod = params.getDouble("pAtkMod", 1.0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index d325c3d5ed..f191867614 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -38,7 +38,7 @@ public class PhysicalAttackHpLink extends AbstractEffect private final double _criticalChance; private final boolean _overHit; - public PhysicalAttackHpLink(StatsSet params) + public PhysicalAttackHpLink(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index dc575c2c75..fe087a1bcc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class PhysicalAttackMute extends AbstractEffect { - public PhysicalAttackMute(StatsSet params) + public PhysicalAttackMute(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java index 112b41eb36..2093d45264 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAttackRange extends AbstractStatEffect { - public PhysicalAttackRange(StatsSet params) + public PhysicalAttackRange(StatSet params) { super(params, Stat.PHYSICAL_ATTACK_RANGE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index d3c2dcfaf2..5d66bd4c87 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ public class PhysicalAttackSaveHp extends AbstractEffect private final boolean _overHit; private final double _saveHp; - public PhysicalAttackSaveHp(StatsSet params) + public PhysicalAttackSaveHp(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java index 167b859572..cdf34eb6f6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAttackSpeed extends AbstractStatEffect { - public PhysicalAttackSpeed(StatsSet params) + public PhysicalAttackSpeed(StatSet params) { super(params, Stat.PHYSICAL_ATTACK_SPEED); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 61bed5561b..a1a6818a00 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class PhysicalAttackWeaponBonus extends AbstractEffect private final Map _weaponBonus = new EnumMap<>(WeaponType.class); - public PhysicalAttackWeaponBonus(StatsSet params) + public PhysicalAttackWeaponBonus(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java index fa3925e725..078c3673b9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalDefence extends AbstractConditionalHpEffect { - public PhysicalDefence(StatsSet params) + public PhysicalDefence(StatSet params) { super(params, Stat.PHYSICAL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java index 812c641ac8..9714220e1b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalEvasion extends AbstractConditionalHpEffect { - public PhysicalEvasion(StatsSet params) + public PhysicalEvasion(StatSet params) { super(params, Stat.EVASION_RATE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index b337fed6cb..fe7cf853c8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class PhysicalMute extends AbstractEffect { - public PhysicalMute(StatsSet params) + public PhysicalMute(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java index 0fd835f4e3..1b843dda3d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class PhysicalShieldAngleAll extends AbstractEffect { - public PhysicalShieldAngleAll(StatsSet params) + public PhysicalShieldAngleAll(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java index 9d3f051659..507eb57326 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalSkillPower extends AbstractStatEffect { - public PhysicalSkillPower(StatsSet params) + public PhysicalSkillPower(StatSet params) { super(params, Stat.PHYSICAL_SKILL_POWER, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index a958116ff7..9ceccea4cc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -42,7 +42,7 @@ public class PhysicalSoulAttack extends AbstractEffect private final boolean _ignoreShieldDefence; private final boolean _overHit; - public PhysicalSoulAttack(StatsSet params) + public PhysicalSoulAttack(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index e95e09ab90..fd2b23a2ae 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class PkCount extends AbstractEffect { private final int _amount; - public PkCount(StatsSet params) + public PkCount(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index 2d64d05406..b51d6a7961 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class Plunder extends AbstractEffect { - public Plunder(StatsSet params) + public Plunder(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index fd61584af1..3e885274b3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PolearmSingleTarget extends AbstractEffect { - public PolearmSingleTarget(StatsSet params) + public PolearmSingleTarget(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java index 86f2e2cee8..b2fb920379 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class ProtectDeathPenalty extends AbstractEffect { - public ProtectDeathPenalty(StatsSet params) + public ProtectDeathPenalty(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java index 890b8980bd..6664b36bae 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ProtectionBlessing extends AbstractEffect { - public ProtectionBlessing(StatsSet params) + public ProtectionBlessing(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index 6de78c2c82..62c480716d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class PullBack extends AbstractEffect private final int _animationSpeed; private final FlyType _type; - public PullBack(StatsSet params) + public PullBack(StatSet params) { _speed = params.getInt("speed", 0); _delay = params.getInt("delay", _speed); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java index 1019c56778..84a72299f3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveMagicalSkillDamageBonus extends AbstractStatPercentEffect { - public PveMagicalSkillDamageBonus(StatsSet params) + public PveMagicalSkillDamageBonus(StatSet params) { super(params, Stat.PVE_MAGICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java index 8da698c746..70870aa45c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveMagicalSkillDefenceBonus(StatsSet params) + public PveMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java index c7a82d4ded..8f60ea025c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalAttackDamageBonus extends AbstractStatPercentEffect { - public PvePhysicalAttackDamageBonus(StatsSet params) + public PvePhysicalAttackDamageBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_ATTACK_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java index 0717fe525b..ea01a4e1d8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PvePhysicalAttackDefenceBonus(StatsSet params) + public PvePhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java index 878f942877..1e8b9e76c4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvePhysicalSkillDamageBonus(StatsSet params) + public PvePhysicalSkillDamageBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java index bdfa0dcc67..b1dbb0b217 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvePhysicalSkillDefenceBonus(StatsSet params) + public PvePhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java index 94fdc26015..fbe3119ba8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveRaidMagicalSkillDefenceBonus(StatsSet params) + public PveRaidMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java index f54d849752..83352e1b2f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidPhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PveRaidPhysicalAttackDefenceBonus(StatsSet params) + public PveRaidPhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java index 0a344f96de..be05bec159 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidPhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveRaidPhysicalSkillDefenceBonus(StatsSet params) + public PveRaidPhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java index 542c019420..2f0153189a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpMagicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvpMagicalSkillDamageBonus(StatsSet params) + public PvpMagicalSkillDamageBonus(StatSet params) { super(params, Stat.PVP_MAGICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java index bb006280fc..41ad3b7749 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvpMagicalSkillDefenceBonus(StatsSet params) + public PvpMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVP_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java index 483d7b02e4..23488ea000 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalAttackDamageBonus extends AbstractStatPercentEffect { - public PvpPhysicalAttackDamageBonus(StatsSet params) + public PvpPhysicalAttackDamageBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_ATTACK_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java index 40c3a22ea2..ff942b3d4d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PvpPhysicalAttackDefenceBonus(StatsSet params) + public PvpPhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java index 225c7c1e39..19a7c96003 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvpPhysicalSkillDamageBonus(StatsSet params) + public PvpPhysicalSkillDamageBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java index ea2d1fa126..211d14c5e3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvpPhysicalSkillDefenceBonus(StatsSet params) + public PvpPhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 8a01583374..e500b487af 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -36,7 +36,7 @@ public class RandomizeHate extends AbstractEffect { private final int _chance; - public RandomizeHate(StatsSet params) + public RandomizeHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index 8b2801ee6c..18b07bd2d7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class RealDamage extends AbstractEffect { private final double _power; - public RealDamage(StatsSet params) + public RealDamage(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java index 4372c15bcf..86738fae0f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class RearDamage extends AbstractStatPercentEffect { - public RearDamage(StatsSet params) + public RearDamage(StatSet params) { super(params, Stat.REAR_DAMAGE_RATE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 31c7a4e4b3..82ed18faa1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RebalanceHP extends AbstractEffect { - public RebalanceHP(StatsSet params) + public RebalanceHP(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index 09d307be02..979809b533 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RebalanceHPSummon extends AbstractEffect { - public RebalanceHPSummon(StatsSet params) + public RebalanceHPSummon(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 7599b691ac..e76328929a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class RecoverVitalityInPeaceZone extends AbstractEffect private final double _amount; private final int _ticks; - public RecoverVitalityInPeaceZone(StatsSet params) + public RecoverVitalityInPeaceZone(StatSet params) { _amount = params.getDouble("amount", 0); _ticks = params.getInt("ticks", 10); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java index 824044ae21..e52b5abafb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ReduceCancel extends AbstractStatEffect { - public ReduceCancel(StatsSet params) + public ReduceCancel(StatSet params) { super(params, Stat.ATTACK_CANCEL); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index ecc7a10d31..be9188f3b0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -33,7 +33,7 @@ public class ReduceDamage extends AbstractEffect { private final double _amount; - public ReduceDamage(StatsSet params) + public ReduceDamage(StatSet params) { _amount = params.getDouble("amount"); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java index 8534a94fc6..7b8862f608 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ReduceDropType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -32,7 +32,7 @@ public class ReduceDropPenalty extends AbstractEffect private final double _deathPenalty; private final ReduceDropType _type; - public ReduceDropPenalty(StatsSet params) + public ReduceDropPenalty(StatSet params) { _exp = params.getDouble("exp", 0); _deathPenalty = params.getDouble("deathPenalty", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java index c15f7301b9..6436b488e0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ReflectMagic extends AbstractStatAddEffect { - public ReflectMagic(StatsSet params) + public ReflectMagic(StatSet params) { super(params, Stat.VENGEANCE_SKILL_MAGIC_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java index bf1d555351..583191fd4c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.BasicProperty; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ReflectSkill extends AbstractEffect private final Stat _stat; private final double _amount; - public ReflectSkill(StatsSet params) + public ReflectSkill(StatSet params) { _stat = params.getEnum("type", BasicProperty.class, BasicProperty.PHYSICAL) == BasicProperty.PHYSICAL ? Stat.REFLECT_SKILL_PHYSIC : Stat.REFLECT_SKILL_MAGIC; _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index e850ea6be9..77b96e4205 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class RefuelAirship extends AbstractEffect { private final int _value; - public RefuelAirship(StatsSet params) + public RefuelAirship(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Relax.java index c8c61fe47e..e2ba4420db 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ public class Relax extends AbstractEffect { private final double _power; - public Relax(StatsSet params) + public Relax(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 9678dc1174..0613c17234 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class ResetInstanceEntry extends AbstractEffect { private final Set _instanceId; - public ResetInstanceEntry(StatsSet params) + public ResetInstanceEntry(StatSet params) { final String instanceIds = params.getString("instanceId", null); if ((instanceIds != null) && !instanceIds.isEmpty()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java index 940c731208..f15ff56189 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ResistAbnormalByCategory extends AbstractEffect private final DispelSlotType _slot; private final double _amount; - public ResistAbnormalByCategory(StatsSet params) + public ResistAbnormalByCategory(StatSet params) { _amount = params.getDouble("amount", 0); _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.DEBUFF); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java index dae38e5246..2e29b5cc8e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ResistDDMagic extends AbstractStatPercentEffect { - public ResistDDMagic(StatsSet params) + public ResistDDMagic(StatSet params) { super(params, Stat.MAGIC_SUCCESS_RES); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java index af2b203aad..d08fcb262a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ResistDispelByCategory extends AbstractEffect private final DispelSlotType _slot; private final double _amount; - public ResistDispelByCategory(StatsSet params) + public ResistDispelByCategory(StatSet params) { _amount = params.getDouble("amount", 0); _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index af1e40bea8..cd03f1a74a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -34,7 +34,7 @@ public class ResistSkill extends AbstractEffect { private final List _skills = new ArrayList<>(); - public ResistSkill(StatsSet params) + public ResistSkill(StatSet params) { for (int i = 1;; i++) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index feb5885fb0..6f887a07cf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class Restoration extends AbstractEffect private final int _itemCount; private final int _itemEnchantmentLevel; - public Restoration(StatsSet params) + public Restoration(StatSet params) { _itemId = params.getInt("itemId", 0); _itemCount = params.getInt("itemCount", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 37cd974643..0baf0aaae6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -25,7 +25,7 @@ import java.util.Map.Entry; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.ExtractableProductItem; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,12 +47,12 @@ public class RestorationRandom extends AbstractEffect { private final List _products = new ArrayList<>(); - public RestorationRandom(StatsSet params) + public RestorationRandom(StatSet params) { - for (StatsSet group : params.getList("items", StatsSet.class)) + for (StatSet group : params.getList("items", StatSet.class)) { final List items = new ArrayList<>(); - for (StatsSet item : group.getList(".", StatsSet.class)) + for (StatSet item : group.getList(".", StatSet.class)) { items.add(new RestorationItemHolder(item.getInt(".id"), item.getInt(".count"), item.getInt(".minEnchant", 0), item.getInt(".maxEnchant", 0))); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index f9c10b7ff2..9b287dd419 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class Resurrection extends AbstractEffect { private final int _power; - public Resurrection(StatsSet params) + public Resurrection(StatSet params) { _power = params.getInt("power", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 18d8bdb0bd..6ef063ce91 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -39,7 +39,7 @@ public class ResurrectionSpecial extends AbstractEffect private final int _power; private final Set _instanceId; - public ResurrectionSpecial(StatsSet params) + public ResurrectionSpecial(StatSet params) { _power = params.getInt("power", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index e4d66b43d3..0e7391681b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class Reuse extends AbstractEffect private final int _magicType; private final double _amount; - public Reuse(StatsSet params) + public Reuse(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index 3716fc1922..e17cd7cc25 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ReuseSkillById extends AbstractEffect { private final int _skillId; - public ReuseSkillById(StatsSet params) + public ReuseSkillById(StatSet params) { _skillId = params.getInt("skillId", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Root.java index 1ca3492949..b6876e8e13 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Root extends AbstractEffect { - public Root(StatsSet params) + public Root(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index 66fc8d82c8..4c7ee53239 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class SacrificeSummon extends AbstractEffect { - public SacrificeSummon(StatsSet params) + public SacrificeSummon(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java index d00856c9bd..683f45bb55 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SafeFallHeight extends AbstractStatEffect { - public SafeFallHeight(StatsSet params) + public SafeFallHeight(StatSet params) { super(params, Stat.FALL); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 7f6bf69ee3..797aa95263 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -33,7 +33,7 @@ public class SendSystemMessageToClan extends AbstractEffect { private final SystemMessage _message; - public SendSystemMessageToClan(StatsSet params) + public SendSystemMessageToClan(StatSet params) { final int id = params.getInt("id", 0); _message = new SystemMessage(id); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java index 7acbf846df..a0508d73b1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class ServitorShare extends AbstractEffect { private final Map _sharedStats = new EnumMap<>(Stat.class); - public ServitorShare(StatsSet params) + public ServitorShare(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 01dfd87c71..6e8187feae 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SetHp extends AbstractEffect private final double _amount; private final StatModifierType _mode; - public SetHp(StatsSet params) + public SetHp(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index 805d18160b..fae21baa51 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SetSkill extends AbstractEffect private final int _skillId; private final int _skillLvl; - public SetSkill(StatsSet params) + public SetSkill(StatSet params) { _skillId = params.getInt("skillId", 0); _skillLvl = params.getInt("skillLvl", 1); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java index a93bb5f253..354cb42b55 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ShieldDefence extends AbstractStatEffect { - public ShieldDefence(StatsSet params) + public ShieldDefence(StatSet params) { super(params, Stat.SHIELD_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java index f28d0e4ad2..1fdee75f69 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ShieldDefenceRate extends AbstractStatEffect { - public ShieldDefenceRate(StatsSet params) + public ShieldDefenceRate(StatSet params) { super(params, Stat.SHIELD_DEFENCE_RATE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java index 1d649082dc..533b631f10 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class SilentMove extends AbstractEffect { - public SilentMove(StatsSet params) + public SilentMove(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java index 89dad85514..7c929a7fe8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class SkillCritical extends AbstractEffect { private final BaseStat _stat; - public SkillCritical(StatsSet params) + public SkillCritical(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java index 369bef11f5..8f054f973b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillCriticalDamage extends AbstractStatEffect { - public SkillCriticalDamage(StatsSet params) + public SkillCriticalDamage(StatSet params) { super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java index c91f2d6b49..88ecf69e77 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillCriticalProbability extends AbstractStatPercentEffect { - public SkillCriticalProbability(StatsSet params) + public SkillCriticalProbability(StatSet params) { super(params, Stat.SKILL_CRITICAL_PROBABILITY); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 7b98a9e180..1664ea1827 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class SkillEvasion extends AbstractEffect private final int _magicType; private final double _amount; - public SkillEvasion(StatsSet params) + public SkillEvasion(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java index 9cc62532b4..2880d0ccef 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillPowerAdd extends AbstractStatAddEffect { - public SkillPowerAdd(StatsSet params) + public SkillPowerAdd(StatSet params) { super(params, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 9578c88f91..7156fff2df 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SkillTurning extends AbstractEffect private final int _chance; private final boolean _staticChance; - public SkillTurning(StatsSet params) + public SkillTurning(StatSet params) { _chance = params.getInt("chance", 100); _staticChance = params.getBoolean("staticChance", false); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 45b02206a4..04691304ed 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SkillTurningOverTime extends AbstractEffect private final int _chance; private final boolean _staticChance; - public SkillTurningOverTime(StatsSet params) + public SkillTurningOverTime(StatSet params) { _chance = params.getInt("chance", 100); _staticChance = params.getBoolean("staticChance", false); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index c1dd92cedb..b919c7acac 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -36,7 +36,7 @@ public class SoulBlow extends AbstractEffect private final double _chanceBoost; private final boolean _overHit; - public SoulBlow(StatsSet params) + public SoulBlow(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 8471aa236c..4f63a84081 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; @@ -40,7 +40,7 @@ public class SoulEating extends AbstractEffect private final int _expNeeded; private final int _maxSouls; - public SoulEating(StatsSet params) + public SoulEating(StatSet params) { _expNeeded = params.getInt("expNeeded"); _maxSouls = params.getInt("maxSouls"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a7d5c2628a..ad261845eb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Seed; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Sow extends AbstractEffect { - public Sow(StatsSet params) + public Sow(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SpModify.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SpModify.java index 24d124ecce..c3bc6193e9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SpModify.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SpModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SpModify extends AbstractStatAddEffect { - public SpModify(StatsSet params) + public SpModify(StatSet params) { super(params, Stat.BONUS_SP); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 0718408ca2..890438d65f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.enums.SpeedType; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -36,7 +36,7 @@ public class Speed extends AbstractEffect private final StatModifierType _mode; private List _speedType; - public Speed(StatsSet params) + public Speed(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index 91b91ad05e..db247775f3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SphericBarrier extends AbstractStatAddEffect { - public SphericBarrier(StatsSet params) + public SphericBarrier(StatSet params) { super(params, Stat.SPHERIC_BARRIER_RANGE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index d13eaf1c2e..385240377f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class Spoil extends AbstractEffect { - public Spoil(StatsSet params) + public Spoil(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index b63c24dc20..22c4132b63 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -36,7 +36,7 @@ public class StatBonusSkillCritical extends AbstractEffect private final BaseStat _stat; private final Condition _armorTypeCondition; - public StatBonusSkillCritical(StatsSet params) + public StatBonusSkillCritical(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.DEX); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index 41a20bfafe..49280eb774 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -36,7 +36,7 @@ public class StatBonusSpeed extends AbstractEffect private final BaseStat _stat; private final Condition _armorTypeCondition; - public StatBonusSpeed(StatsSet params) + public StatBonusSpeed(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.DEX); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index a007b118b2..bcf691e360 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class StatByMoveType extends AbstractEffect private final MoveType _type; private final double _value; - public StatByMoveType(StatsSet params) + public StatByMoveType(StatSet params) { _stat = params.getEnum("stat", Stat.class); _type = params.getEnum("type", MoveType.class); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StatUp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StatUp.java index b961ec8484..7abb1367af 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StatUp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StatUp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class StatUp extends AbstractEffect private final BaseStat _stat; private final double _amount; - public StatUp(StatsSet params) + public StatUp(StatSet params) { _amount = params.getDouble("amount", 0); _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index 0720057c19..23239887a7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.List; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -39,7 +39,7 @@ public class StealAbnormal extends AbstractEffect private final int _rate; private final int _max; - public StealAbnormal(StatsSet params) + public StealAbnormal(StatSet params) { _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); _rate = params.getInt("rate", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Summon.java index cd7bfabef8..62daa5ffdf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.ServitorInstance; @@ -43,7 +43,7 @@ public class Summon extends AbstractEffect private final int _lifeTime; private final int _consumeItemInterval; - public Summon(StatsSet params) + public Summon(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index 8929e1f2b0..50c025e572 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class SummonAgathion extends AbstractEffect { private final int _npcId; - public SummonAgathion(StatsSet params) + public SummonAgathion(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index 7716d58f16..49b816f272 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.CubicData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; @@ -42,7 +42,7 @@ public class SummonCubic extends AbstractEffect private final int _cubicId; private final int _cubicLvl; - public SummonCubic(StatsSet params) + public SummonCubic(StatSet params) { _cubicId = params.getInt("cubicId", -1); _cubicLvl = params.getInt("cubicLvl", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index d0a2a82738..13d5a2eac7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoppelgangerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ public class SummonHallucination extends AbstractEffect private final int _npcId; private final int _npcCount; - public SummonHallucination(StatsSet params) + public SummonHallucination(StatSet params) { _despawnDelay = params.getInt("despawnDelay", 20000); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index bcd050e084..d61a6e5c02 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.ServitorInstance; @@ -43,7 +43,7 @@ public class SummonMulti extends AbstractEffect private final int _consumeItemInterval; private final int _summonPoints; - public SummonMulti(StatsSet params) + public SummonMulti(StatSet params) { _npcId = params.getInt("npcId"); _expMultiplier = params.getFloat("expMultiplier", 1); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index 6f4090eef0..eaff214b7c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DecoyInstance; @@ -48,7 +48,7 @@ public class SummonNpc extends AbstractEffect private final boolean _isSummonSpawn; private final boolean _singleInstance; // Only one instance of this NPC is allowed. - public SummonNpc(StatsSet params) + public SummonNpc(StatSet params) { _despawnDelay = params.getInt("despawnDelay", 20000); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 5ef621819e..534a41ee16 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.data.xml.impl.PetDataTable; import org.l2jmobius.gameserver.model.PetData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PetItemList; */ public class SummonPet extends AbstractEffect { - public SummonPet(StatsSet params) + public SummonPet(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java index 7dd690587c..b1d5ec38cb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SummonPoints extends AbstractStatAddEffect { - public SummonPoints(StatsSet params) + public SummonPoints(StatSet params) { super(params, Stat.MAX_SUMMON_POINTS); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index d8a47b670f..ac1ddaa16a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; @@ -35,7 +35,7 @@ public class SummonTrap extends AbstractEffect private final int _despawnTime; private final int _npcId; - public SummonTrap(StatsSet params) + public SummonTrap(StatSet params) { _despawnTime = params.getInt("despawnTime", 0); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 84f6d070a8..3196bb949d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Collection; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Sweeper extends AbstractEffect { - public Sweeper(StatsSet params) + public Sweeper(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 559dfc6437..ec29554f2d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ public class Synergy extends AbstractEffect private final int _skillLevelScaleTo; private final int _minSlot; - public Synergy(StatsSet params) + public Synergy(StatSet params) { final String requiredSlots = params.getString("requiredSlots", null); if ((requiredSlots != null) && !requiredSlots.isEmpty()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index e35516fef5..39ed981bbf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Castle; @@ -33,7 +33,7 @@ public class TakeCastle extends AbstractEffect { private final CastleSide _side; - public TakeCastle(StatsSet params) + public TakeCastle(StatSet params) { _side = params.getEnum("side", CastleSide.class); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 77fd9ec103..3be2bf5593 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Castle; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TakeCastleStart extends AbstractEffect { - public TakeCastleStart(StatsSet params) + public TakeCastleStart(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 70842191a7..18749c1aef 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Fort; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TakeFort extends AbstractEffect { - public TakeFort(StatsSet params) + public TakeFort(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 0eb23f6733..77355f9683 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TakeFortStart extends AbstractEffect { - public TakeFortStart(StatsSet params) + public TakeFortStart(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index cec32755ed..dd8e09278f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class TalismanSlot extends AbstractEffect { private final int _slots; - public TalismanSlot(StatsSet params) + public TalismanSlot(StatSet params) { _slots = params.getInt("slots", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 281b5322fd..32a126f499 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class TargetCancel extends AbstractEffect { private final int _chance; - public TargetCancel(StatsSet params) + public TargetCancel(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index b4463de391..86ff70c9ca 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMe extends AbstractEffect { - public TargetMe(StatsSet params) + public TargetMe(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index 11e581113e..e68a1e1faf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class TargetMeProbability extends AbstractEffect { private final int _chance; - public TargetMeProbability(StatsSet params) + public TargetMeProbability(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 6c30519678..9ca01faf50 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -32,7 +32,7 @@ public class Teleport extends AbstractEffect { private final Location _loc; - public Teleport(StatsSet params) + public Teleport(StatSet params) { _loc = new Location(params.getInt("x", 0), params.getInt("y", 0), params.getInt("z", 0)); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index e0e715818c..bdc53208d5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -38,7 +38,7 @@ public class TeleportToNpc extends AbstractEffect private final int _npcId; private final boolean _party; - public TeleportToNpc(StatsSet params) + public TeleportToNpc(StatSet params) { _npcId = params.getInt("npcId"); _party = params.getBoolean("party", false); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index c84c559322..4f4275fd41 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TeleportToPlayer extends AbstractEffect { - public TeleportToPlayer(StatsSet params) + public TeleportToPlayer(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index 1c9af0f535..b2d6b663de 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class TeleportToSummon extends AbstractEffect { private final double _maxDistance; - public TeleportToSummon(StatsSet params) + public TeleportToSummon(StatSet params) { _maxDistance = params.getDouble("distance", -1); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index e550302b02..c4bf787a10 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class TeleportToTarget extends AbstractEffect { - public TeleportToTarget(StatsSet params) + public TeleportToTarget(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index ba1c55c615..ff63eea817 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class TransferDamageToPlayer extends AbstractStatAddEffect { - public TransferDamageToPlayer(StatsSet params) + public TransferDamageToPlayer(StatSet params) { super(params, Stat.TRANSFER_DAMAGE_TO_PLAYER); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java index b084bfc1cb..c87d5f0554 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class TransferDamageToSummon extends AbstractStatAddEffect { - public TransferDamageToSummon(StatsSet params) + public TransferDamageToSummon(StatSet params) { super(params, Stat.TRANSFER_DAMAGE_SUMMON_PERCENT); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index e9f0292113..48bc5e3a1c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -34,7 +34,7 @@ public class TransferHate extends AbstractEffect { private final int _chance; - public TransferHate(StatsSet params) + public TransferHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 2ddf95a4db..bf593eaed8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Transformation extends AbstractEffect { private final List _id; - public Transformation(StatsSet params) + public Transformation(StatSet params) { final String ids = params.getString("transformationId", null); if ((ids != null) && !ids.isEmpty()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 103ccdf8ce..2b4af0a1d3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class TrapDetect extends AbstractEffect { private final int _power; - public TrapDetect(StatsSet params) + public TrapDetect(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index eb7b073b36..c4a6c6aed9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.TrapAction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class TrapRemove extends AbstractEffect { private final int _power; - public TrapRemove(StatsSet params) + public TrapRemove(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 6df3874ab1..8fb87050b1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -59,7 +59,7 @@ public class TriggerSkillByAttack extends AbstractEffect * @param params */ - public TriggerSkillByAttack(StatsSet params) + public TriggerSkillByAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index ae6a3bc89f..78366b8047 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillByAvoid extends AbstractEffect /** * @param params */ - public TriggerSkillByAvoid(StatsSet params) + public TriggerSkillByAvoid(StatSet params) { _chance = params.getInt("chance", 100); _skill = new SkillHolder(params.getInt("skillId", 0), params.getInt("skillLevel", 0)); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index c24fb95246..9fe53c0622 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -48,7 +48,7 @@ public class TriggerSkillByDamage extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillByDamage(StatsSet params) + public TriggerSkillByDamage(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c086507336..8b84350293 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillByDeathBlow extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillByDeathBlow(StatsSet params) + public TriggerSkillByDeathBlow(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index a9bfcc320c..11802645f2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -37,7 +37,7 @@ public class TriggerSkillByKill extends AbstractEffect private final int _chance; private final SkillHolder _skill; - public TriggerSkillByKill(StatsSet params) + public TriggerSkillByKill(StatSet params) { _chance = params.getInt("chance", 100); _skill = new SkillHolder(params.getInt("skillId", 0), params.getInt("skillLevel", 0)); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 2893d46f33..7f2d3f9fa7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -52,7 +52,7 @@ public class TriggerSkillByMagicType extends AbstractEffect * @param params */ - public TriggerSkillByMagicType(StatsSet params) + public TriggerSkillByMagicType(StatSet params) { _chance = params.getInt("chance", 100); _magicTypes = params.getIntArray("magicTypes", ";"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 1524e3d4f4..b77da803f5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillBySkill extends AbstractEffect private final int _skillLevelScaleTo; private final TargetType _targetType; - public TriggerSkillBySkill(StatsSet params) + public TriggerSkillBySkill(StatSet params) { _castSkillId = params.getInt("castSkillId"); _chance = params.getInt("chance", 100); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index ec2124c44e..7bb68baec9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -53,7 +53,7 @@ public class TriggerSkillBySkillAttack extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillBySkillAttack(StatsSet params) + public TriggerSkillBySkillAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 3f58619f0a..c209decfb3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -69,7 +69,7 @@ public class TwoHandedBluntBonus extends AbstractEffect private final double _speedAmount; private final StatModifierType _speedMode; - public TwoHandedBluntBonus(StatsSet params) + public TwoHandedBluntBonus(StatSet params) { _pAtkAmount = params.getDouble("pAtkAmount", 0); _pAtkMode = params.getEnum("pAtkMode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index b2c50c4b88..344456a925 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -69,7 +69,7 @@ public class TwoHandedSwordBonus extends AbstractEffect private final double _speedAmount; private final StatModifierType _speedMode; - public TwoHandedSwordBonus(StatsSet params) + public TwoHandedSwordBonus(StatSet params) { _pAtkAmount = params.getDouble("pAtkAmount", 0); _pAtkMode = params.getEnum("pAtkMode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 01ae8122ec..20b418c29b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ public class Unsummon extends AbstractEffect { private final int _chance; - public Unsummon(StatsSet params) + public Unsummon(StatSet params) { _chance = params.getInt("chance", -1); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 57eb89196d..f73f0f57f0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; */ public class UnsummonAgathion extends AbstractEffect { - public UnsummonAgathion(StatsSet params) + public UnsummonAgathion(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index a4fdc2c0aa..0779d018cc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class UnsummonServitors extends AbstractEffect { - public UnsummonServitors(StatsSet params) + public UnsummonServitors(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index dbb0c700b5..ac33fcba0d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Untargetable extends AbstractEffect { - public Untargetable(StatsSet params) + public Untargetable(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java index ac6cae3d05..1c85196fe0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class VampiricAttack extends AbstractEffect private final double _amount; private final double _sum; - public VampiricAttack(StatsSet params) + public VampiricAttack(StatSet params) { _amount = params.getDouble("amount"); _sum = _amount * params.getDouble("chance"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java index ab724714e1..571ca55bbe 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ public class VampiricDefence extends AbstractEffect { private final int _amount; - public VampiricDefence(StatsSet params) + public VampiricDefence(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java index f8b9d76f3a..caaa8d02b4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class VitalityExpRate extends AbstractStatPercentEffect { - public VitalityExpRate(StatsSet params) + public VitalityExpRate(StatSet params) { super(params, Stat.VITALITY_EXP_RATE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index cba2b14c35..385595e03d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class VitalityPointUp extends AbstractEffect { private final int _value; - public VitalityPointUp(StatsSet params) + public VitalityPointUp(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java index 86612955dd..72f78ec177 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class VitalityPointsRate extends AbstractStatPercentEffect { - public VitalityPointsRate(StatsSet params) + public VitalityPointsRate(StatSet params) { super(params, Stat.VITALITY_CONSUME_RATE); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java index 09500b3823..bf20bd5018 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WeightLimit extends AbstractStatEffect { - public WeightLimit(StatsSet params) + public WeightLimit(StatSet params) { super(params, Stat.WEIGHT_LIMIT); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java index f9be68f493..6020399f85 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WeightPenalty extends AbstractStatAddEffect { - public WeightPenalty(StatsSet params) + public WeightPenalty(StatSet params) { super(params, Stat.WEIGHT_PENALTY); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java index bdf9aca48d..81eb9a9688 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WorldChatPoints extends AbstractStatEffect { - public WorldChatPoints(StatsSet params) + public WorldChatPoints(StatSet params) { super(params, Stat.WORLD_CHAT_POINTS); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java index 5a3842921d..127dadf9d2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class BuildAdvanceBaseSkillCondition implements ISkillCondition { - public BuildAdvanceBaseSkillCondition(StatsSet params) + public BuildAdvanceBaseSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java index 9328638400..b479302f61 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class BuildCampSkillCondition implements ISkillCondition { - public BuildCampSkillCondition(StatsSet params) + public BuildCampSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java index c1220c828a..aca51bafbf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanAddMaxEntranceInzoneSkillCondition implements ISkillCondition { - public CanAddMaxEntranceInzoneSkillCondition(StatsSet params) + public CanAddMaxEntranceInzoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java index eddd45771c..6ac3c2e199 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ public class CanBookmarkAddSlotSkillCondition implements ISkillCondition { private final int _teleportBookmarkSlots; - public CanBookmarkAddSlotSkillCondition(StatsSet params) + public CanBookmarkAddSlotSkillCondition(StatSet params) { _teleportBookmarkSlots = params.getInt("teleportBookmarkSlots"); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java index 30fdb7f36f..ee1bf96e69 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanChangeVitalItemCountSkillCondition implements ISkillCondition { - public CanChangeVitalItemCountSkillCondition(StatsSet params) + public CanChangeVitalItemCountSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java index da553a6d9f..48e28e7af7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanEnchantAttributeSkillCondition implements ISkillCondition { - public CanEnchantAttributeSkillCondition(StatsSet params) + public CanEnchantAttributeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java index c14f1ffe64..2908994776 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanMountForEventSkillCondition implements ISkillCondition { - public CanMountForEventSkillCondition(StatsSet params) + public CanMountForEventSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java index d07aa9a622..9dc5f99592 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShipInstance; @@ -31,7 +31,7 @@ public class CanRefuelAirshipSkillCondition implements ISkillCondition { private final int _amount; - public CanRefuelAirshipSkillCondition(StatsSet params) + public CanRefuelAirshipSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java index d451f3c997..67206b47bd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanRestoreVitalPointSkillCondition implements ISkillCondition { - public CanRestoreVitalPointSkillCondition(StatsSet params) + public CanRestoreVitalPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java index 7e519025b0..49232af88f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CanSummonCubicSkillCondition implements ISkillCondition { - public CanSummonCubicSkillCondition(StatsSet params) + public CanSummonCubicSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java index 8b550d164c..33541e82a8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class CanSummonMultiSkillCondition implements ISkillCondition { private final int _summonPoints; - public CanSummonMultiSkillCondition(StatsSet params) + public CanSummonMultiSkillCondition(StatSet params) { _summonPoints = params.getInt("summonPoints"); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java index aa9579e92a..b06ba00f32 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.CharSummonTable; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; */ public class CanSummonPetSkillCondition implements ISkillCondition { - public CanSummonPetSkillCondition(StatsSet params) + public CanSummonPetSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java index ea41a2e22e..3655e158cb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanSummonSiegeGolemSkillCondition implements ISkillCondition { - public CanSummonSiegeGolemSkillCondition(StatsSet params) + public CanSummonSiegeGolemSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java index 460d72a743..e07ce75c8f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanSummonSkillCondition implements ISkillCondition { - public CanSummonSkillCondition(StatsSet params) + public CanSummonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java index 309da529c9..bd8838d02f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanTransformInDominionSkillCondition implements ISkillCondition { - public CanTransformInDominionSkillCondition(StatsSet params) + public CanTransformInDominionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java index 81297944f1..2f4d780cab 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class CanTransformSkillCondition implements ISkillCondition // TODO: What to do with this? // private final int _transformId; - public CanTransformSkillCondition(StatsSet params) + public CanTransformSkillCondition(StatSet params) { // _transformId = params.getInt("transformId"); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java index 800d0375be..771873a553 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanUntransformSkillCondition implements ISkillCondition { - public CanUntransformSkillCondition(StatsSet params) + public CanUntransformSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java index e651b3b1d5..ffe2e4a026 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class CanUseInBattlefieldSkillCondition implements ISkillCondition { - public CanUseInBattlefieldSkillCondition(StatsSet params) + public CanUseInBattlefieldSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java index 5ff751abce..ba030b97a4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanUseInDragonLairSkillCondition implements ISkillCondition { - public CanUseInDragonLairSkillCondition(StatsSet params) + public CanUseInDragonLairSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java index 4d914c28fe..8a0cb18ac7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class CanUseSwoopCannonSkillCondition implements ISkillCondition { - public CanUseSwoopCannonSkillCondition(StatsSet params) + public CanUseSwoopCannonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java index 6a2d832a4c..e9996580fc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanUseVitalityConsumeItemSkillCondition implements ISkillCondition { - public CanUseVitalityConsumeItemSkillCondition(StatsSet params) + public CanUseVitalityConsumeItemSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java index f694956e7e..48dafb46c3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class CannotUseInTransformSkillCondition implements ISkillCondition { private final int _transformId; - public CannotUseInTransformSkillCondition(StatsSet params) + public CannotUseInTransformSkillCondition(StatSet params) { _transformId = params.getInt("transformId", -1); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java index 141c69322f..6591233504 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -32,7 +32,7 @@ public class CheckLevelSkillCondition implements ISkillCondition private final int _maxLevel; private final SkillConditionAffectType _affectType; - public CheckLevelSkillCondition(StatsSet params) + public CheckLevelSkillCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java index 15163a3373..d72f463c4e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class CheckSexSkillCondition implements ISkillCondition { private final boolean _isFemale; - public CheckSexSkillCondition(StatsSet params) + public CheckSexSkillCondition(StatSet params) { _isFemale = params.getBoolean("isFemale"); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java index 8dee11ef9c..12e49c23a7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConsumeBodySkillCondition implements ISkillCondition { - public ConsumeBodySkillCondition(StatsSet params) + public ConsumeBodySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java index c24da9ebcd..ba1b1cdd5f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class EnergySavedSkillCondition implements ISkillCondition { private final int _amount; - public EnergySavedSkillCondition(StatsSet params) + public EnergySavedSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 192f3487e2..cbaf72bb00 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -35,7 +35,7 @@ public class EquipArmorSkillCondition implements ISkillCondition { private int _armorTypesMask = 0; - public EquipArmorSkillCondition(StatsSet params) + public EquipArmorSkillCondition(StatSet params) { final List armorTypes = params.getEnumList("armorType", ArmorType.class); if (armorTypes != null) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index e5f22008fa..708b4dd1d4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class EquipShieldSkillCondition implements ISkillCondition { - public EquipShieldSkillCondition(StatsSet params) + public EquipShieldSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 4561945254..f733f81f62 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -33,7 +33,7 @@ public class EquipWeaponSkillCondition implements ISkillCondition { private int _weaponTypesMask = 0; - public EquipWeaponSkillCondition(StatsSet params) + public EquipWeaponSkillCondition(StatSet params) { final List weaponTypes = params.getEnumList("weaponType", WeaponType.class); if (weaponTypes != null) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java index 5f77215218..e36c06fa11 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class NotFearedSkillCondition implements ISkillCondition { - public NotFearedSkillCondition(StatsSet params) + public NotFearedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java index b9096cc1a9..b6e7bcd826 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class NotInUnderwaterSkillCondition implements ISkillCondition { - public NotInUnderwaterSkillCondition(StatsSet params) + public NotInUnderwaterSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index eee6ec73e9..18d8dc8a11 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -35,7 +35,7 @@ public class Op2hWeaponSkillCondition implements ISkillCondition { private final List _weaponTypes = new ArrayList<>(); - public Op2hWeaponSkillCondition(StatsSet params) + public Op2hWeaponSkillCondition(StatSet params) { final List weaponTypes = params.getList("weaponType", String.class); if (weaponTypes != null) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 3b91f36fe4..6223172dbc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; - public OpAffectedBySkillSkillCondition(StatsSet params) + public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java index 2eb561291e..3818df4736 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAgathionEnergySkillCondition implements ISkillCondition { - public OpAgathionEnergySkillCondition(StatsSet params) + public OpAgathionEnergySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java index 76a7ebc5a8..ee2b415021 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.enums.SkillConditionAlignment; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -32,7 +32,7 @@ public class OpAlignmentSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final SkillConditionAlignment _alignment; - public OpAlignmentSkillCondition(StatsSet params) + public OpAlignmentSkillCondition(StatSet params) { _affectType = params.getEnum("affectType", SkillConditionAffectType.class); _alignment = params.getEnum("alignment", SkillConditionAlignment.class); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index 1c83d18f4e..bcc6715bb2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -33,7 +33,7 @@ public class OpBlinkSkillCondition implements ISkillCondition private final int _angle; private final int _range; - public OpBlinkSkillCondition(StatsSet params) + public OpBlinkSkillCondition(StatSet params) { switch (params.getEnum("direction", Position.class)) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java index 5215f86ae6..fde0c7f0f8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpCallPcSkillCondition implements ISkillCondition { - public OpCallPcSkillCondition(StatsSet params) + public OpCallPcSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java index dddafec6f0..1de2a32550 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCanEscapeSkillCondition implements ISkillCondition { - public OpCanEscapeSkillCondition(StatsSet params) + public OpCanEscapeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java index 3f1685a1e0..a87fd8adb6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCanNotUseAirshipSkillCondition implements ISkillCondition { - public OpCanNotUseAirshipSkillCondition(StatsSet params) + public OpCanNotUseAirshipSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java index 8eec19a568..ac7a81c015 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCannotUseTargetWithPrivateStoreSkillCondition implements ISkillCondition { - public OpCannotUseTargetWithPrivateStoreSkillCondition(StatsSet params) + public OpCannotUseTargetWithPrivateStoreSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 91de0adc8c..4030b79d00 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Weapon; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpChangeWeaponSkillCondition implements ISkillCondition { - public OpChangeWeaponSkillCondition(StatsSet params) + public OpChangeWeaponSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java index c2de03de1e..3e304e7d9d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.AbnormalType; @@ -34,7 +34,7 @@ public class OpCheckAbnormalSkillCondition implements ISkillCondition private final boolean _hasAbnormal; private final SkillConditionAffectType _affectType; - public OpCheckAbnormalSkillCondition(StatsSet params) + public OpCheckAbnormalSkillCondition(StatSet params) { _type = params.getEnum("type", AbnormalType.class); _level = params.getInt("level"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java index 65084182b1..c70b58dc50 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCheckAccountTypeSkillCondition implements ISkillCondition { - public OpCheckAccountTypeSkillCondition(StatsSet params) + public OpCheckAccountTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java index 3d4f0a58a0..11eb804274 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpCheckCastRangeSkillCondition implements ISkillCondition { private final int _distance; - public OpCheckCastRangeSkillCondition(StatsSet params) + public OpCheckCastRangeSkillCondition(StatSet params) { _distance = params.getInt("distance"); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java index 7e2e391595..03af1ac63d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.ClassId; @@ -35,7 +35,7 @@ public class OpCheckClassListSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final boolean _isWithin; - public OpCheckClassListSkillCondition(StatsSet params) + public OpCheckClassListSkillCondition(StatSet params) { _classIds = params.getEnumList("classIds", ClassId.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java index 9f779f937a..9702804304 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.ClassId; @@ -33,7 +33,7 @@ public class OpCheckClassSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final boolean _isWithin; - public OpCheckClassSkillCondition(StatsSet params) + public OpCheckClassSkillCondition(StatSet params) { _classId = params.getEnum("classId", ClassId.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java index 3bf6b65dc8..ad997dced7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckCrtEffectSkillCondition implements ISkillCondition { - public OpCheckCrtEffectSkillCondition(StatsSet params) + public OpCheckCrtEffectSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java index 144dc95daa..1d5a3adff9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class OpCheckFlagSkillCondition implements ISkillCondition { - public OpCheckFlagSkillCondition(StatsSet params) + public OpCheckFlagSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java index 75af2ab89a..2e0c07d040 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckOnGoingEventCampaignSkillCondition implements ISkillCondition { - public OpCheckOnGoingEventCampaignSkillCondition(StatsSet params) + public OpCheckOnGoingEventCampaignSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java index c64f7c6722..f11569f43c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckPcbangPointSkillCondition implements ISkillCondition { - public OpCheckPcbangPointSkillCondition(StatsSet params) + public OpCheckPcbangPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java index 252519f7ff..997a4d0fec 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.data.xml.impl.ClanHallData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -35,7 +35,7 @@ public class OpCheckResidenceSkillCondition implements ISkillCondition private final List _residencesId; private final boolean _isWithin; - public OpCheckResidenceSkillCondition(StatsSet params) + public OpCheckResidenceSkillCondition(StatSet params) { _residencesId = params.getList("residencesId", Integer.class); _isWithin = params.getBoolean("isWithin"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java index 6abeed7d35..3a1bcf424c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -34,7 +34,7 @@ public class OpCheckSkillListSkillCondition implements ISkillCondition private final List _skillIds; private final SkillConditionAffectType _affectType; - public OpCheckSkillListSkillCondition(StatsSet params) + public OpCheckSkillListSkillCondition(StatSet params) { _skillIds = params.getList("skillIds", Integer.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java index 984338b2c0..af563d983f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpCheckSkillSkillCondition implements ISkillCondition private final int _skillId; private final SkillConditionAffectType _affectType; - public OpCheckSkillSkillCondition(StatsSet params) + public OpCheckSkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java index ea882c3635..5d85a2dbdb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionCompanionType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpCompanionSkillCondition implements ISkillCondition { private final SkillConditionCompanionType _type; - public OpCompanionSkillCondition(StatsSet params) + public OpCompanionSkillCondition(StatSet params) { _type = params.getEnum("type", SkillConditionCompanionType.class); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java index 069b9d1759..464853c00c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpEnchantRangeSkillCondition implements ISkillCondition { - public OpEnchantRangeSkillCondition(StatsSet params) + public OpEnchantRangeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java index 99f22bb16a..e12f3ae007 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class OpEncumberedSkillCondition implements ISkillCondition private final int _slotsPercent; private final int _weightPercent; - public OpEncumberedSkillCondition(StatsSet params) + public OpEncumberedSkillCondition(StatSet params) { _slotsPercent = params.getInt("slotsPercent"); _weightPercent = params.getInt("weightPercent"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java index 187dfba744..49cf8e2cb8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpEnergyMaxSkillCondition implements ISkillCondition { private final int _amount; - public OpEnergyMaxSkillCondition(StatsSet params) + public OpEnergyMaxSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 75bdf465e0..82eb70b770 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class OpEquipItemSkillCondition implements ISkillCondition private final int _itemId; private final SkillConditionAffectType _affectType; - public OpEquipItemSkillCondition(StatsSet params) + public OpEquipItemSkillCondition(StatSet params) { _itemId = params.getInt("itemId"); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java index 2c4576c2fa..fa6e82082b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ public class OpExistNpcSkillCondition implements ISkillCondition private final int _range; private final boolean _isAround; - public OpExistNpcSkillCondition(StatsSet params) + public OpExistNpcSkillCondition(StatSet params) { _npcIds = params.getList("npcIds", Integer.class); _range = params.getInt("range"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java index 27cc3e90a9..8299b40047 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingCastSkillCondition implements ISkillCondition { - public OpFishingCastSkillCondition(StatsSet params) + public OpFishingCastSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java index 84cc031a24..4b43eb834e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingPumpingSkillCondition implements ISkillCondition { - public OpFishingPumpingSkillCondition(StatsSet params) + public OpFishingPumpingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java index 86aa667bee..a6a400f96f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingReelingSkillCondition implements ISkillCondition { - public OpFishingReelingSkillCondition(StatsSet params) + public OpFishingReelingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java index d22733df7e..50e6dafb82 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpHaveSummonSkillCondition implements ISkillCondition { - public OpHaveSummonSkillCondition(StatsSet params) + public OpHaveSummonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 2e854ca2b8..cceb4e937b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { private final int _npcId; - public OpHaveSummonedNpcSkillCondition(StatsSet params) + public OpHaveSummonedNpcSkillCondition(StatSet params) { _npcId = params.getInt("npcId"); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java index 16932ce531..374a75bfab 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.impl.ClanHallData; import org.l2jmobius.gameserver.enums.ResidenceType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -34,7 +34,7 @@ public class OpHomeSkillCondition implements ISkillCondition { private final ResidenceType _type; - public OpHomeSkillCondition(StatsSet params) + public OpHomeSkillCondition(StatSet params) { _type = params.getEnum("type", ResidenceType.class); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java index 9482a0bf55..62ad48bdcc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpInSiegeTimeSkillCondition implements ISkillCondition { - public OpInSiegeTimeSkillCondition(StatsSet params) + public OpInSiegeTimeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java index 1bffdacd6c..f2fb298398 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -30,7 +30,7 @@ public class OpInstantzoneSkillCondition implements ISkillCondition { private final int _instanceId; - public OpInstantzoneSkillCondition(StatsSet params) + public OpInstantzoneSkillCondition(StatSet params) { _instanceId = params.getInt("instanceId"); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java index 76703cc53b..7418ef9b64 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpMainjobSkillCondition implements ISkillCondition { - public OpMainjobSkillCondition(StatsSet params) + public OpMainjobSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java index d4c9f1f331..3c81369bbb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNeedAgathionSkillCondition implements ISkillCondition { - public OpNeedAgathionSkillCondition(StatsSet params) + public OpNeedAgathionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java index 96f6774f25..e7a477b0ee 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; @@ -34,7 +34,7 @@ public class OpNeedSummonOrPetSkillCondition implements ISkillCondition { private final List _npcIds = new ArrayList<>(); - public OpNeedSummonOrPetSkillCondition(StatsSet params) + public OpNeedSummonOrPetSkillCondition(StatSet params) { final List npcIds = params.getList("npcIds", String.class); if (npcIds != null) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java index 9701002065..ae1edfd719 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotCursedSkillCondition implements ISkillCondition { - public OpNotCursedSkillCondition(StatsSet params) + public OpNotCursedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java index bf909425d8..1de79f388a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpNotInPeacezoneSkillCondition implements ISkillCondition { - public OpNotInPeacezoneSkillCondition(StatsSet params) + public OpNotInPeacezoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java index 0752ba4a6a..0d3e4cb4dd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotInstantzoneSkillCondition implements ISkillCondition { - public OpNotInstantzoneSkillCondition(StatsSet params) + public OpNotInstantzoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java index 45891cd0ac..7ea02159ba 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotOlympiadSkillCondition implements ISkillCondition { - public OpNotOlympiadSkillCondition(StatsSet params) + public OpNotOlympiadSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java index 5c5d293ae8..2397a68e99 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpNotTerritorySkillCondition implements ISkillCondition { - public OpNotTerritorySkillCondition(StatsSet params) + public OpNotTerritorySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java index 874872bb2e..d9f8c1fa3b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpPeacezoneSkillCondition implements ISkillCondition { - public OpPeacezoneSkillCondition(StatsSet params) + public OpPeacezoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java index c20c4665bb..08d6bb095a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpPkcountSkillCondition implements ISkillCondition { private final SkillConditionAffectType _affectType; - public OpPkcountSkillCondition(StatsSet params) + public OpPkcountSkillCondition(StatSet params) { _affectType = params.getEnum("affectType", SkillConditionAffectType.class); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java index 879fc88c4c..d393c5ddc3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -30,7 +30,7 @@ public class OpPledgeSkillCondition implements ISkillCondition { private final int _level; - public OpPledgeSkillCondition(StatsSet params) + public OpPledgeSkillCondition(StatSet params) { _level = params.getInt("level"); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java index 9adc89b98d..adf16f8feb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpRestartPointSkillCondition implements ISkillCondition { - public OpRestartPointSkillCondition(StatsSet params) + public OpRestartPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java index bbd1d9d7d1..6874091ba2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class OpResurrectionSkillCondition implements ISkillCondition { - public OpResurrectionSkillCondition(StatsSet params) + public OpResurrectionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java index 8bbf796ad2..566f935a50 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpSiegeHammerSkillCondition implements ISkillCondition { - public OpSiegeHammerSkillCondition(StatsSet params) + public OpSiegeHammerSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java index be3ad18e05..cbfc1a25b2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition private final int _skillId; private final boolean _hasLearned; - public OpSkillAcquireSkillCondition(StatsSet params) + public OpSkillAcquireSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _hasLearned = params.getBoolean("hasLearned"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java index c8789d28e4..a8382b83b3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpSkillSkillCondition implements ISkillCondition private final int _skillLevel; private final boolean _hasLearned; - public OpSkillSkillCondition(StatsSet params) + public OpSkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _skillLevel = params.getInt("skillLevel"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java index 5127071683..a3d188f3eb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpSocialClassSkillCondition implements ISkillCondition { private final int _socialClass; - public OpSocialClassSkillCondition(StatsSet params) + public OpSocialClassSkillCondition(StatSet params) { _socialClass = params.getInt("socialClass"); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java index b9d37d18c0..c86984a218 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class OpSoulMaxSkillCondition implements ISkillCondition { - public OpSoulMaxSkillCondition(StatsSet params) + public OpSoulMaxSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java index 4780c13a58..0faa676bbe 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpSubjobSkillCondition implements ISkillCondition { - public OpSubjobSkillCondition(StatsSet params) + public OpSubjobSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java index 17a9a1a9e3..a14192847a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.concurrent.atomic.AtomicBoolean; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpSweeperSkillCondition implements ISkillCondition { - public OpSweeperSkillCondition(StatsSet params) + public OpSweeperSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java index b36585bf00..c4b3923e92 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTargetAllItemTypeSkillCondition implements ISkillCondition { - public OpTargetAllItemTypeSkillCondition(StatsSet params) + public OpTargetAllItemTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 6b85389d62..5492e96e1a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTargetArmorTypeSkillCondition implements ISkillCondition { - public OpTargetArmorTypeSkillCondition(StatsSet params) + public OpTargetArmorTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java index 0c0090fbc4..97e07a1822 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpTargetDoorSkillCondition implements ISkillCondition { private final List _doorIds; - public OpTargetDoorSkillCondition(StatsSet params) + public OpTargetDoorSkillCondition(StatSet params) { _doorIds = params.getList("doorIds", Integer.class); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java index 6fbc3cda10..eaabf4a73d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpTargetMyPledgeAcademySkillCondition implements ISkillCondition { - public OpTargetMyPledgeAcademySkillCondition(StatsSet params) + public OpTargetMyPledgeAcademySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java index d5820600dd..14a744613d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpTargetNpcSkillCondition implements ISkillCondition { private final List _npcId; - public OpTargetNpcSkillCondition(StatsSet params) + public OpTargetNpcSkillCondition(StatSet params) { _npcId = params.getList("npcIds", Integer.class); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java index 854225a75a..b0c5e50ae3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpTargetPcSkillCondition implements ISkillCondition { - public OpTargetPcSkillCondition(StatsSet params) + public OpTargetPcSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index 7faecb2ffd..62fd4b365f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Weapon; @@ -34,7 +34,7 @@ public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition { private final List _weaponTypes = new ArrayList<>(); - public OpTargetWeaponAttackTypeSkillCondition(StatsSet params) + public OpTargetWeaponAttackTypeSkillCondition(StatSet params) { final List weaponTypes = params.getList("weaponType", String.class); if (weaponTypes != null) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java index 8451365885..e114c03412 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTerritorySkillCondition implements ISkillCondition { - public OpTerritorySkillCondition(StatsSet params) + public OpTerritorySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java index 13f287687e..fde1293086 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpUnlockSkillCondition implements ISkillCondition { - public OpUnlockSkillCondition(StatsSet params) + public OpUnlockSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java index 8cc76a34bb..46dea5bbcb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpUseFirecrackerSkillCondition implements ISkillCondition { - public OpUseFirecrackerSkillCondition(StatsSet params) + public OpUseFirecrackerSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java index f3b54bbad7..651dade274 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpUsePraseedSkillCondition implements ISkillCondition { - public OpUsePraseedSkillCondition(StatsSet params) + public OpUsePraseedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java index 890b0fcd5f..dd57df0e13 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.MountType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpWyvernSkillCondition implements ISkillCondition { - public OpWyvernSkillCondition(StatsSet params) + public OpWyvernSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java index 49085b6674..8590262afc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class PossessHolythingSkillCondition implements ISkillCondition { - public PossessHolythingSkillCondition(StatsSet params) + public PossessHolythingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java index 8b0fb55554..38b5644fb1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class RemainCpPerSkillCondition implements ISkillCondition private final int _amount; private final SkillConditionPercentType _percentType; - public RemainCpPerSkillCondition(StatsSet params) + public RemainCpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java index 612367a233..1ad96100ad 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -33,7 +33,7 @@ public class RemainHpPerSkillCondition implements ISkillCondition private final SkillConditionPercentType _percentType; private final SkillConditionAffectType _affectType; - public RemainHpPerSkillCondition(StatsSet params) + public RemainHpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java index 5455c1587a..39085349d9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class RemainMpPerSkillCondition implements ISkillCondition private final int _amount; private final SkillConditionPercentType _percentType; - public RemainMpPerSkillCondition(StatsSet params) + public RemainMpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java index 7de47f103f..6e9e5ad821 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class SoulSavedSkillCondition implements ISkillCondition { private final int _amount; - public SoulSavedSkillCondition(StatsSet params) + public SoulSavedSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java index 0b75a5a623..f4bdbaaecb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class TargetItemCrystalTypeSkillCondition implements ISkillCondition { - public TargetItemCrystalTypeSkillCondition(StatsSet params) + public TargetItemCrystalTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java index 51502ff209..604a41f904 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.MentorManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMyMenteeSkillCondition implements ISkillCondition { - public TargetMyMenteeSkillCondition(StatsSet params) + public TargetMyMenteeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java index fc621365a9..4bfb496634 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class TargetMyPartySkillCondition implements ISkillCondition { private final boolean _includeMe; - public TargetMyPartySkillCondition(StatsSet params) + public TargetMyPartySkillCondition(StatSet params) { _includeMe = params.getBoolean("includeMe"); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java index 9ebec0e691..d44a1bc8a9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMyPledgeSkillCondition implements ISkillCondition { - public TargetMyPledgeSkillCondition(StatsSet params) + public TargetMyPledgeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java index f4da8d6079..5045aa3848 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class TargetRaceSkillCondition implements ISkillCondition { private final Race _race; - public TargetRaceSkillCondition(StatsSet params) + public TargetRaceSkillCondition(StatSet params) { _race = params.getEnum("race", Race.class); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java index b1d0ec8553..7e9236b634 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.ActionDataHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -57,7 +57,7 @@ public class ActionData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "action", actionNode -> { - final ActionDataHolder holder = new ActionDataHolder(new StatsSet(parseAttributes(actionNode))); + final ActionDataHolder holder = new ActionDataHolder(new StatSet(parseAttributes(actionNode))); _actionData.put(holder.getId(), holder); })); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java index 36002572b0..f7762ab07b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java @@ -32,7 +32,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.AdminCommandAccessRight; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -72,7 +72,7 @@ public class AdminData implements IXmlReader { NamedNodeMap attrs; Node attr; - StatsSet set; + StatSet set; AccessLevel level; AdminCommandAccessRight command; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -83,7 +83,7 @@ public class AdminData implements IXmlReader { if ("access".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -99,7 +99,7 @@ public class AdminData implements IXmlReader } else if ("admin".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index 6d25769eab..817f0cabde 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; @@ -83,7 +83,7 @@ public class AppearanceItemData implements IXmlReader { if ("appearance_stone".equalsIgnoreCase(d.getNodeName())) { - final AppearanceStone stone = new AppearanceStone(new StatsSet(parseAttributes(d))); + final AppearanceStone stone = new AppearanceStone(new StatSet(parseAttributes(d))); for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) { switch (c.getNodeName()) @@ -120,7 +120,7 @@ public class AppearanceItemData implements IXmlReader } case "visual": { - stone.addVisualId(new AppearanceHolder(new StatsSet(parseAttributes(c)))); + stone.addVisualId(new AppearanceHolder(new StatSet(parseAttributes(c)))); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java index 6c96d3874a..6eac3240e7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -64,7 +64,7 @@ public class AttendanceRewardData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "item", rewardNode -> { - final StatsSet set = new StatsSet(parseAttributes(rewardNode)); + final StatSet set = new StatSet(parseAttributes(rewardNode)); final int itemId = set.getInt("id"); final int itemCount = set.getInt("count"); if (ItemTable.getInstance().getTemplate(itemId) == null) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java index 891d19fcf2..3054b0e7ef 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.beautyshop.BeautyData; import org.l2jmobius.gameserver.model.beautyshop.BeautyItem; @@ -56,7 +56,7 @@ public class BeautyShopData implements IXmlReader public void parseDocument(Document doc, File f) { NamedNodeMap attrs; - StatsSet set; + StatSet set; Node att; Race race = null; Sex sex = null; @@ -92,7 +92,7 @@ public class BeautyShopData implements IXmlReader if ("hair".equalsIgnoreCase(a.getNodeName())) { attrs = a.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -105,7 +105,7 @@ public class BeautyShopData implements IXmlReader if ("color".equalsIgnoreCase(g.getNodeName())) { attrs = g.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -119,7 +119,7 @@ public class BeautyShopData implements IXmlReader else if ("face".equalsIgnoreCase(a.getNodeName())) { attrs = a.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java index 37e977c51e..530a5d975a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java @@ -34,7 +34,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.entity.ClanHall; @@ -66,7 +66,7 @@ public class ClanHallData implements IXmlReader final List doors = new ArrayList<>(); final List npcs = new ArrayList<>(); final List teleports = new ArrayList<>(); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); for (Node listNode = doc.getFirstChild(); listNode != null; listNode = listNode.getNextSibling()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java index ae608cefb6..f1a23734e0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.combination.CombinationItem; import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; @@ -57,7 +57,7 @@ public class CombinationItemsData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "item", itemNode -> { - final CombinationItem item = new CombinationItem(new StatsSet(parseAttributes(itemNode))); + final CombinationItem item = new CombinationItem(new StatSet(parseAttributes(itemNode))); forEach(itemNode, "reward", rewardNode -> { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java index 038738b138..4af039b48d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.CubicSkill; import org.l2jmobius.gameserver.model.cubic.ICubicConditionHolder; @@ -61,7 +61,7 @@ public class CubicData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - forEach(doc, "list", listNode -> forEach(listNode, "cubic", cubicNode -> parseTemplate(cubicNode, new CubicTemplate(new StatsSet(parseAttributes(cubicNode)))))); + forEach(doc, "list", listNode -> forEach(listNode, "cubic", cubicNode -> parseTemplate(cubicNode, new CubicTemplate(new StatSet(parseAttributes(cubicNode)))))); } /** @@ -137,7 +137,7 @@ public class CubicData implements IXmlReader { forEach(cubicNode, "skill", skillNode -> { - final CubicSkill skill = new CubicSkill(new StatsSet(parseAttributes(skillNode))); + final CubicSkill skill = new CubicSkill(new StatSet(parseAttributes(skillNode))); forEach(cubicNode, "conditions", conditionNode -> parseConditions(cubicNode, template, skill)); template.getSkills().add(skill); }); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java index 3d19bee079..ede9b72202 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -62,7 +62,7 @@ public class DailyMissionData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "reward", rewardNode -> { - final StatsSet set = new StatsSet(parseAttributes(rewardNode)); + final StatSet set = new StatSet(parseAttributes(rewardNode)); final List items = new ArrayList<>(1); forEach(rewardNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> @@ -80,14 +80,14 @@ public class DailyMissionData implements IXmlReader // Initial values in case handler doesn't exists set.set("handler", ""); - set.set("params", StatsSet.EMPTY_STATSET); + set.set("params", StatSet.EMPTY_STATSET); // Parse handler and parameters forEach(rewardNode, "handler", handlerNode -> { set.set("handler", parseString(handlerNode.getAttributes(), "name")); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); set.set("params", params); forEach(handlerNode, "param", paramNode -> params.set(parseString(paramNode.getAttributes(), "name"), paramNode.getTextContent())); }); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java index 835eab4fe9..53248de524 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java @@ -35,7 +35,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -51,7 +51,7 @@ public class DoorData implements IXmlReader // Info holders private final Map> _groups = new HashMap<>(); private final Map _doors = new HashMap<>(); - private final Map _templates = new HashMap<>(); + private final Map _templates = new HashMap<>(); private final Map> _regions = new HashMap<>(); protected DoorData() @@ -75,9 +75,9 @@ public class DoorData implements IXmlReader LOGGER.info(getClass().getSimpleName() + ": Loaded " + _doors.size() + " Door Templates for " + _regions.size() + " regions."); } - public StatsSet parseDoor(Node doorNode) + public StatSet parseDoor(Node doorNode) { - final StatsSet params = new StatsSet(parseAttributes(doorNode)); + final StatSet params = new StatSet(parseAttributes(doorNode)); params.set("baseHpMax", 1); // Avoid doors without HP value created dead due to default value 0 in CreatureTemplate forEach(doorNode, IXmlReader::isNode, innerDoorNode -> @@ -115,7 +115,7 @@ public class DoorData implements IXmlReader /** * @param set */ - private void applyCollisions(StatsSet set) + private void applyCollisions(StatSet set) { // Insert Collision data if (set.contains("nodeX_0") && set.contains("nodeY_0") && set.contains("nodeX_1") && set.contains("nodeY_1")) @@ -142,7 +142,7 @@ public class DoorData implements IXmlReader * @param set * @return */ - public DoorInstance spawnDoor(StatsSet set) + public DoorInstance spawnDoor(StatSet set) { // Create door template + door instance final DoorTemplate template = new DoorTemplate(set); @@ -183,7 +183,7 @@ public class DoorData implements IXmlReader return door; } - public StatsSet getDoorTemplate(int doorId) + public StatSet getDoorTemplate(int doorId) { return _templates.get(doorId); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java index eca42a9a34..637ef1e953 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -64,7 +64,7 @@ public class EnchantItemData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node att; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -76,7 +76,7 @@ public class EnchantItemData implements IXmlReader if ("enchant".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -107,7 +107,7 @@ public class EnchantItemData implements IXmlReader else if ("support".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java index 46701fd777..bb1e8026b7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.SkillEnchantType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.EnchantSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -69,10 +69,10 @@ public class EnchantSkillGroupsData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "enchant", enchantNode -> { - final EnchantSkillHolder enchantSkillHolder = new EnchantSkillHolder(new StatsSet(parseAttributes(enchantNode))); + final EnchantSkillHolder enchantSkillHolder = new EnchantSkillHolder(new StatSet(parseAttributes(enchantNode))); forEach(enchantNode, "sps", spsNode -> forEach(spsNode, "sp", spNode -> enchantSkillHolder.addSp(parseEnum(spNode.getAttributes(), SkillEnchantType.class, "type"), parseInteger(spNode.getAttributes(), "amount")))); forEach(enchantNode, "chances", chancesNode -> forEach(chancesNode, "chance", chanceNode -> enchantSkillHolder.addChance(parseEnum(chanceNode.getAttributes(), SkillEnchantType.class, "type"), parseInteger(chanceNode.getAttributes(), "value")))); - forEach(enchantNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> enchantSkillHolder.addRequiredItem(parseEnum(itemNode.getAttributes(), SkillEnchantType.class, "type"), new ItemHolder(new StatsSet(parseAttributes(itemNode)))))); + forEach(enchantNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> enchantSkillHolder.addRequiredItem(parseEnum(itemNode.getAttributes(), SkillEnchantType.class, "type"), new ItemHolder(new StatSet(parseAttributes(itemNode)))))); _enchantSkillHolders.put(parseInteger(enchantNode.getAttributes(), "level"), enchantSkillHolder); })); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java index a8bb0397ac..037af7e1ae 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java @@ -34,7 +34,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.eventengine.AbstractEventManager; import org.l2jmobius.gameserver.model.eventengine.EventMethodNotification; import org.l2jmobius.gameserver.model.eventengine.EventScheduler; @@ -156,7 +156,7 @@ public class EventEngineData implements IXmlReader */ private void parseVariables(AbstractEventManager eventManager, Node innerNode) { - final StatsSet variables = new StatsSet(LinkedHashMap::new); + final StatSet variables = new StatSet(LinkedHashMap::new); for (Node variableNode = innerNode.getFirstChild(); variableNode != null; variableNode = variableNode.getNextSibling()) { if ("variable".equals(variableNode.getNodeName())) @@ -188,7 +188,7 @@ public class EventEngineData implements IXmlReader { if ("schedule".equals(scheduleNode.getNodeName())) { - final StatsSet params = new StatsSet(LinkedHashMap::new); + final StatSet params = new StatSet(LinkedHashMap::new); final NamedNodeMap attrs = scheduleNode.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -235,7 +235,7 @@ public class EventEngineData implements IXmlReader } else if ("conditionalSchedule".equals(scheduleNode.getNodeName())) { - final StatsSet params = new StatsSet(LinkedHashMap::new); + final StatSet params = new StatSet(LinkedHashMap::new); final NamedNodeMap attrs = scheduleNode.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -346,7 +346,7 @@ public class EventEngineData implements IXmlReader * @param variableNode */ @SuppressWarnings("unchecked") - private void parseListVariables(AbstractEventManager eventManager, StatsSet variables, Node variableNode) + private void parseListVariables(AbstractEventManager eventManager, StatSet variables, Node variableNode) { final String name = parseString(variableNode.getAttributes(), "name"); final String type = parseString(variableNode.getAttributes(), "type"); @@ -419,7 +419,7 @@ public class EventEngineData implements IXmlReader * @param variableNode */ @SuppressWarnings("unchecked") - private void parseMapVariables(AbstractEventManager eventManager, StatsSet variables, Node variableNode) + private void parseMapVariables(AbstractEventManager eventManager, StatSet variables, Node variableNode) { final String name = parseString(variableNode.getAttributes(), "name"); final String keyType = parseString(variableNode.getAttributes(), "keyType"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java index db19c5fdff..0724877d9d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.ConditionHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.ICondition; import org.l2jmobius.gameserver.model.holders.ExtendDropDataHolder; import org.l2jmobius.gameserver.model.holders.ExtendDropItemHolder; @@ -62,7 +62,7 @@ public class ExtendDropData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "drop", dropNode -> { - final StatsSet set = new StatsSet(parseAttributes(dropNode)); + final StatSet set = new StatSet(parseAttributes(dropNode)); final List items = new ArrayList<>(1); forEach(dropNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> @@ -80,8 +80,8 @@ public class ExtendDropData implements IXmlReader forEach(dropNode, "conditions", conditionsNode -> forEach(conditionsNode, "condition", conditionNode -> { final String conditionName = parseString(conditionNode.getAttributes(), "name"); - final StatsSet params = (StatsSet) parseValue(conditionNode); - final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); + final StatSet params = (StatSet) parseValue(conditionNode); + final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); if (conditionFunction != null) { conditions.add(conditionFunction.apply(params)); @@ -109,7 +109,7 @@ public class ExtendDropData implements IXmlReader private Object parseValue(Node node) { - StatsSet statsSet = null; + StatSet statSet = null; List list = null; Object text = null; for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) @@ -145,12 +145,12 @@ public class ExtendDropData implements IXmlReader final Object value = parseValue(node); if (value != null) { - if (statsSet == null) + if (statSet == null) { - statsSet = new StatsSet(); + statSet = new StatSet(); } - statsSet.set(nodeName, value); + statSet.set(nodeName, value); } } } @@ -161,9 +161,9 @@ public class ExtendDropData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", list); + statSet.set(".", list); } else { @@ -176,16 +176,16 @@ public class ExtendDropData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", text); + statSet.set(".", text); } else { return text; } } - return statsSet; + return statSet; } public ExtendDropDataHolder getExtendDropById(int id) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java index 57a16d6390..608f4702b8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.FakePlayerHolder; @@ -72,7 +72,7 @@ public class FakePlayerData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayer", fakePlayerNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerNode)); final int npcId = set.getInt("npcId"); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); final String name = template.getName(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java index 18cc499b71..a5ade27c03 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.FenceState; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldRegion; import org.l2jmobius.gameserver.model.actor.instance.FenceInstance; @@ -79,7 +79,7 @@ public class FenceData implements IXmlReader private void spawnFence(Node fenceNode) { - final StatsSet set = new StatsSet(parseAttributes(fenceNode)); + final StatSet set = new StatSet(parseAttributes(fenceNode)); spawnFence(set.getInt("x"), set.getInt("y"), set.getInt("z"), set.getString("name"), set.getInt("width"), set.getInt("length"), set.getInt("height"), 0, set.getEnum("state", FenceState.class, FenceState.CLOSED)); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java index 67dd4e396b..02efb756f2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.Henna; import org.l2jmobius.gameserver.model.skills.Skill; @@ -86,7 +86,7 @@ public class HennaData implements IXmlReader */ private void parseHenna(Node d) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final List wearClassIds = new ArrayList<>(); final List skills = new ArrayList<>(); NamedNodeMap attrs = d.getAttributes(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java index 03ad8ab79e..d81e85948d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; @@ -93,7 +93,7 @@ public class InitialEquipmentData implements IXmlReader { if ("item".equalsIgnoreCase(c.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java index 72080aa4ac..54b1909d60 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemPointHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; @@ -55,17 +55,17 @@ public class LuckyGameData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "luckygame", rewardNode -> { - final LuckyGameDataHolder holder = new LuckyGameDataHolder(new StatsSet(parseAttributes(rewardNode))); + final LuckyGameDataHolder holder = new LuckyGameDataHolder(new StatSet(parseAttributes(rewardNode))); forEach(rewardNode, "common_reward", commonRewardNode -> forEach(commonRewardNode, "item", itemNode -> { - final StatsSet stats = new StatsSet(parseAttributes(itemNode)); + final StatSet stats = new StatSet(parseAttributes(itemNode)); holder.addCommonReward(new ItemChanceHolder(stats.getInt("id"), stats.getDouble("chance"), stats.getLong("count"))); })); forEach(rewardNode, "unique_reward", uniqueRewardNode -> forEach(uniqueRewardNode, "item", itemNode -> { - holder.addUniqueReward(new ItemPointHolder(new StatsSet(parseAttributes(itemNode)))); + holder.addUniqueReward(new ItemPointHolder(new StatSet(parseAttributes(itemNode)))); })); forEach(rewardNode, "modify_reward", uniqueRewardNode -> @@ -74,7 +74,7 @@ public class LuckyGameData implements IXmlReader holder.setMaxModifyRewardGame(parseInteger(uniqueRewardNode.getAttributes(), "max_game")); forEach(uniqueRewardNode, "item", itemNode -> { - final StatsSet stats = new StatsSet(parseAttributes(itemNode)); + final StatSet stats = new StatSet(parseAttributes(itemNode)); holder.addModifyReward(new ItemChanceHolder(stats.getInt("id"), stats.getDouble("chance"), stats.getLong("count"))); }); }); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java index 75bb48ed37..190653cdec 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java @@ -35,7 +35,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.SpecialItemType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; @@ -90,7 +90,7 @@ public class MultisellData implements IXmlReader { forEach(doc, "list", listNode -> { - final StatsSet set = new StatsSet(parseAttributes(listNode)); + final StatSet set = new StatSet(parseAttributes(listNode)); final int listId = Integer.parseInt(f.getName().substring(0, f.getName().length() - 4)); final List entries = new ArrayList<>(listNode.getChildNodes().getLength()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java index 3a990d0145..bda5bbcf7f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.enums.AISkillScope; import org.l2jmobius.gameserver.enums.DropType; import org.l2jmobius.gameserver.enums.MpRewardAffectType; import org.l2jmobius.gameserver.enums.MpRewardType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.DropHolder; @@ -95,7 +95,7 @@ public class NpcData implements IXmlReader if ("npc".equalsIgnoreCase(listNode.getNodeName())) { NamedNodeMap attrs = listNode.getAttributes(); - final StatsSet set = new StatsSet(new HashMap<>()); + final StatSet set = new StatSet(new HashMap<>()); final int npcId = parseInteger(attrs, "id"); Map parameters = null; Map skills = null; @@ -514,11 +514,11 @@ public class NpcData implements IXmlReader if (parameters != null) { // Using unmodifiable map parameters of template are not meant to be changed at runtime. - template.setParameters(new StatsSet(Collections.unmodifiableMap(parameters))); + template.setParameters(new StatSet(Collections.unmodifiableMap(parameters))); } else { - template.setParameters(StatsSet.EMPTY_STATSET); + template.setParameters(StatSet.EMPTY_STATSET); } if (skills != null) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java index 3712cca6af..373f87ecfc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -79,7 +79,7 @@ public class NpcNameLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); NPC_NAME_LOCALISATIONS.get(_lang).put(set.getInt("id"), new String[] { set.getString("name"), diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 55dcd539aa..36c5897ecd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.EffectHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; @@ -71,7 +71,7 @@ public class OptionData implements IXmlReader forEach(innerNode, "effect", effectNode -> { final String name = parseString(effectNode.getAttributes(), "name"); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); forEach(effectNode, IXmlReader::isNode, paramNode -> params.set(paramNode.getNodeName(), SkillData.getInstance().parseValue(paramNode, true, false, Collections.emptyMap()))); option.addEffect(EffectHandler.getInstance().getHandlerFactory(name).apply(params)); }); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java index b1bb74baf6..c893725bc3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.PetLevelData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * This class parse and hold all pet parameters.
    @@ -116,7 +116,7 @@ public class PetDataTable implements IXmlReader if (s.getNodeName().equals("stat")) { final int level = Integer.parseInt(s.getAttributes().getNamedItem("level").getNodeValue()); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (Node bean = s.getFirstChild(); bean != null; bean = bean.getNextSibling()) { if (bean.getNodeName().equals("set")) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java index ab1cb3b257..b646782547 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.base.ClassId; @@ -83,7 +83,7 @@ public class PlayerTemplateData implements IXmlReader } else if ("staticData".equalsIgnoreCase(d.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.set("classId", classId); final List creationPoints = new ArrayList<>(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java index 34a04edd9b..35b879e73f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; @@ -83,7 +83,7 @@ public class PrimeShopData implements IXmlReader { NamedNodeMap attrs = d.getAttributes(); Node att; - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java index b7ed4c8fba..43e5d84784 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.RecipeInstance; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.RecipeStatInstance; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; /** @@ -82,7 +82,7 @@ public class RecipeData implements IXmlReader Node att; int id = -1; boolean haveRare = false; - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); att = attrs.getNamedItem("id"); if (att == null) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java index 796f5ae085..9a8397e085 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java @@ -29,7 +29,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate; /** @@ -60,7 +60,7 @@ public class ResidenceFunctionsData implements IXmlReader forEach(doc, "list", list -> forEach(list, "function", func -> { final NamedNodeMap attrs = func.getAttributes(); - final StatsSet set = new StatsSet(HashMap::new); + final StatSet set = new StatSet(HashMap::new); for (int i = 0; i < attrs.getLength(); i++) { final Node node = attrs.item(i); @@ -69,7 +69,7 @@ public class ResidenceFunctionsData implements IXmlReader forEach(func, "function", levelNode -> { final NamedNodeMap levelAttrs = levelNode.getAttributes(); - final StatsSet levelSet = new StatsSet(HashMap::new); + final StatSet levelSet = new StatSet(HashMap::new); levelSet.merge(set); for (int i = 0; i < levelAttrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java index 053d9089ce..d6b28a5962 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; /** @@ -82,7 +82,7 @@ public class SendMessageLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); SEND_MESSAGE_LOCALISATIONS.get(_lang).put(set.getString("message").split(SPLIT_STRING), set.getString("translation").split(SPLIT_STRING)); })); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java index e473030c56..c3eda1f3b8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.actor.instance.ShuttleInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; @@ -72,7 +72,7 @@ public class ShuttleData implements IXmlReader public void parseDocument(Document doc, File f) { NamedNodeMap attrs; - StatsSet set; + StatSet set; Node att; ShuttleDataHolder data; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -84,7 +84,7 @@ public class ShuttleData implements IXmlReader if ("shuttle".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -164,7 +164,7 @@ public class ShuttleData implements IXmlReader { for (ShuttleDataHolder data : _shuttles.values()) { - final ShuttleInstance shuttle = new ShuttleInstance(new CreatureTemplate(new StatsSet())); + final ShuttleInstance shuttle = new ShuttleInstance(new CreatureTemplate(new StatSet())); shuttle.setData(data); shuttle.setHeading(data.getLocation().getHeading()); shuttle.setLocationInvisible(data.getLocation()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java index 9db0b5f64b..ba000649f2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.SiegeScheduleDate; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.util.Util; /** @@ -54,7 +54,7 @@ public class SiegeScheduleData implements IXmlReader LOGGER.info(getClass().getSimpleName() + ": Loaded " + _scheduleData.size() + " siege schedulers."); if (_scheduleData.isEmpty()) { - _scheduleData.add(new SiegeScheduleDate(new StatsSet())); + _scheduleData.add(new SiegeScheduleDate(new StatSet())); LOGGER.info(getClass().getSimpleName() + ": Emergency loaded " + _scheduleData.size() + " default siege schedulers."); } } @@ -72,7 +72,7 @@ public class SiegeScheduleData implements IXmlReader { case "schedule": { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final NamedNodeMap attrs = cd.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java index cc019c4dbb..2592b3ed97 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java @@ -40,7 +40,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.EffectHandler; import org.l2jmobius.gameserver.handler.SkillConditionHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.EffectScope; @@ -67,9 +67,9 @@ public class SkillData implements IXmlReader private final Integer _toLevel; private final Integer _fromSubLevel; private final Integer _toSubLevel; - private final Map> _info; + private final Map> _info; - public NamedParamInfo(String name, Integer fromLevel, Integer toLevel, Integer fromSubLevel, Integer toSubLevel, Map> info) + public NamedParamInfo(String name, Integer fromLevel, Integer toLevel, Integer fromSubLevel, Integer toSubLevel, Map> info) { _name = name; _fromLevel = fromLevel; @@ -104,7 +104,7 @@ public class SkillData implements IXmlReader return _toSubLevel; } - public Map> getInfo() + public Map> getInfo() { return _info; } @@ -241,8 +241,8 @@ public class SkillData implements IXmlReader { NamedNodeMap attributes = listNode.getAttributes(); final Map> levels = new HashMap<>(); - final Map> skillInfo = new HashMap<>(); - final StatsSet generalSkillInfo = skillInfo.computeIfAbsent(-1, k -> new HashMap<>()).computeIfAbsent(-1, k -> new StatsSet()); + final Map> skillInfo = new HashMap<>(); + final StatSet generalSkillInfo = skillInfo.computeIfAbsent(-1, k -> new HashMap<>()).computeIfAbsent(-1, k -> new StatSet()); parseAttributes(attributes, "", generalSkillInfo); @@ -321,7 +321,7 @@ public class SkillData implements IXmlReader { return; } - subLevelMap.forEach((subLevel, statsSet) -> + subLevelMap.forEach((subLevel, statSet) -> { if (subLevel == -1) { @@ -339,7 +339,7 @@ public class SkillData implements IXmlReader { return; } - subLevelMap.forEach((subLevel, statsSet) -> + subLevelMap.forEach((subLevel, statSet) -> { if (subLevel == -1) { @@ -371,31 +371,31 @@ public class SkillData implements IXmlReader levels.forEach((level, subLevels) -> subLevels.forEach(subLevel -> { - final StatsSet statsSet = Optional.ofNullable(skillInfo.getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatsSet::new); - skillInfo.getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(statsSet.getSet()::putIfAbsent); - skillInfo.getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(statsSet.getSet()::putIfAbsent); - statsSet.set(".level", level); - statsSet.set(".subLevel", subLevel); - final Skill skill = new Skill(statsSet); + final StatSet statSet = Optional.ofNullable(skillInfo.getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatSet::new); + skillInfo.getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(statSet.getSet()::putIfAbsent); + skillInfo.getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(statSet.getSet()::putIfAbsent); + statSet.set(".level", level); + statSet.set(".subLevel", subLevel); + final Skill skill = new Skill(statSet); forEachNamedParamInfoParam(effectParamInfo, level, subLevel, ((effectScope, params) -> { final String effectName = params.getString(".name"); params.remove(".name"); try { - final Function effectFunction = EffectHandler.getInstance().getHandlerFactory(effectName); + final Function effectFunction = EffectHandler.getInstance().getHandlerFactory(effectName); if (effectFunction != null) { skill.addEffect(effectScope, effectFunction.apply(params)); } else { - LOGGER.warning(getClass().getSimpleName() + ": Missing effect for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]"); + LOGGER.warning(getClass().getSimpleName() + ": Missing effect for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]"); } } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading effect for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading effect for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]", e); } })); @@ -405,19 +405,19 @@ public class SkillData implements IXmlReader params.remove(".name"); try { - final Function conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName); + final Function conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName); if (conditionFunction != null) { skill.addCondition(skillConditionScope, conditionFunction.apply(params)); } else { - LOGGER.warning(getClass().getSimpleName() + ": Missing condition for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + skillConditionScope + "] Effect Name[" + conditionName + "]"); + LOGGER.warning(getClass().getSimpleName() + ": Missing condition for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + skillConditionScope + "] Effect Name[" + conditionName + "]"); } } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading condition for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Condition Scope[" + skillConditionScope + "] Condition Name[" + conditionName + "]", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading condition for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Condition Scope[" + skillConditionScope + "] Condition Name[" + conditionName + "]", e); } })); @@ -434,16 +434,16 @@ public class SkillData implements IXmlReader } } - private void forEachNamedParamInfoParam(Map> paramInfo, int level, int subLevel, BiConsumer consumer) + private void forEachNamedParamInfoParam(Map> paramInfo, int level, int subLevel, BiConsumer consumer) { paramInfo.forEach((scope, namedParamInfos) -> namedParamInfos.forEach(namedParamInfo -> { if ((((namedParamInfo.getFromLevel() == null) && (namedParamInfo.getToLevel() == null)) || ((namedParamInfo.getFromLevel() <= level) && (namedParamInfo.getToLevel() >= level))) // && (((namedParamInfo.getFromSubLevel() == null) && (namedParamInfo.getToSubLevel() == null)) || ((namedParamInfo.getFromSubLevel() <= subLevel) && (namedParamInfo.getToSubLevel() >= subLevel)))) { - final StatsSet params = Optional.ofNullable(namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatsSet::new); - namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); - namedParamInfo.getInfo().getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); + final StatSet params = Optional.ofNullable(namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatSet::new); + namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); + namedParamInfo.getInfo().getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); params.set(".name", namedParamInfo.getName()); consumer.accept(scope, params); } @@ -460,7 +460,7 @@ public class SkillData implements IXmlReader final Integer subLevel = parseInteger(attributes, "subLevel"); final Integer fromSubLevel = parseInteger(attributes, "fromSubLevel", subLevel); final Integer toSubLevel = parseInteger(attributes, "toSubLevel", subLevel); - final Map> info = new HashMap<>(); + final Map> info = new HashMap<>(); for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) { if (!node.getNodeName().equals("#text")) @@ -471,7 +471,7 @@ public class SkillData implements IXmlReader return new NamedParamInfo(name, fromLevel, toLevel, fromSubLevel, toSubLevel, info); } - private void parseInfo(Node node, Map>> variableValues, Map> info) + private void parseInfo(Node node, Map>> variableValues, Map> info) { Map> values = parseValues(node); final Object generalValue = values.getOrDefault(-1, Collections.emptyMap()).get(-1); @@ -492,7 +492,7 @@ public class SkillData implements IXmlReader } } - values.forEach((level, subLevelMap) -> subLevelMap.forEach((subLevel, value) -> info.computeIfAbsent(level, k -> new HashMap<>()).computeIfAbsent(subLevel, k -> new StatsSet()).set(node.getNodeName(), value))); + values.forEach((level, subLevelMap) -> subLevelMap.forEach((subLevel, value) -> info.computeIfAbsent(level, k -> new HashMap<>()).computeIfAbsent(subLevel, k -> new StatSet()).set(node.getNodeName(), value))); } private Map> parseValues(Node node) @@ -535,7 +535,7 @@ public class SkillData implements IXmlReader variables.put("index", (i - fromLevel) + 1d); variables.put("subIndex", (j - fromSubLevel) + 1d); final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1); - if ((base != null) && !(base instanceof StatsSet)) + if ((base != null) && !(base instanceof StatSet)) { variables.put("base", Double.parseDouble(String.valueOf(base))); } @@ -555,13 +555,13 @@ public class SkillData implements IXmlReader Object parseValue(Node node, boolean blockValue, boolean parseAttributes, Map variables) { - StatsSet statsSet = null; + StatSet statSet = null; List list = null; Object text = null; if (parseAttributes && (!node.getNodeName().equals("value") || !blockValue) && (node.getAttributes().getLength() > 0)) { - statsSet = new StatsSet(); - parseAttributes(node.getAttributes(), "", statsSet, variables); + statSet = new StatSet(); + parseAttributes(node.getAttributes(), "", statSet, variables); } for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) { @@ -604,12 +604,12 @@ public class SkillData implements IXmlReader final Object value = parseValue(node, false, true, variables); if (value != null) { - if (statsSet == null) + if (statSet == null) { - statsSet = new StatsSet(); + statSet = new StatSet(); } - statsSet.set(nodeName, value); + statSet.set(nodeName, value); } } } @@ -620,9 +620,9 @@ public class SkillData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", list); + statSet.set(".", list); } else { @@ -635,30 +635,30 @@ public class SkillData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", text); + statSet.set(".", text); } else { return text; } } - return statsSet; + return statSet; } - private void parseAttributes(NamedNodeMap attributes, String prefix, StatsSet statsSet, Map variables) + private void parseAttributes(NamedNodeMap attributes, String prefix, StatSet statSet, Map variables) { for (int i = 0; i < attributes.getLength(); i++) { final Node attributeNode = attributes.item(i); - statsSet.set(prefix + "." + attributeNode.getNodeName(), parseNodeValue(attributeNode.getNodeValue(), variables)); + statSet.set(prefix + "." + attributeNode.getNodeName(), parseNodeValue(attributeNode.getNodeValue(), variables)); } } - private void parseAttributes(NamedNodeMap attributes, String prefix, StatsSet statsSet) + private void parseAttributes(NamedNodeMap attributes, String prefix, StatSet statSet) { - parseAttributes(attributes, prefix, statsSet, Collections.emptyMap()); + parseAttributes(attributes, prefix, statSet, Collections.emptyMap()); } private Object parseNodeValue(String value, Map variables) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java index fdd0012ffe..d23d1ebee3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.SubclassType; import org.l2jmobius.gameserver.model.SkillLearn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.base.ClassId; @@ -229,7 +229,7 @@ public class SkillTreesData implements IXmlReader { if ("skill".equalsIgnoreCase(c.getNodeName())) { - final StatsSet learnSkillSet = new StatsSet(); + final StatSet learnSkillSet = new StatSet(); attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java index 87915d89eb..78c22d1e7d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java @@ -36,7 +36,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.ChanceLocation; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.MinionHolder; import org.l2jmobius.gameserver.model.interfaces.IParameterized; @@ -169,7 +169,7 @@ public class SpawnsData implements IXmlReader public void parseSpawn(Node spawnsNode, File file, Collection spawns) { - final SpawnTemplate spawnTemplate = new SpawnTemplate(new StatsSet(parseAttributes(spawnsNode)), file); + final SpawnTemplate spawnTemplate = new SpawnTemplate(new StatSet(parseAttributes(spawnsNode)), file); SpawnGroup defaultGroup = null; for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling()) { @@ -185,7 +185,7 @@ public class SpawnsData implements IXmlReader { if (defaultGroup == null) { - defaultGroup = new SpawnGroup(StatsSet.EMPTY_STATSET); + defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET); } parseNpc(innerNode, spawnTemplate, defaultGroup); } @@ -244,7 +244,7 @@ public class SpawnsData implements IXmlReader private void parseGroup(Node n, SpawnTemplate spawnTemplate) { - final SpawnGroup group = new SpawnGroup(new StatsSet(parseAttributes(n))); + final SpawnGroup group = new SpawnGroup(new StatSet(parseAttributes(n))); forEach(n, IXmlReader::isNode, npcNode -> { switch (npcNode.getNodeName()) @@ -271,7 +271,7 @@ public class SpawnsData implements IXmlReader */ private void parseNpc(Node n, SpawnTemplate spawnTemplate, SpawnGroup group) { - final NpcSpawnTemplate npcTemplate = new NpcSpawnTemplate(spawnTemplate, group, new StatsSet(parseAttributes(n))); + final NpcSpawnTemplate npcTemplate = new NpcSpawnTemplate(spawnTemplate, group, new StatSet(parseAttributes(n))); final NpcTemplate template = NpcData.getInstance().getTemplate(npcTemplate.getId()); if (template == null) { @@ -332,10 +332,10 @@ public class SpawnsData implements IXmlReader * @param n * @param npcTemplate */ - private void parseParameters(Node n, IParameterized npcTemplate) + private void parseParameters(Node n, IParameterized npcTemplate) { final Map params = parseParameters(n); - npcTemplate.setParameters(!params.isEmpty() ? new StatsSet(Collections.unmodifiableMap(params)) : StatsSet.EMPTY_STATSET); + npcTemplate.setParameters(!params.isEmpty() ? new StatSet(Collections.unmodifiableMap(params)) : StatSet.EMPTY_STATSET); } /** @@ -344,7 +344,7 @@ public class SpawnsData implements IXmlReader */ private void parseMinions(Node n, NpcSpawnTemplate npcTemplate) { - forEach(n, "minion", minionNode -> npcTemplate.addMinion(new MinionHolder(new StatsSet(parseAttributes(minionNode))))); + forEach(n, "minion", minionNode -> npcTemplate.addMinion(new MinionHolder(new StatSet(parseAttributes(minionNode))))); } /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java index 98d333446c..ef93935404 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; @@ -69,7 +69,7 @@ public class StaticObjectData implements IXmlReader if ("object".equalsIgnoreCase(d.getNodeName())) { final NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -86,9 +86,9 @@ public class StaticObjectData implements IXmlReader * Initialize an static object based on the stats set and add it to the map. * @param set the stats set to add. */ - private void addObject(StatsSet set) + private void addObject(StatSet set) { - final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatsSet()), set.getInt("id")); + final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatSet()), set.getInt("id")); obj.setType(set.getInt("type", 0)); obj.setName(set.getString("name")); obj.setMap(set.getString("texture", "none"), set.getInt("map_x", 0), set.getInt("map_y", 0)); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java index 7c8c9a538d..487bae9dea 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.TeleportType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.teleporter.TeleportHolder; /** @@ -74,7 +74,7 @@ public class TeleportersData implements IXmlReader final String name = parseString(nodeAttrs, "name", type.name()); // Parse locations final TeleportHolder holder = new TeleportHolder(name, type); - forEach(node, "location", location -> holder.registerLocation(new StatsSet(parseAttributes(location)))); + forEach(node, "location", location -> holder.registerLocation(new StatSet(parseAttributes(location)))); // Register holder if (teleList.putIfAbsent(name, holder) != null) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java index b6b3bf2e90..c2f5f94adb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java @@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.transform.Transform; import org.l2jmobius.gameserver.model.actor.transform.TransformLevelData; import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate; @@ -70,7 +70,7 @@ public class TransformData implements IXmlReader if ("transform".equalsIgnoreCase(d.getNodeName())) { NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -192,7 +192,7 @@ public class TransformData implements IXmlReader transform.setTemplate(isMale, templateData); } - final StatsSet levelsSet = new StatsSet(); + final StatSet levelsSet = new StatSet(); for (Node s = z.getFirstChild(); s != null; s = s.getNextSibling()) { if ("level".equals(s.getNodeName())) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/engines/DocumentBase.java index ba3fc7f6b4..d178b10006 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/engines/DocumentBase.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/engines/DocumentBase.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.PlayerState; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionCategoryType; @@ -178,7 +178,7 @@ public abstract class DocumentBase protected abstract void parseDocument(Document doc); - protected abstract StatsSet getStatsSet(); + protected abstract StatSet getStatSet(); protected abstract String getTableValue(String name); @@ -1245,7 +1245,7 @@ public abstract class DocumentBase setTable(name, array.toArray(new String[array.size()])); } - protected void parseBeanSet(Node n, StatsSet set, Integer level) + protected void parseBeanSet(Node n, StatSet set, Integer level) { final String name = n.getAttributes().getNamedItem("name").getNodeValue().trim(); final String value = n.getAttributes().getNamedItem("val").getNodeValue().trim(); @@ -1260,7 +1260,7 @@ public abstract class DocumentBase } } - protected void setExtractableSkillData(StatsSet set, String value) + protected void setExtractableSkillData(StatSet set, String value) { set.set("capsuled_items_skill", value); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java index e8c77b206e..46f8f9be1f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java @@ -21,7 +21,7 @@ import java.io.File; import org.w3c.dom.Document; import org.w3c.dom.Node; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; /** @@ -41,7 +41,7 @@ public class DocumentBaseGeneral extends DocumentBase } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return null; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java index 3ea7f41bb6..419552cf68 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.engines.DocumentBase; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -57,7 +57,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return _currentItem.set; } @@ -111,7 +111,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader _currentItem.id = itemId; _currentItem.name = itemName; _currentItem.type = className; - _currentItem.set = new StatsSet(); + _currentItem.set = new StatSet(); _currentItem.set.set("item_id", itemId); _currentItem.set.set("name", itemName); _currentItem.set.set("additionalName", additionalName); @@ -218,7 +218,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatsSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (Item) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java index 56e5b21a9f..967c1fc34d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.engines.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; public class ItemDataHolder @@ -24,7 +24,7 @@ public class ItemDataHolder int id; String type; String name; - StatsSet set; + StatSet set; int currentLevel; Item item; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/ConditionHandler.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/ConditionHandler.java index 47f24d690d..b53f170fb3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/ConditionHandler.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/ConditionHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.ICondition; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class ConditionHandler { - private final Map> _conditionHandlerFactories = new HashMap<>(); + private final Map> _conditionHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _conditionHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _conditionHandlerFactories.get(name); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/EffectHandler.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/EffectHandler.java index a58de8efb4..328265d9db 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/EffectHandler.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/EffectHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class EffectHandler { - private final Map> _effectHandlerFactories = new HashMap<>(); + private final Map> _effectHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _effectHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _effectHandlerFactories.get(name); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java index a6e2275d04..32438040e0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class SkillConditionHandler { - private final Map> _skillConditionHandlerFactories = new HashMap<>(); + private final Map> _skillConditionHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _skillConditionHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _skillConditionHandlerFactories.get(name); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java index 6992dd5366..65a8c52d7e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.model.AirShipTeleportList; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShipInstance; @@ -45,13 +45,13 @@ public class AirShipManager private static final String UPDATE_DB = "UPDATE airships SET fuel=? WHERE owner_id=?"; private CreatureTemplate _airShipTemplate = null; - private final Map _airShipsInfo = new HashMap<>(); + private final Map _airShipsInfo = new HashMap<>(); private final Map _airShips = new HashMap<>(); private final Map _teleports = new HashMap<>(); protected AirShipManager() { - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", 9); npcDat.set("level", 0); npcDat.set("jClass", "boat"); @@ -113,7 +113,7 @@ public class AirShipManager public AirShipInstance getNewAirShip(int x, int y, int z, int heading, int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return null; @@ -147,7 +147,7 @@ public class AirShipManager if (ship.getOwnerId() != 0) { storeInDb(ship.getOwnerId()); - final StatsSet info = _airShipsInfo.get(ship.getOwnerId()); + final StatSet info = _airShipsInfo.get(ship.getOwnerId()); if (info != null) { info.set("fuel", ship.getFuel()); @@ -164,7 +164,7 @@ public class AirShipManager { if (!_airShipsInfo.containsKey(ownerId)) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("fuel", 600); _airShipsInfo.put(ownerId, info); @@ -264,10 +264,10 @@ public class AirShipManager Statement s = con.createStatement(); ResultSet rs = s.executeQuery(LOAD_DB)) { - StatsSet info; + StatSet info; while (rs.next()) { - info = new StatsSet(); + info = new StatSet(); info.set("fuel", rs.getInt("fuel")); _airShipsInfo.put(rs.getInt("owner_id"), info); } @@ -285,7 +285,7 @@ public class AirShipManager private void storeInDb(int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java index 2db10dd045..e5c610b3f2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.BoatInstance; @@ -57,7 +57,7 @@ public class BoatManager return null; } - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", boatId); npcDat.set("level", 0); npcDat.set("jClass", "boat"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 99a9678ece..56f08422cd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.enums.ManorMode; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; import org.l2jmobius.gameserver.model.SeedProduction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.entity.Castle; @@ -126,7 +126,7 @@ public class CastleManorManager implements IXmlReader, IStorable @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; NamedNodeMap attrs; Node att; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -142,7 +142,7 @@ public class CastleManorManager implements IXmlReader, IStorable { if ("crop".equalsIgnoreCase(c.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); set.set("castleId", castleId); attrs = c.getAttributes(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java index 8cb2c76f84..b329a67097 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java @@ -27,7 +27,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosState; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -181,7 +181,7 @@ public class CeremonyOfChaosManager extends AbstractEventManager _npcs = new ConcurrentHashMap<>(); protected final Map _spawns = new ConcurrentHashMap<>(); - protected final Map _storedInfo = new ConcurrentHashMap<>(); + protected final Map _storedInfo = new ConcurrentHashMap<>(); protected final Map> _schedules = new ConcurrentHashMap<>(); /** @@ -161,7 +161,7 @@ public class DBSpawnManager { npc.setDBStatus(RaidBossStatus.ALIVE); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getCurrentHp()); info.set("currentMP", npc.getCurrentMp()); info.set("respawnTime", 0); @@ -181,7 +181,7 @@ public class DBSpawnManager */ public void updateStatus(Npc npc, boolean isNpcDead) { - final StatsSet info = _storedInfo.get(npc.getId()); + final StatSet info = _storedInfo.get(npc.getId()); if (info == null) { return; @@ -254,7 +254,7 @@ public class DBSpawnManager _npcs.put(npcId, npc); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", currentHP); info.set("currentMP", currentMP); info.set("respawnTime", 0); @@ -316,7 +316,7 @@ public class DBSpawnManager } npc.setDBStatus(RaidBossStatus.ALIVE); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", 0); @@ -401,7 +401,7 @@ public class DBSpawnManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("UPDATE npc_respawns SET respawnTime = ?, currentHP = ?, currentMP = ? WHERE id = ?")) { - for (Entry entry : _storedInfo.entrySet()) + for (Entry entry : _storedInfo.entrySet()) { final Integer npcId = entry.getKey(); if (npcId == null) @@ -420,7 +420,7 @@ public class DBSpawnManager updateStatus(npc, false); } - final StatsSet info = entry.getValue(); + final StatSet info = entry.getValue(); if (info == null) { continue; @@ -529,7 +529,7 @@ public class DBSpawnManager */ public void notifySpawnNightNpc(Npc npc) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getCurrentHp()); info.set("currentMP", npc.getCurrentMp()); info.set("respawnTime", 0); @@ -572,7 +572,7 @@ public class DBSpawnManager * Gets the stored info. * @return the stored info */ - public Map getStoredInfo() + public Map getStoredInfo() { return _storedInfo; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index 3dd4e3f652..767bed6954 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.datatables.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.FakePlayerChatHolder; @@ -73,7 +73,7 @@ public class FakePlayerChatManager implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayerChat", fakePlayerChatNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerChatNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerChatNode)); MESSAGES.add(new FakePlayerChatHolder(set.getString("fpcName"), set.getString("searchMethod"), set.getString("searchText"), set.getString("answers"))); })); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java index 07c111065e..52bab09349 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java @@ -33,7 +33,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.tasks.GrandBossManagerStoreTask; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; import org.l2jmobius.gameserver.model.interfaces.IStorable; @@ -51,7 +51,7 @@ public class GrandBossManager implements IStorable protected static Map _bosses = new ConcurrentHashMap<>(); - protected static Map _storedInfo = new HashMap<>(); + protected static Map _storedInfo = new HashMap<>(); private final Map _bossStatus = new HashMap<>(); @@ -72,7 +72,7 @@ public class GrandBossManager implements IStorable final int bossId = rs.getInt("boss_id"); if (NpcData.getInstance().getTemplate(bossId) != null) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("loc_x", rs.getInt("loc_x")); info.set("loc_y", rs.getInt("loc_y")); info.set("loc_z", rs.getInt("loc_z")); @@ -140,12 +140,12 @@ public class GrandBossManager implements IStorable return _bosses.get(bossId); } - public StatsSet getStatsSet(int bossId) + public StatSet getStatSet(int bossId) { return _storedInfo.get(bossId); } - public void setStatsSet(int bossId, StatsSet info) + public void setStatSet(int bossId, StatSet info) { _storedInfo.put(bossId, info); updateDb(bossId, false); @@ -156,10 +156,10 @@ public class GrandBossManager implements IStorable { try (Connection con = DatabaseFactory.getConnection()) { - for (Entry e : _storedInfo.entrySet()) + for (Entry e : _storedInfo.entrySet()) { final GrandBossInstance boss = _bosses.get(e.getKey()); - final StatsSet info = e.getValue(); + final StatSet info = e.getValue(); if ((boss == null) || (info == null)) { try (PreparedStatement update = con.prepareStatement(UPDATE_GRAND_BOSS_DATA2)) @@ -209,7 +209,7 @@ public class GrandBossManager implements IStorable try (Connection con = DatabaseFactory.getConnection()) { final GrandBossInstance boss = _bosses.get(bossId); - final StatsSet info = _storedInfo.get(bossId); + final StatSet info = _storedInfo.get(bossId); if (statusOnly || (boss == null) || (info == null)) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index d77642378f..29e517b0cd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.enums.InstanceReenterType; import org.l2jmobius.gameserver.enums.InstanceRemoveBuffType; import org.l2jmobius.gameserver.enums.InstanceTeleportType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.holders.InstanceReenterTimeHolder; @@ -151,7 +151,7 @@ public class InstanceManager implements IXmlReader return; } - final InstanceTemplate template = new InstanceTemplate(new StatsSet(parseAttributes(instanceNode))); + final InstanceTemplate template = new InstanceTemplate(new StatSet(parseAttributes(instanceNode))); // Update name if wasn't provided if (template.getName() == null) @@ -241,10 +241,10 @@ public class InstanceManager implements IXmlReader { if (doorNode.getNodeName().equals("door")) { - final StatsSet parsedSet = DoorData.getInstance().parseDoor(doorNode); - final StatsSet mergedSet = new StatsSet(); + final StatSet parsedSet = DoorData.getInstance().parseDoor(doorNode); + final StatSet mergedSet = new StatSet(); final int doorId = parsedSet.getInt("id"); - final StatsSet templateSet = DoorData.getInstance().getDoorTemplate(doorId); + final StatSet templateSet = DoorData.getInstance().getDoorTemplate(doorId); if (templateSet != null) { mergedSet.merge(templateSet); @@ -324,14 +324,14 @@ public class InstanceManager implements IXmlReader final boolean onlyLeader = parseBoolean(attrs, "onlyLeader", false); final boolean showMessageAndHtml = parseBoolean(attrs, "showMessageAndHtml", false); // Load parameters - StatsSet params = null; + StatSet params = null; for (Node f = conditionNode.getFirstChild(); f != null; f = f.getNextSibling()) { if (f.getNodeName().equals("param")) { if (params == null) { - params = new StatsSet(); + params = new StatSet(); } params.set(parseString(f.getAttributes(), "name"), parseString(f.getAttributes(), "value")); @@ -341,14 +341,14 @@ public class InstanceManager implements IXmlReader // If none parameters found then set empty StatSet if (params == null) { - params = StatsSet.EMPTY_STATSET; + params = StatSet.EMPTY_STATSET; } // Now when everything is loaded register condition to template try { final Class clazz = Class.forName("org.l2jmobius.gameserver.model.instancezone.conditions.Condition" + type); - final Constructor constructor = clazz.getConstructor(InstanceTemplate.class, StatsSet.class, boolean.class, boolean.class); + final Constructor constructor = clazz.getConstructor(InstanceTemplate.class, StatSet.class, boolean.class, boolean.class); conditions.add((Condition) constructor.newInstance(template, params, onlyLeader, showMessageAndHtml)); } catch (Exception ex) @@ -378,7 +378,7 @@ public class InstanceManager implements IXmlReader */ public Instance createInstance() { - return new Instance(getNewInstanceId(), new InstanceTemplate(StatsSet.EMPTY_STATSET), null); + return new Instance(getNewInstanceId(), new InstanceTemplate(StatSet.EMPTY_STATSET), null); } /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/AccessLevel.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/AccessLevel.java index 772c1fe77e..72b77905e1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/AccessLevel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/AccessLevel.java @@ -52,7 +52,7 @@ public class AccessLevel /** Flag to gain exp in party */ private boolean _gainExp = false; - public AccessLevel(StatsSet set) + public AccessLevel(StatSet set) { _accessLevel = set.getInt("level"); _name = set.getString("name"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ActionDataHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ActionDataHolder.java index 4887bedba8..ca6d9ee685 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ActionDataHolder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ActionDataHolder.java @@ -25,7 +25,7 @@ public class ActionDataHolder private final String _handler; private final int _optionId; - public ActionDataHolder(StatsSet set) + public ActionDataHolder(StatSet set) { _id = set.getInt("id"); _handler = set.getString("handler"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java index 656119098e..3f88e455d7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java @@ -27,7 +27,7 @@ public class AdminCommandAccessRight private final int _accessLevel; private final boolean _requireConfirm; - public AdminCommandAccessRight(StatsSet set) + public AdminCommandAccessRight(StatSet set) { _adminCommand = set.getString("command"); _requireConfirm = set.getBoolean("confirmDlg", false); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index efc53c7e48..6102d39d06 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -36,7 +36,7 @@ public class DailyMissionDataHolder private final List _rewardsItems; private final List _classRestriction; private final int _requiredCompletions; - private final StatsSet _params; + private final StatSet _params; private final boolean _dailyReset; private final boolean _isOneTime; private final boolean _isMainClassOnly; @@ -44,7 +44,7 @@ public class DailyMissionDataHolder private final boolean _isDisplayedWhenNotAvailable; private final AbstractDailyMissionHandler _handler; - public DailyMissionDataHolder(StatsSet set) + public DailyMissionDataHolder(StatSet set) { final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); @@ -53,7 +53,7 @@ public class DailyMissionDataHolder _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); - _params = set.getObject("params", StatsSet.class); + _params = set.getObject("params", StatSet.class); _dailyReset = set.getBoolean("dailyReset", true); _isOneTime = set.getBoolean("isOneTime", true); _isMainClassOnly = set.getBoolean("isMainClassOnly", true); @@ -87,7 +87,7 @@ public class DailyMissionDataHolder return _requiredCompletions; } - public StatsSet getParams() + public StatSet getParams() { return _params; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Location.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Location.java index 1c61740e4d..024c71075f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Location.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Location.java @@ -49,7 +49,7 @@ public class Location implements IPositionable this(obj.getX(), obj.getY(), obj.getZ(), obj.getHeading()); } - public Location(StatsSet set) + public Location(StatSet set) { _x = set.getInt("x"); _y = set.getInt("y"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/PetLevelData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/PetLevelData.java index e46b215b5f..7cad1a225a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/PetLevelData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/PetLevelData.java @@ -46,7 +46,7 @@ public class PetLevelData private final double _slowFlySpeedOnRide; private final double _fastFlySpeedOnRide; - public PetLevelData(StatsSet set) + public PetLevelData(StatSet set) { _ownerExpTaken = set.getInt("get_exp_type"); _petMaxExp = set.getLong("exp"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/RecipeList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/RecipeList.java index 9e4a3b2387..a81bbb1802 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/RecipeList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/RecipeList.java @@ -68,7 +68,7 @@ public class RecipeList * @param set * @param haveRare */ - public RecipeList(StatsSet set, boolean haveRare) + public RecipeList(StatSet set, boolean haveRare) { _recipes = new RecipeInstance[0]; _statUse = new RecipeStatInstance[0]; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Seed.java index 6d31ffc60f..54ef8acd9f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Seed.java @@ -35,7 +35,7 @@ public class Seed private final int _seedReferencePrice; private final int _cropReferencePrice; - public Seed(StatsSet set) + public Seed(StatSet set) { _cropId = set.getInt("id"); _seedId = set.getInt("seedId"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java index 78897cf4f1..4de77df228 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java @@ -27,7 +27,7 @@ public class SiegeScheduleDate private final int _hour; private final int _maxConcurrent; - public SiegeScheduleDate(StatsSet set) + public SiegeScheduleDate(StatSet set) { _day = set.getInt("day", Calendar.SUNDAY); _hour = set.getInt("hour", 16); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/SkillLearn.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/SkillLearn.java index e2ccdd6331..00f53c0cb9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/SkillLearn.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/SkillLearn.java @@ -58,7 +58,7 @@ public class SkillLearn * Constructor for SkillLearn. * @param set the set with the SkillLearn data. */ - public SkillLearn(StatsSet set) + public SkillLearn(StatSet set) { _skillName = set.getString("skillName"); _skillId = set.getInt("skillId"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/StatSet.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/StatSet.java new file mode 100644 index 0000000000..3c824d9fa4 --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/StatSet.java @@ -0,0 +1,968 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Supplier; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.stream.Collectors; + +import org.l2jmobius.commons.util.TimeUtil; +import org.l2jmobius.gameserver.model.holders.MinionHolder; +import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.interfaces.IParserAdvUtils; +import org.l2jmobius.gameserver.util.Util; + +/** + * This class is meant to hold a set of (key,value) pairs.
    + * They are stored as object but can be retrieved in any type wanted. As long as cast is available.
    + * @author mkizub + */ +public class StatSet implements IParserAdvUtils +{ + private static final Logger LOGGER = Logger.getLogger(StatSet.class.getName()); + /** Static empty immutable map, used to avoid multiple null checks over the source. */ + public static final StatSet EMPTY_STATSET = new StatSet(Collections.emptyMap()); + + private final Map _set; + + public StatSet() + { + this(ConcurrentHashMap::new); + } + + public StatSet(Supplier> mapFactory) + { + this(mapFactory.get()); + } + + public StatSet(Map map) + { + _set = map; + } + + /** + * Returns the set of values + * @return HashMap + */ + public Map getSet() + { + return _set; + } + + /** + * Add a set of couple values in the current set + * @param newSet : StatSet pointing out the list of couples to add in the current set + */ + public void merge(StatSet newSet) + { + _set.putAll(newSet.getSet()); + } + + /** + * Verifies if the stat set is empty. + * @return {@code true} if the stat set is empty, {@code false} otherwise + */ + public boolean isEmpty() + { + return _set.isEmpty(); + } + + /** + * Return the boolean value associated with key. + * @param key : String designating the key in the set + * @return boolean : value associated to the key + * @throws IllegalArgumentException : If value is not set or value is not boolean + */ + @Override + public boolean getBoolean(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Boolean value required, but not specified"); + } + if (val instanceof Boolean) + { + return ((Boolean) val).booleanValue(); + } + try + { + return Boolean.parseBoolean((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Boolean value required, but found: " + val); + } + } + + /** + * Return the boolean value associated with key.
    + * If no value is associated with key, or type of value is wrong, returns defaultValue. + * @param key : String designating the key in the entry set + * @return boolean : value associated to the key + */ + @Override + public boolean getBoolean(String key, boolean defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Boolean) + { + return ((Boolean) val).booleanValue(); + } + try + { + return Boolean.parseBoolean((String) val); + } + catch (Exception e) + { + return defaultValue; + } + } + + @Override + public byte getByte(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Byte value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).byteValue(); + } + try + { + return Byte.parseByte((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + + @Override + public byte getByte(String key, byte defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).byteValue(); + } + try + { + return Byte.parseByte((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + + public short increaseByte(String key, byte increaseWith) + { + final byte newValue = (byte) (getByte(key) + increaseWith); + set(key, newValue); + return newValue; + } + + public short increaseByte(String key, byte defaultValue, byte increaseWith) + { + final byte newValue = (byte) (getByte(key, defaultValue) + increaseWith); + set(key, newValue); + return newValue; + } + + public byte[] getByteArray(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Byte value required, but not specified"); + } + if (val instanceof Number) + { + return new byte[] + { + ((Number) val).byteValue() + }; + } + int c = 0; + final String[] vals = ((String) val).split(splitOn); + final byte[] result = new byte[vals.length]; + for (String v : vals) + { + try + { + result[c++] = Byte.parseByte(v); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + return result; + } + + public List getByteList(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final List result = new ArrayList<>(); + for (Byte i : getByteArray(key, splitOn)) + { + result.add(i); + } + return result; + } + + @Override + public short getShort(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Short value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).shortValue(); + } + try + { + return Short.parseShort((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Short value required, but found: " + val); + } + } + + @Override + public short getShort(String key, short defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).shortValue(); + } + try + { + return Short.parseShort((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Short value required, but found: " + val); + } + } + + public short increaseShort(String key, short increaseWith) + { + final short newValue = (short) (getShort(key) + increaseWith); + set(key, newValue); + return newValue; + } + + public short increaseShort(String key, short defaultValue, short increaseWith) + { + final short newValue = (short) (getShort(key, defaultValue) + increaseWith); + set(key, newValue); + return newValue; + } + + @Override + public int getInt(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Integer value required, but not specified: " + key + "!"); + } + + if (val instanceof Number) + { + return ((Number) val).intValue(); + } + + try + { + return Integer.parseInt((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val + "!"); + } + } + + @Override + public int getInt(String key, int defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).intValue(); + } + try + { + return Integer.parseInt((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val); + } + } + + public int increaseInt(String key, int increaseWith) + { + final int newValue = getInt(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public int increaseInt(String key, int defaultValue, int increaseWith) + { + final int newValue = getInt(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + public int[] getIntArray(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Integer value required, but not specified"); + } + if (val instanceof Number) + { + return new int[] + { + ((Number) val).intValue() + }; + } + int c = 0; + final String[] vals = ((String) val).split(splitOn); + final int[] result = new int[vals.length]; + for (String v : vals) + { + try + { + result[c++] = Integer.parseInt(v); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val); + } + } + return result; + } + + public List getIntegerList(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final List result = new ArrayList<>(); + for (int i : getIntArray(key, splitOn)) + { + result.add(i); + } + return result; + } + + @Override + public long getLong(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Long value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).longValue(); + } + try + { + return Long.parseLong((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Long value required, but found: " + val); + } + } + + @Override + public long getLong(String key, long defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).longValue(); + } + try + { + return Long.parseLong((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Long value required, but found: " + val); + } + } + + public long increaseLong(String key, long increaseWith) + { + final long newValue = getLong(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public long increaseLong(String key, long defaultValue, long increaseWith) + { + final long newValue = getLong(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public float getFloat(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Float value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).floatValue(); + } + try + { + return Float.parseFloat((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Float value required, but found: " + val); + } + } + + @Override + public float getFloat(String key, float defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).floatValue(); + } + try + { + return Float.parseFloat((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Float value required, but found: " + val); + } + } + + public float increaseFloat(String key, float increaseWith) + { + final float newValue = getFloat(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public float increaseFloat(String key, float defaultValue, float increaseWith) + { + final float newValue = getFloat(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public double getDouble(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Double value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).doubleValue(); + } + try + { + return Double.parseDouble((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Double value required, but found: " + val); + } + } + + @Override + public double getDouble(String key, double defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).doubleValue(); + } + try + { + return Double.parseDouble((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Double value required, but found: " + val); + } + } + + public double increaseDouble(String key, double increaseWith) + { + final double newValue = getDouble(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public double increaseDouble(String key, double defaultValue, double increaseWith) + { + final double newValue = getDouble(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public String getString(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("String value required, but not specified"); + } + return String.valueOf(val); + } + + @Override + public String getString(String key, String defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + return String.valueOf(val); + } + + @Override + public Duration getDuration(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("String value required, but not specified"); + } + return TimeUtil.parseDuration(String.valueOf(val)); + } + + @Override + public Duration getDuration(String key, Duration defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + return TimeUtil.parseDuration(String.valueOf(val)); + } + + @Override + @SuppressWarnings("unchecked") + public > T getEnum(String key, Class enumClass) + { + Objects.requireNonNull(key); + Objects.requireNonNull(enumClass); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but not specified"); + } + if (enumClass.isInstance(val)) + { + return (T) val; + } + try + { + return Enum.valueOf(enumClass, String.valueOf(val)); + } + catch (Exception e) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); + } + } + + @Override + @SuppressWarnings("unchecked") + public > T getEnum(String key, Class enumClass, T defaultValue) + { + Objects.requireNonNull(key); + Objects.requireNonNull(enumClass); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (enumClass.isInstance(val)) + { + return (T) val; + } + try + { + return Enum.valueOf(enumClass, String.valueOf(val)); + } + catch (Exception e) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); + } + } + + @SuppressWarnings("unchecked") + public A getObject(String name, Class type) + { + Objects.requireNonNull(name); + Objects.requireNonNull(type); + final Object obj = _set.get(name); + if ((obj == null) || !type.isAssignableFrom(obj.getClass())) + { + return null; + } + + return (A) obj; + } + + @SuppressWarnings("unchecked") + public A getObject(String name, Class type, A defaultValue) + { + Objects.requireNonNull(name); + Objects.requireNonNull(type); + final Object obj = _set.get(name); + if ((obj == null) || !type.isAssignableFrom(obj.getClass())) + { + return defaultValue; + } + + return (A) obj; + } + + public SkillHolder getSkillHolder(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof SkillHolder)) + { + return null; + } + + return (SkillHolder) obj; + } + + public Location getLocation(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof Location)) + { + return null; + } + return (Location) obj; + } + + @SuppressWarnings("unchecked") + public List getMinionList(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return Collections.emptyList(); + } + + return (List) obj; + } + + @SuppressWarnings("unchecked") + public List getList(String key, Class clazz) + { + Objects.requireNonNull(key); + Objects.requireNonNull(clazz); + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return null; + } + + final List originalList = (List) obj; + if (!originalList.isEmpty() && !originalList.stream().allMatch(clazz::isInstance)) + { + if (clazz.getSuperclass() == Enum.class) + { + throw new IllegalAccessError("Please use getEnumList if you want to get list of Enums!"); + } + + // Attempt to convert the list + final List convertedList = convertList(originalList, clazz); + if (convertedList == null) + { + LOGGER.log(Level.WARNING, "getList(\"" + key + "\", " + clazz.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); + return null; + } + + // Overwrite the existing list with proper generic type + _set.put(key, convertedList); + return convertedList; + } + return (List) obj; + } + + public List getList(String key, Class clazz, List defaultValue) + { + final List list = getList(key, clazz); + return list == null ? defaultValue : list; + } + + @SuppressWarnings("unchecked") + public > List getEnumList(String key, Class clazz) + { + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return null; + } + + final List originalList = (List) obj; + if (!originalList.isEmpty() && (obj.getClass().getGenericInterfaces()[0] != clazz) && originalList.stream().allMatch(name -> Util.isEnum(name.toString(), clazz))) + { + final List convertedList = originalList.stream().map(Object::toString).map(name -> Enum.valueOf(clazz, name)).map(clazz::cast).collect(Collectors.toList()); + + // Overwrite the existing list with proper generic type + _set.put(key, convertedList); + return convertedList; + } + return (List) obj; + } + + /** + * @param + * @param originalList + * @param clazz + * @return + */ + private List convertList(List originalList, Class clazz) + { + if (clazz == Integer.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isInteger)) + { + return originalList.stream().map(Object::toString).map(Integer::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + else if (clazz == Float.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isFloat)) + { + return originalList.stream().map(Object::toString).map(Float::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + else if (clazz == Double.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isDouble)) + { + return originalList.stream().map(Object::toString).map(Double::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + return null; + } + + @SuppressWarnings("unchecked") + public Map getMap(String key, Class keyClass, Class valueClass) + { + final Object obj = _set.get(key); + if (!(obj instanceof Map)) + { + return null; + } + + final Map originalList = (Map) obj; + if (!originalList.isEmpty() && ((!originalList.keySet().stream().allMatch(keyClass::isInstance)) || (!originalList.values().stream().allMatch(valueClass::isInstance)))) + { + LOGGER.log(Level.WARNING, "getMap(\"" + key + "\", " + keyClass.getSimpleName() + ", " + valueClass.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); + } + return (Map) obj; + } + + public StatSet set(String name, Object value) + { + if (value == null) + { + return this; + } + _set.put(name, value); + return this; + } + + public StatSet set(String key, boolean value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, byte value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, short value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, int value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, long value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, float value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, double value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, String value) + { + if (value == null) + { + return this; + } + _set.put(key, value); + return this; + } + + public StatSet set(String key, Enum value) + { + if (value == null) + { + return this; + } + _set.put(key, value); + return this; + } + + public static StatSet valueOf(String key, Object value) + { + final StatSet set = new StatSet(); + set.set(key, value); + return set; + } + + public void remove(String key) + { + _set.remove(key); + } + + public boolean contains(String name) + { + return _set.containsKey(name); + } + + @Override + public String toString() + { + return "StatSet{_set=" + _set + '}'; + } +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/StatsSet.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/StatsSet.java deleted file mode 100644 index 5ce013ebd2..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/StatsSet.java +++ /dev/null @@ -1,968 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.ConcurrentHashMap; -import java.util.function.Supplier; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.stream.Collectors; - -import org.l2jmobius.commons.util.TimeUtil; -import org.l2jmobius.gameserver.model.holders.MinionHolder; -import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.interfaces.IParserAdvUtils; -import org.l2jmobius.gameserver.util.Util; - -/** - * This class is meant to hold a set of (key,value) pairs.
    - * They are stored as object but can be retrieved in any type wanted. As long as cast is available.
    - * @author mkizub - */ -public class StatsSet implements IParserAdvUtils -{ - private static final Logger LOGGER = Logger.getLogger(StatsSet.class.getName()); - /** Static empty immutable map, used to avoid multiple null checks over the source. */ - public static final StatsSet EMPTY_STATSET = new StatsSet(Collections.emptyMap()); - - private final Map _set; - - public StatsSet() - { - this(ConcurrentHashMap::new); - } - - public StatsSet(Supplier> mapFactory) - { - this(mapFactory.get()); - } - - public StatsSet(Map map) - { - _set = map; - } - - /** - * Returns the set of values - * @return HashMap - */ - public Map getSet() - { - return _set; - } - - /** - * Add a set of couple values in the current set - * @param newSet : StatsSet pointing out the list of couples to add in the current set - */ - public void merge(StatsSet newSet) - { - _set.putAll(newSet.getSet()); - } - - /** - * Verifies if the stat set is empty. - * @return {@code true} if the stat set is empty, {@code false} otherwise - */ - public boolean isEmpty() - { - return _set.isEmpty(); - } - - /** - * Return the boolean value associated with key. - * @param key : String designating the key in the set - * @return boolean : value associated to the key - * @throws IllegalArgumentException : If value is not set or value is not boolean - */ - @Override - public boolean getBoolean(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Boolean value required, but not specified"); - } - if (val instanceof Boolean) - { - return ((Boolean) val).booleanValue(); - } - try - { - return Boolean.parseBoolean((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Boolean value required, but found: " + val); - } - } - - /** - * Return the boolean value associated with key.
    - * If no value is associated with key, or type of value is wrong, returns defaultValue. - * @param key : String designating the key in the entry set - * @return boolean : value associated to the key - */ - @Override - public boolean getBoolean(String key, boolean defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Boolean) - { - return ((Boolean) val).booleanValue(); - } - try - { - return Boolean.parseBoolean((String) val); - } - catch (Exception e) - { - return defaultValue; - } - } - - @Override - public byte getByte(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Byte value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).byteValue(); - } - try - { - return Byte.parseByte((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - - @Override - public byte getByte(String key, byte defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).byteValue(); - } - try - { - return Byte.parseByte((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - - public short increaseByte(String key, byte increaseWith) - { - final byte newValue = (byte) (getByte(key) + increaseWith); - set(key, newValue); - return newValue; - } - - public short increaseByte(String key, byte defaultValue, byte increaseWith) - { - final byte newValue = (byte) (getByte(key, defaultValue) + increaseWith); - set(key, newValue); - return newValue; - } - - public byte[] getByteArray(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Byte value required, but not specified"); - } - if (val instanceof Number) - { - return new byte[] - { - ((Number) val).byteValue() - }; - } - int c = 0; - final String[] vals = ((String) val).split(splitOn); - final byte[] result = new byte[vals.length]; - for (String v : vals) - { - try - { - result[c++] = Byte.parseByte(v); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - return result; - } - - public List getByteList(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final List result = new ArrayList<>(); - for (Byte i : getByteArray(key, splitOn)) - { - result.add(i); - } - return result; - } - - @Override - public short getShort(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Short value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).shortValue(); - } - try - { - return Short.parseShort((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Short value required, but found: " + val); - } - } - - @Override - public short getShort(String key, short defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).shortValue(); - } - try - { - return Short.parseShort((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Short value required, but found: " + val); - } - } - - public short increaseShort(String key, short increaseWith) - { - final short newValue = (short) (getShort(key) + increaseWith); - set(key, newValue); - return newValue; - } - - public short increaseShort(String key, short defaultValue, short increaseWith) - { - final short newValue = (short) (getShort(key, defaultValue) + increaseWith); - set(key, newValue); - return newValue; - } - - @Override - public int getInt(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Integer value required, but not specified: " + key + "!"); - } - - if (val instanceof Number) - { - return ((Number) val).intValue(); - } - - try - { - return Integer.parseInt((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val + "!"); - } - } - - @Override - public int getInt(String key, int defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).intValue(); - } - try - { - return Integer.parseInt((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val); - } - } - - public int increaseInt(String key, int increaseWith) - { - final int newValue = getInt(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public int increaseInt(String key, int defaultValue, int increaseWith) - { - final int newValue = getInt(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - public int[] getIntArray(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Integer value required, but not specified"); - } - if (val instanceof Number) - { - return new int[] - { - ((Number) val).intValue() - }; - } - int c = 0; - final String[] vals = ((String) val).split(splitOn); - final int[] result = new int[vals.length]; - for (String v : vals) - { - try - { - result[c++] = Integer.parseInt(v); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val); - } - } - return result; - } - - public List getIntegerList(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final List result = new ArrayList<>(); - for (int i : getIntArray(key, splitOn)) - { - result.add(i); - } - return result; - } - - @Override - public long getLong(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Long value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).longValue(); - } - try - { - return Long.parseLong((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Long value required, but found: " + val); - } - } - - @Override - public long getLong(String key, long defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).longValue(); - } - try - { - return Long.parseLong((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Long value required, but found: " + val); - } - } - - public long increaseLong(String key, long increaseWith) - { - final long newValue = getLong(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public long increaseLong(String key, long defaultValue, long increaseWith) - { - final long newValue = getLong(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public float getFloat(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Float value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).floatValue(); - } - try - { - return Float.parseFloat((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Float value required, but found: " + val); - } - } - - @Override - public float getFloat(String key, float defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).floatValue(); - } - try - { - return Float.parseFloat((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Float value required, but found: " + val); - } - } - - public float increaseFloat(String key, float increaseWith) - { - final float newValue = getFloat(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public float increaseFloat(String key, float defaultValue, float increaseWith) - { - final float newValue = getFloat(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public double getDouble(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Double value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).doubleValue(); - } - try - { - return Double.parseDouble((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Double value required, but found: " + val); - } - } - - @Override - public double getDouble(String key, double defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).doubleValue(); - } - try - { - return Double.parseDouble((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Double value required, but found: " + val); - } - } - - public double increaseDouble(String key, double increaseWith) - { - final double newValue = getDouble(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public double increaseDouble(String key, double defaultValue, double increaseWith) - { - final double newValue = getDouble(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public String getString(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("String value required, but not specified"); - } - return String.valueOf(val); - } - - @Override - public String getString(String key, String defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - return String.valueOf(val); - } - - @Override - public Duration getDuration(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("String value required, but not specified"); - } - return TimeUtil.parseDuration(String.valueOf(val)); - } - - @Override - public Duration getDuration(String key, Duration defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - return TimeUtil.parseDuration(String.valueOf(val)); - } - - @Override - @SuppressWarnings("unchecked") - public > T getEnum(String key, Class enumClass) - { - Objects.requireNonNull(key); - Objects.requireNonNull(enumClass); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but not specified"); - } - if (enumClass.isInstance(val)) - { - return (T) val; - } - try - { - return Enum.valueOf(enumClass, String.valueOf(val)); - } - catch (Exception e) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); - } - } - - @Override - @SuppressWarnings("unchecked") - public > T getEnum(String key, Class enumClass, T defaultValue) - { - Objects.requireNonNull(key); - Objects.requireNonNull(enumClass); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (enumClass.isInstance(val)) - { - return (T) val; - } - try - { - return Enum.valueOf(enumClass, String.valueOf(val)); - } - catch (Exception e) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); - } - } - - @SuppressWarnings("unchecked") - public A getObject(String name, Class type) - { - Objects.requireNonNull(name); - Objects.requireNonNull(type); - final Object obj = _set.get(name); - if ((obj == null) || !type.isAssignableFrom(obj.getClass())) - { - return null; - } - - return (A) obj; - } - - @SuppressWarnings("unchecked") - public A getObject(String name, Class type, A defaultValue) - { - Objects.requireNonNull(name); - Objects.requireNonNull(type); - final Object obj = _set.get(name); - if ((obj == null) || !type.isAssignableFrom(obj.getClass())) - { - return defaultValue; - } - - return (A) obj; - } - - public SkillHolder getSkillHolder(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof SkillHolder)) - { - return null; - } - - return (SkillHolder) obj; - } - - public Location getLocation(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof Location)) - { - return null; - } - return (Location) obj; - } - - @SuppressWarnings("unchecked") - public List getMinionList(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return Collections.emptyList(); - } - - return (List) obj; - } - - @SuppressWarnings("unchecked") - public List getList(String key, Class clazz) - { - Objects.requireNonNull(key); - Objects.requireNonNull(clazz); - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return null; - } - - final List originalList = (List) obj; - if (!originalList.isEmpty() && !originalList.stream().allMatch(clazz::isInstance)) - { - if (clazz.getSuperclass() == Enum.class) - { - throw new IllegalAccessError("Please use getEnumList if you want to get list of Enums!"); - } - - // Attempt to convert the list - final List convertedList = convertList(originalList, clazz); - if (convertedList == null) - { - LOGGER.log(Level.WARNING, "getList(\"" + key + "\", " + clazz.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); - return null; - } - - // Overwrite the existing list with proper generic type - _set.put(key, convertedList); - return convertedList; - } - return (List) obj; - } - - public List getList(String key, Class clazz, List defaultValue) - { - final List list = getList(key, clazz); - return list == null ? defaultValue : list; - } - - @SuppressWarnings("unchecked") - public > List getEnumList(String key, Class clazz) - { - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return null; - } - - final List originalList = (List) obj; - if (!originalList.isEmpty() && (obj.getClass().getGenericInterfaces()[0] != clazz) && originalList.stream().allMatch(name -> Util.isEnum(name.toString(), clazz))) - { - final List convertedList = originalList.stream().map(Object::toString).map(name -> Enum.valueOf(clazz, name)).map(clazz::cast).collect(Collectors.toList()); - - // Overwrite the existing list with proper generic type - _set.put(key, convertedList); - return convertedList; - } - return (List) obj; - } - - /** - * @param - * @param originalList - * @param clazz - * @return - */ - private List convertList(List originalList, Class clazz) - { - if (clazz == Integer.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isInteger)) - { - return originalList.stream().map(Object::toString).map(Integer::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - else if (clazz == Float.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isFloat)) - { - return originalList.stream().map(Object::toString).map(Float::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - else if (clazz == Double.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isDouble)) - { - return originalList.stream().map(Object::toString).map(Double::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - return null; - } - - @SuppressWarnings("unchecked") - public Map getMap(String key, Class keyClass, Class valueClass) - { - final Object obj = _set.get(key); - if (!(obj instanceof Map)) - { - return null; - } - - final Map originalList = (Map) obj; - if (!originalList.isEmpty() && ((!originalList.keySet().stream().allMatch(keyClass::isInstance)) || (!originalList.values().stream().allMatch(valueClass::isInstance)))) - { - LOGGER.log(Level.WARNING, "getMap(\"" + key + "\", " + keyClass.getSimpleName() + ", " + valueClass.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); - } - return (Map) obj; - } - - public StatsSet set(String name, Object value) - { - if (value == null) - { - return this; - } - _set.put(name, value); - return this; - } - - public StatsSet set(String key, boolean value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, byte value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, short value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, int value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, long value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, float value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, double value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, String value) - { - if (value == null) - { - return this; - } - _set.put(key, value); - return this; - } - - public StatsSet set(String key, Enum value) - { - if (value == null) - { - return this; - } - _set.put(key, value); - return this; - } - - public static StatsSet valueOf(String key, Object value) - { - final StatsSet set = new StatsSet(); - set.set(key, value); - return set; - } - - public void remove(String key) - { - _set.remove(key); - } - - public boolean contains(String name) - { - return _set.containsKey(name); - } - - @Override - public String toString() - { - return "StatsSet{_set=" + _set + '}'; - } -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Npc.java index 74109a5102..9efcc7d9c8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.MpRewardTask; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.FishermanInstance; @@ -148,7 +148,7 @@ public class Npc extends Creature private NpcStringId _titleString; private NpcStringId _nameString; - private StatsSet _params; + private StatSet _params; private RaidBossStatus _raidStatus; /** Contains information about local tax payments. */ @@ -1756,7 +1756,7 @@ public class Npc extends Creature /** * @return the parameters of the npc merged with the spawn parameters (if there are any) */ - public StatsSet getParameters() + public StatSet getParameters() { if (_params != null) { @@ -1768,10 +1768,10 @@ public class Npc extends Creature final NpcSpawnTemplate npcSpawnTemplate = _spawn.getNpcSpawnTemplate(); if ((npcSpawnTemplate != null) && (npcSpawnTemplate.getParameters() != null) && !npcSpawnTemplate.getParameters().isEmpty()) { - final StatsSet params = getTemplate().getParameters(); + final StatSet params = getTemplate().getParameters(); if ((params != null) && !params.getSet().isEmpty()) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.merge(params); set.merge(npcSpawnTemplate.getParameters()); _params = set; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index c8cbb989c0..a4d95ae3fc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -21,7 +21,7 @@ import java.util.EnumMap; import java.util.Map; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; @@ -49,12 +49,12 @@ public class CreatureTemplate extends ListenersContainer /** The creature's race. */ private Race _race; - public CreatureTemplate(StatsSet set) + public CreatureTemplate(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { // Base stats _baseValues.put(Stat.STAT_STR, set.getDouble("baseSTR", 0)); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java index 86441c678c..14f0e9cae8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.CubicInstance; @@ -46,7 +46,7 @@ public class CubicTemplate implements ICubicConditionHolder private final List _conditions = new ArrayList<>(); public List _skills = new ArrayList<>(); - public CubicTemplate(StatsSet set) + public CubicTemplate(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java index c40883ac75..410040bc86 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.templates; import org.l2jmobius.gameserver.enums.DoorOpenType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -57,7 +57,7 @@ public class DoorTemplate extends CreatureTemplate implements IIdentifiable private final boolean _stealth; private final boolean _isInverted; - public DoorTemplate(StatsSet set) + public DoorTemplate(StatSet set) { super(set); _doorId = set.getInt("id"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 1eedf5be50..92f55589e8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.enums.MpRewardAffectType; import org.l2jmobius.gameserver.enums.MpRewardType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -63,7 +63,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private boolean _usingServerSideName; private String _title; private boolean _usingServerSideTitle; - private StatsSet _parameters; + private StatSet _parameters; private Sex _sex; private int _chestId; private int _rhandId; @@ -123,15 +123,15 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable /** * Constructor of Creature. - * @param set The StatsSet object to transfer data to the method + * @param set The StatSet object to transfer data to the method */ - public NpcTemplate(StatsSet set) + public NpcTemplate(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _id = set.getInt("id"); @@ -320,12 +320,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _usingServerSideTitle; } - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } - public void setParameters(StatsSet set) + public void setParameters(StatSet set) { _parameters = set; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 50292b8bc8..28458aa09e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -50,7 +50,7 @@ public class PlayerTemplate extends CreatureTemplate private final List _creationPoints; private final Map _baseSlotDef; - public PlayerTemplate(StatsSet set, List creationPoints) + public PlayerTemplate(StatSet set, List creationPoints) { super(set); _classId = ClassId.getClassId(set.getInt("classId")); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index aa28a0f648..260da48365 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -23,7 +23,7 @@ import java.util.Objects; import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import org.l2jmobius.gameserver.enums.InventoryBlockType; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -57,7 +57,7 @@ public class Transform implements IIdentifiable private TransformTemplate _maleTemplate; private TransformTemplate _femaleTemplate; - public Transform(StatsSet set) + public Transform(StatSet set) { _id = set.getInt("id"); _displayId = set.getInt("displayId", _id); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java index 5660852a01..729998503f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.actor.transform; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -31,7 +31,7 @@ public class TransformLevelData private final double _levelMod; private Map _stats; - public TransformLevelData(StatsSet set) + public TransformLevelData(StatSet set) { _level = set.getInt("val"); _levelMod = set.getDouble("levelMod"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 4de84b8bdc..7aca059f91 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -23,7 +23,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -49,7 +49,7 @@ public class TransformTemplate private ExBasicActionList _list; private final Map _data = new LinkedHashMap<>(100); - public TransformTemplate(StatsSet set) + public TransformTemplate(StatSet set) { _collisionRadius = set.contains("radius") ? set.getDouble("radius") : null; _collisionHeight = set.contains("height") ? set.getDouble("height") : null; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java index d808a6b8bf..02550d2818 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -36,7 +36,7 @@ public class AlchemyCraftData private ItemHolder _productionSuccess; private ItemHolder _productionFailure; - public AlchemyCraftData(StatsSet set) + public AlchemyCraftData(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java index 0bd061d3c4..79dd6c0207 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.beautyshop; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -32,7 +32,7 @@ public class BeautyItem private final int _beautyShopTicket; private final Map _colors = new HashMap<>(); - public BeautyItem(StatsSet set) + public BeautyItem(StatSet set) { _id = set.getInt("id"); _adena = set.getInt("adena", 0); @@ -60,7 +60,7 @@ public class BeautyItem return _beautyShopTicket; } - public void addColor(StatsSet set) + public void addColor(StatSet set) { final BeautyItem color = new BeautyItem(set); _colors.put(set.getInt("id"), color); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index e0d1486962..1c341e0c31 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party.MessageType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.appearance.PlayerAppearance; @@ -244,7 +244,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent player.teleToLocation(_instance.getEnterLocations().get(index++), 0, _instance); } - getTimers().addTimer("match_start_countdown", StatsSet.valueOf("time", 60), 100, null, null); + getTimers().addTimer("match_start_countdown", StatSet.valueOf("time", 60), 100, null, null); getTimers().addTimer("teleport_message1", 10000, null, null); getTimers().addTimer("teleport_message2", 14000, null, null); @@ -394,7 +394,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent } } getTimers().cancelTimer("update", null, null); - getTimers().addTimer("match_end_countdown", StatsSet.valueOf("time", 30), 30 * 1000, null, null); + getTimers().addTimer("match_end_countdown", StatSet.valueOf("time", 30), 30 * 1000, null, null); EventDispatcher.getInstance().notifyEvent(new OnCeremonyOfChaosMatchResult(winners, members)); } @@ -487,7 +487,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java index 39f9196d93..371f8dc459 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.conditions.ICubicCondition; @@ -38,7 +38,7 @@ public class CubicSkill extends SkillHolder implements ICubicConditionHolder private final List _conditions = new ArrayList<>(); private final boolean _targetDebuff; - public CubicSkill(StatsSet set) + public CubicSkill(StatSet set) { super(set.getInt("id"), set.getInt("level")); _triggerRate = set.getInt("triggerRate", 100); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/entity/ClanHall.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/entity/ClanHall.java index 8da77477fd..22af370709 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/entity/ClanHall.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/entity/ClanHall.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -75,7 +75,7 @@ public class ClanHall extends AbstractResidence private static final String LOAD_CLANHALL = "SELECT * FROM clanhall WHERE id=?"; private static final String UPDATE_CLANHALL = "UPDATE clanhall SET ownerId=?,paidUntil=? WHERE id=?"; - public ClanHall(StatsSet params) + public ClanHall(StatSet params) { super(params.getInt("id")); // Set static parameters diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/entity/Hero.java index ef005ff325..aee8b019ee 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/entity/Hero.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/entity/Hero.java @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.data.xml.impl.ClassListData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -74,13 +74,13 @@ public class Hero // delete hero items private static final String DELETE_ITEMS = "DELETE FROM items WHERE item_id IN (30392, 30393, 30394, 30395, 30396, 30397, 30398, 30399, 30400, 30401, 30402, 30403, 30404, 30405, 30372, 30373, 6842, 6611, 6612, 6613, 6614, 6615, 6616, 6617, 6618, 6619, 6620, 6621, 9388, 9389, 9390) AND owner_id NOT IN (SELECT charId FROM characters WHERE accesslevel > 0)"; - private static final Map HEROES = new ConcurrentHashMap<>(); - private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); + private static final Map HEROES = new ConcurrentHashMap<>(); + private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); - private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); - private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); + private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); + private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); - private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); + private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); private static final Map HERO_MESSAGE = new ConcurrentHashMap<>(); public static final String COUNT = "count"; @@ -118,7 +118,7 @@ public class Hero { while (rset.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset.getInt(Olympiad.CLASS_ID)); @@ -137,7 +137,7 @@ public class Hero while (rset2.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset2.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset2.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset2.getInt(Olympiad.CLASS_ID)); @@ -159,7 +159,7 @@ public class Hero LOGGER.info("Hero System: Loaded " + COMPLETE_HEROS.size() + " all time Heroes."); } - private void processHeros(PreparedStatement ps, int charId, StatsSet hero) throws SQLException + private void processHeros(PreparedStatement ps, int charId, StatSet hero) throws SQLException { ps.setInt(1, charId); try (ResultSet rs = ps.executeQuery()) @@ -224,7 +224,7 @@ public class Hero public void loadDiary(int charId) { - final List diary = new ArrayList<>(); + final List diary = new ArrayList<>(); int diaryentries = 0; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement("SELECT * FROM heroes_diary WHERE charId=? ORDER BY time ASC")) @@ -234,7 +234,7 @@ public class Hero { while (rset.next()) { - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final long time = rset.getLong("time"); final int action = rset.getInt("action"); @@ -279,8 +279,8 @@ public class Hero public void loadFights(int charId) { - final List fights = new ArrayList<>(); - final StatsSet heroCountData = new StatsSet(); + final List fights = new ArrayList<>(); + final StatSet heroCountData = new StatSet(); final Calendar data = Calendar.getInstance(); data.set(Calendar.DAY_OF_MONTH, 1); data.set(Calendar.HOUR_OF_DAY, 0); @@ -326,7 +326,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charTwoClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -362,7 +362,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charOneClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -410,14 +410,14 @@ public class Hero } } - public Map getHeroes() + public Map getHeroes() { return HEROES; } public int getHeroByClass(int classid) { - for (Entry e : HEROES.entrySet()) + for (Entry e : HEROES.entrySet()) { if (e.getValue().getInt(Olympiad.CLASS_ID) == classid) { @@ -438,7 +438,7 @@ public class Hero public void showHeroDiary(PlayerInstance player, int heroclass, int charid, int page) { final int perpage = 10; - final List mainList = HERO_DIARY.get(charid); + final List mainList = HERO_DIARY.get(charid); if (mainList != null) { final NpcHtmlMessage diaryReply = new NpcHtmlMessage(); @@ -453,7 +453,7 @@ public class Hero if (!mainList.isEmpty()) { - final List list = new ArrayList<>(mainList); + final List list = new ArrayList<>(mainList); Collections.reverse(list); boolean color = true; @@ -463,7 +463,7 @@ public class Hero for (int i = (page - 1) * perpage; i < list.size(); i++) { breakat = i; - final StatsSet diaryEntry = list.get(i); + final StatSet diaryEntry = list.get(i); fList.append(""); if (color) { @@ -524,7 +524,7 @@ public class Hero int loss = 0; int draw = 0; - final List heroFights = HERO_FIGHTS.get(charid); + final List heroFights = HERO_FIGHTS.get(charid); if (heroFights != null) { final NpcHtmlMessage fightReply = new NpcHtmlMessage(); @@ -536,7 +536,7 @@ public class Hero if (!heroFights.isEmpty()) { - final StatsSet heroCount = HERO_COUNTS.get(charid); + final StatSet heroCount = HERO_COUNTS.get(charid); if (heroCount != null) { win = heroCount.getInt("victory"); @@ -551,7 +551,7 @@ public class Hero for (int i = (page - 1) * perpage; i < heroFights.size(); i++) { breakat = i; - final StatsSet fight = heroFights.get(i); + final StatSet fight = heroFights.get(i); fList.append(""); if (color) { @@ -609,7 +609,7 @@ public class Hero } } - public synchronized void computeNewHeroes(List newHeroes) + public synchronized void computeNewHeroes(List newHeroes) { updateHeroes(true); @@ -659,13 +659,13 @@ public class Hero return; } - for (StatsSet hero : newHeroes) + for (StatSet hero : newHeroes) { final int charId = hero.getInt(Olympiad.CHAR_ID); if (COMPLETE_HEROS.containsKey(charId)) { - final StatsSet oldHero = COMPLETE_HEROS.get(charId); + final StatSet oldHero = COMPLETE_HEROS.get(charId); final int count = oldHero.getInt(COUNT); oldHero.set(COUNT, count + 1); oldHero.set(PLAYED, 1); @@ -674,7 +674,7 @@ public class Hero } else { - final StatsSet newHero = new StatsSet(); + final StatSet newHero = new StatSet(); newHero.set(Olympiad.CHAR_NAME, hero.getString(Olympiad.CHAR_NAME)); newHero.set(Olympiad.CLASS_ID, hero.getInt(Olympiad.CLASS_ID)); newHero.set(COUNT, 1); @@ -700,9 +700,9 @@ public class Hero } else { - StatsSet hero; + StatSet hero; int heroId; - for (Entry entry : HEROES.entrySet()) + for (Entry entry : HEROES.entrySet()) { hero = entry.getValue(); heroId = entry.getKey(); @@ -787,13 +787,13 @@ public class Hero setDiaryData(charId, ACTION_RAID_KILLED, npcId); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (template == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -806,13 +806,13 @@ public class Hero setDiaryData(charId, ACTION_CASTLE_TAKEN, castleId); final Castle castle = CastleManager.getInstance().getCastleById(castleId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (castle == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -922,10 +922,10 @@ public class Hero */ public void claimHero(PlayerInstance player) { - StatsSet hero = HEROES.get(player.getObjectId()); + StatSet hero = HEROES.get(player.getObjectId()); if (hero == null) { - hero = new StatsSet(); + hero = new StatSet(); HEROES.put(player.getObjectId(), hero); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java index f1263e8d44..c52f487402 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java @@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.atomic.AtomicReference; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.eventengine.drop.IEventDrop; import org.l2jmobius.gameserver.model.events.AbstractScript; @@ -42,7 +42,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout public abstract class AbstractEventManager>extends AbstractScript { private String _name; - private StatsSet _variables = StatsSet.EMPTY_STATSET; + private StatSet _variables = StatSet.EMPTY_STATSET; private Set _schedulers = Collections.emptySet(); private Set _conditionalSchedulers = Collections.emptySet(); private Map _rewards = Collections.emptyMap(); @@ -67,14 +67,14 @@ public abstract class AbstractEventManager>extends Ab /* ********************** */ - public StatsSet getVariables() + public StatSet getVariables() { return _variables; } - public void setVariables(StatsSet variables) + public void setVariables(StatSet variables) { - _variables = new StatsSet(Collections.unmodifiableMap(variables.getSet())); + _variables = new StatSet(Collections.unmodifiableMap(variables.getSet())); } /* ********************** */ diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java index 59c64b812c..e41af41d1a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.util.cron4j.PastPredictor; import org.l2jmobius.gameserver.util.cron4j.Predictor; @@ -45,7 +45,7 @@ public class EventScheduler private List _notifications; private ScheduledFuture _task; - public EventScheduler(AbstractEventManager manager, StatsSet set) + public EventScheduler(AbstractEventManager manager, StatSet set) { _eventManager = manager; _name = set.getString("name", ""); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 4fc2d3b8b0..819c3bf34d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -50,7 +50,7 @@ import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -181,12 +181,12 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime onTimerCancel(holder.getEvent(), holder.getParams(), holder.getNpc(), holder.getPlayer()); } - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { LOGGER.warning("[" + getClass().getSimpleName() + "]: Timer event arrived at non overriden onTimerEvent method event: " + event + " npc: " + npc + " player: " + player); } - public void onTimerCancel(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerCancel(String event, StatSet params, Npc npc, PlayerInstance player) { } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java index 400fb64b6e..861c4a9b31 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java @@ -24,7 +24,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.timers.IEventTimerCancel; @@ -69,7 +69,7 @@ public class TimerExecutor * @param eventTimer * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - public boolean addTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) + public boolean addTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) { return addTimer(new TimerHolder<>(event, params, time, npc, player, false, eventTimer, _cancelListener, this)); } @@ -95,7 +95,7 @@ public class TimerExecutor * @param player * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - public boolean addTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player) + public boolean addTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player) { return addTimer(event, params, time, npc, player, _eventListener); } @@ -123,7 +123,7 @@ public class TimerExecutor * @param eventTimer * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - private boolean addRepeatingTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) + private boolean addRepeatingTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) { return addTimer(new TimerHolder<>(event, params, time, npc, player, true, eventTimer, _cancelListener, this)); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java index ab8fa150ca..0fcafba759 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java @@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.gameserver.instancemanager.TimersManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.TimerExecutor; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.events.TimerExecutor; public class TimerHolder implements Runnable { private final T _event; - private final StatsSet _params; + private final StatSet _params; private final long _time; private final Npc _npc; private final PlayerInstance _player; @@ -44,7 +44,7 @@ public class TimerHolder implements Runnable private final TimerExecutor _postExecutor; private final ScheduledFuture _task; - public TimerHolder(T event, StatsSet params, long time, Npc npc, PlayerInstance player, boolean isRepeating, IEventTimerEvent eventScript, IEventTimerCancel cancelScript, TimerExecutor postExecutor) + public TimerHolder(T event, StatSet params, long time, Npc npc, PlayerInstance player, boolean isRepeating, IEventTimerEvent eventScript, IEventTimerCancel cancelScript, TimerExecutor postExecutor) { Objects.requireNonNull(event, getClass().getSimpleName() + ": \"event\" cannot be null!"); Objects.requireNonNull(eventScript, getClass().getSimpleName() + ": \"script\" cannot be null!"); @@ -73,7 +73,7 @@ public class TimerHolder implements Runnable /** * @return the parameters of this timer */ - public StatsSet getParams() + public StatSet getParams() { return _params; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index 4a017eaaa2..78b7d0eaa3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; @@ -37,7 +37,7 @@ public class AppearanceHolder private final AppearanceTargetType _targetType; private final Integer _bodyPart; - public AppearanceHolder(StatsSet set) + public AppearanceHolder(StatSet set) { _visualId = set.getInt("id", 0); _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java index 29740873cd..0f9488448d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Nik @@ -43,7 +43,7 @@ public class AttachSkillHolder extends SkillHolder return _requiredSkillLevel; } - public static AttachSkillHolder fromStatsSet(StatsSet set) + public static AttachSkillHolder fromStatSet(StatSet set) { return new AttachSkillHolder(set.getInt("skillId"), set.getInt("skillLevel", 1), set.getInt("requiredSkillId"), set.getInt("requiredSkillLevel", 1)); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java index cc41724532..57b6d47c40 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Set; import org.l2jmobius.gameserver.enums.SkillEnchantType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -36,7 +36,7 @@ public class EnchantSkillHolder private final Map _chance = new EnumMap<>(SkillEnchantType.class); private final Map> _requiredItems = new EnumMap<>(SkillEnchantType.class); - public EnchantSkillHolder(StatsSet set) + public EnchantSkillHolder(StatSet set) { _level = set.getInt("level"); _enchantFailLevel = set.getInt("enchantFailLevel"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java index e6706c8467..33d14e4345 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Map; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -36,7 +36,7 @@ public class ExtendDropDataHolder private final List _conditions; private final Map _systemMessages; - public ExtendDropDataHolder(StatsSet set) + public ExtendDropDataHolder(StatSet set) { _id = set.getInt("id"); _items = set.getList("items", ExtendDropItemHolder.class); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java index 16454d764a..d63d4eb775 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -52,7 +52,7 @@ public class FakePlayerHolder private final int _clanId; private final int _pledgeStatus; - public FakePlayerHolder(StatsSet set) + public FakePlayerHolder(StatSet set) { _classId = set.getInt("classId", 182); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java index a9c72776cd..86af0c1405 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -29,7 +29,7 @@ public class ItemHolder implements IIdentifiable private final int _id; private final long _count; - public ItemHolder(StatsSet set) + public ItemHolder(StatSet set) { _id = set.getInt("id"); _count = set.getLong("count"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java index 5b581c4cfe..a54dfa8300 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -25,7 +25,7 @@ public class ItemPointHolder extends ItemHolder { private final int _points; - public ItemPointHolder(StatsSet params) + public ItemPointHolder(StatSet params) { this(params.getInt("id"), params.getLong("count"), params.getInt("points")); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java index 22c6c327eb..0ba78224d3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.holders; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -34,7 +34,7 @@ public class LuckyGameDataHolder private int _minModifyRewardGame; private int _maxModifyRewardGame; - public LuckyGameDataHolder(StatsSet params) + public LuckyGameDataHolder(StatSet params) { _index = params.getInt("index"); _turningPoints = params.getInt("turning_point"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java index f77e380e8d..9fa8c99654 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.holders; import java.time.Duration; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -32,7 +32,7 @@ public class MinionHolder implements IIdentifiable private final long _respawnTime; private final int _weightPoint; - public MinionHolder(StatsSet set) + public MinionHolder(StatSet set) { _id = set.getInt("id"); _count = set.getInt("count", 1); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java index f4173594d1..36ac70176d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -52,7 +52,7 @@ public class MultisellListHolder implements IIdentifiable } @SuppressWarnings("unchecked") - public MultisellListHolder(StatsSet set) + public MultisellListHolder(StatSet set) { _listId = set.getInt("listId"); _isChanceMultisell = set.getBoolean("isChanceMultisell", false); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index f1b98ee9ac..ecd1069283 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -45,7 +45,7 @@ import org.l2jmobius.gameserver.enums.InstanceReenterType; import org.l2jmobius.gameserver.enums.InstanceTeleportType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -87,7 +87,7 @@ public class Instance implements IIdentifiable, INamable private final Set _players = ConcurrentHashMap.newKeySet(); // Players inside instance private final Set _npcs = ConcurrentHashMap.newKeySet(); // Spawned NPCs inside instance private final Map _doors = new HashMap<>(); // Spawned doors inside instance - private final StatsSet _parameters = new StatsSet(); + private final StatSet _parameters = new StatSet(); // Timers private final Map> _ejectDeadTasks = new ConcurrentHashMap<>(); private ScheduledFuture _cleanUpTask = null; @@ -171,7 +171,7 @@ public class Instance implements IIdentifiable, INamable * Get instance world parameters. * @return instance parameters */ - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } @@ -1020,7 +1020,7 @@ public class Instance implements IIdentifiable, INamable * Get parameters from instance template.
    * @return template parameters */ - public StatsSet getTemplateParameters() + public StatSet getTemplateParameters() { return _template.getParameters(); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 2a196f73ef..b53b0a819d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.AbstractPlayerGroup; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -71,7 +71,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl private float _spRate = Config.RATE_INSTANCE_SP; private float _expPartyRate = Config.RATE_INSTANCE_PARTY_XP; private float _spPartyRate = Config.RATE_INSTANCE_PARTY_SP; - private StatsSet _parameters = StatsSet.EMPTY_STATSET; + private StatSet _parameters = StatSet.EMPTY_STATSET; private final Map _doors = new HashMap<>(); private final List _spawns = new ArrayList<>(); // Locations @@ -92,7 +92,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl /** * @param set */ - public InstanceTemplate(StatsSet set) + public InstanceTemplate(StatSet set) { _templateId = set.getInt("id", 0); _name = set.getString("name", null); @@ -178,7 +178,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (!set.isEmpty()) { - _parameters = new StatsSet(Collections.unmodifiableMap(set)); + _parameters = new StatSet(Collections.unmodifiableMap(set)); } } @@ -469,7 +469,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl * Get instance template parameters. * @return parameters of template */ - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java index 3b67ff72f4..3627959662 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; import java.util.function.BiConsumer; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public abstract class Condition { private final InstanceTemplate _template; - private final StatsSet _parameters; + private final StatSet _parameters; private final boolean _leaderOnly; private final boolean _showMessageAndHtml; private SystemMessageId _systemMsg = null; @@ -46,7 +46,7 @@ public abstract class Condition * @param onlyLeader flag which means if only leader should be affected (leader means player who wants to enter not group leader!) * @param showMessageAndHtml if {@code true} and HTML message is defined then both are send, otherwise only HTML or message is send */ - public Condition(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public Condition(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { _template = template; _parameters = parameters; @@ -58,7 +58,7 @@ public abstract class Condition * Gets parameters of condition. * @return set of parameters */ - protected final StatsSet getParameters() + protected final StatSet getParameters() { return _parameters; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java index e379741b59..c27d92d662 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionCommandChannel extends Condition { - public ConditionCommandChannel(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionCommandChannel(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_CANNOT_ENTER_BECAUSE_YOU_ARE_NOT_ASSOCIATED_WITH_THE_CURRENT_COMMAND_CHANNEL); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java index ed434e3524..a828dcceae 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.model.AbstractPlayerGroup; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionCommandChannelLeader extends Condition { - public ConditionCommandChannelLeader(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionCommandChannelLeader(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java index d2a60816d0..423a37a94e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionDistance extends Condition { - public ConditionDistance(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionDistance(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); setSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED, (message, player) -> message.addString(player.getName())); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java index 3dc78a98c7..8aa68b7e08 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionGroupMax extends Condition { - public ConditionGroupMax(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionGroupMax(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_CANNOT_ENTER_DUE_TO_THE_PARTY_HAVING_EXCEEDED_THE_LIMIT); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java index f7930b1d8c..fde9d13439 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionGroupMin extends Condition { - public ConditionGroupMin(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionGroupMin(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_MUST_HAVE_A_MINIMUM_OF_S1_PEOPLE_TO_ENTER_THIS_INSTANCED_ZONE, (msg, player) -> msg.addInt(getLimit())); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 3088d8ae64..53fee609aa 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.enums.ResidenceType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; */ public class ConditionHasResidence extends Condition { - public ConditionHasResidence(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionHasResidence(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); } @@ -43,7 +43,7 @@ public class ConditionHasResidence extends Condition return false; } - final StatsSet params = getParameters(); + final StatSet params = getParameters(); final int id = params.getInt("id"); boolean test = false; switch (params.getEnum("type", ResidenceType.class)) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java index 4e1c407325..eed350db38 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -32,7 +32,7 @@ public class ConditionItem extends Condition private final long _count; private final boolean _take; - public ConditionItem(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionItem(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Load params diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java index 7d509a20c7..b38f8c0e2c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -32,7 +32,7 @@ public class ConditionLevel extends Condition private final int _min; private final int _max; - public ConditionLevel(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionLevel(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Load params diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java index b91deeffdb..d71e6d0a39 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; */ public class ConditionNoParty extends Condition { - public ConditionNoParty(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionNoParty(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java index dd31bf3ca5..5bf768a03e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionParty extends Condition { - public ConditionParty(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionParty(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java index 524a59675a..0363715536 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionPartyLeader extends Condition { - public ConditionPartyLeader(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionPartyLeader(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java index 481cb251ce..48d7fc7981 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.instancemanager.QuestManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionQuest extends Condition { - public ConditionQuest(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionQuest(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Set message diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 899b17aff9..a073129734 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionReenter extends Condition { - public ConditionReenter(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionReenter(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); setSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET, (message, player) -> message.addString(player.getName())); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java index ec255025c3..fafafe5604 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.itemauction; import java.util.Calendar; import java.util.concurrent.TimeUnit; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Forsaiken @@ -40,7 +40,7 @@ public class AuctionDateGenerator private int _hour_of_day; private int _minute_of_hour; - public AuctionDateGenerator(StatsSet config) + public AuctionDateGenerator(StatSet config) { _calendar = Calendar.getInstance(); _interval = config.getInt(FIELD_INTERVAL, -1); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 64bf0a6ff1..cb554e4dce 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.itemauction; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.idfactory.IdFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,9 +34,9 @@ public class AuctionItem private final int _itemId; private final long _itemCount; @SuppressWarnings("unused") - private final StatsSet _itemExtra; + private final StatSet _itemExtra; - public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatsSet itemExtra) + public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatSet itemExtra) { _auctionItemId = auctionItemId; _auctionLength = auctionLength; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 6dff6e3a4d..dc3a7f6f6b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -44,7 +44,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -84,7 +84,7 @@ public class ItemAuctionInstance _items = new ArrayList<>(); final NamedNodeMap nanode = node.getAttributes(); - final StatsSet generatorConfig = new StatsSet(); + final StatSet generatorConfig = new StatSet(); for (int i = nanode.getLength(); i-- > 0;) { final Node n = nanode.item(i); @@ -115,7 +115,7 @@ public class ItemAuctionInstance throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } - final StatsSet itemExtra = new StatsSet(); + final StatSet itemExtra = new StatSet(); final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Armor.java index ac707b015b..c87f7ed45e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Armor.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.type.ArmorType; /** @@ -28,15 +28,15 @@ public class Armor extends Item /** * Constructor for Armor. - * @param set the StatsSet designating the set of couples (key,value) characterizing the armor. + * @param set the StatSet designating the set of couples (key,value) characterizing the armor. */ - public Armor(StatsSet set) + public Armor(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/EtcItem.java index 86d7291595..a902860c0d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/EtcItem.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -38,15 +38,15 @@ public class EtcItem extends Item /** * Constructor for EtcItem. - * @param set StatsSet designating the set of couples (key,value) for description of the Etc + * @param set StatSet designating the set of couples (key,value) for description of the Etc */ - public EtcItem(StatsSet set) + public EtcItem(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Henna.java index 921fa10dfb..87cea36031 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; @@ -44,7 +44,7 @@ public class Henna private final List _skills; private final List _wear_class; - public Henna(StatsSet set) + public Henna(StatSet set) { _dyeId = set.getInt("dyeId"); _dyeItemId = set.getInt("dyeItemId"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Item.java index 5a362bd454..926f0ad8bd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Item.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.enums.ItemGrade; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; @@ -175,14 +175,14 @@ public abstract class Item extends ListenersContainer implements IIdentifiable /** * Constructor of the Item that fill class variables.
    *
    - * @param set : StatsSet corresponding to a set of couples (key,value) for description of the item + * @param set : StatSet corresponding to a set of couples (key,value) for description of the item */ - protected Item(StatsSet set) + protected Item(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { _itemId = set.getInt("item_id"); _displayId = set.getInt("displayId", _itemId); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java index ab196007a8..3ca228cbe5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -29,7 +29,7 @@ public class PlayerItemTemplate extends ItemHolder /** * @param set the set containing the values for this object */ - public PlayerItemTemplate(StatsSet set) + public PlayerItemTemplate(StatSet set) { super(set.getInt("id"), set.getInt("count")); _equipped = set.getBoolean("equipped", false); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Weapon.java index 16f0c47287..5f9f8507bd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Weapon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.items; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ItemSkillType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -58,15 +58,15 @@ public class Weapon extends Item /** * Constructor for Weapon. - * @param set the StatsSet designating the set of couples (key,value) characterizing the weapon. + * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. */ - public Weapon(StatsSet set) + public Weapon(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java index 422054b245..aa1f33acce 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java @@ -23,7 +23,7 @@ import java.util.List; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -54,7 +54,7 @@ public class AppearanceStone private List _racesNot; private List _allVisualIds; - public AppearanceStone(StatsSet set) + public AppearanceStone(StatSet set) { _id = set.getInt("id"); _visualId = set.getInt("visualId", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java index f3b53f1a67..a2897ba911 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.items.combination; import java.util.EnumMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -31,7 +31,7 @@ public class CombinationItem private final int _chance; private final Map _rewards = new EnumMap<>(CombinationItemType.class); - public CombinationItem(StatsSet set) + public CombinationItem(StatSet set) { _itemOne = set.getInt("one"); _itemTwo = set.getInt("two"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java index 1cde38a6d6..a7f1326bd8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.CrystalType; @@ -59,7 +59,7 @@ public abstract class AbstractEnchantItem private final int _maxEnchantLevel; private final double _bonusRate; - public AbstractEnchantItem(StatsSet set) + public AbstractEnchantItem(StatSet set) { _id = set.getInt("id"); if (getItem() == null) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java index b6b34cc667..7329d8728e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -40,7 +40,7 @@ public class EnchantScroll extends AbstractEnchantItem private final int _scrollGroupId; private Set _items; - public EnchantScroll(StatsSet set) + public EnchantScroll(StatSet set) { super(set); _scrollGroupId = set.getInt("scrollGroupId", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java index c02095428b..978e38d533 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items.enchant; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.items.type.ItemType; @@ -30,7 +30,7 @@ public class EnchantSupportItem extends AbstractEnchantItem private final boolean _isGiant; private final ItemType type; - public EnchantSupportItem(StatsSet set) + public EnchantSupportItem(StatSet set) { super(set); type = getItem().getItemType(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index c965e15d4c..36efcc2103 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -45,7 +45,7 @@ import org.l2jmobius.gameserver.data.xml.impl.ClassListData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.ClassId; @@ -63,7 +63,7 @@ public class Olympiad extends ListenersContainer protected static final Logger LOGGER = Logger.getLogger(Olympiad.class.getName()); protected static final Logger LOGGER_OLYMPIAD = Logger.getLogger("olympiad"); - private static final Map NOBLES = new ConcurrentHashMap<>(); + private static final Map NOBLES = new ConcurrentHashMap<>(); private static final Map NOBLES_RANK = new HashMap<>(); public static final String OLYMPIAD_HTML_PATH = "data/html/olympiad/"; @@ -228,10 +228,10 @@ public class Olympiad extends ListenersContainer PreparedStatement statement = con.prepareStatement(OLYMPIAD_LOAD_NOBLES); ResultSet rset = statement.executeQuery()) { - StatsSet statData; + StatSet statData; while (rset.next()) { - statData = new StatsSet(); + statData = new StatSet(); statData.set(CLASS_ID, rset.getInt(CLASS_ID)); statData.set(CHAR_NAME, rset.getString(CHAR_NAME)); statData.set(POINTS, rset.getInt(POINTS)); @@ -454,7 +454,7 @@ public class Olympiad extends ListenersContainer saveNobleData(); _period = 1; - final List heroesToBe = sortHerosToBe(); + final List heroesToBe = sortHerosToBe(); Hero.getInstance().resetData(); Hero.getInstance().computeNewHeroes(heroesToBe); @@ -488,7 +488,7 @@ public class Olympiad extends ListenersContainer return NOBLES.size(); } - public static StatsSet getNobleStats(int playerId) + public static StatSet getNobleStats(int playerId) { return NOBLES.get(playerId); } @@ -787,7 +787,7 @@ public class Olympiad extends ListenersContainer } int currentPoints; - for (StatsSet nobleInfo : NOBLES.values()) + for (StatSet nobleInfo : NOBLES.values()) { currentPoints = nobleInfo.getInt(POINTS); currentPoints += WEEKLY_POINTS; @@ -805,7 +805,7 @@ public class Olympiad extends ListenersContainer return; } - for (StatsSet nobleInfo : NOBLES.values()) + for (StatSet nobleInfo : NOBLES.values()) { nobleInfo.set(COMP_DONE_WEEK, 0); } @@ -838,9 +838,9 @@ public class Olympiad extends ListenersContainer try (Connection con = DatabaseFactory.getConnection()) { - for (Entry entry : NOBLES.entrySet()) + for (Entry entry : NOBLES.entrySet()) { - final StatsSet nobleInfo = entry.getValue(); + final StatSet nobleInfo = entry.getValue(); if (nobleInfo == null) { @@ -953,7 +953,7 @@ public class Olympiad extends ListenersContainer } } - protected List sortHerosToBe() + protected List sortHerosToBe() { if (_period != 1) { @@ -961,8 +961,8 @@ public class Olympiad extends ListenersContainer } LOGGER_OLYMPIAD.info("Noble,charid,classid,compDone,points"); - StatsSet nobleInfo; - for (Entry entry : NOBLES.entrySet()) + StatSet nobleInfo; + for (Entry entry : NOBLES.entrySet()) { nobleInfo = entry.getValue(); if (nobleInfo == null) @@ -979,12 +979,12 @@ public class Olympiad extends ListenersContainer LOGGER_OLYMPIAD.info(charName + "," + charId + "," + classId + "," + compDone + "," + points); } - final List heroesToBe = new LinkedList<>(); + final List heroesToBe = new LinkedList<>(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(OLYMPIAD_GET_HEROS)) { - StatsSet hero; + StatSet hero; for (int element : HERO_IDS) { // Classic can have 2nd and 3rd class competitors, but only 1 hero @@ -996,7 +996,7 @@ public class Olympiad extends ListenersContainer { if (rset.next()) { - hero = new StatsSet(); + hero = new StatSet(); hero.set(CLASS_ID, element); // save the 3rd class title hero.set(CHAR_ID, rset.getInt(CHAR_ID)); hero.set(CHAR_NAME, rset.getString(CHAR_NAME)); @@ -1050,7 +1050,7 @@ public class Olympiad extends ListenersContainer return 0; } - final StatsSet noble = NOBLES.get(objectId); + final StatSet noble = NOBLES.get(objectId); if ((noble == null) || (noble.getInt(POINTS) == 0)) { return 0; @@ -1100,7 +1100,7 @@ public class Olympiad extends ListenersContainer { if (!NOBLES.containsKey(player.getObjectId())) { - final StatsSet statDat = new StatsSet(); + final StatSet statDat = new StatSet(); statDat.set(CLASS_ID, player.getBaseClass()); statDat.set(CHAR_NAME, player.getName()); statDat.set(POINTS, DEFAULT_POINTS); @@ -1207,7 +1207,7 @@ public class Olympiad extends ListenersContainer * @param data the stats set data to add. * @return the old stats set if the noble is already present, null otherwise. */ - public static StatsSet addNobleStats(int charId, StatsSet data) + public static StatSet addNobleStats(int charId, StatSet data) { return NOBLES.put(charId, data); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/Participant.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/Participant.java index 670066ac32..b6d879b902 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/Participant.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/Participant.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.olympiad; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class Participant private final int baseClass; private boolean disconnected = false; private boolean defaulted = false; - private final StatsSet stats; + private final StatSet stats; public String clanName; public int clanId; @@ -125,7 +125,7 @@ public class Participant /** * @return the stats */ - public StatsSet getStats() + public StatSet getStats() { return stats; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java index 4d5231ca5d..c1fb0f88f6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.primeshop; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -49,7 +49,7 @@ public class PrimeShopGroup private final int _availableCount; private final List _items; - public PrimeShopGroup(StatsSet set, List items) + public PrimeShopGroup(StatSet set, List items) { _brId = set.getInt("id"); _category = set.getInt("cat", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java index d150ec98cd..88795e0721 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.residences; import java.time.Duration; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -33,7 +33,7 @@ public class ResidenceFunctionTemplate private final Duration _duration; private final double _value; - public ResidenceFunctionTemplate(StatsSet set) + public ResidenceFunctionTemplate(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java index 4f15efda0b..b19f8e59d5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; /** @@ -34,7 +34,7 @@ public class ShuttleDataHolder private final List _stops = new ArrayList<>(2); private final List _routes = new ArrayList<>(2); - public ShuttleDataHolder(StatsSet set) + public ShuttleDataHolder(StatSet set) { _id = set.getInt("id"); _loc = new Location(set); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/Skill.java index c44b45a781..0e97466a3a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.handler.IAffectScopeHandler; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.CubicInstance; @@ -210,7 +210,7 @@ public class Skill implements IIdentifiable private final SkillBuffType _buffType; private final boolean _displayInList; - public Skill(StatsSet set) + public Skill(StatSet set) { _id = set.getInt(".id"); _level = set.getInt(".level"); @@ -391,7 +391,7 @@ public class Skill implements IIdentifiable _toggleGroupId = set.getInt("toggleGroupId", -1); _attachToggleGroupId = set.getInt("attachToggleGroupId", -1); - _attachSkills = set.getList("attachSkillList", StatsSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatsSet).collect(Collectors.toList()); + _attachSkills = set.getList("attachSkillList", StatSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatSet).collect(Collectors.toList()); final String abnormalResist = set.getString("abnormalResists", null); if (abnormalResist != null) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java index bfc25bddde..39b738dbca 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.ChanceLocation; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory; /** * @author UnAfraid */ -public class NpcSpawnTemplate implements Cloneable, IParameterized +public class NpcSpawnTemplate implements Cloneable, IParameterized { private static final Logger LOGGER = Logger.getLogger(NpcSpawnTemplate.class.getName()); @@ -56,7 +56,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized private final Duration _respawnTimeRandom; private List _locations; private SpawnTerritory _zone; - private StatsSet _parameters; + private StatSet _parameters; private final boolean _spawnAnimation; private final boolean _saveInDB; private final String _dbName; @@ -82,7 +82,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized _minions = template._minions; } - public NpcSpawnTemplate(SpawnTemplate spawnTemplate, SpawnGroup group, StatsSet set) + public NpcSpawnTemplate(SpawnTemplate spawnTemplate, SpawnGroup group, StatSet set) { _spawnTemplate = spawnTemplate; _group = group; @@ -128,14 +128,14 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized mergeParameters(spawnTemplate, group); } - private StatsSet mergeParameters(SpawnTemplate spawnTemplate, SpawnGroup group) + private StatSet mergeParameters(SpawnTemplate spawnTemplate, SpawnGroup group) { if ((_parameters == null) && (spawnTemplate.getParameters() == null) && (group.getParameters() == null)) { return null; } - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); if (spawnTemplate.getParameters() != null) { set.merge(spawnTemplate.getParameters()); @@ -206,13 +206,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized } @Override - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } @Override - public void setParameters(StatsSet parameters) + public void setParameters(StatSet parameters) { if (_parameters == null) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java index 6723863c93..7ceb2d46af 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IParameterized; import org.l2jmobius.gameserver.model.interfaces.ITerritorized; @@ -31,16 +31,16 @@ import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory; /** * @author UnAfraid */ -public class SpawnGroup implements Cloneable, ITerritorized, IParameterized +public class SpawnGroup implements Cloneable, ITerritorized, IParameterized { private final String _name; private final boolean _spawnByDefault; private List _territories; private List _bannedTerritories; private final List _spawns = new ArrayList<>(); - private StatsSet _parameters; + private StatSet _parameters; - public SpawnGroup(StatsSet set) + public SpawnGroup(StatSet set) { this(set.getString("name", null), set.getBoolean("spawnByDefault", true)); } @@ -104,13 +104,13 @@ public class SpawnGroup implements Cloneable, ITerritorized, IParameterized +public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized { private final String _name; private final String _ai; @@ -45,9 +45,9 @@ public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized _territories; private List _bannedTerritories; private final List _groups = new ArrayList<>(); - private StatsSet _parameters; + private StatSet _parameters; - public SpawnTemplate(StatsSet set, File file) + public SpawnTemplate(StatSet set, File file) { this(set.getString("name", null), set.getString("ai", null), set.getBoolean("spawnByDefault", true), file); } @@ -128,13 +128,13 @@ public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized _castleId; - public TeleportLocation(int id, StatsSet set) + public TeleportLocation(int id, StatSet set) { super(set); _id = id; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java index 916ae0790c..33cf6ac3bc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.variables; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.IRestorable; import org.l2jmobius.gameserver.model.interfaces.IStorable; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.interfaces.IStorable; /** * @author UnAfraid */ -public abstract class AbstractVariables extends StatsSet implements IRestorable, IStorable, IDeletable +public abstract class AbstractVariables extends StatSet implements IRestorable, IStorable, IDeletable { private final AtomicBoolean _hasChanges = new AtomicBoolean(false); @@ -41,42 +41,42 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, */ @Override - public StatsSet set(String name, boolean value) + public StatSet set(String name, boolean value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, double value) + public StatSet set(String name, double value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, Enum value) + public StatSet set(String name, Enum value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, int value) + public StatSet set(String name, int value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, long value) + public StatSet set(String name, long value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, String value) + public StatSet set(String name, String value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); @@ -89,7 +89,7 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, * @param markAsChanged * @return */ - public StatsSet set(String name, String value, boolean markAsChanged) + public StatSet set(String name, String value, boolean markAsChanged) { if (markAsChanged) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index 5c03122a62..4d97f0017a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExHeroList implements IClientOutgoingPacket { - private final Map _heroList; + private final Map _heroList; public ExHeroList() { @@ -42,7 +42,7 @@ public class ExHeroList implements IClientOutgoingPacket OutgoingPackets.EX_HERO_LIST.writeId(packet); packet.writeD(_heroList.size()); - for (StatsSet hero : _heroList.values()) + for (StatSet hero : _heroList.values()) { packet.writeS(hero.getString(Olympiad.CHAR_NAME)); packet.writeD(hero.getInt(Olympiad.CLASS_ID)); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/BypassParser.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/BypassParser.java index 414125bdeb..a80323ba1f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/BypassParser.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/BypassParser.java @@ -20,12 +20,12 @@ import java.util.LinkedHashMap; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid */ -public class BypassParser extends StatsSet +public class BypassParser extends StatSet { private static final String ALLOWED_CHARS = "a-zA-Z0-9-_`!@#%^&*()\\[\\]|\\\\/"; private static final Pattern PATTERN = Pattern.compile(String.format("([%s]*)=('([%s ]*)'|[%s]*)", ALLOWED_CHARS, ALLOWED_CHARS, ALLOWED_CHARS)); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index b837d839d8..d12c29d422 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -138,7 +138,7 @@ public class Antharas extends AbstractNpcAI addAttackId(ANTHARAS, BOMBER, BEHEMOTH, TERASQUE); addKillId(ANTHARAS, TERASQUE, BEHEMOTH); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANTHARAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANTHARAS); final double curr_hp = info.getDouble("currentHP"); final double curr_mp = info.getDouble("currentMP"); final int loc_x = info.getInt("loc_x"); @@ -761,7 +761,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(PlayerInstance attacker, int damage) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Baium/Baium.java index a1e8eb99d5..2686236add 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -112,7 +112,7 @@ public class Baium extends AbstractNpcAI addSeeCreatureId(BAIUM); addSpellFinishedId(BAIUM); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(BAIUM); + final StatSet info = GrandBossManager.getInstance().getStatSet(BAIUM); switch (getStatus()) { @@ -666,7 +666,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Core/Core.java index bfa7212b8c..c1452bf9de 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; @@ -85,7 +85,7 @@ public class Core extends AbstractNpcAI registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR); _firstAttacked = false; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. @@ -205,9 +205,9 @@ public class Core extends AbstractNpcAI final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000; startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(CORE, info); + GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index 38eebefc7b..5e525a6caa 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -92,7 +92,7 @@ public class Orfen extends AbstractNpcAI registerMobs(mobs); _IsTeleported = false; ZONE = ZoneManager.getInstance().getZoneById(12013); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); final int status = GrandBossManager.getInstance().getBossStatus(ORFEN); if (status == DEAD) { @@ -327,9 +327,9 @@ public class Orfen extends AbstractNpcAI respawnTime *= 3600000; startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(ORFEN, info); + GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); startQuestTimer("despawn_minions", 20000, null, null); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index c2564917c7..b9fdddaaf7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; @@ -91,7 +91,7 @@ public class QueenAnt extends AbstractNpcAI addFactionCallId(NURSE); _zone = ZoneManager.getInstance().getZoneById(12012); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); final int status = GrandBossManager.getInstance().getBossStatus(QUEEN); if (status == DEAD) { @@ -367,9 +367,9 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("action", npc, null); cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(QUEEN, info); + GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); _larva.deleteMe(); _larva = null; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java index 0964b5fd44..a322a608f2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java @@ -18,7 +18,7 @@ package ai.bosses.Zaken; import org.l2jmobius.Config; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -48,7 +48,7 @@ public class Zaken extends AbstractNpcAI { addKillId(ZAKEN); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ZAKEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN); final int status = GrandBossManager.getInstance().getBossStatus(ZAKEN); if (status == DEAD) { @@ -96,9 +96,9 @@ public class Zaken extends AbstractNpcAI final long respawnTime = (Config.ZAKEN_SPAWN_INTERVAL + getRandom(-Config.ZAKEN_SPAWN_RANDOM, Config.ZAKEN_SPAWN_RANDOM)) * 3600000; startQuestTimer("zaken_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ZAKEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(ZAKEN, info); + GrandBossManager.getInstance().setStatSet(ZAKEN, info); return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java index 25a584bdf9..1feccc805a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -101,7 +101,7 @@ public class CastleTeleporter extends AbstractNpcAI if (st.hasMoreTokens()) { final int unknowInt = Integer.parseInt(st.nextToken()); - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); Location teleLoc = null; switch (unknowInt) { @@ -191,7 +191,7 @@ public class CastleTeleporter extends AbstractNpcAI return htmltext; } - private Location getTeleportLocation(StatsSet npcParams, String paramName1, String paramName2, String paramName3) + private Location getTeleportLocation(StatSet npcParams, String paramName1, String paramName2, String paramName3) { final Location loc; if (getRandom(100) < 33) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java index f19f5dea69..c817501830 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java @@ -17,7 +17,7 @@ package ai.others.Servitors; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -52,7 +52,7 @@ public class TreeOfLife extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (player != null) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index d459bd2538..4f36bd6b51 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.zone.type.NoRestartZone; @@ -305,7 +305,7 @@ public class AdminGrandBoss implements IAdminCommandHandler } } - final StatsSet info = GrandBossManager.getInstance().getStatsSet(grandBossId); + final StatSet info = GrandBossManager.getInstance().getStatSet(grandBossId); final String bossRespawn = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(info.getLong("respawn_time")); final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java index f1109bf0e7..9489d8e1bb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java @@ -19,7 +19,7 @@ package handlers.admincommandhandlers; import java.util.StringTokenizer; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -114,7 +114,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.isNoble()) { - final StatsSet statDat = getPlayerSet(player); + final StatSet statDat = getPlayerSet(player); final int oldpoints = Olympiad.getInstance().getNoblePoints(player); final int points = Math.max(oldpoints + val, 0); if (points > 1000) @@ -155,7 +155,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.isNoble()) { - final StatsSet playerStat = Olympiad.getNobleStats(player.getObjectId()); + final StatSet playerStat = Olympiad.getNobleStats(player.getObjectId()); if (playerStat == null) { BuilderUtil.sendSysMessage(activeChar, "This player hasn't played on Olympiad yet!"); @@ -197,7 +197,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.isNoble()) { - final StatsSet statDat = getPlayerSet(player); + final StatSet statDat = getPlayerSet(player); final int oldpoints = Olympiad.getInstance().getNoblePoints(player); final int points = oldpoints - val; if ((points < 1) && (points > 1000)) @@ -237,12 +237,12 @@ public class AdminOlympiad implements IAdminCommandHandler return Integer.decode(token); } - private StatsSet getPlayerSet(PlayerInstance player) + private StatSet getPlayerSet(PlayerInstance player) { - StatsSet statDat = Olympiad.getNobleStats(player.getObjectId()); + StatSet statDat = Olympiad.getNobleStats(player.getObjectId()); if (statDat == null) { - statDat = new StatsSet(); + statDat = new StatSet(); statDat.set(Olympiad.CLASS_ID, player.getBaseClass()); statDat.set(Olympiad.CHAR_NAME, player.getName()); statDat.set(Olympiad.POINTS, Olympiad.DEFAULT_POINTS); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java index d8a3d6e5ce..6382651e6c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java @@ -19,7 +19,7 @@ package handlers.conditions; import java.util.List; import org.l2jmobius.gameserver.enums.CategoryType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -31,7 +31,7 @@ public class CategoryTypeCondition implements ICondition { private final List _categoryTypes; - public CategoryTypeCondition(StatsSet params) + public CategoryTypeCondition(StatSet params) { _categoryTypes = params.getEnumList("category", CategoryType.class); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java index b24cfa0f14..9a14cb6fa2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java @@ -16,7 +16,7 @@ */ package handlers.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -29,7 +29,7 @@ public class NpcLevelCondition implements ICondition private final int _minLevel; private final int _maxLevel; - public NpcLevelCondition(StatsSet params) + public NpcLevelCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java index afffe7a0c5..9e3deaa8ce 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java @@ -16,7 +16,7 @@ */ package handlers.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -29,7 +29,7 @@ public class PlayerLevelCondition implements ICondition private final int _minLevel; private final int _maxLevel; - public PlayerLevelCondition(StatsSet params) + public PlayerLevelCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 09f609dc37..0e81066579 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -32,7 +32,7 @@ public class AbnormalShield extends AbstractEffect { private final int _times; - public AbnormalShield(StatsSet params) + public AbnormalShield(StatSet params) { _times = params.getInt("times", -1); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 0496c9068d..9c508c8c52 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Objects; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class AbnormalTimeChange extends AbstractEffect private final int _time; private final int _mode; - public AbnormalTimeChange(StatsSet params) + public AbnormalTimeChange(StatSet params) { final String abnormals = params.getString("slot", null); if ((abnormals != null) && !abnormals.isEmpty()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 98f85c7b21..3f9132b8e3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -37,7 +37,7 @@ public class AbsorbDamage extends AbstractEffect private final double _damage; private static final Map _damageHolder = new ConcurrentHashMap<>(); - public AbsorbDamage(StatsSet params) + public AbsorbDamage(StatSet params) { _damage = params.getDouble("damage", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 26f51d5351..86fef7cf6d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; @@ -38,7 +38,7 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect private final int _hpPercent; private final Map _updates = new ConcurrentHashMap<>(); - protected AbstractConditionalHpEffect(StatsSet params, Stat stat) + protected AbstractConditionalHpEffect(StatSet params, Stat stat) { super(params, stat); _hpPercent = params.getInt("hpPercent", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java index 2e40124e39..f010f84271 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AbstractStatAddEffect extends AbstractEffect private final Stat _stat; protected final double _amount; - public AbstractStatAddEffect(StatsSet params, Stat stat) + public AbstractStatAddEffect(StatSet params, Stat stat) { _stat = stat; _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index da6a575c44..29e439684b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; @@ -42,12 +42,12 @@ public abstract class AbstractStatEffect extends AbstractEffect protected final StatModifierType _mode; protected final List _conditions = new ArrayList<>(); - public AbstractStatEffect(StatsSet params, Stat stat) + public AbstractStatEffect(StatSet params, Stat stat) { this(params, stat, stat); } - public AbstractStatEffect(StatsSet params, Stat mulStat, Stat addStat) + public AbstractStatEffect(StatSet params, Stat mulStat, Stat addStat) { _addStat = addStat; _mulStat = mulStat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java index 9811f395aa..33d08bff36 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AbstractStatPercentEffect extends AbstractEffect private final Stat _stat; protected final double _amount; - public AbstractStatPercentEffect(StatsSet params, Stat stat) + public AbstractStatPercentEffect(StatSet params, Stat stat) { _stat = stat; _amount = params.getDouble("amount", 1); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java index 539814ef2a..79c022a23c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class Accuracy extends AbstractStatEffect { - public Accuracy(StatsSet params) + public Accuracy(StatSet params) { super(params, Stat.ACCURACY_COMBAT); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index 0c1fcbd92b..48d69968c5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddHate extends AbstractEffect private final double _power; private final boolean _affectSummoner; - public AddHate(StatsSet params) + public AddHate(StatSet params) { _power = params.getDouble("power", 0); _affectSummoner = params.getBoolean("affectSummoner", false); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java index e90d5cc7f3..324927947a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddSkillBySkill extends AbstractEffect private final int _existingSkillLevel; private final SkillHolder _addedSkill; - public AddSkillBySkill(StatsSet params) + public AddSkillBySkill(StatSet params) { _existingSkillId = params.getInt("existingSkillId"); _existingSkillLevel = params.getInt("existingSkillLevel"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index bdd8314dd7..205bc82200 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddTeleportBookmarkSlot extends AbstractEffect { private final int _amount; - public AddTeleportBookmarkSlot(StatsSet params) + public AddTeleportBookmarkSlot(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java index c26ec5442f..658931ecb2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionCp extends AbstractStatAddEffect { - public AdditionalPotionCp(StatsSet params) + public AdditionalPotionCp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_CP); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java index 6b68e40f32..57d54c7d3b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionHp extends AbstractStatAddEffect { - public AdditionalPotionHp(StatsSet params) + public AdditionalPotionHp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_HP); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java index c9e1cc237e..007547ebe7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionMp extends AbstractStatAddEffect { - public AdditionalPotionMp(StatsSet params) + public AdditionalPotionMp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_MP); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AgathionSlot.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AgathionSlot.java index 2d2a3cf6df..b8a91b683f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AgathionSlot.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AgathionSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AgathionSlot extends AbstractStatAddEffect { - public AgathionSlot(StatsSet params) + public AgathionSlot(StatSet params) { super(params, Stat.AGATHION_SLOTS); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java index f5cbb63465..9255ba1877 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AreaDamage extends AbstractStatAddEffect { - public AreaDamage(StatsSet params) + public AreaDamage(StatSet params) { super(params, Stat.DAMAGE_ZONE_VULN); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java index 2ded14e7ae..a5d56477f5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AttackAttribute extends AbstractEffect private final AttributeType _attribute; private final double _amount; - public AttackAttribute(StatsSet params) + public AttackAttribute(StatSet params) { _amount = params.getDouble("amount", 0); _attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java index ff58d09cc7..795366850d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class AttackAttributeAdd extends AbstractEffect { private final double _amount; - public AttackAttributeAdd(StatsSet params) + public AttackAttributeAdd(StatSet params) { _amount = params.getDouble("amount", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java index 37bfbf341a..fcd2b48c99 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class AttackBehind extends AbstractEffect { - public AttackBehind(StatsSet params) + public AttackBehind(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index 062c325a55..4136f5d530 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class AttackTrait extends AbstractEffect { private final Map _attackTraits = new EnumMap<>(TraitType.class); - public AttackTrait(StatsSet params) + public AttackTrait(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 02d6a8d78c..8ac42d45c3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -37,7 +37,7 @@ public class Backstab extends AbstractEffect private final double _criticalChance; private final boolean _overHit; - public Backstab(StatsSet params) + public Backstab(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Betray.java index 32e3c65c55..79e8bd3360 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Betray extends AbstractEffect { - public Betray(StatsSet params) + public Betray(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Blink.java index ba1caed6ac..56d3f628fd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -52,7 +52,7 @@ public class Blink extends AbstractEffect private final int _flyDelay; private final int _animationSpeed; - public Blink(StatsSet params) + public Blink(StatSet params) { _flyCourse = params.getInt("angle", 0); _flyRadius = params.getInt("range", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 8677f72407..596d4b752f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; */ public class BlinkSwap extends AbstractEffect { - public BlinkSwap(StatsSet params) + public BlinkSwap(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 7bec602aef..cea12039d2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -20,7 +20,7 @@ import java.util.Arrays; import java.util.Set; import java.util.stream.Collectors; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class BlockAbnormalSlot extends AbstractEffect { private final Set _blockAbnormalSlots; - public BlockAbnormalSlot(StatsSet params) + public BlockAbnormalSlot(StatSet params) { _blockAbnormalSlots = Arrays.stream(params.getString("slot").split(";")).map(slot -> Enum.valueOf(AbnormalType.class, slot)).collect(Collectors.toSet()); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index b4839ab322..348881f970 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -21,7 +21,7 @@ import java.util.Set; import org.l2jmobius.gameserver.datatables.BotReportTable; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class BlockAction extends AbstractEffect { private final Set _blockedActions = new HashSet<>(); - public BlockAction(StatsSet params) + public BlockAction(StatSet params) { final String[] actions = params.getString("blockedActions").split(","); for (String action : actions) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index 68f6586e3e..635d2735f9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -22,7 +22,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class BlockActions extends AbstractEffect { private final Set _allowedSkills; - public BlockActions(StatsSet params) + public BlockActions(StatSet params) { final String[] allowedSkills = params.getString("allowedSkills", "").split(";"); _allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 99af987208..3502d140d0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockChat extends AbstractEffect { - public BlockChat(StatsSet params) + public BlockChat(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java index 6160114414..a2b084c918 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; */ public class BlockControl extends AbstractEffect { - public BlockControl(StatsSet params) + public BlockControl(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java index 3d96329b6d..69b390ae8f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BlockEscape extends AbstractEffect { - public BlockEscape(StatsSet params) + public BlockEscape(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index 8bbd7ac018..85d89180e7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockMove extends AbstractEffect { - public BlockMove(StatsSet params) + public BlockMove(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index 316f82f855..9e28fc403a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockParty extends AbstractEffect { - public BlockParty(StatsSet params) + public BlockParty(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java index ae2ac8b035..d3235fc34f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BlockResurrection extends AbstractEffect { - public BlockResurrection(StatsSet params) + public BlockResurrection(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index f7f119691f..f2cc65b782 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -35,7 +35,7 @@ public class BlockSkill extends AbstractEffect { private final int[] _magicTypes; - public BlockSkill(StatsSet params) + public BlockSkill(StatSet params) { _magicTypes = params.getIntArray("magicTypes", ";"); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index d9b3d3a34d..9f0b7143d2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockTarget extends AbstractEffect { - public BlockTarget(StatsSet params) + public BlockTarget(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index bc4cbd6320..bef60ad003 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class Bluff extends AbstractEffect { private final int _chance; - public Bluff(StatsSet params) + public Bluff(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java index 2ace40a596..69583d613b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusDropAmount extends AbstractStatPercentEffect { - public BonusDropAmount(StatsSet params) + public BonusDropAmount(StatSet params) { super(params, Stat.BONUS_DROP_AMOUNT); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java index b81560b040..e63c8f79f4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusDropRate extends AbstractStatPercentEffect { - public BonusDropRate(StatsSet params) + public BonusDropRate(StatSet params) { super(params, Stat.BONUS_DROP_RATE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java index b984404cb2..e0fb54b162 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusSpoilRate extends AbstractStatPercentEffect { - public BonusSpoilRate(StatsSet params) + public BonusSpoilRate(StatSet params) { super(params, Stat.BONUS_SPOIL_RATE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Breath.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Breath.java index 859f341f3c..4235319f22 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Breath.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Breath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class Breath extends AbstractStatEffect { - public Breath(StatsSet params) + public Breath(StatSet params) { super(params, Stat.BREATH); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java index a6d25f3c36..4102506e6c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BuffBlock extends AbstractEffect { - public BuffBlock(StatsSet params) + public BuffBlock(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index de7497f8bf..4f470b06c7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class CallLearnedSkill extends AbstractEffect { private final int _skillId; - public CallLearnedSkill(StatsSet params) + public CallLearnedSkill(StatSet params) { _skillId = params.getInt("skillId"); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index e6096be4be..b41daf073c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CallParty extends AbstractEffect { - public CallParty(StatsSet params) + public CallParty(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index 0760fb675e..eb4bdf2349 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class CallPc extends AbstractEffect private final int _itemId; private final int _itemCount; - public CallPc(StatsSet params) + public CallPc(StatSet params) { _itemId = params.getInt("itemId", 0); _itemCount = params.getInt("itemCount", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index d6d5cb721d..0da3802665 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -35,7 +35,7 @@ public class CallRandomSkill extends AbstractEffect { private final List _skills = new ArrayList<>(); - public CallRandomSkill(StatsSet params) + public CallRandomSkill(StatSet params) { final String skills = params.getString("skills", null); if (skills != null) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index 99c1494223..f8e4b226c4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -35,7 +35,7 @@ public class CallSkill extends AbstractEffect private final SkillHolder _skill; private final int _skillLevelScaleTo; - public CallSkill(StatsSet params) + public CallSkill(StatSet params) { _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0)); _skillLevelScaleTo = params.getInt("skillLevelScaleTo", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index cec2706e81..4a18b31781 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.Collections; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ public class CallSkillOnActionTime extends AbstractEffect { private final SkillHolder _skill; - public CallSkillOnActionTime(StatsSet params) + public CallSkillOnActionTime(StatSet params) { _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0)); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index d48eb90fb3..32753a71a0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CallTargetParty extends AbstractEffect { - public CallTargetParty(StatsSet params) + public CallTargetParty(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index ef01f4a8ed..d4331bf5b7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ public class ChameleonRest extends AbstractEffect { private final double _power; - public ChameleonRest(StatsSet params) + public ChameleonRest(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index e3b846674d..37054f2fd0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; @@ -35,9 +35,9 @@ public class ChangeBody extends AbstractEffect { private final Set _transformations = new HashSet<>(); - public ChangeBody(StatsSet params) + public ChangeBody(StatSet params) { - for (StatsSet item : params.getList("templates", StatsSet.class)) + for (StatSet item : params.getList("templates", StatSet.class)) { _transformations.add(new TemplateChanceHolder(item.getInt(".templateId"), item.getInt(".minChance"), item.getInt(".maxChance"))); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 76c6e03aa6..6b6386909e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeFace extends AbstractEffect { private final int _value; - public ChangeFace(StatsSet params) + public ChangeFace(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java index cee3ac1a6f..304afa821c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; /** @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; */ public class ChangeFishingMastery extends AbstractEffect { - public ChangeFishingMastery(StatsSet params) + public ChangeFishingMastery(StatSet params) { } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index 0c583cbc13..64ac49f5d5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeHairColor extends AbstractEffect { private final int _value; - public ChangeHairColor(StatsSet params) + public ChangeHairColor(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index ad2efbe6a0..ae7d6c6da1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeHairStyle extends AbstractEffect { private final int _value; - public ChangeHairStyle(StatsSet params) + public ChangeHairStyle(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java index 2d536029fd..4d7c380c75 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class CheapShot extends AbstractEffect { - public CheapShot(StatsSet params) + public CheapShot(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index 5fa3df1676..0215ff6a5b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.SubclassInfoType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class ClassChange extends AbstractEffect private final int _index; private static final int IDENTITY_CRISIS_SKILL_ID = 1570; - public ClassChange(StatsSet params) + public ClassChange(StatSet params) { _index = params.getInt("index", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index ccf7598eff..e184022afc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.stats.Formulas; */ public class Compelling extends AbstractEffect { - public Compelling(StatsSet params) + public Compelling(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index b6aa30f604..f164ac6f3f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class Confuse extends AbstractEffect { private final int _chance; - public Confuse(StatsSet params) + public Confuse(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 25e29532eb..78293c1b0f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ConsumeBody extends AbstractEffect { - public ConsumeBody(StatsSet params) + public ConsumeBody(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index e915eb0391..6ddd0d72eb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class ConvertItem extends AbstractEffect { - public ConvertItem(StatsSet params) + public ConvertItem(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java index 9402fdb06d..857df659c0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CounterPhysicalSkill extends AbstractStatAddEffect { - public CounterPhysicalSkill(StatsSet params) + public CounterPhysicalSkill(StatSet params) { super(params, Stat.VENGEANCE_SKILL_PHYSICAL_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 67bca7fd1b..598682037b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Cp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Cp(StatsSet params) + public Cp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index e0cd52808e..37303b0e7a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class CpHeal extends AbstractEffect { private final double _power; - public CpHeal(StatsSet params) + public CpHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index e2e8ee3479..54de5adfc6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class CpHealOverTime extends AbstractEffect { private final double _power; - public CpHealOverTime(StatsSet params) + public CpHealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index 5665e937dc..b4a994d6df 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CpHealPercent extends AbstractEffect { private final double _power; - public CpHealPercent(StatsSet params) + public CpHealPercent(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java index 1cc851b2af..efb020bbd5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CpRegen extends AbstractStatEffect { - public CpRegen(StatsSet params) + public CpRegen(StatSet params) { super(params, Stat.REGENERATE_CP_RATE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java index 8983497026..0b93eef45e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CriticalDamage extends AbstractStatEffect { - public CriticalDamage(StatsSet params) + public CriticalDamage(StatSet params) { super(params, Stat.CRITICAL_DAMAGE, Stat.CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 7ef4f0ecb4..0630f087b7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.Position; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CriticalDamagePosition extends AbstractEffect private final double _amount; private final Position _position; - public CriticalDamagePosition(StatsSet params) + public CriticalDamagePosition(StatSet params) { _amount = params.getDouble("amount", 0); _position = params.getEnum("position", Position.class, Position.FRONT); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java index 01f49380eb..0d4bded60e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; public class CriticalRate extends AbstractConditionalHpEffect { - public CriticalRate(StatsSet params) + public CriticalRate(StatSet params) { super(params, Stat.CRITICAL_RATE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 863b385ca3..4d65fa84eb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.Position; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CriticalRatePositionBonus extends AbstractEffect private final double _amount; private final Position _position; - public CriticalRatePositionBonus(StatsSet params) + public CriticalRatePositionBonus(StatSet params) { _amount = params.getDouble("amount", 0); _position = params.getEnum("position", Position.class, Position.FRONT); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index 2e8ec38347..9d04575ae2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class CrystalGradeModify extends AbstractEffect { private final int _grade; - public CrystalGradeModify(StatsSet params) + public CrystalGradeModify(StatSet params) { _grade = params.getInt("grade", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java index 94ff8e64e2..79ee5b994e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CubicMastery extends AbstractStatAddEffect { - public CubicMastery(StatsSet params) + public CubicMastery(StatSet params) { super(params, Stat.MAX_CUBIC); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index 36abf0accf..e6bb53fdea 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class DamOverTime extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTime(StatsSet params) + public DamOverTime(StatSet params) { _canKill = params.getBoolean("canKill", false); _power = params.getDouble("power"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 13e57099e0..b5f25db4d8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class DamOverTimePercent extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTimePercent(StatsSet params) + public DamOverTimePercent(StatSet params) { _canKill = params.getBoolean("canKill", false); _power = params.getDouble("power"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java index dc7a45198f..c9567ea034 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ public class DamageBlock extends AbstractEffect private final boolean _blockHp; private final boolean _blockMp; - public DamageBlock(StatsSet params) + public DamageBlock(StatSet params) { final String type = params.getString("type", null); _blockHp = type.equalsIgnoreCase("BLOCK_HP"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java index 5bc9b5fff8..3d8985d1d8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DamageByAttackType; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -38,7 +38,7 @@ public class DamageByAttack extends AbstractEffect private final double _value; private final DamageByAttackType _type; - public DamageByAttack(StatsSet params) + public DamageByAttack(StatSet params) { _value = params.getDouble("amount"); _type = params.getEnum("type", DamageByAttackType.class, DamageByAttackType.NONE); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java index 5a7629482a..e823a9824a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DamageShield extends AbstractStatAddEffect { - public DamageShield(StatsSet params) + public DamageShield(StatSet params) { super(params, Stat.REFLECT_DAMAGE_PERCENT); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java index db1abe264d..3029a3f0aa 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DamageShieldResist extends AbstractStatAddEffect { - public DamageShieldResist(StatsSet params) + public DamageShieldResist(StatSet params) { super(params, Stat.REFLECT_DAMAGE_PERCENT_DEFENSE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index 8561ff46b0..369bd5483d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class DeathLink extends AbstractEffect { private final double _power; - public DeathLink(StatsSet params) + public DeathLink(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java index b948fad1fc..54261c6229 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class DebuffBlock extends AbstractEffect { - public DebuffBlock(StatsSet params) + public DebuffBlock(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java index 217ef3dfaa..4bc08271fa 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class DefenceAttribute extends AbstractEffect private final AttributeType _attribute; private final double _amount; - public DefenceAttribute(StatsSet params) + public DefenceAttribute(StatSet params) { _amount = params.getDouble("amount", 0); _attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java index 0c0c2e8d6a..daff53d9e1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceCriticalDamage extends AbstractStatEffect { - public DefenceCriticalDamage(StatsSet params) + public DefenceCriticalDamage(StatSet params) { super(params, Stat.DEFENCE_CRITICAL_DAMAGE, Stat.DEFENCE_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java index 131eb500ea..74a729e38c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceCriticalRate extends AbstractStatEffect { - public DefenceCriticalRate(StatsSet params) + public DefenceCriticalRate(StatSet params) { super(params, Stat.DEFENCE_CRITICAL_RATE, Stat.DEFENCE_CRITICAL_RATE_ADD); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java index 1abee78e08..c664939977 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceMagicCriticalDamage extends AbstractStatEffect { - public DefenceMagicCriticalDamage(StatsSet params) + public DefenceMagicCriticalDamage(StatSet params) { super(params, Stat.DEFENCE_MAGIC_CRITICAL_DAMAGE, Stat.DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java index 2146b89551..6594dda2b3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceMagicCriticalRate extends AbstractStatEffect { - public DefenceMagicCriticalRate(StatsSet params) + public DefenceMagicCriticalRate(StatSet params) { super(params, Stat.DEFENCE_MAGIC_CRITICAL_RATE, Stat.DEFENCE_MAGIC_CRITICAL_RATE_ADD); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index bd80f690cd..134ed56979 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class DefenceTrait extends AbstractEffect { private final Map _defenceTraits = new EnumMap<>(TraitType.class); - public DefenceTrait(StatsSet params) + public DefenceTrait(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index bab5e1a762..7cee616006 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class DeleteHate extends AbstractEffect { private final int _chance; - public DeleteHate(StatsSet params) + public DeleteHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index 85985653b8..f10f189e68 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class DeleteHateOfMe extends AbstractEffect { private final int _chance; - public DeleteHateOfMe(StatsSet params) + public DeleteHateOfMe(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index d3664ad00f..82833ac79d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class DeleteTopAgro extends AbstractEffect { private final int _chance; - public DeleteTopAgro(StatsSet params) + public DeleteTopAgro(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index ae1f2a5942..ba6dad4698 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DoorOpenType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DetectHiddenObjects extends AbstractEffect { - public DetectHiddenObjects(StatsSet params) + public DetectHiddenObjects(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Detection.java index 078360ff35..a20cbcb348 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Detection extends AbstractEffect { - public Detection(StatsSet params) + public Detection(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 8567a94d12..32ee715df7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DisableTargeting extends AbstractEffect { - public DisableTargeting(StatsSet params) + public DisableTargeting(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index fa06ec7221..5a80971f51 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Disarm extends AbstractEffect { - public Disarm(StatsSet params) + public Disarm(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index 2bf9a6cfe1..0693c6ebdc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class Disarmor extends AbstractEffect private final Map _unequippedItems; // PlayerObjId, ItemObjId private final long _slot; - public Disarmor(StatsSet params) + public Disarmor(StatSet params) { _unequippedItems = new ConcurrentHashMap<>(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 95de0300bb..a652a023f5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DispelAll extends AbstractEffect { - public DispelAll(StatsSet params) + public DispelAll(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 88d979a0d9..040271d2a7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.List; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -38,7 +38,7 @@ public class DispelByCategory extends AbstractEffect private final int _rate; private final int _max; - public DispelByCategory(StatsSet params) + public DispelByCategory(StatSet params) { _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); _rate = params.getInt("rate", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index a6e4c7cd19..ab79e046b2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.EnumMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -37,7 +37,7 @@ public class DispelBySlot extends AbstractEffect private final String _dispel; private final Map _dispelAbnormals; - public DispelBySlot(StatsSet params) + public DispelBySlot(StatSet params) { _dispel = params.getString("dispel"); if ((_dispel != null) && !_dispel.isEmpty()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 1ba6612e23..d1341d10b9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class DispelBySlotMyself extends AbstractEffect { private final Set _dispelAbnormals; - public DispelBySlotMyself(StatsSet params) + public DispelBySlotMyself(StatSet params) { final String dispel = params.getString("dispel"); if ((dispel != null) && !dispel.isEmpty()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 845980e59d..b58723058e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -37,7 +37,7 @@ public class DispelBySlotProbability extends AbstractEffect private final Set _dispelAbnormals; private final int _rate; - public DispelBySlotProbability(StatsSet params) + public DispelBySlotProbability(StatSet params) { final String[] dispelEffects = params.getString("dispel").split(";"); _rate = params.getInt("rate", 100); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index 7acd9c4a6c..688d77a703 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -45,7 +45,7 @@ public class DoubleCast extends AbstractEffect private final Map> _addedToggles; - public DoubleCast(StatsSet params) + public DoubleCast(StatSet params) { _addedToggles = new HashMap<>(); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java index d7f067a2a0..d1e21edeb0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DuelistFury extends AbstractEffect { - public DuelistFury(StatsSet params) + public DuelistFury(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index 409fed6a23..de397bb5ff 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class EnableCloak extends AbstractEffect { - public EnableCloak(StatsSet params) + public EnableCloak(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index e855c4ba1a..2fe2bef99f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -43,7 +43,7 @@ public class EnergyAttack extends AbstractEffect private final boolean _overHit; private final double _pDefMod; - public EnergyAttack(StatsSet params) + public EnergyAttack(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getInt("criticalChance", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index a8f108573f..ae463ef2a4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class EnlargeAbnormalSlot extends AbstractEffect { private final int _slots; - public EnlargeAbnormalSlot(StatsSet params) + public EnlargeAbnormalSlot(StatSet params) { _slots = params.getInt("slots", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java index c43ea04413..c4073b1a47 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StorageType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class EnlargeSlot extends AbstractEffect private final StorageType _type; private final double _amount; - public EnlargeSlot(StatsSet params) + public EnlargeSlot(StatSet params) { _amount = params.getDouble("amount", 0); _type = params.getEnum("type", StorageType.class, StorageType.INVENTORY_NORMAL); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Escape.java index 936f82d8ce..f3a07c9d15 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class Escape extends AbstractEffect { private final TeleportWhereType _escapeType; - public Escape(StatsSet params) + public Escape(StatSet params) { _escapeType = params.getEnum("escapeType", TeleportWhereType.class, null); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java index 76dbc8171c..eb68d24af8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ExpModify extends AbstractStatAddEffect { - public ExpModify(StatsSet params) + public ExpModify(StatSet params) { super(params, Stat.BONUS_EXP); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java index bf11db6e4b..1100ca25be 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Faceoff extends AbstractEffect { - public Faceoff(StatsSet params) + public Faceoff(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index e256209e39..79f7b43503 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -34,7 +34,7 @@ public class FakeDeath extends AbstractEffect { private final double _power; - public FakeDeath(StatsSet params) + public FakeDeath(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index a94c75d310..780d5cefba 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -44,7 +44,7 @@ public class FatalBlow extends AbstractEffect private final double _abnormalPower; private final boolean _overHit; - public FatalBlow(StatsSet params) + public FatalBlow(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java index c8ff8f7acb..6e7597e63d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class FatalBlowRate extends AbstractEffect private final double _amount; private final StatModifierType _mode; - public FatalBlowRate(StatsSet params) + public FatalBlowRate(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 9731e75e5d..ec2659ea2c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DefenderInstance; import org.l2jmobius.gameserver.model.actor.instance.FortCommanderInstance; @@ -40,7 +40,7 @@ public class Fear extends AbstractEffect { private static final int FEAR_RANGE = 500; - public Fear(StatsSet params) + public Fear(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 5e04e46d60..94d9912bdf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.MountType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ public class Feed extends AbstractEffect private final int _ride; private final int _wyvern; - public Feed(StatsSet params) + public Feed(StatSet params) { _normal = params.getInt("normal", 0); _ride = params.getInt("ride", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java index 0b22a4d4c9..146e3b73e6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class FishingExpSpBonus extends AbstractStatPercentEffect { - public FishingExpSpBonus(StatsSet params) + public FishingExpSpBonus(StatSet params) { super(params, Stat.FISHING_EXP_SP_BONUS); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Flag.java index c1469eab19..2442cbdb35 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Flag extends AbstractEffect { - public Flag(StatsSet params) + public Flag(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index 0243f0f543..74a9754a95 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.BlockInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class FlipBlock extends AbstractEffect { - public FlipBlock(StatsSet params) + public FlipBlock(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 7fc7da5fe6..3412e4d36d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class FlyAway extends AbstractEffect { private final int _radius; - public FlyAway(StatsSet params) + public FlyAway(StatSet params) { _radius = params.getInt("radius"); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java index fd3216286d..590fbbcd44 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class FocusEnergy extends AbstractStatAddEffect { - public FocusEnergy(StatsSet params) + public FocusEnergy(StatSet params) { super(params, Stat.MAX_MOMENTUM); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index efbd93f304..19f0163e42 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class FocusMaxMomentum extends AbstractEffect { - public FocusMaxMomentum(StatsSet params) + public FocusMaxMomentum(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index 284d19ee5f..e8c18e9682 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -36,7 +36,7 @@ public class FocusMomentum extends AbstractEffect private final int _amount; private final int _maxCharges; - public FocusMomentum(StatsSet params) + public FocusMomentum(StatSet params) { _amount = params.getInt("amount", 1); _maxCharges = params.getInt("maxCharges", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 18a9864bbc..debd491cfe 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class FocusSouls extends AbstractEffect { private final int _charge; - public FocusSouls(StatsSet params) + public FocusSouls(StatSet params) { _charge = params.getInt("charge", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 8540ccd49c..23328db910 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Set; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class GetAgro extends AbstractEffect { - public GetAgro(StatsSet params) + public GetAgro(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java index 1ca8722709..e91002d04b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class GetDamageLimit extends AbstractStatAddEffect { - public GetDamageLimit(StatsSet params) + public GetDamageLimit(StatSet params) { super(params, Stat.DAMAGE_LIMIT); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 2dfd3bf8c4..439f3e8e3a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class GetMomentum extends AbstractEffect { private static int _ticks; - public GetMomentum(StatsSet params) + public GetMomentum(StatSet params) { _ticks = params.getInt("ticks", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index 7c1c0f3fa2..2c842101ed 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class GiveClanReputation extends AbstractEffect { private final int _reputation; - public GiveClanReputation(StatsSet params) + public GiveClanReputation(StatSet params) { _reputation = params.getInt("reputation", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index fd4d61fa73..9052c63154 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class GiveExpAndSp extends AbstractEffect private final int _xp; private final int _sp; - public GiveExpAndSp(StatsSet params) + public GiveExpAndSp(StatSet params) { _xp = params.getInt("xp", 0); _sp = params.getInt("sp", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index 3448e09797..9d41a4395b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ public class GiveFame extends AbstractEffect { private final int _fame; - public GiveFame(StatsSet params) + public GiveFame(StatSet params) { _fame = params.getInt("fame", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index c948fa0948..617a8ef88a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class GiveRecommendation extends AbstractEffect { private final int _amount; - public GiveRecommendation(StatsSet params) + public GiveRecommendation(StatSet params) { _amount = params.getInt("amount", 0); if (_amount == 0) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index 5fe06566c7..75a16fe828 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class GiveSp extends AbstractEffect { private final int _sp; - public GiveSp(StatsSet params) + public GiveSp(StatSet params) { _sp = params.getInt("sp", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index 5b1a04c165..ae7248c500 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class GiveXp extends AbstractEffect { private final int _xp; - public GiveXp(StatsSet params) + public GiveXp(StatSet params) { _xp = params.getInt("xp", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 17095c209a..5cf4994f32 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Grow extends AbstractEffect { - public Grow(StatsSet params) + public Grow(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index a2200e1a2f..350c8e659f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.UserInfoType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class HairAccessorySet extends AbstractEffect { - public HairAccessorySet(StatsSet params) + public HairAccessorySet(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index f881ed5027..1654fc650c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Harvesting extends AbstractEffect { - public Harvesting(StatsSet params) + public Harvesting(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java index ac1c9f49d8..097db6604a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HateAttack extends AbstractStatPercentEffect { - public HateAttack(StatsSet params) + public HateAttack(StatSet params) { super(params, Stat.HATE_ATTACK); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index 00f569eb17..9963ff1336 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlagInstance; @@ -34,7 +34,7 @@ public class HeadquarterCreate extends AbstractEffect private static final int HQ_NPC_ID = 35062; private final boolean _isAdvanced; - public HeadquarterCreate(StatsSet params) + public HeadquarterCreate(StatSet params) { _isAdvanced = params.getBoolean("isAdvanced", false); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 4c2218df9b..d2848a6242 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -40,7 +40,7 @@ public class Heal extends AbstractEffect { private final double _power; - public Heal(StatsSet params) + public Heal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java index 5a7457d3df..a9f75ab036 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HealEffect extends AbstractStatEffect { - public HealEffect(StatsSet params) + public HealEffect(StatSet params) { super(params, Stat.HEAL_EFFECT, Stat.HEAL_EFFECT_ADD); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 86e28dc8b4..da76f33058 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class HealOverTime extends AbstractEffect { private final double _power; - public HealOverTime(StatsSet params) + public HealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index 6c9c8986bb..8b1c821a0a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class HealPercent extends AbstractEffect { private final int _power; - public HealPercent(StatsSet params) + public HealPercent(StatSet params) { _power = params.getInt("power", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Hide.java index e431277964..d02898bac5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Hide extends AbstractEffect { - public Hide(StatsSet params) + public Hide(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index e7e5f3f91b..78fa1c9392 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.GameTimeController; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HitAtNight extends AbstractStatEffect { - public HitAtNight(StatsSet params) + public HitAtNight(StatSet params) { super(params, Stat.HIT_AT_NIGHT); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java index 1fd98e7aa9..f14b922308 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HitNumber extends AbstractStatEffect { - public HitNumber(StatsSet params) + public HitNumber(StatSet params) { super(params, Stat.ATTACK_COUNT_MAX); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 3611fd7d74..c2426f8d11 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Hp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Hp(StatsSet params) + public Hp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index 3d125565fe..6244c76428 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class HpByLevel extends AbstractEffect { private final double _power; - public HpByLevel(StatsSet params) + public HpByLevel(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index f9d9d0beeb..af3726c17f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -40,7 +40,7 @@ public class HpCpHeal extends AbstractEffect { private final double _power; - public HpCpHeal(StatsSet params) + public HpCpHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java index 0394dab996..6f96c2dcb3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class HpCpHealCritical extends AbstractEffect { - public HpCpHealCritical(StatsSet params) + public HpCpHealCritical(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 554b1cec79..7cf47c3a65 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class HpDrain extends AbstractEffect private final double _power; private final double _percentage; - public HpDrain(StatsSet params) + public HpDrain(StatSet params) { _power = params.getDouble("power", 0); _percentage = params.getDouble("percentage", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java index cb1d2bc3a7..b170bc62ba 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HpRegen extends AbstractStatEffect { - public HpRegen(StatsSet params) + public HpRegen(StatSet params) { super(params, Stat.REGENERATE_HP_RATE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 235e89a79b..f346fbaad8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class HpToOwner extends AbstractEffect private final double _power; private final int _stealAmount; - public HpToOwner(StatsSet params) + public HpToOwner(StatSet params) { _power = params.getDouble("power"); _stealAmount = params.getInt("stealAmount"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java index 9829519da9..c659684ae8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class IgnoreDeath extends AbstractEffect { - public IgnoreDeath(StatsSet params) + public IgnoreDeath(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index f7c9baa155..44dceba10e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ImmobilePetBuff extends AbstractEffect { - public ImmobilePetBuff(StatsSet params) + public ImmobilePetBuff(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java index a60fc45d15..a03eff933a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ public class InstantKillResist extends AbstractEffect { private final int _amount; - public InstantKillResist(StatsSet params) + public InstantKillResist(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java index 7e1fc8abe4..265a9aab97 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class JewelSlot extends AbstractStatAddEffect { - public JewelSlot(StatsSet params) + public JewelSlot(StatSet params) { super(params, Stat.BROOCH_JEWELS); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 3d5ff2dda3..a34d7cc5b3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class KarmaCount extends AbstractEffect private final int _amount; private final int _mode; - public KarmaCount(StatsSet params) + public KarmaCount(StatSet params) { _amount = params.getInt("amount", 0); switch (params.getString("mode", "DIFF")) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index dd58d33685..3af09931f8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -45,7 +45,7 @@ public class KnockBack extends AbstractEffect private final boolean _knockDown; private final FlyType _type; - public KnockBack(StatsSet params) + public KnockBack(StatSet params) { _distance = params.getInt("distance", 50); _speed = params.getInt("speed", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index 7bfac989cf..1affb1b141 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -38,7 +38,7 @@ public class Lethal extends AbstractEffect private final double _fullLethal; private final double _halfLethal; - public Lethal(StatsSet params) + public Lethal(StatSet params) { _fullLethal = params.getDouble("fullLethal", 0); _halfLethal = params.getDouble("halfLethal", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java index aeb42458a6..43b17877ad 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitCp extends AbstractStatEffect { - public LimitCp(StatsSet params) + public LimitCp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_CP); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java index cf76ec482a..45d8f37355 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitHp extends AbstractStatEffect { - public LimitHp(StatsSet params) + public LimitHp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_HP); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java index f5eda36ba6..8d31633d0a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitMp extends AbstractStatEffect { - public LimitMp(StatsSet params) + public LimitMp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_MP); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Lucky.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Lucky.java index 3775d2361d..4ff5ea9a01 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Lucky.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Lucky.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Lucky extends AbstractEffect { - public Lucky(StatsSet params) + public Lucky(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MAtk.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MAtk.java index 5f9ad5f32b..38c2fc9067 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MAtk.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MAtk.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MAtk extends AbstractStatEffect { - public MAtk(StatsSet params) + public MAtk(StatSet params) { super(params, Stat.MAGIC_ATTACK); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java index 2b9ae2e9e6..393d0d2d30 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicAccuracy extends AbstractStatEffect { - public MagicAccuracy(StatsSet params) + public MagicAccuracy(StatSet params) { super(params, Stat.ACCURACY_MAGIC); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java index 123706eb55..b9a58b09f3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicCriticalDamage extends AbstractStatEffect { - public MagicCriticalDamage(StatsSet params) + public MagicCriticalDamage(StatSet params) { super(params, Stat.MAGIC_CRITICAL_DAMAGE, Stat.MAGIC_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java index 0c10014e50..c9fa9a4240 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicCriticalRate extends AbstractStatEffect { - public MagicCriticalRate(StatsSet params) + public MagicCriticalRate(StatSet params) { super(params, Stat.MAGIC_CRITICAL_RATE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index e8b6f5e8bf..5281bf8445 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class MagicMpCost extends AbstractEffect private final int _magicType; private final double _amount; - public MagicMpCost(StatsSet params) + public MagicMpCost(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index ed4a3fca8b..283a99176c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class MagicalAbnormalDispelAttack extends AbstractEffect private final double _power; private final AbnormalType _abnormalType; - public MagicalAbnormalDispelAttack(StatsSet params) + public MagicalAbnormalDispelAttack(StatSet params) { _power = params.getDouble("power", 0); _abnormalType = AbnormalType.getAbnormalType(params.getString("abnormalType", null)); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java index 8234db1c43..be6403077c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAbnormalResist extends AbstractStatAddEffect { - public MagicalAbnormalResist(StatsSet params) + public MagicalAbnormalResist(StatSet params) { super(params, Stat.ABNORMAL_RESIST_MAGICAL); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index 4e938809f1..25c7d25954 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -37,7 +37,7 @@ public class MagicalAttack extends AbstractEffect private final boolean _overHit; private final double _debuffModifier; - public MagicalAttack(StatsSet params) + public MagicalAttack(StatSet params) { _power = params.getDouble("power", 0); _overHit = params.getBoolean("overHit", false); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 424480b76c..11c387780e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class MagicalAttackByAbnormal extends AbstractEffect { private final double _power; - public MagicalAttackByAbnormal(StatsSet params) + public MagicalAttackByAbnormal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9c3e263a05..348e904025 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -40,7 +40,7 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect private final double _power; private final Set _abnormals; - public MagicalAttackByAbnormalSlot(StatsSet params) + public MagicalAttackByAbnormalSlot(StatSet params) { _power = params.getDouble("power", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 49dd351046..de55dd0fcd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -38,7 +38,7 @@ public class MagicalAttackMp extends AbstractEffect private final boolean _critical; private final double _criticalLimit; - public MagicalAttackMp(StatsSet params) + public MagicalAttackMp(StatSet params) { _power = params.getDouble("power"); _critical = params.getBoolean("critical"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 4414b36fa7..93ac560169 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class MagicalAttackRange extends AbstractEffect private final double _power; private final double _shieldDefPercent; - public MagicalAttackRange(StatsSet params) + public MagicalAttackRange(StatSet params) { _power = params.getDouble("power"); _shieldDefPercent = params.getDouble("shieldDefPercent", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java index 2e304e5f8b..1cf39ed501 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAttackSpeed extends AbstractStatEffect { - public MagicalAttackSpeed(StatsSet params) + public MagicalAttackSpeed(StatSet params) { super(params, Stat.MAGIC_ATTACK_SPEED); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 9a3a776e32..880d71f0c5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class MagicalDamOverTime extends AbstractEffect private final double _power; private final boolean _canKill; - public MagicalDamOverTime(StatsSet params) + public MagicalDamOverTime(StatSet params) { _power = params.getDouble("power", 0); _canKill = params.getBoolean("canKill", false); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java index 80fdf87050..9b4e6061aa 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalDefence extends AbstractStatEffect { - public MagicalDefence(StatsSet params) + public MagicalDefence(StatSet params) { super(params, Stat.MAGICAL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java index c3c7c404f3..4e83b80e8b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalEvasion extends AbstractStatEffect { - public MagicalEvasion(StatsSet params) + public MagicalEvasion(StatSet params) { super(params, Stat.MAGIC_EVASION_RATE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java index 6253af7373..bf419a19f7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalSkillPower extends AbstractStatEffect { - public MagicalSkillPower(StatsSet params) + public MagicalSkillPower(StatSet params) { super(params, Stat.MAGICAL_SKILL_POWER, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index d0047fedef..f4388dc16f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class MagicalSoulAttack extends AbstractEffect { private final double _power; - public MagicalSoulAttack(StatsSet params) + public MagicalSoulAttack(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java index fcc143cd4b..688243d9e1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ManaCharge extends AbstractStatAddEffect { - public ManaCharge(StatsSet params) + public ManaCharge(StatSet params) { super(params, Stat.MANA_CHARGE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index 0c84b4ab61..b889e6e824 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class ManaDamOverTime extends AbstractEffect { private final double _power; - public ManaDamOverTime(StatsSet params) + public ManaDamOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index f48011c9a2..94286df1c8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -34,7 +34,7 @@ public class ManaHeal extends AbstractEffect { private final double _power; - public ManaHeal(StatsSet params) + public ManaHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index bfdfa54380..61f15449a0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -35,7 +35,7 @@ public class ManaHealByLevel extends AbstractEffect { private final double _power; - public ManaHealByLevel(StatsSet params) + public ManaHealByLevel(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 46937a8dd0..e505c9e7a2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class ManaHealOverTime extends AbstractEffect { private final double _power; - public ManaHealOverTime(StatsSet params) + public ManaHealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 101961d1c4..71085da549 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class ManaHealPercent extends AbstractEffect { private final double _power; - public ManaHealPercent(StatsSet params) + public ManaHealPercent(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 7c9c63e3ad..07d15d826c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxCp extends AbstractStatEffect { private final boolean _heal; - public MaxCp(StatsSet params) + public MaxCp(StatSet params) { super(params, Stat.MAX_CP); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 6d2c3449bd..85867bca96 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxHp extends AbstractStatEffect { private final boolean _heal; - public MaxHp(StatsSet params) + public MaxHp(StatSet params) { super(params, Stat.MAX_HP); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index e554c63055..9ca46fda8d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxMp extends AbstractStatEffect { private final boolean _heal; - public MaxMp(StatsSet params) + public MaxMp(StatSet params) { super(params, Stat.MAX_MP); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 39cf62a95b..c27284e5f6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -43,7 +43,7 @@ public class ModifyVital extends AbstractEffect private final int _mp; private final int _cp; - public ModifyVital(StatsSet params) + public ModifyVital(StatSet params) { _type = params.getEnum("type", ModifyType.class); if (_type != ModifyType.SET) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 29ee88f805..095d130f7f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Mp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Mp(StatsSet params) + public Mp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index 76d858ad8e..b13d7824d0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class MpConsumePerLevel extends AbstractEffect { private final double _power; - public MpConsumePerLevel(StatsSet params) + public MpConsumePerLevel(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java index 2051009805..ae7bf0c48c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpRegen extends AbstractStatEffect { - public MpRegen(StatsSet params) + public MpRegen(StatSet params) { super(params, Stat.REGENERATE_MP_RATE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MpShield.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MpShield.java index 82e307a562..a4eb3e663f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MpShield.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MpShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpShield extends AbstractStatAddEffect { - public MpShield(StatsSet params) + public MpShield(StatSet params) { super(params, Stat.MANA_SHIELD_PERCENT); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java index af2ce119cc..366e96b18f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpVampiricAttack extends AbstractStatAddEffect { - public MpVampiricAttack(StatsSet params) + public MpVampiricAttack(StatSet params) { super(params, Stat.ABSORB_MANA_DAMAGE_PERCENT); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Mute.java index a7f2f76e23..7e5b5a528f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Mute extends AbstractEffect { - public Mute(StatsSet params) + public Mute(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java index 3cc4cae96f..513dc46ec7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class NoblesseBless extends AbstractEffect { - public NoblesseBless(StatsSet params) + public NoblesseBless(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index bb0f02af5c..05f8c6a99b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpenChest extends AbstractEffect { - public OpenChest(StatsSet params) + public OpenChest(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 15cd9c2a64..de0414fd23 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.RecipeController; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpenCommonRecipeBook extends AbstractEffect { - public OpenCommonRecipeBook(StatsSet params) + public OpenCommonRecipeBook(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 21dd337982..7b5effc6b4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class OpenDoor extends AbstractEffect private final int _chance; private final boolean _isItem; - public OpenDoor(StatsSet params) + public OpenDoor(StatSet params) { _chance = params.getInt("chance", 0); _isItem = params.getBoolean("isItem", false); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index b99a8f9757..3526fa5fdc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.RecipeController; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpenDwarfRecipeBook extends AbstractEffect { - public OpenDwarfRecipeBook(StatsSet params) + public OpenDwarfRecipeBook(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PAtk.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PAtk.java index c353d03a00..7f10b9dcc7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PAtk.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PAtk.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PAtk extends AbstractConditionalHpEffect { - public PAtk(StatsSet params) + public PAtk(StatSet params) { super(params, Stat.PHYSICAL_ATTACK); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Passive.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Passive.java index cef680ca21..27ce15bb60 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Passive.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Passive.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Passive extends AbstractEffect { - public Passive(StatsSet params) + public Passive(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java index 05f55c7dac..1a9f29424f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAbnormalResist extends AbstractStatAddEffect { - public PhysicalAbnormalResist(StatsSet params) + public PhysicalAbnormalResist(StatSet params) { super(params, Stat.ABNORMAL_RESIST_PHYSICAL); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 098770705b..7e5fb14465 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -52,7 +52,7 @@ public class PhysicalAttack extends AbstractEffect private final Set _abnormals; private final double _abnormalPowerMod; - public PhysicalAttack(StatsSet params) + public PhysicalAttack(StatSet params) { _power = params.getDouble("power", 0); _pAtkMod = params.getDouble("pAtkMod", 1.0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index d325c3d5ed..f191867614 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -38,7 +38,7 @@ public class PhysicalAttackHpLink extends AbstractEffect private final double _criticalChance; private final boolean _overHit; - public PhysicalAttackHpLink(StatsSet params) + public PhysicalAttackHpLink(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index dc575c2c75..fe087a1bcc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class PhysicalAttackMute extends AbstractEffect { - public PhysicalAttackMute(StatsSet params) + public PhysicalAttackMute(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java index 112b41eb36..2093d45264 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAttackRange extends AbstractStatEffect { - public PhysicalAttackRange(StatsSet params) + public PhysicalAttackRange(StatSet params) { super(params, Stat.PHYSICAL_ATTACK_RANGE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index d3c2dcfaf2..5d66bd4c87 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ public class PhysicalAttackSaveHp extends AbstractEffect private final boolean _overHit; private final double _saveHp; - public PhysicalAttackSaveHp(StatsSet params) + public PhysicalAttackSaveHp(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java index 167b859572..cdf34eb6f6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAttackSpeed extends AbstractStatEffect { - public PhysicalAttackSpeed(StatsSet params) + public PhysicalAttackSpeed(StatSet params) { super(params, Stat.PHYSICAL_ATTACK_SPEED); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 61bed5561b..a1a6818a00 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class PhysicalAttackWeaponBonus extends AbstractEffect private final Map _weaponBonus = new EnumMap<>(WeaponType.class); - public PhysicalAttackWeaponBonus(StatsSet params) + public PhysicalAttackWeaponBonus(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java index fa3925e725..078c3673b9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalDefence extends AbstractConditionalHpEffect { - public PhysicalDefence(StatsSet params) + public PhysicalDefence(StatSet params) { super(params, Stat.PHYSICAL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java index 812c641ac8..9714220e1b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalEvasion extends AbstractConditionalHpEffect { - public PhysicalEvasion(StatsSet params) + public PhysicalEvasion(StatSet params) { super(params, Stat.EVASION_RATE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index b337fed6cb..fe7cf853c8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class PhysicalMute extends AbstractEffect { - public PhysicalMute(StatsSet params) + public PhysicalMute(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java index 0fd835f4e3..1b843dda3d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class PhysicalShieldAngleAll extends AbstractEffect { - public PhysicalShieldAngleAll(StatsSet params) + public PhysicalShieldAngleAll(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java index 9d3f051659..507eb57326 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalSkillPower extends AbstractStatEffect { - public PhysicalSkillPower(StatsSet params) + public PhysicalSkillPower(StatSet params) { super(params, Stat.PHYSICAL_SKILL_POWER, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index a958116ff7..9ceccea4cc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -42,7 +42,7 @@ public class PhysicalSoulAttack extends AbstractEffect private final boolean _ignoreShieldDefence; private final boolean _overHit; - public PhysicalSoulAttack(StatsSet params) + public PhysicalSoulAttack(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index e95e09ab90..fd2b23a2ae 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class PkCount extends AbstractEffect { private final int _amount; - public PkCount(StatsSet params) + public PkCount(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index 2d64d05406..b51d6a7961 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class Plunder extends AbstractEffect { - public Plunder(StatsSet params) + public Plunder(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index fd61584af1..3e885274b3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PolearmSingleTarget extends AbstractEffect { - public PolearmSingleTarget(StatsSet params) + public PolearmSingleTarget(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java index 86f2e2cee8..b2fb920379 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class ProtectDeathPenalty extends AbstractEffect { - public ProtectDeathPenalty(StatsSet params) + public ProtectDeathPenalty(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java index 890b8980bd..6664b36bae 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ProtectionBlessing extends AbstractEffect { - public ProtectionBlessing(StatsSet params) + public ProtectionBlessing(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index 6de78c2c82..62c480716d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class PullBack extends AbstractEffect private final int _animationSpeed; private final FlyType _type; - public PullBack(StatsSet params) + public PullBack(StatSet params) { _speed = params.getInt("speed", 0); _delay = params.getInt("delay", _speed); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java index 1019c56778..84a72299f3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveMagicalSkillDamageBonus extends AbstractStatPercentEffect { - public PveMagicalSkillDamageBonus(StatsSet params) + public PveMagicalSkillDamageBonus(StatSet params) { super(params, Stat.PVE_MAGICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java index 8da698c746..70870aa45c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveMagicalSkillDefenceBonus(StatsSet params) + public PveMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java index c7a82d4ded..8f60ea025c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalAttackDamageBonus extends AbstractStatPercentEffect { - public PvePhysicalAttackDamageBonus(StatsSet params) + public PvePhysicalAttackDamageBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_ATTACK_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java index 0717fe525b..ea01a4e1d8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PvePhysicalAttackDefenceBonus(StatsSet params) + public PvePhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java index 878f942877..1e8b9e76c4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvePhysicalSkillDamageBonus(StatsSet params) + public PvePhysicalSkillDamageBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java index bdfa0dcc67..b1dbb0b217 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvePhysicalSkillDefenceBonus(StatsSet params) + public PvePhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java index 94fdc26015..fbe3119ba8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveRaidMagicalSkillDefenceBonus(StatsSet params) + public PveRaidMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java index f54d849752..83352e1b2f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidPhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PveRaidPhysicalAttackDefenceBonus(StatsSet params) + public PveRaidPhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java index 0a344f96de..be05bec159 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidPhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveRaidPhysicalSkillDefenceBonus(StatsSet params) + public PveRaidPhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java index 542c019420..2f0153189a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpMagicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvpMagicalSkillDamageBonus(StatsSet params) + public PvpMagicalSkillDamageBonus(StatSet params) { super(params, Stat.PVP_MAGICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java index bb006280fc..41ad3b7749 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvpMagicalSkillDefenceBonus(StatsSet params) + public PvpMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVP_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java index 483d7b02e4..23488ea000 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalAttackDamageBonus extends AbstractStatPercentEffect { - public PvpPhysicalAttackDamageBonus(StatsSet params) + public PvpPhysicalAttackDamageBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_ATTACK_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java index 40c3a22ea2..ff942b3d4d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PvpPhysicalAttackDefenceBonus(StatsSet params) + public PvpPhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java index 225c7c1e39..19a7c96003 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvpPhysicalSkillDamageBonus(StatsSet params) + public PvpPhysicalSkillDamageBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java index ea2d1fa126..211d14c5e3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvpPhysicalSkillDefenceBonus(StatsSet params) + public PvpPhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 8a01583374..e500b487af 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -36,7 +36,7 @@ public class RandomizeHate extends AbstractEffect { private final int _chance; - public RandomizeHate(StatsSet params) + public RandomizeHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index 8b2801ee6c..18b07bd2d7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class RealDamage extends AbstractEffect { private final double _power; - public RealDamage(StatsSet params) + public RealDamage(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java index 4372c15bcf..86738fae0f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class RearDamage extends AbstractStatPercentEffect { - public RearDamage(StatsSet params) + public RearDamage(StatSet params) { super(params, Stat.REAR_DAMAGE_RATE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 31c7a4e4b3..82ed18faa1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RebalanceHP extends AbstractEffect { - public RebalanceHP(StatsSet params) + public RebalanceHP(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index 09d307be02..979809b533 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RebalanceHPSummon extends AbstractEffect { - public RebalanceHPSummon(StatsSet params) + public RebalanceHPSummon(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 7599b691ac..e76328929a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class RecoverVitalityInPeaceZone extends AbstractEffect private final double _amount; private final int _ticks; - public RecoverVitalityInPeaceZone(StatsSet params) + public RecoverVitalityInPeaceZone(StatSet params) { _amount = params.getDouble("amount", 0); _ticks = params.getInt("ticks", 10); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java index 824044ae21..e52b5abafb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ReduceCancel extends AbstractStatEffect { - public ReduceCancel(StatsSet params) + public ReduceCancel(StatSet params) { super(params, Stat.ATTACK_CANCEL); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index ecc7a10d31..be9188f3b0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -33,7 +33,7 @@ public class ReduceDamage extends AbstractEffect { private final double _amount; - public ReduceDamage(StatsSet params) + public ReduceDamage(StatSet params) { _amount = params.getDouble("amount"); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java index 8534a94fc6..7b8862f608 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ReduceDropType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -32,7 +32,7 @@ public class ReduceDropPenalty extends AbstractEffect private final double _deathPenalty; private final ReduceDropType _type; - public ReduceDropPenalty(StatsSet params) + public ReduceDropPenalty(StatSet params) { _exp = params.getDouble("exp", 0); _deathPenalty = params.getDouble("deathPenalty", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java index c15f7301b9..6436b488e0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ReflectMagic extends AbstractStatAddEffect { - public ReflectMagic(StatsSet params) + public ReflectMagic(StatSet params) { super(params, Stat.VENGEANCE_SKILL_MAGIC_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java index bf1d555351..583191fd4c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.BasicProperty; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ReflectSkill extends AbstractEffect private final Stat _stat; private final double _amount; - public ReflectSkill(StatsSet params) + public ReflectSkill(StatSet params) { _stat = params.getEnum("type", BasicProperty.class, BasicProperty.PHYSICAL) == BasicProperty.PHYSICAL ? Stat.REFLECT_SKILL_PHYSIC : Stat.REFLECT_SKILL_MAGIC; _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index e850ea6be9..77b96e4205 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class RefuelAirship extends AbstractEffect { private final int _value; - public RefuelAirship(StatsSet params) + public RefuelAirship(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Relax.java index c8c61fe47e..e2ba4420db 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ public class Relax extends AbstractEffect { private final double _power; - public Relax(StatsSet params) + public Relax(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 9678dc1174..0613c17234 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class ResetInstanceEntry extends AbstractEffect { private final Set _instanceId; - public ResetInstanceEntry(StatsSet params) + public ResetInstanceEntry(StatSet params) { final String instanceIds = params.getString("instanceId", null); if ((instanceIds != null) && !instanceIds.isEmpty()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java index 940c731208..f15ff56189 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ResistAbnormalByCategory extends AbstractEffect private final DispelSlotType _slot; private final double _amount; - public ResistAbnormalByCategory(StatsSet params) + public ResistAbnormalByCategory(StatSet params) { _amount = params.getDouble("amount", 0); _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.DEBUFF); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java index dae38e5246..2e29b5cc8e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ResistDDMagic extends AbstractStatPercentEffect { - public ResistDDMagic(StatsSet params) + public ResistDDMagic(StatSet params) { super(params, Stat.MAGIC_SUCCESS_RES); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java index af2b203aad..d08fcb262a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ResistDispelByCategory extends AbstractEffect private final DispelSlotType _slot; private final double _amount; - public ResistDispelByCategory(StatsSet params) + public ResistDispelByCategory(StatSet params) { _amount = params.getDouble("amount", 0); _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index af1e40bea8..cd03f1a74a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -34,7 +34,7 @@ public class ResistSkill extends AbstractEffect { private final List _skills = new ArrayList<>(); - public ResistSkill(StatsSet params) + public ResistSkill(StatSet params) { for (int i = 1;; i++) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index feb5885fb0..6f887a07cf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class Restoration extends AbstractEffect private final int _itemCount; private final int _itemEnchantmentLevel; - public Restoration(StatsSet params) + public Restoration(StatSet params) { _itemId = params.getInt("itemId", 0); _itemCount = params.getInt("itemCount", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 37cd974643..0baf0aaae6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -25,7 +25,7 @@ import java.util.Map.Entry; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.ExtractableProductItem; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,12 +47,12 @@ public class RestorationRandom extends AbstractEffect { private final List _products = new ArrayList<>(); - public RestorationRandom(StatsSet params) + public RestorationRandom(StatSet params) { - for (StatsSet group : params.getList("items", StatsSet.class)) + for (StatSet group : params.getList("items", StatSet.class)) { final List items = new ArrayList<>(); - for (StatsSet item : group.getList(".", StatsSet.class)) + for (StatSet item : group.getList(".", StatSet.class)) { items.add(new RestorationItemHolder(item.getInt(".id"), item.getInt(".count"), item.getInt(".minEnchant", 0), item.getInt(".maxEnchant", 0))); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index f9c10b7ff2..9b287dd419 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class Resurrection extends AbstractEffect { private final int _power; - public Resurrection(StatsSet params) + public Resurrection(StatSet params) { _power = params.getInt("power", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 18d8bdb0bd..6ef063ce91 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -39,7 +39,7 @@ public class ResurrectionSpecial extends AbstractEffect private final int _power; private final Set _instanceId; - public ResurrectionSpecial(StatsSet params) + public ResurrectionSpecial(StatSet params) { _power = params.getInt("power", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index e4d66b43d3..0e7391681b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class Reuse extends AbstractEffect private final int _magicType; private final double _amount; - public Reuse(StatsSet params) + public Reuse(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index 3716fc1922..e17cd7cc25 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ReuseSkillById extends AbstractEffect { private final int _skillId; - public ReuseSkillById(StatsSet params) + public ReuseSkillById(StatSet params) { _skillId = params.getInt("skillId", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Root.java index 1ca3492949..b6876e8e13 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Root extends AbstractEffect { - public Root(StatsSet params) + public Root(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index 66fc8d82c8..4c7ee53239 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class SacrificeSummon extends AbstractEffect { - public SacrificeSummon(StatsSet params) + public SacrificeSummon(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java index d00856c9bd..683f45bb55 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SafeFallHeight extends AbstractStatEffect { - public SafeFallHeight(StatsSet params) + public SafeFallHeight(StatSet params) { super(params, Stat.FALL); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 7f6bf69ee3..797aa95263 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -33,7 +33,7 @@ public class SendSystemMessageToClan extends AbstractEffect { private final SystemMessage _message; - public SendSystemMessageToClan(StatsSet params) + public SendSystemMessageToClan(StatSet params) { final int id = params.getInt("id", 0); _message = new SystemMessage(id); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java index 7acbf846df..a0508d73b1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class ServitorShare extends AbstractEffect { private final Map _sharedStats = new EnumMap<>(Stat.class); - public ServitorShare(StatsSet params) + public ServitorShare(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 01dfd87c71..6e8187feae 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SetHp extends AbstractEffect private final double _amount; private final StatModifierType _mode; - public SetHp(StatsSet params) + public SetHp(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index 805d18160b..fae21baa51 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SetSkill extends AbstractEffect private final int _skillId; private final int _skillLvl; - public SetSkill(StatsSet params) + public SetSkill(StatSet params) { _skillId = params.getInt("skillId", 0); _skillLvl = params.getInt("skillLvl", 1); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java index a93bb5f253..354cb42b55 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ShieldDefence extends AbstractStatEffect { - public ShieldDefence(StatsSet params) + public ShieldDefence(StatSet params) { super(params, Stat.SHIELD_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java index f28d0e4ad2..1fdee75f69 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ShieldDefenceRate extends AbstractStatEffect { - public ShieldDefenceRate(StatsSet params) + public ShieldDefenceRate(StatSet params) { super(params, Stat.SHIELD_DEFENCE_RATE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java index 1d649082dc..533b631f10 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class SilentMove extends AbstractEffect { - public SilentMove(StatsSet params) + public SilentMove(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java index 89dad85514..7c929a7fe8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class SkillCritical extends AbstractEffect { private final BaseStat _stat; - public SkillCritical(StatsSet params) + public SkillCritical(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java index 369bef11f5..8f054f973b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillCriticalDamage extends AbstractStatEffect { - public SkillCriticalDamage(StatsSet params) + public SkillCriticalDamage(StatSet params) { super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java index c91f2d6b49..88ecf69e77 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillCriticalProbability extends AbstractStatPercentEffect { - public SkillCriticalProbability(StatsSet params) + public SkillCriticalProbability(StatSet params) { super(params, Stat.SKILL_CRITICAL_PROBABILITY); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 7b98a9e180..1664ea1827 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class SkillEvasion extends AbstractEffect private final int _magicType; private final double _amount; - public SkillEvasion(StatsSet params) + public SkillEvasion(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java index 9cc62532b4..2880d0ccef 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillPowerAdd extends AbstractStatAddEffect { - public SkillPowerAdd(StatsSet params) + public SkillPowerAdd(StatSet params) { super(params, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 9578c88f91..7156fff2df 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SkillTurning extends AbstractEffect private final int _chance; private final boolean _staticChance; - public SkillTurning(StatsSet params) + public SkillTurning(StatSet params) { _chance = params.getInt("chance", 100); _staticChance = params.getBoolean("staticChance", false); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 45b02206a4..04691304ed 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SkillTurningOverTime extends AbstractEffect private final int _chance; private final boolean _staticChance; - public SkillTurningOverTime(StatsSet params) + public SkillTurningOverTime(StatSet params) { _chance = params.getInt("chance", 100); _staticChance = params.getBoolean("staticChance", false); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index c1dd92cedb..b919c7acac 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -36,7 +36,7 @@ public class SoulBlow extends AbstractEffect private final double _chanceBoost; private final boolean _overHit; - public SoulBlow(StatsSet params) + public SoulBlow(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 8471aa236c..4f63a84081 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; @@ -40,7 +40,7 @@ public class SoulEating extends AbstractEffect private final int _expNeeded; private final int _maxSouls; - public SoulEating(StatsSet params) + public SoulEating(StatSet params) { _expNeeded = params.getInt("expNeeded"); _maxSouls = params.getInt("maxSouls"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a7d5c2628a..ad261845eb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Seed; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Sow extends AbstractEffect { - public Sow(StatsSet params) + public Sow(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SpModify.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SpModify.java index 24d124ecce..c3bc6193e9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SpModify.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SpModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SpModify extends AbstractStatAddEffect { - public SpModify(StatsSet params) + public SpModify(StatSet params) { super(params, Stat.BONUS_SP); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 0718408ca2..890438d65f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.enums.SpeedType; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -36,7 +36,7 @@ public class Speed extends AbstractEffect private final StatModifierType _mode; private List _speedType; - public Speed(StatsSet params) + public Speed(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index 91b91ad05e..db247775f3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SphericBarrier extends AbstractStatAddEffect { - public SphericBarrier(StatsSet params) + public SphericBarrier(StatSet params) { super(params, Stat.SPHERIC_BARRIER_RANGE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index d13eaf1c2e..385240377f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class Spoil extends AbstractEffect { - public Spoil(StatsSet params) + public Spoil(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index b63c24dc20..22c4132b63 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -36,7 +36,7 @@ public class StatBonusSkillCritical extends AbstractEffect private final BaseStat _stat; private final Condition _armorTypeCondition; - public StatBonusSkillCritical(StatsSet params) + public StatBonusSkillCritical(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.DEX); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index 41a20bfafe..49280eb774 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -36,7 +36,7 @@ public class StatBonusSpeed extends AbstractEffect private final BaseStat _stat; private final Condition _armorTypeCondition; - public StatBonusSpeed(StatsSet params) + public StatBonusSpeed(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.DEX); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index a007b118b2..bcf691e360 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class StatByMoveType extends AbstractEffect private final MoveType _type; private final double _value; - public StatByMoveType(StatsSet params) + public StatByMoveType(StatSet params) { _stat = params.getEnum("stat", Stat.class); _type = params.getEnum("type", MoveType.class); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StatUp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StatUp.java index b961ec8484..7abb1367af 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StatUp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StatUp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class StatUp extends AbstractEffect private final BaseStat _stat; private final double _amount; - public StatUp(StatsSet params) + public StatUp(StatSet params) { _amount = params.getDouble("amount", 0); _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index 0720057c19..23239887a7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.List; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -39,7 +39,7 @@ public class StealAbnormal extends AbstractEffect private final int _rate; private final int _max; - public StealAbnormal(StatsSet params) + public StealAbnormal(StatSet params) { _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); _rate = params.getInt("rate", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Summon.java index cd7bfabef8..62daa5ffdf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.ServitorInstance; @@ -43,7 +43,7 @@ public class Summon extends AbstractEffect private final int _lifeTime; private final int _consumeItemInterval; - public Summon(StatsSet params) + public Summon(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index 8929e1f2b0..50c025e572 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class SummonAgathion extends AbstractEffect { private final int _npcId; - public SummonAgathion(StatsSet params) + public SummonAgathion(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index 7716d58f16..49b816f272 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.CubicData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; @@ -42,7 +42,7 @@ public class SummonCubic extends AbstractEffect private final int _cubicId; private final int _cubicLvl; - public SummonCubic(StatsSet params) + public SummonCubic(StatSet params) { _cubicId = params.getInt("cubicId", -1); _cubicLvl = params.getInt("cubicLvl", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index d0a2a82738..13d5a2eac7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoppelgangerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ public class SummonHallucination extends AbstractEffect private final int _npcId; private final int _npcCount; - public SummonHallucination(StatsSet params) + public SummonHallucination(StatSet params) { _despawnDelay = params.getInt("despawnDelay", 20000); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index bcd050e084..d61a6e5c02 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.ServitorInstance; @@ -43,7 +43,7 @@ public class SummonMulti extends AbstractEffect private final int _consumeItemInterval; private final int _summonPoints; - public SummonMulti(StatsSet params) + public SummonMulti(StatSet params) { _npcId = params.getInt("npcId"); _expMultiplier = params.getFloat("expMultiplier", 1); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index 6f4090eef0..eaff214b7c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DecoyInstance; @@ -48,7 +48,7 @@ public class SummonNpc extends AbstractEffect private final boolean _isSummonSpawn; private final boolean _singleInstance; // Only one instance of this NPC is allowed. - public SummonNpc(StatsSet params) + public SummonNpc(StatSet params) { _despawnDelay = params.getInt("despawnDelay", 20000); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 5ef621819e..534a41ee16 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.data.xml.impl.PetDataTable; import org.l2jmobius.gameserver.model.PetData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PetItemList; */ public class SummonPet extends AbstractEffect { - public SummonPet(StatsSet params) + public SummonPet(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java index 7dd690587c..b1d5ec38cb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SummonPoints extends AbstractStatAddEffect { - public SummonPoints(StatsSet params) + public SummonPoints(StatSet params) { super(params, Stat.MAX_SUMMON_POINTS); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index d8a47b670f..ac1ddaa16a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; @@ -35,7 +35,7 @@ public class SummonTrap extends AbstractEffect private final int _despawnTime; private final int _npcId; - public SummonTrap(StatsSet params) + public SummonTrap(StatSet params) { _despawnTime = params.getInt("despawnTime", 0); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 84f6d070a8..3196bb949d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Collection; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Sweeper extends AbstractEffect { - public Sweeper(StatsSet params) + public Sweeper(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 559dfc6437..ec29554f2d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ public class Synergy extends AbstractEffect private final int _skillLevelScaleTo; private final int _minSlot; - public Synergy(StatsSet params) + public Synergy(StatSet params) { final String requiredSlots = params.getString("requiredSlots", null); if ((requiredSlots != null) && !requiredSlots.isEmpty()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index e35516fef5..39ed981bbf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Castle; @@ -33,7 +33,7 @@ public class TakeCastle extends AbstractEffect { private final CastleSide _side; - public TakeCastle(StatsSet params) + public TakeCastle(StatSet params) { _side = params.getEnum("side", CastleSide.class); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 77fd9ec103..3be2bf5593 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Castle; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TakeCastleStart extends AbstractEffect { - public TakeCastleStart(StatsSet params) + public TakeCastleStart(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 70842191a7..18749c1aef 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Fort; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TakeFort extends AbstractEffect { - public TakeFort(StatsSet params) + public TakeFort(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 0eb23f6733..77355f9683 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TakeFortStart extends AbstractEffect { - public TakeFortStart(StatsSet params) + public TakeFortStart(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index cec32755ed..dd8e09278f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class TalismanSlot extends AbstractEffect { private final int _slots; - public TalismanSlot(StatsSet params) + public TalismanSlot(StatSet params) { _slots = params.getInt("slots", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 281b5322fd..32a126f499 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class TargetCancel extends AbstractEffect { private final int _chance; - public TargetCancel(StatsSet params) + public TargetCancel(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index b4463de391..86ff70c9ca 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMe extends AbstractEffect { - public TargetMe(StatsSet params) + public TargetMe(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index 11e581113e..e68a1e1faf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class TargetMeProbability extends AbstractEffect { private final int _chance; - public TargetMeProbability(StatsSet params) + public TargetMeProbability(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 6c30519678..9ca01faf50 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -32,7 +32,7 @@ public class Teleport extends AbstractEffect { private final Location _loc; - public Teleport(StatsSet params) + public Teleport(StatSet params) { _loc = new Location(params.getInt("x", 0), params.getInt("y", 0), params.getInt("z", 0)); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index e0e715818c..bdc53208d5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -38,7 +38,7 @@ public class TeleportToNpc extends AbstractEffect private final int _npcId; private final boolean _party; - public TeleportToNpc(StatsSet params) + public TeleportToNpc(StatSet params) { _npcId = params.getInt("npcId"); _party = params.getBoolean("party", false); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index c84c559322..4f4275fd41 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TeleportToPlayer extends AbstractEffect { - public TeleportToPlayer(StatsSet params) + public TeleportToPlayer(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index 1c9af0f535..b2d6b663de 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class TeleportToSummon extends AbstractEffect { private final double _maxDistance; - public TeleportToSummon(StatsSet params) + public TeleportToSummon(StatSet params) { _maxDistance = params.getDouble("distance", -1); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index e550302b02..c4bf787a10 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class TeleportToTarget extends AbstractEffect { - public TeleportToTarget(StatsSet params) + public TeleportToTarget(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index ba1c55c615..ff63eea817 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class TransferDamageToPlayer extends AbstractStatAddEffect { - public TransferDamageToPlayer(StatsSet params) + public TransferDamageToPlayer(StatSet params) { super(params, Stat.TRANSFER_DAMAGE_TO_PLAYER); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java index b084bfc1cb..c87d5f0554 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class TransferDamageToSummon extends AbstractStatAddEffect { - public TransferDamageToSummon(StatsSet params) + public TransferDamageToSummon(StatSet params) { super(params, Stat.TRANSFER_DAMAGE_SUMMON_PERCENT); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index e9f0292113..48bc5e3a1c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -34,7 +34,7 @@ public class TransferHate extends AbstractEffect { private final int _chance; - public TransferHate(StatsSet params) + public TransferHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 2ddf95a4db..bf593eaed8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Transformation extends AbstractEffect { private final List _id; - public Transformation(StatsSet params) + public Transformation(StatSet params) { final String ids = params.getString("transformationId", null); if ((ids != null) && !ids.isEmpty()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 103ccdf8ce..2b4af0a1d3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class TrapDetect extends AbstractEffect { private final int _power; - public TrapDetect(StatsSet params) + public TrapDetect(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index eb7b073b36..c4a6c6aed9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.TrapAction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class TrapRemove extends AbstractEffect { private final int _power; - public TrapRemove(StatsSet params) + public TrapRemove(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 6df3874ab1..8fb87050b1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -59,7 +59,7 @@ public class TriggerSkillByAttack extends AbstractEffect * @param params */ - public TriggerSkillByAttack(StatsSet params) + public TriggerSkillByAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index ae6a3bc89f..78366b8047 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillByAvoid extends AbstractEffect /** * @param params */ - public TriggerSkillByAvoid(StatsSet params) + public TriggerSkillByAvoid(StatSet params) { _chance = params.getInt("chance", 100); _skill = new SkillHolder(params.getInt("skillId", 0), params.getInt("skillLevel", 0)); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index c24fb95246..9fe53c0622 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -48,7 +48,7 @@ public class TriggerSkillByDamage extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillByDamage(StatsSet params) + public TriggerSkillByDamage(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c086507336..8b84350293 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillByDeathBlow extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillByDeathBlow(StatsSet params) + public TriggerSkillByDeathBlow(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index a9bfcc320c..11802645f2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -37,7 +37,7 @@ public class TriggerSkillByKill extends AbstractEffect private final int _chance; private final SkillHolder _skill; - public TriggerSkillByKill(StatsSet params) + public TriggerSkillByKill(StatSet params) { _chance = params.getInt("chance", 100); _skill = new SkillHolder(params.getInt("skillId", 0), params.getInt("skillLevel", 0)); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 2893d46f33..7f2d3f9fa7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -52,7 +52,7 @@ public class TriggerSkillByMagicType extends AbstractEffect * @param params */ - public TriggerSkillByMagicType(StatsSet params) + public TriggerSkillByMagicType(StatSet params) { _chance = params.getInt("chance", 100); _magicTypes = params.getIntArray("magicTypes", ";"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 1524e3d4f4..b77da803f5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillBySkill extends AbstractEffect private final int _skillLevelScaleTo; private final TargetType _targetType; - public TriggerSkillBySkill(StatsSet params) + public TriggerSkillBySkill(StatSet params) { _castSkillId = params.getInt("castSkillId"); _chance = params.getInt("chance", 100); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index ec2124c44e..7bb68baec9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -53,7 +53,7 @@ public class TriggerSkillBySkillAttack extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillBySkillAttack(StatsSet params) + public TriggerSkillBySkillAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 3f58619f0a..c209decfb3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -69,7 +69,7 @@ public class TwoHandedBluntBonus extends AbstractEffect private final double _speedAmount; private final StatModifierType _speedMode; - public TwoHandedBluntBonus(StatsSet params) + public TwoHandedBluntBonus(StatSet params) { _pAtkAmount = params.getDouble("pAtkAmount", 0); _pAtkMode = params.getEnum("pAtkMode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index b2c50c4b88..344456a925 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -69,7 +69,7 @@ public class TwoHandedSwordBonus extends AbstractEffect private final double _speedAmount; private final StatModifierType _speedMode; - public TwoHandedSwordBonus(StatsSet params) + public TwoHandedSwordBonus(StatSet params) { _pAtkAmount = params.getDouble("pAtkAmount", 0); _pAtkMode = params.getEnum("pAtkMode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 01ae8122ec..20b418c29b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ public class Unsummon extends AbstractEffect { private final int _chance; - public Unsummon(StatsSet params) + public Unsummon(StatSet params) { _chance = params.getInt("chance", -1); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 57eb89196d..f73f0f57f0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; */ public class UnsummonAgathion extends AbstractEffect { - public UnsummonAgathion(StatsSet params) + public UnsummonAgathion(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index a4fdc2c0aa..0779d018cc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class UnsummonServitors extends AbstractEffect { - public UnsummonServitors(StatsSet params) + public UnsummonServitors(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index dbb0c700b5..ac33fcba0d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Untargetable extends AbstractEffect { - public Untargetable(StatsSet params) + public Untargetable(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java index ac6cae3d05..1c85196fe0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class VampiricAttack extends AbstractEffect private final double _amount; private final double _sum; - public VampiricAttack(StatsSet params) + public VampiricAttack(StatSet params) { _amount = params.getDouble("amount"); _sum = _amount * params.getDouble("chance"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java index ab724714e1..571ca55bbe 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ public class VampiricDefence extends AbstractEffect { private final int _amount; - public VampiricDefence(StatsSet params) + public VampiricDefence(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java index f8b9d76f3a..caaa8d02b4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class VitalityExpRate extends AbstractStatPercentEffect { - public VitalityExpRate(StatsSet params) + public VitalityExpRate(StatSet params) { super(params, Stat.VITALITY_EXP_RATE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index cba2b14c35..385595e03d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class VitalityPointUp extends AbstractEffect { private final int _value; - public VitalityPointUp(StatsSet params) + public VitalityPointUp(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java index 86612955dd..72f78ec177 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class VitalityPointsRate extends AbstractStatPercentEffect { - public VitalityPointsRate(StatsSet params) + public VitalityPointsRate(StatSet params) { super(params, Stat.VITALITY_CONSUME_RATE); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java index 09500b3823..bf20bd5018 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WeightLimit extends AbstractStatEffect { - public WeightLimit(StatsSet params) + public WeightLimit(StatSet params) { super(params, Stat.WEIGHT_LIMIT); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java index f9be68f493..6020399f85 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WeightPenalty extends AbstractStatAddEffect { - public WeightPenalty(StatsSet params) + public WeightPenalty(StatSet params) { super(params, Stat.WEIGHT_PENALTY); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java index bdf9aca48d..81eb9a9688 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WorldChatPoints extends AbstractStatEffect { - public WorldChatPoints(StatsSet params) + public WorldChatPoints(StatSet params) { super(params, Stat.WORLD_CHAT_POINTS); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java index 5a3842921d..127dadf9d2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class BuildAdvanceBaseSkillCondition implements ISkillCondition { - public BuildAdvanceBaseSkillCondition(StatsSet params) + public BuildAdvanceBaseSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java index 9328638400..b479302f61 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class BuildCampSkillCondition implements ISkillCondition { - public BuildCampSkillCondition(StatsSet params) + public BuildCampSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java index c1220c828a..aca51bafbf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanAddMaxEntranceInzoneSkillCondition implements ISkillCondition { - public CanAddMaxEntranceInzoneSkillCondition(StatsSet params) + public CanAddMaxEntranceInzoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java index eddd45771c..6ac3c2e199 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ public class CanBookmarkAddSlotSkillCondition implements ISkillCondition { private final int _teleportBookmarkSlots; - public CanBookmarkAddSlotSkillCondition(StatsSet params) + public CanBookmarkAddSlotSkillCondition(StatSet params) { _teleportBookmarkSlots = params.getInt("teleportBookmarkSlots"); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java index 30fdb7f36f..ee1bf96e69 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanChangeVitalItemCountSkillCondition implements ISkillCondition { - public CanChangeVitalItemCountSkillCondition(StatsSet params) + public CanChangeVitalItemCountSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java index da553a6d9f..48e28e7af7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanEnchantAttributeSkillCondition implements ISkillCondition { - public CanEnchantAttributeSkillCondition(StatsSet params) + public CanEnchantAttributeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java index c14f1ffe64..2908994776 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanMountForEventSkillCondition implements ISkillCondition { - public CanMountForEventSkillCondition(StatsSet params) + public CanMountForEventSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java index d07aa9a622..9dc5f99592 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShipInstance; @@ -31,7 +31,7 @@ public class CanRefuelAirshipSkillCondition implements ISkillCondition { private final int _amount; - public CanRefuelAirshipSkillCondition(StatsSet params) + public CanRefuelAirshipSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java index d451f3c997..67206b47bd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanRestoreVitalPointSkillCondition implements ISkillCondition { - public CanRestoreVitalPointSkillCondition(StatsSet params) + public CanRestoreVitalPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java index 7e519025b0..49232af88f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CanSummonCubicSkillCondition implements ISkillCondition { - public CanSummonCubicSkillCondition(StatsSet params) + public CanSummonCubicSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java index 8b550d164c..33541e82a8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class CanSummonMultiSkillCondition implements ISkillCondition { private final int _summonPoints; - public CanSummonMultiSkillCondition(StatsSet params) + public CanSummonMultiSkillCondition(StatSet params) { _summonPoints = params.getInt("summonPoints"); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java index aa9579e92a..b06ba00f32 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.CharSummonTable; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; */ public class CanSummonPetSkillCondition implements ISkillCondition { - public CanSummonPetSkillCondition(StatsSet params) + public CanSummonPetSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java index ea41a2e22e..3655e158cb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanSummonSiegeGolemSkillCondition implements ISkillCondition { - public CanSummonSiegeGolemSkillCondition(StatsSet params) + public CanSummonSiegeGolemSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java index 460d72a743..e07ce75c8f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanSummonSkillCondition implements ISkillCondition { - public CanSummonSkillCondition(StatsSet params) + public CanSummonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java index 309da529c9..bd8838d02f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanTransformInDominionSkillCondition implements ISkillCondition { - public CanTransformInDominionSkillCondition(StatsSet params) + public CanTransformInDominionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java index 81297944f1..2f4d780cab 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class CanTransformSkillCondition implements ISkillCondition // TODO: What to do with this? // private final int _transformId; - public CanTransformSkillCondition(StatsSet params) + public CanTransformSkillCondition(StatSet params) { // _transformId = params.getInt("transformId"); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java index 800d0375be..771873a553 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanUntransformSkillCondition implements ISkillCondition { - public CanUntransformSkillCondition(StatsSet params) + public CanUntransformSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java index e651b3b1d5..ffe2e4a026 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class CanUseInBattlefieldSkillCondition implements ISkillCondition { - public CanUseInBattlefieldSkillCondition(StatsSet params) + public CanUseInBattlefieldSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java index 5ff751abce..ba030b97a4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanUseInDragonLairSkillCondition implements ISkillCondition { - public CanUseInDragonLairSkillCondition(StatsSet params) + public CanUseInDragonLairSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java index 4d914c28fe..8a0cb18ac7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class CanUseSwoopCannonSkillCondition implements ISkillCondition { - public CanUseSwoopCannonSkillCondition(StatsSet params) + public CanUseSwoopCannonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java index 6a2d832a4c..e9996580fc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanUseVitalityConsumeItemSkillCondition implements ISkillCondition { - public CanUseVitalityConsumeItemSkillCondition(StatsSet params) + public CanUseVitalityConsumeItemSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java index f694956e7e..48dafb46c3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class CannotUseInTransformSkillCondition implements ISkillCondition { private final int _transformId; - public CannotUseInTransformSkillCondition(StatsSet params) + public CannotUseInTransformSkillCondition(StatSet params) { _transformId = params.getInt("transformId", -1); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java index 141c69322f..6591233504 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -32,7 +32,7 @@ public class CheckLevelSkillCondition implements ISkillCondition private final int _maxLevel; private final SkillConditionAffectType _affectType; - public CheckLevelSkillCondition(StatsSet params) + public CheckLevelSkillCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java index 15163a3373..d72f463c4e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class CheckSexSkillCondition implements ISkillCondition { private final boolean _isFemale; - public CheckSexSkillCondition(StatsSet params) + public CheckSexSkillCondition(StatSet params) { _isFemale = params.getBoolean("isFemale"); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java index 8dee11ef9c..12e49c23a7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConsumeBodySkillCondition implements ISkillCondition { - public ConsumeBodySkillCondition(StatsSet params) + public ConsumeBodySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java index c24da9ebcd..ba1b1cdd5f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class EnergySavedSkillCondition implements ISkillCondition { private final int _amount; - public EnergySavedSkillCondition(StatsSet params) + public EnergySavedSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 89d705e991..34f76973f0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -35,7 +35,7 @@ public class EquipArmorSkillCondition implements ISkillCondition { private int _armorTypesMask = 0; - public EquipArmorSkillCondition(StatsSet params) + public EquipArmorSkillCondition(StatSet params) { final List armorTypes = params.getEnumList("armorType", ArmorType.class); if (armorTypes != null) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index e5f22008fa..708b4dd1d4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class EquipShieldSkillCondition implements ISkillCondition { - public EquipShieldSkillCondition(StatsSet params) + public EquipShieldSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 4561945254..f733f81f62 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -33,7 +33,7 @@ public class EquipWeaponSkillCondition implements ISkillCondition { private int _weaponTypesMask = 0; - public EquipWeaponSkillCondition(StatsSet params) + public EquipWeaponSkillCondition(StatSet params) { final List weaponTypes = params.getEnumList("weaponType", WeaponType.class); if (weaponTypes != null) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java index 5f77215218..e36c06fa11 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class NotFearedSkillCondition implements ISkillCondition { - public NotFearedSkillCondition(StatsSet params) + public NotFearedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java index b9096cc1a9..b6e7bcd826 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class NotInUnderwaterSkillCondition implements ISkillCondition { - public NotInUnderwaterSkillCondition(StatsSet params) + public NotInUnderwaterSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index eee6ec73e9..18d8dc8a11 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -35,7 +35,7 @@ public class Op2hWeaponSkillCondition implements ISkillCondition { private final List _weaponTypes = new ArrayList<>(); - public Op2hWeaponSkillCondition(StatsSet params) + public Op2hWeaponSkillCondition(StatSet params) { final List weaponTypes = params.getList("weaponType", String.class); if (weaponTypes != null) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 3b91f36fe4..6223172dbc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; - public OpAffectedBySkillSkillCondition(StatsSet params) + public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java index 2eb561291e..3818df4736 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAgathionEnergySkillCondition implements ISkillCondition { - public OpAgathionEnergySkillCondition(StatsSet params) + public OpAgathionEnergySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java index 76a7ebc5a8..ee2b415021 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.enums.SkillConditionAlignment; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -32,7 +32,7 @@ public class OpAlignmentSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final SkillConditionAlignment _alignment; - public OpAlignmentSkillCondition(StatsSet params) + public OpAlignmentSkillCondition(StatSet params) { _affectType = params.getEnum("affectType", SkillConditionAffectType.class); _alignment = params.getEnum("alignment", SkillConditionAlignment.class); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index 1c83d18f4e..bcc6715bb2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -33,7 +33,7 @@ public class OpBlinkSkillCondition implements ISkillCondition private final int _angle; private final int _range; - public OpBlinkSkillCondition(StatsSet params) + public OpBlinkSkillCondition(StatSet params) { switch (params.getEnum("direction", Position.class)) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java index 5215f86ae6..fde0c7f0f8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpCallPcSkillCondition implements ISkillCondition { - public OpCallPcSkillCondition(StatsSet params) + public OpCallPcSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java index dddafec6f0..1de2a32550 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCanEscapeSkillCondition implements ISkillCondition { - public OpCanEscapeSkillCondition(StatsSet params) + public OpCanEscapeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java index 3f1685a1e0..a87fd8adb6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCanNotUseAirshipSkillCondition implements ISkillCondition { - public OpCanNotUseAirshipSkillCondition(StatsSet params) + public OpCanNotUseAirshipSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java index 8eec19a568..ac7a81c015 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCannotUseTargetWithPrivateStoreSkillCondition implements ISkillCondition { - public OpCannotUseTargetWithPrivateStoreSkillCondition(StatsSet params) + public OpCannotUseTargetWithPrivateStoreSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 91de0adc8c..4030b79d00 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Weapon; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpChangeWeaponSkillCondition implements ISkillCondition { - public OpChangeWeaponSkillCondition(StatsSet params) + public OpChangeWeaponSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java index c2de03de1e..3e304e7d9d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.AbnormalType; @@ -34,7 +34,7 @@ public class OpCheckAbnormalSkillCondition implements ISkillCondition private final boolean _hasAbnormal; private final SkillConditionAffectType _affectType; - public OpCheckAbnormalSkillCondition(StatsSet params) + public OpCheckAbnormalSkillCondition(StatSet params) { _type = params.getEnum("type", AbnormalType.class); _level = params.getInt("level"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java index 65084182b1..c70b58dc50 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCheckAccountTypeSkillCondition implements ISkillCondition { - public OpCheckAccountTypeSkillCondition(StatsSet params) + public OpCheckAccountTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java index 3d4f0a58a0..11eb804274 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpCheckCastRangeSkillCondition implements ISkillCondition { private final int _distance; - public OpCheckCastRangeSkillCondition(StatsSet params) + public OpCheckCastRangeSkillCondition(StatSet params) { _distance = params.getInt("distance"); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java index 7e2e391595..03af1ac63d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.ClassId; @@ -35,7 +35,7 @@ public class OpCheckClassListSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final boolean _isWithin; - public OpCheckClassListSkillCondition(StatsSet params) + public OpCheckClassListSkillCondition(StatSet params) { _classIds = params.getEnumList("classIds", ClassId.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java index 9f779f937a..9702804304 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.ClassId; @@ -33,7 +33,7 @@ public class OpCheckClassSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final boolean _isWithin; - public OpCheckClassSkillCondition(StatsSet params) + public OpCheckClassSkillCondition(StatSet params) { _classId = params.getEnum("classId", ClassId.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java index 3bf6b65dc8..ad997dced7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckCrtEffectSkillCondition implements ISkillCondition { - public OpCheckCrtEffectSkillCondition(StatsSet params) + public OpCheckCrtEffectSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java index 144dc95daa..1d5a3adff9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class OpCheckFlagSkillCondition implements ISkillCondition { - public OpCheckFlagSkillCondition(StatsSet params) + public OpCheckFlagSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java index 75af2ab89a..2e0c07d040 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckOnGoingEventCampaignSkillCondition implements ISkillCondition { - public OpCheckOnGoingEventCampaignSkillCondition(StatsSet params) + public OpCheckOnGoingEventCampaignSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java index c64f7c6722..f11569f43c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckPcbangPointSkillCondition implements ISkillCondition { - public OpCheckPcbangPointSkillCondition(StatsSet params) + public OpCheckPcbangPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java index 252519f7ff..997a4d0fec 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.data.xml.impl.ClanHallData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -35,7 +35,7 @@ public class OpCheckResidenceSkillCondition implements ISkillCondition private final List _residencesId; private final boolean _isWithin; - public OpCheckResidenceSkillCondition(StatsSet params) + public OpCheckResidenceSkillCondition(StatSet params) { _residencesId = params.getList("residencesId", Integer.class); _isWithin = params.getBoolean("isWithin"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java index 6abeed7d35..3a1bcf424c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -34,7 +34,7 @@ public class OpCheckSkillListSkillCondition implements ISkillCondition private final List _skillIds; private final SkillConditionAffectType _affectType; - public OpCheckSkillListSkillCondition(StatsSet params) + public OpCheckSkillListSkillCondition(StatSet params) { _skillIds = params.getList("skillIds", Integer.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java index 984338b2c0..af563d983f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpCheckSkillSkillCondition implements ISkillCondition private final int _skillId; private final SkillConditionAffectType _affectType; - public OpCheckSkillSkillCondition(StatsSet params) + public OpCheckSkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java index ea882c3635..5d85a2dbdb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionCompanionType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpCompanionSkillCondition implements ISkillCondition { private final SkillConditionCompanionType _type; - public OpCompanionSkillCondition(StatsSet params) + public OpCompanionSkillCondition(StatSet params) { _type = params.getEnum("type", SkillConditionCompanionType.class); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java index 069b9d1759..464853c00c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpEnchantRangeSkillCondition implements ISkillCondition { - public OpEnchantRangeSkillCondition(StatsSet params) + public OpEnchantRangeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java index 99f22bb16a..e12f3ae007 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class OpEncumberedSkillCondition implements ISkillCondition private final int _slotsPercent; private final int _weightPercent; - public OpEncumberedSkillCondition(StatsSet params) + public OpEncumberedSkillCondition(StatSet params) { _slotsPercent = params.getInt("slotsPercent"); _weightPercent = params.getInt("weightPercent"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java index 187dfba744..49cf8e2cb8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpEnergyMaxSkillCondition implements ISkillCondition { private final int _amount; - public OpEnergyMaxSkillCondition(StatsSet params) + public OpEnergyMaxSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 75bdf465e0..82eb70b770 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class OpEquipItemSkillCondition implements ISkillCondition private final int _itemId; private final SkillConditionAffectType _affectType; - public OpEquipItemSkillCondition(StatsSet params) + public OpEquipItemSkillCondition(StatSet params) { _itemId = params.getInt("itemId"); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java index 2c4576c2fa..fa6e82082b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ public class OpExistNpcSkillCondition implements ISkillCondition private final int _range; private final boolean _isAround; - public OpExistNpcSkillCondition(StatsSet params) + public OpExistNpcSkillCondition(StatSet params) { _npcIds = params.getList("npcIds", Integer.class); _range = params.getInt("range"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java index 27cc3e90a9..8299b40047 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingCastSkillCondition implements ISkillCondition { - public OpFishingCastSkillCondition(StatsSet params) + public OpFishingCastSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java index 84cc031a24..4b43eb834e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingPumpingSkillCondition implements ISkillCondition { - public OpFishingPumpingSkillCondition(StatsSet params) + public OpFishingPumpingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java index 86aa667bee..a6a400f96f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingReelingSkillCondition implements ISkillCondition { - public OpFishingReelingSkillCondition(StatsSet params) + public OpFishingReelingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java index d22733df7e..50e6dafb82 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpHaveSummonSkillCondition implements ISkillCondition { - public OpHaveSummonSkillCondition(StatsSet params) + public OpHaveSummonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 2e854ca2b8..cceb4e937b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { private final int _npcId; - public OpHaveSummonedNpcSkillCondition(StatsSet params) + public OpHaveSummonedNpcSkillCondition(StatSet params) { _npcId = params.getInt("npcId"); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java index 16932ce531..374a75bfab 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.impl.ClanHallData; import org.l2jmobius.gameserver.enums.ResidenceType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -34,7 +34,7 @@ public class OpHomeSkillCondition implements ISkillCondition { private final ResidenceType _type; - public OpHomeSkillCondition(StatsSet params) + public OpHomeSkillCondition(StatSet params) { _type = params.getEnum("type", ResidenceType.class); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java index 9482a0bf55..62ad48bdcc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpInSiegeTimeSkillCondition implements ISkillCondition { - public OpInSiegeTimeSkillCondition(StatsSet params) + public OpInSiegeTimeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java index 1bffdacd6c..f2fb298398 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -30,7 +30,7 @@ public class OpInstantzoneSkillCondition implements ISkillCondition { private final int _instanceId; - public OpInstantzoneSkillCondition(StatsSet params) + public OpInstantzoneSkillCondition(StatSet params) { _instanceId = params.getInt("instanceId"); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java index 76703cc53b..7418ef9b64 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpMainjobSkillCondition implements ISkillCondition { - public OpMainjobSkillCondition(StatsSet params) + public OpMainjobSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java index d4c9f1f331..3c81369bbb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNeedAgathionSkillCondition implements ISkillCondition { - public OpNeedAgathionSkillCondition(StatsSet params) + public OpNeedAgathionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java index 96f6774f25..e7a477b0ee 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; @@ -34,7 +34,7 @@ public class OpNeedSummonOrPetSkillCondition implements ISkillCondition { private final List _npcIds = new ArrayList<>(); - public OpNeedSummonOrPetSkillCondition(StatsSet params) + public OpNeedSummonOrPetSkillCondition(StatSet params) { final List npcIds = params.getList("npcIds", String.class); if (npcIds != null) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java index 9701002065..ae1edfd719 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotCursedSkillCondition implements ISkillCondition { - public OpNotCursedSkillCondition(StatsSet params) + public OpNotCursedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java index bf909425d8..1de79f388a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpNotInPeacezoneSkillCondition implements ISkillCondition { - public OpNotInPeacezoneSkillCondition(StatsSet params) + public OpNotInPeacezoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java index 0752ba4a6a..0d3e4cb4dd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotInstantzoneSkillCondition implements ISkillCondition { - public OpNotInstantzoneSkillCondition(StatsSet params) + public OpNotInstantzoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java index 45891cd0ac..7ea02159ba 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotOlympiadSkillCondition implements ISkillCondition { - public OpNotOlympiadSkillCondition(StatsSet params) + public OpNotOlympiadSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java index 5c5d293ae8..2397a68e99 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpNotTerritorySkillCondition implements ISkillCondition { - public OpNotTerritorySkillCondition(StatsSet params) + public OpNotTerritorySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java index 874872bb2e..d9f8c1fa3b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpPeacezoneSkillCondition implements ISkillCondition { - public OpPeacezoneSkillCondition(StatsSet params) + public OpPeacezoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java index c20c4665bb..08d6bb095a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpPkcountSkillCondition implements ISkillCondition { private final SkillConditionAffectType _affectType; - public OpPkcountSkillCondition(StatsSet params) + public OpPkcountSkillCondition(StatSet params) { _affectType = params.getEnum("affectType", SkillConditionAffectType.class); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java index 879fc88c4c..d393c5ddc3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -30,7 +30,7 @@ public class OpPledgeSkillCondition implements ISkillCondition { private final int _level; - public OpPledgeSkillCondition(StatsSet params) + public OpPledgeSkillCondition(StatSet params) { _level = params.getInt("level"); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java index 9adc89b98d..adf16f8feb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpRestartPointSkillCondition implements ISkillCondition { - public OpRestartPointSkillCondition(StatsSet params) + public OpRestartPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java index bbd1d9d7d1..6874091ba2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class OpResurrectionSkillCondition implements ISkillCondition { - public OpResurrectionSkillCondition(StatsSet params) + public OpResurrectionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java index 8bbf796ad2..566f935a50 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpSiegeHammerSkillCondition implements ISkillCondition { - public OpSiegeHammerSkillCondition(StatsSet params) + public OpSiegeHammerSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java index be3ad18e05..cbfc1a25b2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition private final int _skillId; private final boolean _hasLearned; - public OpSkillAcquireSkillCondition(StatsSet params) + public OpSkillAcquireSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _hasLearned = params.getBoolean("hasLearned"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java index c8789d28e4..a8382b83b3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpSkillSkillCondition implements ISkillCondition private final int _skillLevel; private final boolean _hasLearned; - public OpSkillSkillCondition(StatsSet params) + public OpSkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _skillLevel = params.getInt("skillLevel"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java index 5127071683..a3d188f3eb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpSocialClassSkillCondition implements ISkillCondition { private final int _socialClass; - public OpSocialClassSkillCondition(StatsSet params) + public OpSocialClassSkillCondition(StatSet params) { _socialClass = params.getInt("socialClass"); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java index b9d37d18c0..c86984a218 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class OpSoulMaxSkillCondition implements ISkillCondition { - public OpSoulMaxSkillCondition(StatsSet params) + public OpSoulMaxSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java index 4780c13a58..0faa676bbe 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpSubjobSkillCondition implements ISkillCondition { - public OpSubjobSkillCondition(StatsSet params) + public OpSubjobSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java index 17a9a1a9e3..a14192847a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.concurrent.atomic.AtomicBoolean; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpSweeperSkillCondition implements ISkillCondition { - public OpSweeperSkillCondition(StatsSet params) + public OpSweeperSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java index b36585bf00..c4b3923e92 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTargetAllItemTypeSkillCondition implements ISkillCondition { - public OpTargetAllItemTypeSkillCondition(StatsSet params) + public OpTargetAllItemTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 6b85389d62..5492e96e1a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTargetArmorTypeSkillCondition implements ISkillCondition { - public OpTargetArmorTypeSkillCondition(StatsSet params) + public OpTargetArmorTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java index 0c0090fbc4..97e07a1822 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpTargetDoorSkillCondition implements ISkillCondition { private final List _doorIds; - public OpTargetDoorSkillCondition(StatsSet params) + public OpTargetDoorSkillCondition(StatSet params) { _doorIds = params.getList("doorIds", Integer.class); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java index 6fbc3cda10..eaabf4a73d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpTargetMyPledgeAcademySkillCondition implements ISkillCondition { - public OpTargetMyPledgeAcademySkillCondition(StatsSet params) + public OpTargetMyPledgeAcademySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java index d5820600dd..14a744613d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpTargetNpcSkillCondition implements ISkillCondition { private final List _npcId; - public OpTargetNpcSkillCondition(StatsSet params) + public OpTargetNpcSkillCondition(StatSet params) { _npcId = params.getList("npcIds", Integer.class); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java index 854225a75a..b0c5e50ae3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpTargetPcSkillCondition implements ISkillCondition { - public OpTargetPcSkillCondition(StatsSet params) + public OpTargetPcSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index 7faecb2ffd..62fd4b365f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Weapon; @@ -34,7 +34,7 @@ public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition { private final List _weaponTypes = new ArrayList<>(); - public OpTargetWeaponAttackTypeSkillCondition(StatsSet params) + public OpTargetWeaponAttackTypeSkillCondition(StatSet params) { final List weaponTypes = params.getList("weaponType", String.class); if (weaponTypes != null) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java index 8451365885..e114c03412 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTerritorySkillCondition implements ISkillCondition { - public OpTerritorySkillCondition(StatsSet params) + public OpTerritorySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java index 13f287687e..fde1293086 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpUnlockSkillCondition implements ISkillCondition { - public OpUnlockSkillCondition(StatsSet params) + public OpUnlockSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java index 8cc76a34bb..46dea5bbcb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpUseFirecrackerSkillCondition implements ISkillCondition { - public OpUseFirecrackerSkillCondition(StatsSet params) + public OpUseFirecrackerSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java index f3b54bbad7..651dade274 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpUsePraseedSkillCondition implements ISkillCondition { - public OpUsePraseedSkillCondition(StatsSet params) + public OpUsePraseedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java index 890b0fcd5f..dd57df0e13 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.MountType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpWyvernSkillCondition implements ISkillCondition { - public OpWyvernSkillCondition(StatsSet params) + public OpWyvernSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java index 49085b6674..8590262afc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class PossessHolythingSkillCondition implements ISkillCondition { - public PossessHolythingSkillCondition(StatsSet params) + public PossessHolythingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java index 8b0fb55554..38b5644fb1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class RemainCpPerSkillCondition implements ISkillCondition private final int _amount; private final SkillConditionPercentType _percentType; - public RemainCpPerSkillCondition(StatsSet params) + public RemainCpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java index 612367a233..1ad96100ad 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -33,7 +33,7 @@ public class RemainHpPerSkillCondition implements ISkillCondition private final SkillConditionPercentType _percentType; private final SkillConditionAffectType _affectType; - public RemainHpPerSkillCondition(StatsSet params) + public RemainHpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java index 5455c1587a..39085349d9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class RemainMpPerSkillCondition implements ISkillCondition private final int _amount; private final SkillConditionPercentType _percentType; - public RemainMpPerSkillCondition(StatsSet params) + public RemainMpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java index 7de47f103f..6e9e5ad821 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class SoulSavedSkillCondition implements ISkillCondition { private final int _amount; - public SoulSavedSkillCondition(StatsSet params) + public SoulSavedSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java index 0b75a5a623..f4bdbaaecb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class TargetItemCrystalTypeSkillCondition implements ISkillCondition { - public TargetItemCrystalTypeSkillCondition(StatsSet params) + public TargetItemCrystalTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java index 51502ff209..604a41f904 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.MentorManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMyMenteeSkillCondition implements ISkillCondition { - public TargetMyMenteeSkillCondition(StatsSet params) + public TargetMyMenteeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java index fc621365a9..4bfb496634 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class TargetMyPartySkillCondition implements ISkillCondition { private final boolean _includeMe; - public TargetMyPartySkillCondition(StatsSet params) + public TargetMyPartySkillCondition(StatSet params) { _includeMe = params.getBoolean("includeMe"); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java index 9ebec0e691..d44a1bc8a9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMyPledgeSkillCondition implements ISkillCondition { - public TargetMyPledgeSkillCondition(StatsSet params) + public TargetMyPledgeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java index f4da8d6079..5045aa3848 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class TargetRaceSkillCondition implements ISkillCondition { private final Race _race; - public TargetRaceSkillCondition(StatsSet params) + public TargetRaceSkillCondition(StatSet params) { _race = params.getEnum("race", Race.class); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java index b1d0ec8553..7e9236b634 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.ActionDataHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -57,7 +57,7 @@ public class ActionData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "action", actionNode -> { - final ActionDataHolder holder = new ActionDataHolder(new StatsSet(parseAttributes(actionNode))); + final ActionDataHolder holder = new ActionDataHolder(new StatSet(parseAttributes(actionNode))); _actionData.put(holder.getId(), holder); })); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java index 36002572b0..f7762ab07b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java @@ -32,7 +32,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.AdminCommandAccessRight; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -72,7 +72,7 @@ public class AdminData implements IXmlReader { NamedNodeMap attrs; Node attr; - StatsSet set; + StatSet set; AccessLevel level; AdminCommandAccessRight command; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -83,7 +83,7 @@ public class AdminData implements IXmlReader { if ("access".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -99,7 +99,7 @@ public class AdminData implements IXmlReader } else if ("admin".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index a5de47d07c..c31f2ea750 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; @@ -83,7 +83,7 @@ public class AppearanceItemData implements IXmlReader { if ("appearance_stone".equalsIgnoreCase(d.getNodeName())) { - final AppearanceStone stone = new AppearanceStone(new StatsSet(parseAttributes(d))); + final AppearanceStone stone = new AppearanceStone(new StatSet(parseAttributes(d))); for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) { switch (c.getNodeName()) @@ -120,7 +120,7 @@ public class AppearanceItemData implements IXmlReader } case "visual": { - stone.addVisualId(new AppearanceHolder(new StatsSet(parseAttributes(c)))); + stone.addVisualId(new AppearanceHolder(new StatSet(parseAttributes(c)))); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java index 6c96d3874a..6eac3240e7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -64,7 +64,7 @@ public class AttendanceRewardData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "item", rewardNode -> { - final StatsSet set = new StatsSet(parseAttributes(rewardNode)); + final StatSet set = new StatSet(parseAttributes(rewardNode)); final int itemId = set.getInt("id"); final int itemCount = set.getInt("count"); if (ItemTable.getInstance().getTemplate(itemId) == null) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java index 891d19fcf2..3054b0e7ef 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.beautyshop.BeautyData; import org.l2jmobius.gameserver.model.beautyshop.BeautyItem; @@ -56,7 +56,7 @@ public class BeautyShopData implements IXmlReader public void parseDocument(Document doc, File f) { NamedNodeMap attrs; - StatsSet set; + StatSet set; Node att; Race race = null; Sex sex = null; @@ -92,7 +92,7 @@ public class BeautyShopData implements IXmlReader if ("hair".equalsIgnoreCase(a.getNodeName())) { attrs = a.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -105,7 +105,7 @@ public class BeautyShopData implements IXmlReader if ("color".equalsIgnoreCase(g.getNodeName())) { attrs = g.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -119,7 +119,7 @@ public class BeautyShopData implements IXmlReader else if ("face".equalsIgnoreCase(a.getNodeName())) { attrs = a.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java index 37e977c51e..530a5d975a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java @@ -34,7 +34,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.entity.ClanHall; @@ -66,7 +66,7 @@ public class ClanHallData implements IXmlReader final List doors = new ArrayList<>(); final List npcs = new ArrayList<>(); final List teleports = new ArrayList<>(); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); for (Node listNode = doc.getFirstChild(); listNode != null; listNode = listNode.getNextSibling()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java index ae608cefb6..f1a23734e0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.combination.CombinationItem; import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; @@ -57,7 +57,7 @@ public class CombinationItemsData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "item", itemNode -> { - final CombinationItem item = new CombinationItem(new StatsSet(parseAttributes(itemNode))); + final CombinationItem item = new CombinationItem(new StatSet(parseAttributes(itemNode))); forEach(itemNode, "reward", rewardNode -> { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java index 038738b138..4af039b48d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.CubicSkill; import org.l2jmobius.gameserver.model.cubic.ICubicConditionHolder; @@ -61,7 +61,7 @@ public class CubicData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - forEach(doc, "list", listNode -> forEach(listNode, "cubic", cubicNode -> parseTemplate(cubicNode, new CubicTemplate(new StatsSet(parseAttributes(cubicNode)))))); + forEach(doc, "list", listNode -> forEach(listNode, "cubic", cubicNode -> parseTemplate(cubicNode, new CubicTemplate(new StatSet(parseAttributes(cubicNode)))))); } /** @@ -137,7 +137,7 @@ public class CubicData implements IXmlReader { forEach(cubicNode, "skill", skillNode -> { - final CubicSkill skill = new CubicSkill(new StatsSet(parseAttributes(skillNode))); + final CubicSkill skill = new CubicSkill(new StatSet(parseAttributes(skillNode))); forEach(cubicNode, "conditions", conditionNode -> parseConditions(cubicNode, template, skill)); template.getSkills().add(skill); }); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java index 3d19bee079..ede9b72202 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -62,7 +62,7 @@ public class DailyMissionData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "reward", rewardNode -> { - final StatsSet set = new StatsSet(parseAttributes(rewardNode)); + final StatSet set = new StatSet(parseAttributes(rewardNode)); final List items = new ArrayList<>(1); forEach(rewardNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> @@ -80,14 +80,14 @@ public class DailyMissionData implements IXmlReader // Initial values in case handler doesn't exists set.set("handler", ""); - set.set("params", StatsSet.EMPTY_STATSET); + set.set("params", StatSet.EMPTY_STATSET); // Parse handler and parameters forEach(rewardNode, "handler", handlerNode -> { set.set("handler", parseString(handlerNode.getAttributes(), "name")); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); set.set("params", params); forEach(handlerNode, "param", paramNode -> params.set(parseString(paramNode.getAttributes(), "name"), paramNode.getTextContent())); }); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java index 835eab4fe9..53248de524 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java @@ -35,7 +35,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -51,7 +51,7 @@ public class DoorData implements IXmlReader // Info holders private final Map> _groups = new HashMap<>(); private final Map _doors = new HashMap<>(); - private final Map _templates = new HashMap<>(); + private final Map _templates = new HashMap<>(); private final Map> _regions = new HashMap<>(); protected DoorData() @@ -75,9 +75,9 @@ public class DoorData implements IXmlReader LOGGER.info(getClass().getSimpleName() + ": Loaded " + _doors.size() + " Door Templates for " + _regions.size() + " regions."); } - public StatsSet parseDoor(Node doorNode) + public StatSet parseDoor(Node doorNode) { - final StatsSet params = new StatsSet(parseAttributes(doorNode)); + final StatSet params = new StatSet(parseAttributes(doorNode)); params.set("baseHpMax", 1); // Avoid doors without HP value created dead due to default value 0 in CreatureTemplate forEach(doorNode, IXmlReader::isNode, innerDoorNode -> @@ -115,7 +115,7 @@ public class DoorData implements IXmlReader /** * @param set */ - private void applyCollisions(StatsSet set) + private void applyCollisions(StatSet set) { // Insert Collision data if (set.contains("nodeX_0") && set.contains("nodeY_0") && set.contains("nodeX_1") && set.contains("nodeY_1")) @@ -142,7 +142,7 @@ public class DoorData implements IXmlReader * @param set * @return */ - public DoorInstance spawnDoor(StatsSet set) + public DoorInstance spawnDoor(StatSet set) { // Create door template + door instance final DoorTemplate template = new DoorTemplate(set); @@ -183,7 +183,7 @@ public class DoorData implements IXmlReader return door; } - public StatsSet getDoorTemplate(int doorId) + public StatSet getDoorTemplate(int doorId) { return _templates.get(doorId); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java index eca42a9a34..637ef1e953 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -64,7 +64,7 @@ public class EnchantItemData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node att; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -76,7 +76,7 @@ public class EnchantItemData implements IXmlReader if ("enchant".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -107,7 +107,7 @@ public class EnchantItemData implements IXmlReader else if ("support".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java index 46701fd777..bb1e8026b7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.SkillEnchantType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.EnchantSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -69,10 +69,10 @@ public class EnchantSkillGroupsData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "enchant", enchantNode -> { - final EnchantSkillHolder enchantSkillHolder = new EnchantSkillHolder(new StatsSet(parseAttributes(enchantNode))); + final EnchantSkillHolder enchantSkillHolder = new EnchantSkillHolder(new StatSet(parseAttributes(enchantNode))); forEach(enchantNode, "sps", spsNode -> forEach(spsNode, "sp", spNode -> enchantSkillHolder.addSp(parseEnum(spNode.getAttributes(), SkillEnchantType.class, "type"), parseInteger(spNode.getAttributes(), "amount")))); forEach(enchantNode, "chances", chancesNode -> forEach(chancesNode, "chance", chanceNode -> enchantSkillHolder.addChance(parseEnum(chanceNode.getAttributes(), SkillEnchantType.class, "type"), parseInteger(chanceNode.getAttributes(), "value")))); - forEach(enchantNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> enchantSkillHolder.addRequiredItem(parseEnum(itemNode.getAttributes(), SkillEnchantType.class, "type"), new ItemHolder(new StatsSet(parseAttributes(itemNode)))))); + forEach(enchantNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> enchantSkillHolder.addRequiredItem(parseEnum(itemNode.getAttributes(), SkillEnchantType.class, "type"), new ItemHolder(new StatSet(parseAttributes(itemNode)))))); _enchantSkillHolders.put(parseInteger(enchantNode.getAttributes(), "level"), enchantSkillHolder); })); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java index a8bb0397ac..037af7e1ae 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java @@ -34,7 +34,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.eventengine.AbstractEventManager; import org.l2jmobius.gameserver.model.eventengine.EventMethodNotification; import org.l2jmobius.gameserver.model.eventengine.EventScheduler; @@ -156,7 +156,7 @@ public class EventEngineData implements IXmlReader */ private void parseVariables(AbstractEventManager eventManager, Node innerNode) { - final StatsSet variables = new StatsSet(LinkedHashMap::new); + final StatSet variables = new StatSet(LinkedHashMap::new); for (Node variableNode = innerNode.getFirstChild(); variableNode != null; variableNode = variableNode.getNextSibling()) { if ("variable".equals(variableNode.getNodeName())) @@ -188,7 +188,7 @@ public class EventEngineData implements IXmlReader { if ("schedule".equals(scheduleNode.getNodeName())) { - final StatsSet params = new StatsSet(LinkedHashMap::new); + final StatSet params = new StatSet(LinkedHashMap::new); final NamedNodeMap attrs = scheduleNode.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -235,7 +235,7 @@ public class EventEngineData implements IXmlReader } else if ("conditionalSchedule".equals(scheduleNode.getNodeName())) { - final StatsSet params = new StatsSet(LinkedHashMap::new); + final StatSet params = new StatSet(LinkedHashMap::new); final NamedNodeMap attrs = scheduleNode.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -346,7 +346,7 @@ public class EventEngineData implements IXmlReader * @param variableNode */ @SuppressWarnings("unchecked") - private void parseListVariables(AbstractEventManager eventManager, StatsSet variables, Node variableNode) + private void parseListVariables(AbstractEventManager eventManager, StatSet variables, Node variableNode) { final String name = parseString(variableNode.getAttributes(), "name"); final String type = parseString(variableNode.getAttributes(), "type"); @@ -419,7 +419,7 @@ public class EventEngineData implements IXmlReader * @param variableNode */ @SuppressWarnings("unchecked") - private void parseMapVariables(AbstractEventManager eventManager, StatsSet variables, Node variableNode) + private void parseMapVariables(AbstractEventManager eventManager, StatSet variables, Node variableNode) { final String name = parseString(variableNode.getAttributes(), "name"); final String keyType = parseString(variableNode.getAttributes(), "keyType"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java index db19c5fdff..0724877d9d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.ConditionHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.ICondition; import org.l2jmobius.gameserver.model.holders.ExtendDropDataHolder; import org.l2jmobius.gameserver.model.holders.ExtendDropItemHolder; @@ -62,7 +62,7 @@ public class ExtendDropData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "drop", dropNode -> { - final StatsSet set = new StatsSet(parseAttributes(dropNode)); + final StatSet set = new StatSet(parseAttributes(dropNode)); final List items = new ArrayList<>(1); forEach(dropNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> @@ -80,8 +80,8 @@ public class ExtendDropData implements IXmlReader forEach(dropNode, "conditions", conditionsNode -> forEach(conditionsNode, "condition", conditionNode -> { final String conditionName = parseString(conditionNode.getAttributes(), "name"); - final StatsSet params = (StatsSet) parseValue(conditionNode); - final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); + final StatSet params = (StatSet) parseValue(conditionNode); + final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); if (conditionFunction != null) { conditions.add(conditionFunction.apply(params)); @@ -109,7 +109,7 @@ public class ExtendDropData implements IXmlReader private Object parseValue(Node node) { - StatsSet statsSet = null; + StatSet statSet = null; List list = null; Object text = null; for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) @@ -145,12 +145,12 @@ public class ExtendDropData implements IXmlReader final Object value = parseValue(node); if (value != null) { - if (statsSet == null) + if (statSet == null) { - statsSet = new StatsSet(); + statSet = new StatSet(); } - statsSet.set(nodeName, value); + statSet.set(nodeName, value); } } } @@ -161,9 +161,9 @@ public class ExtendDropData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", list); + statSet.set(".", list); } else { @@ -176,16 +176,16 @@ public class ExtendDropData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", text); + statSet.set(".", text); } else { return text; } } - return statsSet; + return statSet; } public ExtendDropDataHolder getExtendDropById(int id) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java index 57a16d6390..608f4702b8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.FakePlayerHolder; @@ -72,7 +72,7 @@ public class FakePlayerData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayer", fakePlayerNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerNode)); final int npcId = set.getInt("npcId"); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); final String name = template.getName(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java index 18cc499b71..a5ade27c03 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.FenceState; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldRegion; import org.l2jmobius.gameserver.model.actor.instance.FenceInstance; @@ -79,7 +79,7 @@ public class FenceData implements IXmlReader private void spawnFence(Node fenceNode) { - final StatsSet set = new StatsSet(parseAttributes(fenceNode)); + final StatSet set = new StatSet(parseAttributes(fenceNode)); spawnFence(set.getInt("x"), set.getInt("y"), set.getInt("z"), set.getString("name"), set.getInt("width"), set.getInt("length"), set.getInt("height"), 0, set.getEnum("state", FenceState.class, FenceState.CLOSED)); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java index 67dd4e396b..02efb756f2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.Henna; import org.l2jmobius.gameserver.model.skills.Skill; @@ -86,7 +86,7 @@ public class HennaData implements IXmlReader */ private void parseHenna(Node d) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final List wearClassIds = new ArrayList<>(); final List skills = new ArrayList<>(); NamedNodeMap attrs = d.getAttributes(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java index 03ad8ab79e..d81e85948d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; @@ -93,7 +93,7 @@ public class InitialEquipmentData implements IXmlReader { if ("item".equalsIgnoreCase(c.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java index 72080aa4ac..54b1909d60 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemPointHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; @@ -55,17 +55,17 @@ public class LuckyGameData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "luckygame", rewardNode -> { - final LuckyGameDataHolder holder = new LuckyGameDataHolder(new StatsSet(parseAttributes(rewardNode))); + final LuckyGameDataHolder holder = new LuckyGameDataHolder(new StatSet(parseAttributes(rewardNode))); forEach(rewardNode, "common_reward", commonRewardNode -> forEach(commonRewardNode, "item", itemNode -> { - final StatsSet stats = new StatsSet(parseAttributes(itemNode)); + final StatSet stats = new StatSet(parseAttributes(itemNode)); holder.addCommonReward(new ItemChanceHolder(stats.getInt("id"), stats.getDouble("chance"), stats.getLong("count"))); })); forEach(rewardNode, "unique_reward", uniqueRewardNode -> forEach(uniqueRewardNode, "item", itemNode -> { - holder.addUniqueReward(new ItemPointHolder(new StatsSet(parseAttributes(itemNode)))); + holder.addUniqueReward(new ItemPointHolder(new StatSet(parseAttributes(itemNode)))); })); forEach(rewardNode, "modify_reward", uniqueRewardNode -> @@ -74,7 +74,7 @@ public class LuckyGameData implements IXmlReader holder.setMaxModifyRewardGame(parseInteger(uniqueRewardNode.getAttributes(), "max_game")); forEach(uniqueRewardNode, "item", itemNode -> { - final StatsSet stats = new StatsSet(parseAttributes(itemNode)); + final StatSet stats = new StatSet(parseAttributes(itemNode)); holder.addModifyReward(new ItemChanceHolder(stats.getInt("id"), stats.getDouble("chance"), stats.getLong("count"))); }); }); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java index 75bb48ed37..190653cdec 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java @@ -35,7 +35,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.SpecialItemType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; @@ -90,7 +90,7 @@ public class MultisellData implements IXmlReader { forEach(doc, "list", listNode -> { - final StatsSet set = new StatsSet(parseAttributes(listNode)); + final StatSet set = new StatSet(parseAttributes(listNode)); final int listId = Integer.parseInt(f.getName().substring(0, f.getName().length() - 4)); final List entries = new ArrayList<>(listNode.getChildNodes().getLength()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java index 3a990d0145..bda5bbcf7f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.enums.AISkillScope; import org.l2jmobius.gameserver.enums.DropType; import org.l2jmobius.gameserver.enums.MpRewardAffectType; import org.l2jmobius.gameserver.enums.MpRewardType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.DropHolder; @@ -95,7 +95,7 @@ public class NpcData implements IXmlReader if ("npc".equalsIgnoreCase(listNode.getNodeName())) { NamedNodeMap attrs = listNode.getAttributes(); - final StatsSet set = new StatsSet(new HashMap<>()); + final StatSet set = new StatSet(new HashMap<>()); final int npcId = parseInteger(attrs, "id"); Map parameters = null; Map skills = null; @@ -514,11 +514,11 @@ public class NpcData implements IXmlReader if (parameters != null) { // Using unmodifiable map parameters of template are not meant to be changed at runtime. - template.setParameters(new StatsSet(Collections.unmodifiableMap(parameters))); + template.setParameters(new StatSet(Collections.unmodifiableMap(parameters))); } else { - template.setParameters(StatsSet.EMPTY_STATSET); + template.setParameters(StatSet.EMPTY_STATSET); } if (skills != null) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java index 3712cca6af..373f87ecfc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -79,7 +79,7 @@ public class NpcNameLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); NPC_NAME_LOCALISATIONS.get(_lang).put(set.getInt("id"), new String[] { set.getString("name"), diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 55dcd539aa..36c5897ecd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.EffectHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; @@ -71,7 +71,7 @@ public class OptionData implements IXmlReader forEach(innerNode, "effect", effectNode -> { final String name = parseString(effectNode.getAttributes(), "name"); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); forEach(effectNode, IXmlReader::isNode, paramNode -> params.set(paramNode.getNodeName(), SkillData.getInstance().parseValue(paramNode, true, false, Collections.emptyMap()))); option.addEffect(EffectHandler.getInstance().getHandlerFactory(name).apply(params)); }); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java index b1bb74baf6..c893725bc3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.PetLevelData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * This class parse and hold all pet parameters.
    @@ -116,7 +116,7 @@ public class PetDataTable implements IXmlReader if (s.getNodeName().equals("stat")) { final int level = Integer.parseInt(s.getAttributes().getNamedItem("level").getNodeValue()); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (Node bean = s.getFirstChild(); bean != null; bean = bean.getNextSibling()) { if (bean.getNodeName().equals("set")) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java index ab1cb3b257..b646782547 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.base.ClassId; @@ -83,7 +83,7 @@ public class PlayerTemplateData implements IXmlReader } else if ("staticData".equalsIgnoreCase(d.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.set("classId", classId); final List creationPoints = new ArrayList<>(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java index 34a04edd9b..35b879e73f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; @@ -83,7 +83,7 @@ public class PrimeShopData implements IXmlReader { NamedNodeMap attrs = d.getAttributes(); Node att; - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java index b7ed4c8fba..43e5d84784 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.RecipeInstance; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.RecipeStatInstance; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; /** @@ -82,7 +82,7 @@ public class RecipeData implements IXmlReader Node att; int id = -1; boolean haveRare = false; - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); att = attrs.getNamedItem("id"); if (att == null) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java index 796f5ae085..9a8397e085 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java @@ -29,7 +29,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate; /** @@ -60,7 +60,7 @@ public class ResidenceFunctionsData implements IXmlReader forEach(doc, "list", list -> forEach(list, "function", func -> { final NamedNodeMap attrs = func.getAttributes(); - final StatsSet set = new StatsSet(HashMap::new); + final StatSet set = new StatSet(HashMap::new); for (int i = 0; i < attrs.getLength(); i++) { final Node node = attrs.item(i); @@ -69,7 +69,7 @@ public class ResidenceFunctionsData implements IXmlReader forEach(func, "function", levelNode -> { final NamedNodeMap levelAttrs = levelNode.getAttributes(); - final StatsSet levelSet = new StatsSet(HashMap::new); + final StatSet levelSet = new StatSet(HashMap::new); levelSet.merge(set); for (int i = 0; i < levelAttrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java index 053d9089ce..d6b28a5962 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; /** @@ -82,7 +82,7 @@ public class SendMessageLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); SEND_MESSAGE_LOCALISATIONS.get(_lang).put(set.getString("message").split(SPLIT_STRING), set.getString("translation").split(SPLIT_STRING)); })); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java index e473030c56..c3eda1f3b8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.actor.instance.ShuttleInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; @@ -72,7 +72,7 @@ public class ShuttleData implements IXmlReader public void parseDocument(Document doc, File f) { NamedNodeMap attrs; - StatsSet set; + StatSet set; Node att; ShuttleDataHolder data; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -84,7 +84,7 @@ public class ShuttleData implements IXmlReader if ("shuttle".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -164,7 +164,7 @@ public class ShuttleData implements IXmlReader { for (ShuttleDataHolder data : _shuttles.values()) { - final ShuttleInstance shuttle = new ShuttleInstance(new CreatureTemplate(new StatsSet())); + final ShuttleInstance shuttle = new ShuttleInstance(new CreatureTemplate(new StatSet())); shuttle.setData(data); shuttle.setHeading(data.getLocation().getHeading()); shuttle.setLocationInvisible(data.getLocation()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java index 9db0b5f64b..ba000649f2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.SiegeScheduleDate; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.util.Util; /** @@ -54,7 +54,7 @@ public class SiegeScheduleData implements IXmlReader LOGGER.info(getClass().getSimpleName() + ": Loaded " + _scheduleData.size() + " siege schedulers."); if (_scheduleData.isEmpty()) { - _scheduleData.add(new SiegeScheduleDate(new StatsSet())); + _scheduleData.add(new SiegeScheduleDate(new StatSet())); LOGGER.info(getClass().getSimpleName() + ": Emergency loaded " + _scheduleData.size() + " default siege schedulers."); } } @@ -72,7 +72,7 @@ public class SiegeScheduleData implements IXmlReader { case "schedule": { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final NamedNodeMap attrs = cd.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java index cc019c4dbb..2592b3ed97 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java @@ -40,7 +40,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.EffectHandler; import org.l2jmobius.gameserver.handler.SkillConditionHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.EffectScope; @@ -67,9 +67,9 @@ public class SkillData implements IXmlReader private final Integer _toLevel; private final Integer _fromSubLevel; private final Integer _toSubLevel; - private final Map> _info; + private final Map> _info; - public NamedParamInfo(String name, Integer fromLevel, Integer toLevel, Integer fromSubLevel, Integer toSubLevel, Map> info) + public NamedParamInfo(String name, Integer fromLevel, Integer toLevel, Integer fromSubLevel, Integer toSubLevel, Map> info) { _name = name; _fromLevel = fromLevel; @@ -104,7 +104,7 @@ public class SkillData implements IXmlReader return _toSubLevel; } - public Map> getInfo() + public Map> getInfo() { return _info; } @@ -241,8 +241,8 @@ public class SkillData implements IXmlReader { NamedNodeMap attributes = listNode.getAttributes(); final Map> levels = new HashMap<>(); - final Map> skillInfo = new HashMap<>(); - final StatsSet generalSkillInfo = skillInfo.computeIfAbsent(-1, k -> new HashMap<>()).computeIfAbsent(-1, k -> new StatsSet()); + final Map> skillInfo = new HashMap<>(); + final StatSet generalSkillInfo = skillInfo.computeIfAbsent(-1, k -> new HashMap<>()).computeIfAbsent(-1, k -> new StatSet()); parseAttributes(attributes, "", generalSkillInfo); @@ -321,7 +321,7 @@ public class SkillData implements IXmlReader { return; } - subLevelMap.forEach((subLevel, statsSet) -> + subLevelMap.forEach((subLevel, statSet) -> { if (subLevel == -1) { @@ -339,7 +339,7 @@ public class SkillData implements IXmlReader { return; } - subLevelMap.forEach((subLevel, statsSet) -> + subLevelMap.forEach((subLevel, statSet) -> { if (subLevel == -1) { @@ -371,31 +371,31 @@ public class SkillData implements IXmlReader levels.forEach((level, subLevels) -> subLevels.forEach(subLevel -> { - final StatsSet statsSet = Optional.ofNullable(skillInfo.getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatsSet::new); - skillInfo.getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(statsSet.getSet()::putIfAbsent); - skillInfo.getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(statsSet.getSet()::putIfAbsent); - statsSet.set(".level", level); - statsSet.set(".subLevel", subLevel); - final Skill skill = new Skill(statsSet); + final StatSet statSet = Optional.ofNullable(skillInfo.getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatSet::new); + skillInfo.getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(statSet.getSet()::putIfAbsent); + skillInfo.getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(statSet.getSet()::putIfAbsent); + statSet.set(".level", level); + statSet.set(".subLevel", subLevel); + final Skill skill = new Skill(statSet); forEachNamedParamInfoParam(effectParamInfo, level, subLevel, ((effectScope, params) -> { final String effectName = params.getString(".name"); params.remove(".name"); try { - final Function effectFunction = EffectHandler.getInstance().getHandlerFactory(effectName); + final Function effectFunction = EffectHandler.getInstance().getHandlerFactory(effectName); if (effectFunction != null) { skill.addEffect(effectScope, effectFunction.apply(params)); } else { - LOGGER.warning(getClass().getSimpleName() + ": Missing effect for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]"); + LOGGER.warning(getClass().getSimpleName() + ": Missing effect for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]"); } } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading effect for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading effect for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]", e); } })); @@ -405,19 +405,19 @@ public class SkillData implements IXmlReader params.remove(".name"); try { - final Function conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName); + final Function conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName); if (conditionFunction != null) { skill.addCondition(skillConditionScope, conditionFunction.apply(params)); } else { - LOGGER.warning(getClass().getSimpleName() + ": Missing condition for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + skillConditionScope + "] Effect Name[" + conditionName + "]"); + LOGGER.warning(getClass().getSimpleName() + ": Missing condition for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + skillConditionScope + "] Effect Name[" + conditionName + "]"); } } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading condition for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Condition Scope[" + skillConditionScope + "] Condition Name[" + conditionName + "]", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading condition for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Condition Scope[" + skillConditionScope + "] Condition Name[" + conditionName + "]", e); } })); @@ -434,16 +434,16 @@ public class SkillData implements IXmlReader } } - private void forEachNamedParamInfoParam(Map> paramInfo, int level, int subLevel, BiConsumer consumer) + private void forEachNamedParamInfoParam(Map> paramInfo, int level, int subLevel, BiConsumer consumer) { paramInfo.forEach((scope, namedParamInfos) -> namedParamInfos.forEach(namedParamInfo -> { if ((((namedParamInfo.getFromLevel() == null) && (namedParamInfo.getToLevel() == null)) || ((namedParamInfo.getFromLevel() <= level) && (namedParamInfo.getToLevel() >= level))) // && (((namedParamInfo.getFromSubLevel() == null) && (namedParamInfo.getToSubLevel() == null)) || ((namedParamInfo.getFromSubLevel() <= subLevel) && (namedParamInfo.getToSubLevel() >= subLevel)))) { - final StatsSet params = Optional.ofNullable(namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatsSet::new); - namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); - namedParamInfo.getInfo().getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); + final StatSet params = Optional.ofNullable(namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatSet::new); + namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); + namedParamInfo.getInfo().getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); params.set(".name", namedParamInfo.getName()); consumer.accept(scope, params); } @@ -460,7 +460,7 @@ public class SkillData implements IXmlReader final Integer subLevel = parseInteger(attributes, "subLevel"); final Integer fromSubLevel = parseInteger(attributes, "fromSubLevel", subLevel); final Integer toSubLevel = parseInteger(attributes, "toSubLevel", subLevel); - final Map> info = new HashMap<>(); + final Map> info = new HashMap<>(); for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) { if (!node.getNodeName().equals("#text")) @@ -471,7 +471,7 @@ public class SkillData implements IXmlReader return new NamedParamInfo(name, fromLevel, toLevel, fromSubLevel, toSubLevel, info); } - private void parseInfo(Node node, Map>> variableValues, Map> info) + private void parseInfo(Node node, Map>> variableValues, Map> info) { Map> values = parseValues(node); final Object generalValue = values.getOrDefault(-1, Collections.emptyMap()).get(-1); @@ -492,7 +492,7 @@ public class SkillData implements IXmlReader } } - values.forEach((level, subLevelMap) -> subLevelMap.forEach((subLevel, value) -> info.computeIfAbsent(level, k -> new HashMap<>()).computeIfAbsent(subLevel, k -> new StatsSet()).set(node.getNodeName(), value))); + values.forEach((level, subLevelMap) -> subLevelMap.forEach((subLevel, value) -> info.computeIfAbsent(level, k -> new HashMap<>()).computeIfAbsent(subLevel, k -> new StatSet()).set(node.getNodeName(), value))); } private Map> parseValues(Node node) @@ -535,7 +535,7 @@ public class SkillData implements IXmlReader variables.put("index", (i - fromLevel) + 1d); variables.put("subIndex", (j - fromSubLevel) + 1d); final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1); - if ((base != null) && !(base instanceof StatsSet)) + if ((base != null) && !(base instanceof StatSet)) { variables.put("base", Double.parseDouble(String.valueOf(base))); } @@ -555,13 +555,13 @@ public class SkillData implements IXmlReader Object parseValue(Node node, boolean blockValue, boolean parseAttributes, Map variables) { - StatsSet statsSet = null; + StatSet statSet = null; List list = null; Object text = null; if (parseAttributes && (!node.getNodeName().equals("value") || !blockValue) && (node.getAttributes().getLength() > 0)) { - statsSet = new StatsSet(); - parseAttributes(node.getAttributes(), "", statsSet, variables); + statSet = new StatSet(); + parseAttributes(node.getAttributes(), "", statSet, variables); } for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) { @@ -604,12 +604,12 @@ public class SkillData implements IXmlReader final Object value = parseValue(node, false, true, variables); if (value != null) { - if (statsSet == null) + if (statSet == null) { - statsSet = new StatsSet(); + statSet = new StatSet(); } - statsSet.set(nodeName, value); + statSet.set(nodeName, value); } } } @@ -620,9 +620,9 @@ public class SkillData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", list); + statSet.set(".", list); } else { @@ -635,30 +635,30 @@ public class SkillData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", text); + statSet.set(".", text); } else { return text; } } - return statsSet; + return statSet; } - private void parseAttributes(NamedNodeMap attributes, String prefix, StatsSet statsSet, Map variables) + private void parseAttributes(NamedNodeMap attributes, String prefix, StatSet statSet, Map variables) { for (int i = 0; i < attributes.getLength(); i++) { final Node attributeNode = attributes.item(i); - statsSet.set(prefix + "." + attributeNode.getNodeName(), parseNodeValue(attributeNode.getNodeValue(), variables)); + statSet.set(prefix + "." + attributeNode.getNodeName(), parseNodeValue(attributeNode.getNodeValue(), variables)); } } - private void parseAttributes(NamedNodeMap attributes, String prefix, StatsSet statsSet) + private void parseAttributes(NamedNodeMap attributes, String prefix, StatSet statSet) { - parseAttributes(attributes, prefix, statsSet, Collections.emptyMap()); + parseAttributes(attributes, prefix, statSet, Collections.emptyMap()); } private Object parseNodeValue(String value, Map variables) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java index fdd0012ffe..d23d1ebee3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.SubclassType; import org.l2jmobius.gameserver.model.SkillLearn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.base.ClassId; @@ -229,7 +229,7 @@ public class SkillTreesData implements IXmlReader { if ("skill".equalsIgnoreCase(c.getNodeName())) { - final StatsSet learnSkillSet = new StatsSet(); + final StatSet learnSkillSet = new StatSet(); attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java index 87915d89eb..78c22d1e7d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java @@ -36,7 +36,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.ChanceLocation; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.MinionHolder; import org.l2jmobius.gameserver.model.interfaces.IParameterized; @@ -169,7 +169,7 @@ public class SpawnsData implements IXmlReader public void parseSpawn(Node spawnsNode, File file, Collection spawns) { - final SpawnTemplate spawnTemplate = new SpawnTemplate(new StatsSet(parseAttributes(spawnsNode)), file); + final SpawnTemplate spawnTemplate = new SpawnTemplate(new StatSet(parseAttributes(spawnsNode)), file); SpawnGroup defaultGroup = null; for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling()) { @@ -185,7 +185,7 @@ public class SpawnsData implements IXmlReader { if (defaultGroup == null) { - defaultGroup = new SpawnGroup(StatsSet.EMPTY_STATSET); + defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET); } parseNpc(innerNode, spawnTemplate, defaultGroup); } @@ -244,7 +244,7 @@ public class SpawnsData implements IXmlReader private void parseGroup(Node n, SpawnTemplate spawnTemplate) { - final SpawnGroup group = new SpawnGroup(new StatsSet(parseAttributes(n))); + final SpawnGroup group = new SpawnGroup(new StatSet(parseAttributes(n))); forEach(n, IXmlReader::isNode, npcNode -> { switch (npcNode.getNodeName()) @@ -271,7 +271,7 @@ public class SpawnsData implements IXmlReader */ private void parseNpc(Node n, SpawnTemplate spawnTemplate, SpawnGroup group) { - final NpcSpawnTemplate npcTemplate = new NpcSpawnTemplate(spawnTemplate, group, new StatsSet(parseAttributes(n))); + final NpcSpawnTemplate npcTemplate = new NpcSpawnTemplate(spawnTemplate, group, new StatSet(parseAttributes(n))); final NpcTemplate template = NpcData.getInstance().getTemplate(npcTemplate.getId()); if (template == null) { @@ -332,10 +332,10 @@ public class SpawnsData implements IXmlReader * @param n * @param npcTemplate */ - private void parseParameters(Node n, IParameterized npcTemplate) + private void parseParameters(Node n, IParameterized npcTemplate) { final Map params = parseParameters(n); - npcTemplate.setParameters(!params.isEmpty() ? new StatsSet(Collections.unmodifiableMap(params)) : StatsSet.EMPTY_STATSET); + npcTemplate.setParameters(!params.isEmpty() ? new StatSet(Collections.unmodifiableMap(params)) : StatSet.EMPTY_STATSET); } /** @@ -344,7 +344,7 @@ public class SpawnsData implements IXmlReader */ private void parseMinions(Node n, NpcSpawnTemplate npcTemplate) { - forEach(n, "minion", minionNode -> npcTemplate.addMinion(new MinionHolder(new StatsSet(parseAttributes(minionNode))))); + forEach(n, "minion", minionNode -> npcTemplate.addMinion(new MinionHolder(new StatSet(parseAttributes(minionNode))))); } /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java index 98d333446c..ef93935404 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; @@ -69,7 +69,7 @@ public class StaticObjectData implements IXmlReader if ("object".equalsIgnoreCase(d.getNodeName())) { final NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -86,9 +86,9 @@ public class StaticObjectData implements IXmlReader * Initialize an static object based on the stats set and add it to the map. * @param set the stats set to add. */ - private void addObject(StatsSet set) + private void addObject(StatSet set) { - final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatsSet()), set.getInt("id")); + final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatSet()), set.getInt("id")); obj.setType(set.getInt("type", 0)); obj.setName(set.getString("name")); obj.setMap(set.getString("texture", "none"), set.getInt("map_x", 0), set.getInt("map_y", 0)); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java index 7c8c9a538d..487bae9dea 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.TeleportType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.teleporter.TeleportHolder; /** @@ -74,7 +74,7 @@ public class TeleportersData implements IXmlReader final String name = parseString(nodeAttrs, "name", type.name()); // Parse locations final TeleportHolder holder = new TeleportHolder(name, type); - forEach(node, "location", location -> holder.registerLocation(new StatsSet(parseAttributes(location)))); + forEach(node, "location", location -> holder.registerLocation(new StatSet(parseAttributes(location)))); // Register holder if (teleList.putIfAbsent(name, holder) != null) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java index b6b3bf2e90..c2f5f94adb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java @@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.transform.Transform; import org.l2jmobius.gameserver.model.actor.transform.TransformLevelData; import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate; @@ -70,7 +70,7 @@ public class TransformData implements IXmlReader if ("transform".equalsIgnoreCase(d.getNodeName())) { NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -192,7 +192,7 @@ public class TransformData implements IXmlReader transform.setTemplate(isMale, templateData); } - final StatsSet levelsSet = new StatsSet(); + final StatSet levelsSet = new StatSet(); for (Node s = z.getFirstChild(); s != null; s = s.getNextSibling()) { if ("level".equals(s.getNodeName())) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/engines/DocumentBase.java index ba3fc7f6b4..d178b10006 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/engines/DocumentBase.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/engines/DocumentBase.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.PlayerState; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionCategoryType; @@ -178,7 +178,7 @@ public abstract class DocumentBase protected abstract void parseDocument(Document doc); - protected abstract StatsSet getStatsSet(); + protected abstract StatSet getStatSet(); protected abstract String getTableValue(String name); @@ -1245,7 +1245,7 @@ public abstract class DocumentBase setTable(name, array.toArray(new String[array.size()])); } - protected void parseBeanSet(Node n, StatsSet set, Integer level) + protected void parseBeanSet(Node n, StatSet set, Integer level) { final String name = n.getAttributes().getNamedItem("name").getNodeValue().trim(); final String value = n.getAttributes().getNamedItem("val").getNodeValue().trim(); @@ -1260,7 +1260,7 @@ public abstract class DocumentBase } } - protected void setExtractableSkillData(StatsSet set, String value) + protected void setExtractableSkillData(StatSet set, String value) { set.set("capsuled_items_skill", value); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java index e8c77b206e..46f8f9be1f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java @@ -21,7 +21,7 @@ import java.io.File; import org.w3c.dom.Document; import org.w3c.dom.Node; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; /** @@ -41,7 +41,7 @@ public class DocumentBaseGeneral extends DocumentBase } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return null; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java index 3ea7f41bb6..419552cf68 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.engines.DocumentBase; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -57,7 +57,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return _currentItem.set; } @@ -111,7 +111,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader _currentItem.id = itemId; _currentItem.name = itemName; _currentItem.type = className; - _currentItem.set = new StatsSet(); + _currentItem.set = new StatSet(); _currentItem.set.set("item_id", itemId); _currentItem.set.set("name", itemName); _currentItem.set.set("additionalName", additionalName); @@ -218,7 +218,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatsSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (Item) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java index 56e5b21a9f..967c1fc34d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.engines.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; public class ItemDataHolder @@ -24,7 +24,7 @@ public class ItemDataHolder int id; String type; String name; - StatsSet set; + StatSet set; int currentLevel; Item item; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/ConditionHandler.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/ConditionHandler.java index 47f24d690d..b53f170fb3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/ConditionHandler.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/ConditionHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.ICondition; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class ConditionHandler { - private final Map> _conditionHandlerFactories = new HashMap<>(); + private final Map> _conditionHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _conditionHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _conditionHandlerFactories.get(name); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/EffectHandler.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/EffectHandler.java index a58de8efb4..328265d9db 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/EffectHandler.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/EffectHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class EffectHandler { - private final Map> _effectHandlerFactories = new HashMap<>(); + private final Map> _effectHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _effectHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _effectHandlerFactories.get(name); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java index a6e2275d04..32438040e0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class SkillConditionHandler { - private final Map> _skillConditionHandlerFactories = new HashMap<>(); + private final Map> _skillConditionHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _skillConditionHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _skillConditionHandlerFactories.get(name); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java index 6992dd5366..65a8c52d7e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.model.AirShipTeleportList; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShipInstance; @@ -45,13 +45,13 @@ public class AirShipManager private static final String UPDATE_DB = "UPDATE airships SET fuel=? WHERE owner_id=?"; private CreatureTemplate _airShipTemplate = null; - private final Map _airShipsInfo = new HashMap<>(); + private final Map _airShipsInfo = new HashMap<>(); private final Map _airShips = new HashMap<>(); private final Map _teleports = new HashMap<>(); protected AirShipManager() { - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", 9); npcDat.set("level", 0); npcDat.set("jClass", "boat"); @@ -113,7 +113,7 @@ public class AirShipManager public AirShipInstance getNewAirShip(int x, int y, int z, int heading, int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return null; @@ -147,7 +147,7 @@ public class AirShipManager if (ship.getOwnerId() != 0) { storeInDb(ship.getOwnerId()); - final StatsSet info = _airShipsInfo.get(ship.getOwnerId()); + final StatSet info = _airShipsInfo.get(ship.getOwnerId()); if (info != null) { info.set("fuel", ship.getFuel()); @@ -164,7 +164,7 @@ public class AirShipManager { if (!_airShipsInfo.containsKey(ownerId)) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("fuel", 600); _airShipsInfo.put(ownerId, info); @@ -264,10 +264,10 @@ public class AirShipManager Statement s = con.createStatement(); ResultSet rs = s.executeQuery(LOAD_DB)) { - StatsSet info; + StatSet info; while (rs.next()) { - info = new StatsSet(); + info = new StatSet(); info.set("fuel", rs.getInt("fuel")); _airShipsInfo.put(rs.getInt("owner_id"), info); } @@ -285,7 +285,7 @@ public class AirShipManager private void storeInDb(int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java index 2db10dd045..e5c610b3f2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.BoatInstance; @@ -57,7 +57,7 @@ public class BoatManager return null; } - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", boatId); npcDat.set("level", 0); npcDat.set("jClass", "boat"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 99a9678ece..56f08422cd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.enums.ManorMode; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; import org.l2jmobius.gameserver.model.SeedProduction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.entity.Castle; @@ -126,7 +126,7 @@ public class CastleManorManager implements IXmlReader, IStorable @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; NamedNodeMap attrs; Node att; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -142,7 +142,7 @@ public class CastleManorManager implements IXmlReader, IStorable { if ("crop".equalsIgnoreCase(c.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); set.set("castleId", castleId); attrs = c.getAttributes(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java index 8cb2c76f84..b329a67097 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java @@ -27,7 +27,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosState; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -181,7 +181,7 @@ public class CeremonyOfChaosManager extends AbstractEventManager _npcs = new ConcurrentHashMap<>(); protected final Map _spawns = new ConcurrentHashMap<>(); - protected final Map _storedInfo = new ConcurrentHashMap<>(); + protected final Map _storedInfo = new ConcurrentHashMap<>(); protected final Map> _schedules = new ConcurrentHashMap<>(); /** @@ -161,7 +161,7 @@ public class DBSpawnManager { npc.setDBStatus(RaidBossStatus.ALIVE); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getCurrentHp()); info.set("currentMP", npc.getCurrentMp()); info.set("respawnTime", 0); @@ -181,7 +181,7 @@ public class DBSpawnManager */ public void updateStatus(Npc npc, boolean isNpcDead) { - final StatsSet info = _storedInfo.get(npc.getId()); + final StatSet info = _storedInfo.get(npc.getId()); if (info == null) { return; @@ -254,7 +254,7 @@ public class DBSpawnManager _npcs.put(npcId, npc); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", currentHP); info.set("currentMP", currentMP); info.set("respawnTime", 0); @@ -316,7 +316,7 @@ public class DBSpawnManager } npc.setDBStatus(RaidBossStatus.ALIVE); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", 0); @@ -401,7 +401,7 @@ public class DBSpawnManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("UPDATE npc_respawns SET respawnTime = ?, currentHP = ?, currentMP = ? WHERE id = ?")) { - for (Entry entry : _storedInfo.entrySet()) + for (Entry entry : _storedInfo.entrySet()) { final Integer npcId = entry.getKey(); if (npcId == null) @@ -420,7 +420,7 @@ public class DBSpawnManager updateStatus(npc, false); } - final StatsSet info = entry.getValue(); + final StatSet info = entry.getValue(); if (info == null) { continue; @@ -529,7 +529,7 @@ public class DBSpawnManager */ public void notifySpawnNightNpc(Npc npc) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getCurrentHp()); info.set("currentMP", npc.getCurrentMp()); info.set("respawnTime", 0); @@ -572,7 +572,7 @@ public class DBSpawnManager * Gets the stored info. * @return the stored info */ - public Map getStoredInfo() + public Map getStoredInfo() { return _storedInfo; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index 3dd4e3f652..767bed6954 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.datatables.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.FakePlayerChatHolder; @@ -73,7 +73,7 @@ public class FakePlayerChatManager implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayerChat", fakePlayerChatNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerChatNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerChatNode)); MESSAGES.add(new FakePlayerChatHolder(set.getString("fpcName"), set.getString("searchMethod"), set.getString("searchText"), set.getString("answers"))); })); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java index 07c111065e..52bab09349 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java @@ -33,7 +33,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.tasks.GrandBossManagerStoreTask; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; import org.l2jmobius.gameserver.model.interfaces.IStorable; @@ -51,7 +51,7 @@ public class GrandBossManager implements IStorable protected static Map _bosses = new ConcurrentHashMap<>(); - protected static Map _storedInfo = new HashMap<>(); + protected static Map _storedInfo = new HashMap<>(); private final Map _bossStatus = new HashMap<>(); @@ -72,7 +72,7 @@ public class GrandBossManager implements IStorable final int bossId = rs.getInt("boss_id"); if (NpcData.getInstance().getTemplate(bossId) != null) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("loc_x", rs.getInt("loc_x")); info.set("loc_y", rs.getInt("loc_y")); info.set("loc_z", rs.getInt("loc_z")); @@ -140,12 +140,12 @@ public class GrandBossManager implements IStorable return _bosses.get(bossId); } - public StatsSet getStatsSet(int bossId) + public StatSet getStatSet(int bossId) { return _storedInfo.get(bossId); } - public void setStatsSet(int bossId, StatsSet info) + public void setStatSet(int bossId, StatSet info) { _storedInfo.put(bossId, info); updateDb(bossId, false); @@ -156,10 +156,10 @@ public class GrandBossManager implements IStorable { try (Connection con = DatabaseFactory.getConnection()) { - for (Entry e : _storedInfo.entrySet()) + for (Entry e : _storedInfo.entrySet()) { final GrandBossInstance boss = _bosses.get(e.getKey()); - final StatsSet info = e.getValue(); + final StatSet info = e.getValue(); if ((boss == null) || (info == null)) { try (PreparedStatement update = con.prepareStatement(UPDATE_GRAND_BOSS_DATA2)) @@ -209,7 +209,7 @@ public class GrandBossManager implements IStorable try (Connection con = DatabaseFactory.getConnection()) { final GrandBossInstance boss = _bosses.get(bossId); - final StatsSet info = _storedInfo.get(bossId); + final StatSet info = _storedInfo.get(bossId); if (statusOnly || (boss == null) || (info == null)) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index d77642378f..29e517b0cd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.enums.InstanceReenterType; import org.l2jmobius.gameserver.enums.InstanceRemoveBuffType; import org.l2jmobius.gameserver.enums.InstanceTeleportType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.holders.InstanceReenterTimeHolder; @@ -151,7 +151,7 @@ public class InstanceManager implements IXmlReader return; } - final InstanceTemplate template = new InstanceTemplate(new StatsSet(parseAttributes(instanceNode))); + final InstanceTemplate template = new InstanceTemplate(new StatSet(parseAttributes(instanceNode))); // Update name if wasn't provided if (template.getName() == null) @@ -241,10 +241,10 @@ public class InstanceManager implements IXmlReader { if (doorNode.getNodeName().equals("door")) { - final StatsSet parsedSet = DoorData.getInstance().parseDoor(doorNode); - final StatsSet mergedSet = new StatsSet(); + final StatSet parsedSet = DoorData.getInstance().parseDoor(doorNode); + final StatSet mergedSet = new StatSet(); final int doorId = parsedSet.getInt("id"); - final StatsSet templateSet = DoorData.getInstance().getDoorTemplate(doorId); + final StatSet templateSet = DoorData.getInstance().getDoorTemplate(doorId); if (templateSet != null) { mergedSet.merge(templateSet); @@ -324,14 +324,14 @@ public class InstanceManager implements IXmlReader final boolean onlyLeader = parseBoolean(attrs, "onlyLeader", false); final boolean showMessageAndHtml = parseBoolean(attrs, "showMessageAndHtml", false); // Load parameters - StatsSet params = null; + StatSet params = null; for (Node f = conditionNode.getFirstChild(); f != null; f = f.getNextSibling()) { if (f.getNodeName().equals("param")) { if (params == null) { - params = new StatsSet(); + params = new StatSet(); } params.set(parseString(f.getAttributes(), "name"), parseString(f.getAttributes(), "value")); @@ -341,14 +341,14 @@ public class InstanceManager implements IXmlReader // If none parameters found then set empty StatSet if (params == null) { - params = StatsSet.EMPTY_STATSET; + params = StatSet.EMPTY_STATSET; } // Now when everything is loaded register condition to template try { final Class clazz = Class.forName("org.l2jmobius.gameserver.model.instancezone.conditions.Condition" + type); - final Constructor constructor = clazz.getConstructor(InstanceTemplate.class, StatsSet.class, boolean.class, boolean.class); + final Constructor constructor = clazz.getConstructor(InstanceTemplate.class, StatSet.class, boolean.class, boolean.class); conditions.add((Condition) constructor.newInstance(template, params, onlyLeader, showMessageAndHtml)); } catch (Exception ex) @@ -378,7 +378,7 @@ public class InstanceManager implements IXmlReader */ public Instance createInstance() { - return new Instance(getNewInstanceId(), new InstanceTemplate(StatsSet.EMPTY_STATSET), null); + return new Instance(getNewInstanceId(), new InstanceTemplate(StatSet.EMPTY_STATSET), null); } /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/AccessLevel.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/AccessLevel.java index 772c1fe77e..72b77905e1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/AccessLevel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/AccessLevel.java @@ -52,7 +52,7 @@ public class AccessLevel /** Flag to gain exp in party */ private boolean _gainExp = false; - public AccessLevel(StatsSet set) + public AccessLevel(StatSet set) { _accessLevel = set.getInt("level"); _name = set.getString("name"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ActionDataHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ActionDataHolder.java index 4887bedba8..ca6d9ee685 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ActionDataHolder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ActionDataHolder.java @@ -25,7 +25,7 @@ public class ActionDataHolder private final String _handler; private final int _optionId; - public ActionDataHolder(StatsSet set) + public ActionDataHolder(StatSet set) { _id = set.getInt("id"); _handler = set.getString("handler"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java index 656119098e..3f88e455d7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java @@ -27,7 +27,7 @@ public class AdminCommandAccessRight private final int _accessLevel; private final boolean _requireConfirm; - public AdminCommandAccessRight(StatsSet set) + public AdminCommandAccessRight(StatSet set) { _adminCommand = set.getString("command"); _requireConfirm = set.getBoolean("confirmDlg", false); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index efc53c7e48..6102d39d06 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -36,7 +36,7 @@ public class DailyMissionDataHolder private final List _rewardsItems; private final List _classRestriction; private final int _requiredCompletions; - private final StatsSet _params; + private final StatSet _params; private final boolean _dailyReset; private final boolean _isOneTime; private final boolean _isMainClassOnly; @@ -44,7 +44,7 @@ public class DailyMissionDataHolder private final boolean _isDisplayedWhenNotAvailable; private final AbstractDailyMissionHandler _handler; - public DailyMissionDataHolder(StatsSet set) + public DailyMissionDataHolder(StatSet set) { final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); @@ -53,7 +53,7 @@ public class DailyMissionDataHolder _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); - _params = set.getObject("params", StatsSet.class); + _params = set.getObject("params", StatSet.class); _dailyReset = set.getBoolean("dailyReset", true); _isOneTime = set.getBoolean("isOneTime", true); _isMainClassOnly = set.getBoolean("isMainClassOnly", true); @@ -87,7 +87,7 @@ public class DailyMissionDataHolder return _requiredCompletions; } - public StatsSet getParams() + public StatSet getParams() { return _params; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Location.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Location.java index 1c61740e4d..024c71075f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Location.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Location.java @@ -49,7 +49,7 @@ public class Location implements IPositionable this(obj.getX(), obj.getY(), obj.getZ(), obj.getHeading()); } - public Location(StatsSet set) + public Location(StatSet set) { _x = set.getInt("x"); _y = set.getInt("y"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/PetLevelData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/PetLevelData.java index e46b215b5f..7cad1a225a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/PetLevelData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/PetLevelData.java @@ -46,7 +46,7 @@ public class PetLevelData private final double _slowFlySpeedOnRide; private final double _fastFlySpeedOnRide; - public PetLevelData(StatsSet set) + public PetLevelData(StatSet set) { _ownerExpTaken = set.getInt("get_exp_type"); _petMaxExp = set.getLong("exp"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/RecipeList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/RecipeList.java index 9e4a3b2387..a81bbb1802 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/RecipeList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/RecipeList.java @@ -68,7 +68,7 @@ public class RecipeList * @param set * @param haveRare */ - public RecipeList(StatsSet set, boolean haveRare) + public RecipeList(StatSet set, boolean haveRare) { _recipes = new RecipeInstance[0]; _statUse = new RecipeStatInstance[0]; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Seed.java index 6d31ffc60f..54ef8acd9f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Seed.java @@ -35,7 +35,7 @@ public class Seed private final int _seedReferencePrice; private final int _cropReferencePrice; - public Seed(StatsSet set) + public Seed(StatSet set) { _cropId = set.getInt("id"); _seedId = set.getInt("seedId"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java index 78897cf4f1..4de77df228 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java @@ -27,7 +27,7 @@ public class SiegeScheduleDate private final int _hour; private final int _maxConcurrent; - public SiegeScheduleDate(StatsSet set) + public SiegeScheduleDate(StatSet set) { _day = set.getInt("day", Calendar.SUNDAY); _hour = set.getInt("hour", 16); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/SkillLearn.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/SkillLearn.java index e2ccdd6331..00f53c0cb9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/SkillLearn.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/SkillLearn.java @@ -58,7 +58,7 @@ public class SkillLearn * Constructor for SkillLearn. * @param set the set with the SkillLearn data. */ - public SkillLearn(StatsSet set) + public SkillLearn(StatSet set) { _skillName = set.getString("skillName"); _skillId = set.getInt("skillId"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/StatSet.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/StatSet.java new file mode 100644 index 0000000000..3c824d9fa4 --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/StatSet.java @@ -0,0 +1,968 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Supplier; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.stream.Collectors; + +import org.l2jmobius.commons.util.TimeUtil; +import org.l2jmobius.gameserver.model.holders.MinionHolder; +import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.interfaces.IParserAdvUtils; +import org.l2jmobius.gameserver.util.Util; + +/** + * This class is meant to hold a set of (key,value) pairs.
    + * They are stored as object but can be retrieved in any type wanted. As long as cast is available.
    + * @author mkizub + */ +public class StatSet implements IParserAdvUtils +{ + private static final Logger LOGGER = Logger.getLogger(StatSet.class.getName()); + /** Static empty immutable map, used to avoid multiple null checks over the source. */ + public static final StatSet EMPTY_STATSET = new StatSet(Collections.emptyMap()); + + private final Map _set; + + public StatSet() + { + this(ConcurrentHashMap::new); + } + + public StatSet(Supplier> mapFactory) + { + this(mapFactory.get()); + } + + public StatSet(Map map) + { + _set = map; + } + + /** + * Returns the set of values + * @return HashMap + */ + public Map getSet() + { + return _set; + } + + /** + * Add a set of couple values in the current set + * @param newSet : StatSet pointing out the list of couples to add in the current set + */ + public void merge(StatSet newSet) + { + _set.putAll(newSet.getSet()); + } + + /** + * Verifies if the stat set is empty. + * @return {@code true} if the stat set is empty, {@code false} otherwise + */ + public boolean isEmpty() + { + return _set.isEmpty(); + } + + /** + * Return the boolean value associated with key. + * @param key : String designating the key in the set + * @return boolean : value associated to the key + * @throws IllegalArgumentException : If value is not set or value is not boolean + */ + @Override + public boolean getBoolean(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Boolean value required, but not specified"); + } + if (val instanceof Boolean) + { + return ((Boolean) val).booleanValue(); + } + try + { + return Boolean.parseBoolean((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Boolean value required, but found: " + val); + } + } + + /** + * Return the boolean value associated with key.
    + * If no value is associated with key, or type of value is wrong, returns defaultValue. + * @param key : String designating the key in the entry set + * @return boolean : value associated to the key + */ + @Override + public boolean getBoolean(String key, boolean defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Boolean) + { + return ((Boolean) val).booleanValue(); + } + try + { + return Boolean.parseBoolean((String) val); + } + catch (Exception e) + { + return defaultValue; + } + } + + @Override + public byte getByte(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Byte value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).byteValue(); + } + try + { + return Byte.parseByte((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + + @Override + public byte getByte(String key, byte defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).byteValue(); + } + try + { + return Byte.parseByte((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + + public short increaseByte(String key, byte increaseWith) + { + final byte newValue = (byte) (getByte(key) + increaseWith); + set(key, newValue); + return newValue; + } + + public short increaseByte(String key, byte defaultValue, byte increaseWith) + { + final byte newValue = (byte) (getByte(key, defaultValue) + increaseWith); + set(key, newValue); + return newValue; + } + + public byte[] getByteArray(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Byte value required, but not specified"); + } + if (val instanceof Number) + { + return new byte[] + { + ((Number) val).byteValue() + }; + } + int c = 0; + final String[] vals = ((String) val).split(splitOn); + final byte[] result = new byte[vals.length]; + for (String v : vals) + { + try + { + result[c++] = Byte.parseByte(v); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + return result; + } + + public List getByteList(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final List result = new ArrayList<>(); + for (Byte i : getByteArray(key, splitOn)) + { + result.add(i); + } + return result; + } + + @Override + public short getShort(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Short value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).shortValue(); + } + try + { + return Short.parseShort((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Short value required, but found: " + val); + } + } + + @Override + public short getShort(String key, short defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).shortValue(); + } + try + { + return Short.parseShort((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Short value required, but found: " + val); + } + } + + public short increaseShort(String key, short increaseWith) + { + final short newValue = (short) (getShort(key) + increaseWith); + set(key, newValue); + return newValue; + } + + public short increaseShort(String key, short defaultValue, short increaseWith) + { + final short newValue = (short) (getShort(key, defaultValue) + increaseWith); + set(key, newValue); + return newValue; + } + + @Override + public int getInt(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Integer value required, but not specified: " + key + "!"); + } + + if (val instanceof Number) + { + return ((Number) val).intValue(); + } + + try + { + return Integer.parseInt((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val + "!"); + } + } + + @Override + public int getInt(String key, int defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).intValue(); + } + try + { + return Integer.parseInt((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val); + } + } + + public int increaseInt(String key, int increaseWith) + { + final int newValue = getInt(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public int increaseInt(String key, int defaultValue, int increaseWith) + { + final int newValue = getInt(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + public int[] getIntArray(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Integer value required, but not specified"); + } + if (val instanceof Number) + { + return new int[] + { + ((Number) val).intValue() + }; + } + int c = 0; + final String[] vals = ((String) val).split(splitOn); + final int[] result = new int[vals.length]; + for (String v : vals) + { + try + { + result[c++] = Integer.parseInt(v); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val); + } + } + return result; + } + + public List getIntegerList(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final List result = new ArrayList<>(); + for (int i : getIntArray(key, splitOn)) + { + result.add(i); + } + return result; + } + + @Override + public long getLong(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Long value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).longValue(); + } + try + { + return Long.parseLong((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Long value required, but found: " + val); + } + } + + @Override + public long getLong(String key, long defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).longValue(); + } + try + { + return Long.parseLong((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Long value required, but found: " + val); + } + } + + public long increaseLong(String key, long increaseWith) + { + final long newValue = getLong(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public long increaseLong(String key, long defaultValue, long increaseWith) + { + final long newValue = getLong(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public float getFloat(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Float value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).floatValue(); + } + try + { + return Float.parseFloat((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Float value required, but found: " + val); + } + } + + @Override + public float getFloat(String key, float defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).floatValue(); + } + try + { + return Float.parseFloat((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Float value required, but found: " + val); + } + } + + public float increaseFloat(String key, float increaseWith) + { + final float newValue = getFloat(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public float increaseFloat(String key, float defaultValue, float increaseWith) + { + final float newValue = getFloat(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public double getDouble(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Double value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).doubleValue(); + } + try + { + return Double.parseDouble((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Double value required, but found: " + val); + } + } + + @Override + public double getDouble(String key, double defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).doubleValue(); + } + try + { + return Double.parseDouble((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Double value required, but found: " + val); + } + } + + public double increaseDouble(String key, double increaseWith) + { + final double newValue = getDouble(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public double increaseDouble(String key, double defaultValue, double increaseWith) + { + final double newValue = getDouble(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public String getString(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("String value required, but not specified"); + } + return String.valueOf(val); + } + + @Override + public String getString(String key, String defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + return String.valueOf(val); + } + + @Override + public Duration getDuration(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("String value required, but not specified"); + } + return TimeUtil.parseDuration(String.valueOf(val)); + } + + @Override + public Duration getDuration(String key, Duration defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + return TimeUtil.parseDuration(String.valueOf(val)); + } + + @Override + @SuppressWarnings("unchecked") + public > T getEnum(String key, Class enumClass) + { + Objects.requireNonNull(key); + Objects.requireNonNull(enumClass); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but not specified"); + } + if (enumClass.isInstance(val)) + { + return (T) val; + } + try + { + return Enum.valueOf(enumClass, String.valueOf(val)); + } + catch (Exception e) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); + } + } + + @Override + @SuppressWarnings("unchecked") + public > T getEnum(String key, Class enumClass, T defaultValue) + { + Objects.requireNonNull(key); + Objects.requireNonNull(enumClass); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (enumClass.isInstance(val)) + { + return (T) val; + } + try + { + return Enum.valueOf(enumClass, String.valueOf(val)); + } + catch (Exception e) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); + } + } + + @SuppressWarnings("unchecked") + public A getObject(String name, Class type) + { + Objects.requireNonNull(name); + Objects.requireNonNull(type); + final Object obj = _set.get(name); + if ((obj == null) || !type.isAssignableFrom(obj.getClass())) + { + return null; + } + + return (A) obj; + } + + @SuppressWarnings("unchecked") + public A getObject(String name, Class type, A defaultValue) + { + Objects.requireNonNull(name); + Objects.requireNonNull(type); + final Object obj = _set.get(name); + if ((obj == null) || !type.isAssignableFrom(obj.getClass())) + { + return defaultValue; + } + + return (A) obj; + } + + public SkillHolder getSkillHolder(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof SkillHolder)) + { + return null; + } + + return (SkillHolder) obj; + } + + public Location getLocation(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof Location)) + { + return null; + } + return (Location) obj; + } + + @SuppressWarnings("unchecked") + public List getMinionList(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return Collections.emptyList(); + } + + return (List) obj; + } + + @SuppressWarnings("unchecked") + public List getList(String key, Class clazz) + { + Objects.requireNonNull(key); + Objects.requireNonNull(clazz); + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return null; + } + + final List originalList = (List) obj; + if (!originalList.isEmpty() && !originalList.stream().allMatch(clazz::isInstance)) + { + if (clazz.getSuperclass() == Enum.class) + { + throw new IllegalAccessError("Please use getEnumList if you want to get list of Enums!"); + } + + // Attempt to convert the list + final List convertedList = convertList(originalList, clazz); + if (convertedList == null) + { + LOGGER.log(Level.WARNING, "getList(\"" + key + "\", " + clazz.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); + return null; + } + + // Overwrite the existing list with proper generic type + _set.put(key, convertedList); + return convertedList; + } + return (List) obj; + } + + public List getList(String key, Class clazz, List defaultValue) + { + final List list = getList(key, clazz); + return list == null ? defaultValue : list; + } + + @SuppressWarnings("unchecked") + public > List getEnumList(String key, Class clazz) + { + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return null; + } + + final List originalList = (List) obj; + if (!originalList.isEmpty() && (obj.getClass().getGenericInterfaces()[0] != clazz) && originalList.stream().allMatch(name -> Util.isEnum(name.toString(), clazz))) + { + final List convertedList = originalList.stream().map(Object::toString).map(name -> Enum.valueOf(clazz, name)).map(clazz::cast).collect(Collectors.toList()); + + // Overwrite the existing list with proper generic type + _set.put(key, convertedList); + return convertedList; + } + return (List) obj; + } + + /** + * @param + * @param originalList + * @param clazz + * @return + */ + private List convertList(List originalList, Class clazz) + { + if (clazz == Integer.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isInteger)) + { + return originalList.stream().map(Object::toString).map(Integer::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + else if (clazz == Float.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isFloat)) + { + return originalList.stream().map(Object::toString).map(Float::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + else if (clazz == Double.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isDouble)) + { + return originalList.stream().map(Object::toString).map(Double::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + return null; + } + + @SuppressWarnings("unchecked") + public Map getMap(String key, Class keyClass, Class valueClass) + { + final Object obj = _set.get(key); + if (!(obj instanceof Map)) + { + return null; + } + + final Map originalList = (Map) obj; + if (!originalList.isEmpty() && ((!originalList.keySet().stream().allMatch(keyClass::isInstance)) || (!originalList.values().stream().allMatch(valueClass::isInstance)))) + { + LOGGER.log(Level.WARNING, "getMap(\"" + key + "\", " + keyClass.getSimpleName() + ", " + valueClass.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); + } + return (Map) obj; + } + + public StatSet set(String name, Object value) + { + if (value == null) + { + return this; + } + _set.put(name, value); + return this; + } + + public StatSet set(String key, boolean value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, byte value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, short value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, int value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, long value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, float value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, double value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, String value) + { + if (value == null) + { + return this; + } + _set.put(key, value); + return this; + } + + public StatSet set(String key, Enum value) + { + if (value == null) + { + return this; + } + _set.put(key, value); + return this; + } + + public static StatSet valueOf(String key, Object value) + { + final StatSet set = new StatSet(); + set.set(key, value); + return set; + } + + public void remove(String key) + { + _set.remove(key); + } + + public boolean contains(String name) + { + return _set.containsKey(name); + } + + @Override + public String toString() + { + return "StatSet{_set=" + _set + '}'; + } +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/StatsSet.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/StatsSet.java deleted file mode 100644 index 5ce013ebd2..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/StatsSet.java +++ /dev/null @@ -1,968 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.ConcurrentHashMap; -import java.util.function.Supplier; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.stream.Collectors; - -import org.l2jmobius.commons.util.TimeUtil; -import org.l2jmobius.gameserver.model.holders.MinionHolder; -import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.interfaces.IParserAdvUtils; -import org.l2jmobius.gameserver.util.Util; - -/** - * This class is meant to hold a set of (key,value) pairs.
    - * They are stored as object but can be retrieved in any type wanted. As long as cast is available.
    - * @author mkizub - */ -public class StatsSet implements IParserAdvUtils -{ - private static final Logger LOGGER = Logger.getLogger(StatsSet.class.getName()); - /** Static empty immutable map, used to avoid multiple null checks over the source. */ - public static final StatsSet EMPTY_STATSET = new StatsSet(Collections.emptyMap()); - - private final Map _set; - - public StatsSet() - { - this(ConcurrentHashMap::new); - } - - public StatsSet(Supplier> mapFactory) - { - this(mapFactory.get()); - } - - public StatsSet(Map map) - { - _set = map; - } - - /** - * Returns the set of values - * @return HashMap - */ - public Map getSet() - { - return _set; - } - - /** - * Add a set of couple values in the current set - * @param newSet : StatsSet pointing out the list of couples to add in the current set - */ - public void merge(StatsSet newSet) - { - _set.putAll(newSet.getSet()); - } - - /** - * Verifies if the stat set is empty. - * @return {@code true} if the stat set is empty, {@code false} otherwise - */ - public boolean isEmpty() - { - return _set.isEmpty(); - } - - /** - * Return the boolean value associated with key. - * @param key : String designating the key in the set - * @return boolean : value associated to the key - * @throws IllegalArgumentException : If value is not set or value is not boolean - */ - @Override - public boolean getBoolean(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Boolean value required, but not specified"); - } - if (val instanceof Boolean) - { - return ((Boolean) val).booleanValue(); - } - try - { - return Boolean.parseBoolean((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Boolean value required, but found: " + val); - } - } - - /** - * Return the boolean value associated with key.
    - * If no value is associated with key, or type of value is wrong, returns defaultValue. - * @param key : String designating the key in the entry set - * @return boolean : value associated to the key - */ - @Override - public boolean getBoolean(String key, boolean defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Boolean) - { - return ((Boolean) val).booleanValue(); - } - try - { - return Boolean.parseBoolean((String) val); - } - catch (Exception e) - { - return defaultValue; - } - } - - @Override - public byte getByte(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Byte value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).byteValue(); - } - try - { - return Byte.parseByte((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - - @Override - public byte getByte(String key, byte defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).byteValue(); - } - try - { - return Byte.parseByte((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - - public short increaseByte(String key, byte increaseWith) - { - final byte newValue = (byte) (getByte(key) + increaseWith); - set(key, newValue); - return newValue; - } - - public short increaseByte(String key, byte defaultValue, byte increaseWith) - { - final byte newValue = (byte) (getByte(key, defaultValue) + increaseWith); - set(key, newValue); - return newValue; - } - - public byte[] getByteArray(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Byte value required, but not specified"); - } - if (val instanceof Number) - { - return new byte[] - { - ((Number) val).byteValue() - }; - } - int c = 0; - final String[] vals = ((String) val).split(splitOn); - final byte[] result = new byte[vals.length]; - for (String v : vals) - { - try - { - result[c++] = Byte.parseByte(v); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - return result; - } - - public List getByteList(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final List result = new ArrayList<>(); - for (Byte i : getByteArray(key, splitOn)) - { - result.add(i); - } - return result; - } - - @Override - public short getShort(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Short value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).shortValue(); - } - try - { - return Short.parseShort((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Short value required, but found: " + val); - } - } - - @Override - public short getShort(String key, short defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).shortValue(); - } - try - { - return Short.parseShort((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Short value required, but found: " + val); - } - } - - public short increaseShort(String key, short increaseWith) - { - final short newValue = (short) (getShort(key) + increaseWith); - set(key, newValue); - return newValue; - } - - public short increaseShort(String key, short defaultValue, short increaseWith) - { - final short newValue = (short) (getShort(key, defaultValue) + increaseWith); - set(key, newValue); - return newValue; - } - - @Override - public int getInt(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Integer value required, but not specified: " + key + "!"); - } - - if (val instanceof Number) - { - return ((Number) val).intValue(); - } - - try - { - return Integer.parseInt((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val + "!"); - } - } - - @Override - public int getInt(String key, int defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).intValue(); - } - try - { - return Integer.parseInt((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val); - } - } - - public int increaseInt(String key, int increaseWith) - { - final int newValue = getInt(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public int increaseInt(String key, int defaultValue, int increaseWith) - { - final int newValue = getInt(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - public int[] getIntArray(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Integer value required, but not specified"); - } - if (val instanceof Number) - { - return new int[] - { - ((Number) val).intValue() - }; - } - int c = 0; - final String[] vals = ((String) val).split(splitOn); - final int[] result = new int[vals.length]; - for (String v : vals) - { - try - { - result[c++] = Integer.parseInt(v); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val); - } - } - return result; - } - - public List getIntegerList(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final List result = new ArrayList<>(); - for (int i : getIntArray(key, splitOn)) - { - result.add(i); - } - return result; - } - - @Override - public long getLong(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Long value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).longValue(); - } - try - { - return Long.parseLong((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Long value required, but found: " + val); - } - } - - @Override - public long getLong(String key, long defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).longValue(); - } - try - { - return Long.parseLong((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Long value required, but found: " + val); - } - } - - public long increaseLong(String key, long increaseWith) - { - final long newValue = getLong(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public long increaseLong(String key, long defaultValue, long increaseWith) - { - final long newValue = getLong(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public float getFloat(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Float value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).floatValue(); - } - try - { - return Float.parseFloat((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Float value required, but found: " + val); - } - } - - @Override - public float getFloat(String key, float defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).floatValue(); - } - try - { - return Float.parseFloat((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Float value required, but found: " + val); - } - } - - public float increaseFloat(String key, float increaseWith) - { - final float newValue = getFloat(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public float increaseFloat(String key, float defaultValue, float increaseWith) - { - final float newValue = getFloat(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public double getDouble(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Double value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).doubleValue(); - } - try - { - return Double.parseDouble((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Double value required, but found: " + val); - } - } - - @Override - public double getDouble(String key, double defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).doubleValue(); - } - try - { - return Double.parseDouble((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Double value required, but found: " + val); - } - } - - public double increaseDouble(String key, double increaseWith) - { - final double newValue = getDouble(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public double increaseDouble(String key, double defaultValue, double increaseWith) - { - final double newValue = getDouble(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public String getString(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("String value required, but not specified"); - } - return String.valueOf(val); - } - - @Override - public String getString(String key, String defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - return String.valueOf(val); - } - - @Override - public Duration getDuration(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("String value required, but not specified"); - } - return TimeUtil.parseDuration(String.valueOf(val)); - } - - @Override - public Duration getDuration(String key, Duration defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - return TimeUtil.parseDuration(String.valueOf(val)); - } - - @Override - @SuppressWarnings("unchecked") - public > T getEnum(String key, Class enumClass) - { - Objects.requireNonNull(key); - Objects.requireNonNull(enumClass); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but not specified"); - } - if (enumClass.isInstance(val)) - { - return (T) val; - } - try - { - return Enum.valueOf(enumClass, String.valueOf(val)); - } - catch (Exception e) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); - } - } - - @Override - @SuppressWarnings("unchecked") - public > T getEnum(String key, Class enumClass, T defaultValue) - { - Objects.requireNonNull(key); - Objects.requireNonNull(enumClass); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (enumClass.isInstance(val)) - { - return (T) val; - } - try - { - return Enum.valueOf(enumClass, String.valueOf(val)); - } - catch (Exception e) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); - } - } - - @SuppressWarnings("unchecked") - public A getObject(String name, Class type) - { - Objects.requireNonNull(name); - Objects.requireNonNull(type); - final Object obj = _set.get(name); - if ((obj == null) || !type.isAssignableFrom(obj.getClass())) - { - return null; - } - - return (A) obj; - } - - @SuppressWarnings("unchecked") - public A getObject(String name, Class type, A defaultValue) - { - Objects.requireNonNull(name); - Objects.requireNonNull(type); - final Object obj = _set.get(name); - if ((obj == null) || !type.isAssignableFrom(obj.getClass())) - { - return defaultValue; - } - - return (A) obj; - } - - public SkillHolder getSkillHolder(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof SkillHolder)) - { - return null; - } - - return (SkillHolder) obj; - } - - public Location getLocation(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof Location)) - { - return null; - } - return (Location) obj; - } - - @SuppressWarnings("unchecked") - public List getMinionList(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return Collections.emptyList(); - } - - return (List) obj; - } - - @SuppressWarnings("unchecked") - public List getList(String key, Class clazz) - { - Objects.requireNonNull(key); - Objects.requireNonNull(clazz); - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return null; - } - - final List originalList = (List) obj; - if (!originalList.isEmpty() && !originalList.stream().allMatch(clazz::isInstance)) - { - if (clazz.getSuperclass() == Enum.class) - { - throw new IllegalAccessError("Please use getEnumList if you want to get list of Enums!"); - } - - // Attempt to convert the list - final List convertedList = convertList(originalList, clazz); - if (convertedList == null) - { - LOGGER.log(Level.WARNING, "getList(\"" + key + "\", " + clazz.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); - return null; - } - - // Overwrite the existing list with proper generic type - _set.put(key, convertedList); - return convertedList; - } - return (List) obj; - } - - public List getList(String key, Class clazz, List defaultValue) - { - final List list = getList(key, clazz); - return list == null ? defaultValue : list; - } - - @SuppressWarnings("unchecked") - public > List getEnumList(String key, Class clazz) - { - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return null; - } - - final List originalList = (List) obj; - if (!originalList.isEmpty() && (obj.getClass().getGenericInterfaces()[0] != clazz) && originalList.stream().allMatch(name -> Util.isEnum(name.toString(), clazz))) - { - final List convertedList = originalList.stream().map(Object::toString).map(name -> Enum.valueOf(clazz, name)).map(clazz::cast).collect(Collectors.toList()); - - // Overwrite the existing list with proper generic type - _set.put(key, convertedList); - return convertedList; - } - return (List) obj; - } - - /** - * @param - * @param originalList - * @param clazz - * @return - */ - private List convertList(List originalList, Class clazz) - { - if (clazz == Integer.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isInteger)) - { - return originalList.stream().map(Object::toString).map(Integer::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - else if (clazz == Float.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isFloat)) - { - return originalList.stream().map(Object::toString).map(Float::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - else if (clazz == Double.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isDouble)) - { - return originalList.stream().map(Object::toString).map(Double::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - return null; - } - - @SuppressWarnings("unchecked") - public Map getMap(String key, Class keyClass, Class valueClass) - { - final Object obj = _set.get(key); - if (!(obj instanceof Map)) - { - return null; - } - - final Map originalList = (Map) obj; - if (!originalList.isEmpty() && ((!originalList.keySet().stream().allMatch(keyClass::isInstance)) || (!originalList.values().stream().allMatch(valueClass::isInstance)))) - { - LOGGER.log(Level.WARNING, "getMap(\"" + key + "\", " + keyClass.getSimpleName() + ", " + valueClass.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); - } - return (Map) obj; - } - - public StatsSet set(String name, Object value) - { - if (value == null) - { - return this; - } - _set.put(name, value); - return this; - } - - public StatsSet set(String key, boolean value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, byte value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, short value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, int value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, long value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, float value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, double value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, String value) - { - if (value == null) - { - return this; - } - _set.put(key, value); - return this; - } - - public StatsSet set(String key, Enum value) - { - if (value == null) - { - return this; - } - _set.put(key, value); - return this; - } - - public static StatsSet valueOf(String key, Object value) - { - final StatsSet set = new StatsSet(); - set.set(key, value); - return set; - } - - public void remove(String key) - { - _set.remove(key); - } - - public boolean contains(String name) - { - return _set.containsKey(name); - } - - @Override - public String toString() - { - return "StatsSet{_set=" + _set + '}'; - } -} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Npc.java index 74109a5102..9efcc7d9c8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.MpRewardTask; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.FishermanInstance; @@ -148,7 +148,7 @@ public class Npc extends Creature private NpcStringId _titleString; private NpcStringId _nameString; - private StatsSet _params; + private StatSet _params; private RaidBossStatus _raidStatus; /** Contains information about local tax payments. */ @@ -1756,7 +1756,7 @@ public class Npc extends Creature /** * @return the parameters of the npc merged with the spawn parameters (if there are any) */ - public StatsSet getParameters() + public StatSet getParameters() { if (_params != null) { @@ -1768,10 +1768,10 @@ public class Npc extends Creature final NpcSpawnTemplate npcSpawnTemplate = _spawn.getNpcSpawnTemplate(); if ((npcSpawnTemplate != null) && (npcSpawnTemplate.getParameters() != null) && !npcSpawnTemplate.getParameters().isEmpty()) { - final StatsSet params = getTemplate().getParameters(); + final StatSet params = getTemplate().getParameters(); if ((params != null) && !params.getSet().isEmpty()) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.merge(params); set.merge(npcSpawnTemplate.getParameters()); _params = set; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index c8cbb989c0..a4d95ae3fc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -21,7 +21,7 @@ import java.util.EnumMap; import java.util.Map; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; @@ -49,12 +49,12 @@ public class CreatureTemplate extends ListenersContainer /** The creature's race. */ private Race _race; - public CreatureTemplate(StatsSet set) + public CreatureTemplate(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { // Base stats _baseValues.put(Stat.STAT_STR, set.getDouble("baseSTR", 0)); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java index 86441c678c..14f0e9cae8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.CubicInstance; @@ -46,7 +46,7 @@ public class CubicTemplate implements ICubicConditionHolder private final List _conditions = new ArrayList<>(); public List _skills = new ArrayList<>(); - public CubicTemplate(StatsSet set) + public CubicTemplate(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java index c40883ac75..410040bc86 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.templates; import org.l2jmobius.gameserver.enums.DoorOpenType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -57,7 +57,7 @@ public class DoorTemplate extends CreatureTemplate implements IIdentifiable private final boolean _stealth; private final boolean _isInverted; - public DoorTemplate(StatsSet set) + public DoorTemplate(StatSet set) { super(set); _doorId = set.getInt("id"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 1eedf5be50..92f55589e8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.enums.MpRewardAffectType; import org.l2jmobius.gameserver.enums.MpRewardType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -63,7 +63,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private boolean _usingServerSideName; private String _title; private boolean _usingServerSideTitle; - private StatsSet _parameters; + private StatSet _parameters; private Sex _sex; private int _chestId; private int _rhandId; @@ -123,15 +123,15 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable /** * Constructor of Creature. - * @param set The StatsSet object to transfer data to the method + * @param set The StatSet object to transfer data to the method */ - public NpcTemplate(StatsSet set) + public NpcTemplate(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _id = set.getInt("id"); @@ -320,12 +320,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _usingServerSideTitle; } - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } - public void setParameters(StatsSet set) + public void setParameters(StatSet set) { _parameters = set; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 50292b8bc8..28458aa09e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -50,7 +50,7 @@ public class PlayerTemplate extends CreatureTemplate private final List _creationPoints; private final Map _baseSlotDef; - public PlayerTemplate(StatsSet set, List creationPoints) + public PlayerTemplate(StatSet set, List creationPoints) { super(set); _classId = ClassId.getClassId(set.getInt("classId")); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index aa28a0f648..260da48365 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -23,7 +23,7 @@ import java.util.Objects; import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import org.l2jmobius.gameserver.enums.InventoryBlockType; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -57,7 +57,7 @@ public class Transform implements IIdentifiable private TransformTemplate _maleTemplate; private TransformTemplate _femaleTemplate; - public Transform(StatsSet set) + public Transform(StatSet set) { _id = set.getInt("id"); _displayId = set.getInt("displayId", _id); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java index 5660852a01..729998503f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.actor.transform; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -31,7 +31,7 @@ public class TransformLevelData private final double _levelMod; private Map _stats; - public TransformLevelData(StatsSet set) + public TransformLevelData(StatSet set) { _level = set.getInt("val"); _levelMod = set.getDouble("levelMod"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 4de84b8bdc..7aca059f91 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -23,7 +23,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -49,7 +49,7 @@ public class TransformTemplate private ExBasicActionList _list; private final Map _data = new LinkedHashMap<>(100); - public TransformTemplate(StatsSet set) + public TransformTemplate(StatSet set) { _collisionRadius = set.contains("radius") ? set.getDouble("radius") : null; _collisionHeight = set.contains("height") ? set.getDouble("height") : null; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java index d808a6b8bf..02550d2818 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -36,7 +36,7 @@ public class AlchemyCraftData private ItemHolder _productionSuccess; private ItemHolder _productionFailure; - public AlchemyCraftData(StatsSet set) + public AlchemyCraftData(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java index 0bd061d3c4..79dd6c0207 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.beautyshop; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -32,7 +32,7 @@ public class BeautyItem private final int _beautyShopTicket; private final Map _colors = new HashMap<>(); - public BeautyItem(StatsSet set) + public BeautyItem(StatSet set) { _id = set.getInt("id"); _adena = set.getInt("adena", 0); @@ -60,7 +60,7 @@ public class BeautyItem return _beautyShopTicket; } - public void addColor(StatsSet set) + public void addColor(StatSet set) { final BeautyItem color = new BeautyItem(set); _colors.put(set.getInt("id"), color); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index e0d1486962..1c341e0c31 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party.MessageType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.appearance.PlayerAppearance; @@ -244,7 +244,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent player.teleToLocation(_instance.getEnterLocations().get(index++), 0, _instance); } - getTimers().addTimer("match_start_countdown", StatsSet.valueOf("time", 60), 100, null, null); + getTimers().addTimer("match_start_countdown", StatSet.valueOf("time", 60), 100, null, null); getTimers().addTimer("teleport_message1", 10000, null, null); getTimers().addTimer("teleport_message2", 14000, null, null); @@ -394,7 +394,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent } } getTimers().cancelTimer("update", null, null); - getTimers().addTimer("match_end_countdown", StatsSet.valueOf("time", 30), 30 * 1000, null, null); + getTimers().addTimer("match_end_countdown", StatSet.valueOf("time", 30), 30 * 1000, null, null); EventDispatcher.getInstance().notifyEvent(new OnCeremonyOfChaosMatchResult(winners, members)); } @@ -487,7 +487,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java index 39f9196d93..371f8dc459 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.conditions.ICubicCondition; @@ -38,7 +38,7 @@ public class CubicSkill extends SkillHolder implements ICubicConditionHolder private final List _conditions = new ArrayList<>(); private final boolean _targetDebuff; - public CubicSkill(StatsSet set) + public CubicSkill(StatSet set) { super(set.getInt("id"), set.getInt("level")); _triggerRate = set.getInt("triggerRate", 100); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/entity/ClanHall.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/entity/ClanHall.java index 8da77477fd..22af370709 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/entity/ClanHall.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/entity/ClanHall.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -75,7 +75,7 @@ public class ClanHall extends AbstractResidence private static final String LOAD_CLANHALL = "SELECT * FROM clanhall WHERE id=?"; private static final String UPDATE_CLANHALL = "UPDATE clanhall SET ownerId=?,paidUntil=? WHERE id=?"; - public ClanHall(StatsSet params) + public ClanHall(StatSet params) { super(params.getInt("id")); // Set static parameters diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/entity/Hero.java index ef005ff325..aee8b019ee 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/entity/Hero.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/entity/Hero.java @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.data.xml.impl.ClassListData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -74,13 +74,13 @@ public class Hero // delete hero items private static final String DELETE_ITEMS = "DELETE FROM items WHERE item_id IN (30392, 30393, 30394, 30395, 30396, 30397, 30398, 30399, 30400, 30401, 30402, 30403, 30404, 30405, 30372, 30373, 6842, 6611, 6612, 6613, 6614, 6615, 6616, 6617, 6618, 6619, 6620, 6621, 9388, 9389, 9390) AND owner_id NOT IN (SELECT charId FROM characters WHERE accesslevel > 0)"; - private static final Map HEROES = new ConcurrentHashMap<>(); - private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); + private static final Map HEROES = new ConcurrentHashMap<>(); + private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); - private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); - private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); + private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); + private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); - private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); + private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); private static final Map HERO_MESSAGE = new ConcurrentHashMap<>(); public static final String COUNT = "count"; @@ -118,7 +118,7 @@ public class Hero { while (rset.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset.getInt(Olympiad.CLASS_ID)); @@ -137,7 +137,7 @@ public class Hero while (rset2.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset2.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset2.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset2.getInt(Olympiad.CLASS_ID)); @@ -159,7 +159,7 @@ public class Hero LOGGER.info("Hero System: Loaded " + COMPLETE_HEROS.size() + " all time Heroes."); } - private void processHeros(PreparedStatement ps, int charId, StatsSet hero) throws SQLException + private void processHeros(PreparedStatement ps, int charId, StatSet hero) throws SQLException { ps.setInt(1, charId); try (ResultSet rs = ps.executeQuery()) @@ -224,7 +224,7 @@ public class Hero public void loadDiary(int charId) { - final List diary = new ArrayList<>(); + final List diary = new ArrayList<>(); int diaryentries = 0; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement("SELECT * FROM heroes_diary WHERE charId=? ORDER BY time ASC")) @@ -234,7 +234,7 @@ public class Hero { while (rset.next()) { - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final long time = rset.getLong("time"); final int action = rset.getInt("action"); @@ -279,8 +279,8 @@ public class Hero public void loadFights(int charId) { - final List fights = new ArrayList<>(); - final StatsSet heroCountData = new StatsSet(); + final List fights = new ArrayList<>(); + final StatSet heroCountData = new StatSet(); final Calendar data = Calendar.getInstance(); data.set(Calendar.DAY_OF_MONTH, 1); data.set(Calendar.HOUR_OF_DAY, 0); @@ -326,7 +326,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charTwoClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -362,7 +362,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charOneClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -410,14 +410,14 @@ public class Hero } } - public Map getHeroes() + public Map getHeroes() { return HEROES; } public int getHeroByClass(int classid) { - for (Entry e : HEROES.entrySet()) + for (Entry e : HEROES.entrySet()) { if (e.getValue().getInt(Olympiad.CLASS_ID) == classid) { @@ -438,7 +438,7 @@ public class Hero public void showHeroDiary(PlayerInstance player, int heroclass, int charid, int page) { final int perpage = 10; - final List mainList = HERO_DIARY.get(charid); + final List mainList = HERO_DIARY.get(charid); if (mainList != null) { final NpcHtmlMessage diaryReply = new NpcHtmlMessage(); @@ -453,7 +453,7 @@ public class Hero if (!mainList.isEmpty()) { - final List list = new ArrayList<>(mainList); + final List list = new ArrayList<>(mainList); Collections.reverse(list); boolean color = true; @@ -463,7 +463,7 @@ public class Hero for (int i = (page - 1) * perpage; i < list.size(); i++) { breakat = i; - final StatsSet diaryEntry = list.get(i); + final StatSet diaryEntry = list.get(i); fList.append(""); if (color) { @@ -524,7 +524,7 @@ public class Hero int loss = 0; int draw = 0; - final List heroFights = HERO_FIGHTS.get(charid); + final List heroFights = HERO_FIGHTS.get(charid); if (heroFights != null) { final NpcHtmlMessage fightReply = new NpcHtmlMessage(); @@ -536,7 +536,7 @@ public class Hero if (!heroFights.isEmpty()) { - final StatsSet heroCount = HERO_COUNTS.get(charid); + final StatSet heroCount = HERO_COUNTS.get(charid); if (heroCount != null) { win = heroCount.getInt("victory"); @@ -551,7 +551,7 @@ public class Hero for (int i = (page - 1) * perpage; i < heroFights.size(); i++) { breakat = i; - final StatsSet fight = heroFights.get(i); + final StatSet fight = heroFights.get(i); fList.append(""); if (color) { @@ -609,7 +609,7 @@ public class Hero } } - public synchronized void computeNewHeroes(List newHeroes) + public synchronized void computeNewHeroes(List newHeroes) { updateHeroes(true); @@ -659,13 +659,13 @@ public class Hero return; } - for (StatsSet hero : newHeroes) + for (StatSet hero : newHeroes) { final int charId = hero.getInt(Olympiad.CHAR_ID); if (COMPLETE_HEROS.containsKey(charId)) { - final StatsSet oldHero = COMPLETE_HEROS.get(charId); + final StatSet oldHero = COMPLETE_HEROS.get(charId); final int count = oldHero.getInt(COUNT); oldHero.set(COUNT, count + 1); oldHero.set(PLAYED, 1); @@ -674,7 +674,7 @@ public class Hero } else { - final StatsSet newHero = new StatsSet(); + final StatSet newHero = new StatSet(); newHero.set(Olympiad.CHAR_NAME, hero.getString(Olympiad.CHAR_NAME)); newHero.set(Olympiad.CLASS_ID, hero.getInt(Olympiad.CLASS_ID)); newHero.set(COUNT, 1); @@ -700,9 +700,9 @@ public class Hero } else { - StatsSet hero; + StatSet hero; int heroId; - for (Entry entry : HEROES.entrySet()) + for (Entry entry : HEROES.entrySet()) { hero = entry.getValue(); heroId = entry.getKey(); @@ -787,13 +787,13 @@ public class Hero setDiaryData(charId, ACTION_RAID_KILLED, npcId); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (template == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -806,13 +806,13 @@ public class Hero setDiaryData(charId, ACTION_CASTLE_TAKEN, castleId); final Castle castle = CastleManager.getInstance().getCastleById(castleId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (castle == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -922,10 +922,10 @@ public class Hero */ public void claimHero(PlayerInstance player) { - StatsSet hero = HEROES.get(player.getObjectId()); + StatSet hero = HEROES.get(player.getObjectId()); if (hero == null) { - hero = new StatsSet(); + hero = new StatSet(); HEROES.put(player.getObjectId(), hero); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java index f1263e8d44..c52f487402 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java @@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.atomic.AtomicReference; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.eventengine.drop.IEventDrop; import org.l2jmobius.gameserver.model.events.AbstractScript; @@ -42,7 +42,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout public abstract class AbstractEventManager>extends AbstractScript { private String _name; - private StatsSet _variables = StatsSet.EMPTY_STATSET; + private StatSet _variables = StatSet.EMPTY_STATSET; private Set _schedulers = Collections.emptySet(); private Set _conditionalSchedulers = Collections.emptySet(); private Map _rewards = Collections.emptyMap(); @@ -67,14 +67,14 @@ public abstract class AbstractEventManager>extends Ab /* ********************** */ - public StatsSet getVariables() + public StatSet getVariables() { return _variables; } - public void setVariables(StatsSet variables) + public void setVariables(StatSet variables) { - _variables = new StatsSet(Collections.unmodifiableMap(variables.getSet())); + _variables = new StatSet(Collections.unmodifiableMap(variables.getSet())); } /* ********************** */ diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java index 59c64b812c..e41af41d1a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.util.cron4j.PastPredictor; import org.l2jmobius.gameserver.util.cron4j.Predictor; @@ -45,7 +45,7 @@ public class EventScheduler private List _notifications; private ScheduledFuture _task; - public EventScheduler(AbstractEventManager manager, StatsSet set) + public EventScheduler(AbstractEventManager manager, StatSet set) { _eventManager = manager; _name = set.getString("name", ""); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 4fc2d3b8b0..819c3bf34d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -50,7 +50,7 @@ import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -181,12 +181,12 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime onTimerCancel(holder.getEvent(), holder.getParams(), holder.getNpc(), holder.getPlayer()); } - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { LOGGER.warning("[" + getClass().getSimpleName() + "]: Timer event arrived at non overriden onTimerEvent method event: " + event + " npc: " + npc + " player: " + player); } - public void onTimerCancel(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerCancel(String event, StatSet params, Npc npc, PlayerInstance player) { } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java index 400fb64b6e..861c4a9b31 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java @@ -24,7 +24,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.timers.IEventTimerCancel; @@ -69,7 +69,7 @@ public class TimerExecutor * @param eventTimer * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - public boolean addTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) + public boolean addTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) { return addTimer(new TimerHolder<>(event, params, time, npc, player, false, eventTimer, _cancelListener, this)); } @@ -95,7 +95,7 @@ public class TimerExecutor * @param player * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - public boolean addTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player) + public boolean addTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player) { return addTimer(event, params, time, npc, player, _eventListener); } @@ -123,7 +123,7 @@ public class TimerExecutor * @param eventTimer * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - private boolean addRepeatingTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) + private boolean addRepeatingTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) { return addTimer(new TimerHolder<>(event, params, time, npc, player, true, eventTimer, _cancelListener, this)); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java index ab8fa150ca..0fcafba759 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java @@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.gameserver.instancemanager.TimersManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.TimerExecutor; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.events.TimerExecutor; public class TimerHolder implements Runnable { private final T _event; - private final StatsSet _params; + private final StatSet _params; private final long _time; private final Npc _npc; private final PlayerInstance _player; @@ -44,7 +44,7 @@ public class TimerHolder implements Runnable private final TimerExecutor _postExecutor; private final ScheduledFuture _task; - public TimerHolder(T event, StatsSet params, long time, Npc npc, PlayerInstance player, boolean isRepeating, IEventTimerEvent eventScript, IEventTimerCancel cancelScript, TimerExecutor postExecutor) + public TimerHolder(T event, StatSet params, long time, Npc npc, PlayerInstance player, boolean isRepeating, IEventTimerEvent eventScript, IEventTimerCancel cancelScript, TimerExecutor postExecutor) { Objects.requireNonNull(event, getClass().getSimpleName() + ": \"event\" cannot be null!"); Objects.requireNonNull(eventScript, getClass().getSimpleName() + ": \"script\" cannot be null!"); @@ -73,7 +73,7 @@ public class TimerHolder implements Runnable /** * @return the parameters of this timer */ - public StatsSet getParams() + public StatSet getParams() { return _params; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index bcf2f14eec..38dfd26bba 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; @@ -37,7 +37,7 @@ public class AppearanceHolder private final AppearanceTargetType _targetType; private final long _bodyPart; - public AppearanceHolder(StatsSet set) + public AppearanceHolder(StatSet set) { _visualId = set.getInt("id", 0); _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java index 29740873cd..0f9488448d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Nik @@ -43,7 +43,7 @@ public class AttachSkillHolder extends SkillHolder return _requiredSkillLevel; } - public static AttachSkillHolder fromStatsSet(StatsSet set) + public static AttachSkillHolder fromStatSet(StatSet set) { return new AttachSkillHolder(set.getInt("skillId"), set.getInt("skillLevel", 1), set.getInt("requiredSkillId"), set.getInt("requiredSkillLevel", 1)); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java index cc41724532..57b6d47c40 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Set; import org.l2jmobius.gameserver.enums.SkillEnchantType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -36,7 +36,7 @@ public class EnchantSkillHolder private final Map _chance = new EnumMap<>(SkillEnchantType.class); private final Map> _requiredItems = new EnumMap<>(SkillEnchantType.class); - public EnchantSkillHolder(StatsSet set) + public EnchantSkillHolder(StatSet set) { _level = set.getInt("level"); _enchantFailLevel = set.getInt("enchantFailLevel"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java index e6706c8467..33d14e4345 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Map; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -36,7 +36,7 @@ public class ExtendDropDataHolder private final List _conditions; private final Map _systemMessages; - public ExtendDropDataHolder(StatsSet set) + public ExtendDropDataHolder(StatSet set) { _id = set.getInt("id"); _items = set.getList("items", ExtendDropItemHolder.class); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java index 16454d764a..d63d4eb775 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -52,7 +52,7 @@ public class FakePlayerHolder private final int _clanId; private final int _pledgeStatus; - public FakePlayerHolder(StatsSet set) + public FakePlayerHolder(StatSet set) { _classId = set.getInt("classId", 182); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java index a9c72776cd..86af0c1405 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -29,7 +29,7 @@ public class ItemHolder implements IIdentifiable private final int _id; private final long _count; - public ItemHolder(StatsSet set) + public ItemHolder(StatSet set) { _id = set.getInt("id"); _count = set.getLong("count"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java index 5b581c4cfe..a54dfa8300 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -25,7 +25,7 @@ public class ItemPointHolder extends ItemHolder { private final int _points; - public ItemPointHolder(StatsSet params) + public ItemPointHolder(StatSet params) { this(params.getInt("id"), params.getLong("count"), params.getInt("points")); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java index 22c6c327eb..0ba78224d3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.holders; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -34,7 +34,7 @@ public class LuckyGameDataHolder private int _minModifyRewardGame; private int _maxModifyRewardGame; - public LuckyGameDataHolder(StatsSet params) + public LuckyGameDataHolder(StatSet params) { _index = params.getInt("index"); _turningPoints = params.getInt("turning_point"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java index f77e380e8d..9fa8c99654 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.holders; import java.time.Duration; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -32,7 +32,7 @@ public class MinionHolder implements IIdentifiable private final long _respawnTime; private final int _weightPoint; - public MinionHolder(StatsSet set) + public MinionHolder(StatSet set) { _id = set.getInt("id"); _count = set.getInt("count", 1); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java index f4173594d1..36ac70176d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -52,7 +52,7 @@ public class MultisellListHolder implements IIdentifiable } @SuppressWarnings("unchecked") - public MultisellListHolder(StatsSet set) + public MultisellListHolder(StatSet set) { _listId = set.getInt("listId"); _isChanceMultisell = set.getBoolean("isChanceMultisell", false); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index f1b98ee9ac..ecd1069283 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -45,7 +45,7 @@ import org.l2jmobius.gameserver.enums.InstanceReenterType; import org.l2jmobius.gameserver.enums.InstanceTeleportType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -87,7 +87,7 @@ public class Instance implements IIdentifiable, INamable private final Set _players = ConcurrentHashMap.newKeySet(); // Players inside instance private final Set _npcs = ConcurrentHashMap.newKeySet(); // Spawned NPCs inside instance private final Map _doors = new HashMap<>(); // Spawned doors inside instance - private final StatsSet _parameters = new StatsSet(); + private final StatSet _parameters = new StatSet(); // Timers private final Map> _ejectDeadTasks = new ConcurrentHashMap<>(); private ScheduledFuture _cleanUpTask = null; @@ -171,7 +171,7 @@ public class Instance implements IIdentifiable, INamable * Get instance world parameters. * @return instance parameters */ - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } @@ -1020,7 +1020,7 @@ public class Instance implements IIdentifiable, INamable * Get parameters from instance template.
    * @return template parameters */ - public StatsSet getTemplateParameters() + public StatSet getTemplateParameters() { return _template.getParameters(); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 2a196f73ef..b53b0a819d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.AbstractPlayerGroup; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -71,7 +71,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl private float _spRate = Config.RATE_INSTANCE_SP; private float _expPartyRate = Config.RATE_INSTANCE_PARTY_XP; private float _spPartyRate = Config.RATE_INSTANCE_PARTY_SP; - private StatsSet _parameters = StatsSet.EMPTY_STATSET; + private StatSet _parameters = StatSet.EMPTY_STATSET; private final Map _doors = new HashMap<>(); private final List _spawns = new ArrayList<>(); // Locations @@ -92,7 +92,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl /** * @param set */ - public InstanceTemplate(StatsSet set) + public InstanceTemplate(StatSet set) { _templateId = set.getInt("id", 0); _name = set.getString("name", null); @@ -178,7 +178,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (!set.isEmpty()) { - _parameters = new StatsSet(Collections.unmodifiableMap(set)); + _parameters = new StatSet(Collections.unmodifiableMap(set)); } } @@ -469,7 +469,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl * Get instance template parameters. * @return parameters of template */ - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java index 3b67ff72f4..3627959662 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; import java.util.function.BiConsumer; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public abstract class Condition { private final InstanceTemplate _template; - private final StatsSet _parameters; + private final StatSet _parameters; private final boolean _leaderOnly; private final boolean _showMessageAndHtml; private SystemMessageId _systemMsg = null; @@ -46,7 +46,7 @@ public abstract class Condition * @param onlyLeader flag which means if only leader should be affected (leader means player who wants to enter not group leader!) * @param showMessageAndHtml if {@code true} and HTML message is defined then both are send, otherwise only HTML or message is send */ - public Condition(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public Condition(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { _template = template; _parameters = parameters; @@ -58,7 +58,7 @@ public abstract class Condition * Gets parameters of condition. * @return set of parameters */ - protected final StatsSet getParameters() + protected final StatSet getParameters() { return _parameters; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java index e379741b59..c27d92d662 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionCommandChannel extends Condition { - public ConditionCommandChannel(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionCommandChannel(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_CANNOT_ENTER_BECAUSE_YOU_ARE_NOT_ASSOCIATED_WITH_THE_CURRENT_COMMAND_CHANNEL); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java index ed434e3524..a828dcceae 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.model.AbstractPlayerGroup; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionCommandChannelLeader extends Condition { - public ConditionCommandChannelLeader(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionCommandChannelLeader(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java index d2a60816d0..423a37a94e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionDistance extends Condition { - public ConditionDistance(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionDistance(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); setSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED, (message, player) -> message.addString(player.getName())); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java index 3dc78a98c7..8aa68b7e08 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionGroupMax extends Condition { - public ConditionGroupMax(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionGroupMax(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_CANNOT_ENTER_DUE_TO_THE_PARTY_HAVING_EXCEEDED_THE_LIMIT); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java index 818803c844..70ea03c187 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionGroupMin extends Condition { - public ConditionGroupMin(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionGroupMin(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_MUST_HAVE_A_MINIMUM_OF_S1_PEOPLE_TO_ENTER_THIS_INSTANCE_ZONE, (msg, player) -> msg.addInt(getLimit())); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 3088d8ae64..53fee609aa 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.enums.ResidenceType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; */ public class ConditionHasResidence extends Condition { - public ConditionHasResidence(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionHasResidence(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); } @@ -43,7 +43,7 @@ public class ConditionHasResidence extends Condition return false; } - final StatsSet params = getParameters(); + final StatSet params = getParameters(); final int id = params.getInt("id"); boolean test = false; switch (params.getEnum("type", ResidenceType.class)) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java index 4e1c407325..eed350db38 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -32,7 +32,7 @@ public class ConditionItem extends Condition private final long _count; private final boolean _take; - public ConditionItem(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionItem(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Load params diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java index 7d509a20c7..b38f8c0e2c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -32,7 +32,7 @@ public class ConditionLevel extends Condition private final int _min; private final int _max; - public ConditionLevel(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionLevel(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Load params diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java index b91deeffdb..d71e6d0a39 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; */ public class ConditionNoParty extends Condition { - public ConditionNoParty(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionNoParty(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java index dd31bf3ca5..5bf768a03e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionParty extends Condition { - public ConditionParty(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionParty(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java index 524a59675a..0363715536 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionPartyLeader extends Condition { - public ConditionPartyLeader(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionPartyLeader(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java index 481cb251ce..48d7fc7981 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.instancemanager.QuestManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionQuest extends Condition { - public ConditionQuest(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionQuest(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Set message diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 899b17aff9..a073129734 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionReenter extends Condition { - public ConditionReenter(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionReenter(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); setSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET, (message, player) -> message.addString(player.getName())); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java index ec255025c3..fafafe5604 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.itemauction; import java.util.Calendar; import java.util.concurrent.TimeUnit; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Forsaiken @@ -40,7 +40,7 @@ public class AuctionDateGenerator private int _hour_of_day; private int _minute_of_hour; - public AuctionDateGenerator(StatsSet config) + public AuctionDateGenerator(StatSet config) { _calendar = Calendar.getInstance(); _interval = config.getInt(FIELD_INTERVAL, -1); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 64bf0a6ff1..cb554e4dce 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.itemauction; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.idfactory.IdFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,9 +34,9 @@ public class AuctionItem private final int _itemId; private final long _itemCount; @SuppressWarnings("unused") - private final StatsSet _itemExtra; + private final StatSet _itemExtra; - public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatsSet itemExtra) + public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatSet itemExtra) { _auctionItemId = auctionItemId; _auctionLength = auctionLength; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 6dff6e3a4d..dc3a7f6f6b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -44,7 +44,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -84,7 +84,7 @@ public class ItemAuctionInstance _items = new ArrayList<>(); final NamedNodeMap nanode = node.getAttributes(); - final StatsSet generatorConfig = new StatsSet(); + final StatSet generatorConfig = new StatSet(); for (int i = nanode.getLength(); i-- > 0;) { final Node n = nanode.item(i); @@ -115,7 +115,7 @@ public class ItemAuctionInstance throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } - final StatsSet itemExtra = new StatsSet(); + final StatSet itemExtra = new StatSet(); final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Armor.java index 9acdd1f30d..5986408f74 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Armor.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.type.ArmorType; /** @@ -28,15 +28,15 @@ public class Armor extends Item /** * Constructor for Armor. - * @param set the StatsSet designating the set of couples (key,value) characterizing the armor. + * @param set the StatSet designating the set of couples (key,value) characterizing the armor. */ - public Armor(StatsSet set) + public Armor(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/EtcItem.java index 86d7291595..a902860c0d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/EtcItem.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -38,15 +38,15 @@ public class EtcItem extends Item /** * Constructor for EtcItem. - * @param set StatsSet designating the set of couples (key,value) for description of the Etc + * @param set StatSet designating the set of couples (key,value) for description of the Etc */ - public EtcItem(StatsSet set) + public EtcItem(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Henna.java index 921fa10dfb..87cea36031 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; @@ -44,7 +44,7 @@ public class Henna private final List _skills; private final List _wear_class; - public Henna(StatsSet set) + public Henna(StatSet set) { _dyeId = set.getInt("dyeId"); _dyeItemId = set.getInt("dyeItemId"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Item.java index c27b42c534..3271b32a69 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Item.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.enums.ItemGrade; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; @@ -176,14 +176,14 @@ public abstract class Item extends ListenersContainer implements IIdentifiable /** * Constructor of the Item that fill class variables.
    *
    - * @param set : StatsSet corresponding to a set of couples (key,value) for description of the item + * @param set : StatSet corresponding to a set of couples (key,value) for description of the item */ - protected Item(StatsSet set) + protected Item(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { _itemId = set.getInt("item_id"); _displayId = set.getInt("displayId", _itemId); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java index ab196007a8..3ca228cbe5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -29,7 +29,7 @@ public class PlayerItemTemplate extends ItemHolder /** * @param set the set containing the values for this object */ - public PlayerItemTemplate(StatsSet set) + public PlayerItemTemplate(StatSet set) { super(set.getInt("id"), set.getInt("count")); _equipped = set.getBoolean("equipped", false); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Weapon.java index 16f0c47287..5f9f8507bd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Weapon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.items; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ItemSkillType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -58,15 +58,15 @@ public class Weapon extends Item /** * Constructor for Weapon. - * @param set the StatsSet designating the set of couples (key,value) characterizing the weapon. + * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. */ - public Weapon(StatsSet set) + public Weapon(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java index 7bdd968d90..6d05c20ff3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java @@ -23,7 +23,7 @@ import java.util.List; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -54,7 +54,7 @@ public class AppearanceStone private List _racesNot; private List _allVisualIds; - public AppearanceStone(StatsSet set) + public AppearanceStone(StatSet set) { _id = set.getInt("id"); _visualId = set.getInt("visualId", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java index f3b53f1a67..a2897ba911 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.items.combination; import java.util.EnumMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -31,7 +31,7 @@ public class CombinationItem private final int _chance; private final Map _rewards = new EnumMap<>(CombinationItemType.class); - public CombinationItem(StatsSet set) + public CombinationItem(StatSet set) { _itemOne = set.getInt("one"); _itemTwo = set.getInt("two"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java index 1cde38a6d6..a7f1326bd8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.CrystalType; @@ -59,7 +59,7 @@ public abstract class AbstractEnchantItem private final int _maxEnchantLevel; private final double _bonusRate; - public AbstractEnchantItem(StatsSet set) + public AbstractEnchantItem(StatSet set) { _id = set.getInt("id"); if (getItem() == null) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java index b6b34cc667..7329d8728e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -40,7 +40,7 @@ public class EnchantScroll extends AbstractEnchantItem private final int _scrollGroupId; private Set _items; - public EnchantScroll(StatsSet set) + public EnchantScroll(StatSet set) { super(set); _scrollGroupId = set.getInt("scrollGroupId", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java index c02095428b..978e38d533 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items.enchant; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.items.type.ItemType; @@ -30,7 +30,7 @@ public class EnchantSupportItem extends AbstractEnchantItem private final boolean _isGiant; private final ItemType type; - public EnchantSupportItem(StatsSet set) + public EnchantSupportItem(StatSet set) { super(set); type = getItem().getItemType(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index c965e15d4c..36efcc2103 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -45,7 +45,7 @@ import org.l2jmobius.gameserver.data.xml.impl.ClassListData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.ClassId; @@ -63,7 +63,7 @@ public class Olympiad extends ListenersContainer protected static final Logger LOGGER = Logger.getLogger(Olympiad.class.getName()); protected static final Logger LOGGER_OLYMPIAD = Logger.getLogger("olympiad"); - private static final Map NOBLES = new ConcurrentHashMap<>(); + private static final Map NOBLES = new ConcurrentHashMap<>(); private static final Map NOBLES_RANK = new HashMap<>(); public static final String OLYMPIAD_HTML_PATH = "data/html/olympiad/"; @@ -228,10 +228,10 @@ public class Olympiad extends ListenersContainer PreparedStatement statement = con.prepareStatement(OLYMPIAD_LOAD_NOBLES); ResultSet rset = statement.executeQuery()) { - StatsSet statData; + StatSet statData; while (rset.next()) { - statData = new StatsSet(); + statData = new StatSet(); statData.set(CLASS_ID, rset.getInt(CLASS_ID)); statData.set(CHAR_NAME, rset.getString(CHAR_NAME)); statData.set(POINTS, rset.getInt(POINTS)); @@ -454,7 +454,7 @@ public class Olympiad extends ListenersContainer saveNobleData(); _period = 1; - final List heroesToBe = sortHerosToBe(); + final List heroesToBe = sortHerosToBe(); Hero.getInstance().resetData(); Hero.getInstance().computeNewHeroes(heroesToBe); @@ -488,7 +488,7 @@ public class Olympiad extends ListenersContainer return NOBLES.size(); } - public static StatsSet getNobleStats(int playerId) + public static StatSet getNobleStats(int playerId) { return NOBLES.get(playerId); } @@ -787,7 +787,7 @@ public class Olympiad extends ListenersContainer } int currentPoints; - for (StatsSet nobleInfo : NOBLES.values()) + for (StatSet nobleInfo : NOBLES.values()) { currentPoints = nobleInfo.getInt(POINTS); currentPoints += WEEKLY_POINTS; @@ -805,7 +805,7 @@ public class Olympiad extends ListenersContainer return; } - for (StatsSet nobleInfo : NOBLES.values()) + for (StatSet nobleInfo : NOBLES.values()) { nobleInfo.set(COMP_DONE_WEEK, 0); } @@ -838,9 +838,9 @@ public class Olympiad extends ListenersContainer try (Connection con = DatabaseFactory.getConnection()) { - for (Entry entry : NOBLES.entrySet()) + for (Entry entry : NOBLES.entrySet()) { - final StatsSet nobleInfo = entry.getValue(); + final StatSet nobleInfo = entry.getValue(); if (nobleInfo == null) { @@ -953,7 +953,7 @@ public class Olympiad extends ListenersContainer } } - protected List sortHerosToBe() + protected List sortHerosToBe() { if (_period != 1) { @@ -961,8 +961,8 @@ public class Olympiad extends ListenersContainer } LOGGER_OLYMPIAD.info("Noble,charid,classid,compDone,points"); - StatsSet nobleInfo; - for (Entry entry : NOBLES.entrySet()) + StatSet nobleInfo; + for (Entry entry : NOBLES.entrySet()) { nobleInfo = entry.getValue(); if (nobleInfo == null) @@ -979,12 +979,12 @@ public class Olympiad extends ListenersContainer LOGGER_OLYMPIAD.info(charName + "," + charId + "," + classId + "," + compDone + "," + points); } - final List heroesToBe = new LinkedList<>(); + final List heroesToBe = new LinkedList<>(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(OLYMPIAD_GET_HEROS)) { - StatsSet hero; + StatSet hero; for (int element : HERO_IDS) { // Classic can have 2nd and 3rd class competitors, but only 1 hero @@ -996,7 +996,7 @@ public class Olympiad extends ListenersContainer { if (rset.next()) { - hero = new StatsSet(); + hero = new StatSet(); hero.set(CLASS_ID, element); // save the 3rd class title hero.set(CHAR_ID, rset.getInt(CHAR_ID)); hero.set(CHAR_NAME, rset.getString(CHAR_NAME)); @@ -1050,7 +1050,7 @@ public class Olympiad extends ListenersContainer return 0; } - final StatsSet noble = NOBLES.get(objectId); + final StatSet noble = NOBLES.get(objectId); if ((noble == null) || (noble.getInt(POINTS) == 0)) { return 0; @@ -1100,7 +1100,7 @@ public class Olympiad extends ListenersContainer { if (!NOBLES.containsKey(player.getObjectId())) { - final StatsSet statDat = new StatsSet(); + final StatSet statDat = new StatSet(); statDat.set(CLASS_ID, player.getBaseClass()); statDat.set(CHAR_NAME, player.getName()); statDat.set(POINTS, DEFAULT_POINTS); @@ -1207,7 +1207,7 @@ public class Olympiad extends ListenersContainer * @param data the stats set data to add. * @return the old stats set if the noble is already present, null otherwise. */ - public static StatsSet addNobleStats(int charId, StatsSet data) + public static StatSet addNobleStats(int charId, StatSet data) { return NOBLES.put(charId, data); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/Participant.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/Participant.java index 670066ac32..b6d879b902 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/Participant.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/Participant.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.olympiad; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class Participant private final int baseClass; private boolean disconnected = false; private boolean defaulted = false; - private final StatsSet stats; + private final StatSet stats; public String clanName; public int clanId; @@ -125,7 +125,7 @@ public class Participant /** * @return the stats */ - public StatsSet getStats() + public StatSet getStats() { return stats; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java index 4d5231ca5d..c1fb0f88f6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.primeshop; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -49,7 +49,7 @@ public class PrimeShopGroup private final int _availableCount; private final List _items; - public PrimeShopGroup(StatsSet set, List items) + public PrimeShopGroup(StatSet set, List items) { _brId = set.getInt("id"); _category = set.getInt("cat", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java index d150ec98cd..88795e0721 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.residences; import java.time.Duration; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -33,7 +33,7 @@ public class ResidenceFunctionTemplate private final Duration _duration; private final double _value; - public ResidenceFunctionTemplate(StatsSet set) + public ResidenceFunctionTemplate(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java index 4f15efda0b..b19f8e59d5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; /** @@ -34,7 +34,7 @@ public class ShuttleDataHolder private final List _stops = new ArrayList<>(2); private final List _routes = new ArrayList<>(2); - public ShuttleDataHolder(StatsSet set) + public ShuttleDataHolder(StatSet set) { _id = set.getInt("id"); _loc = new Location(set); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/Skill.java index c44b45a781..0e97466a3a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.handler.IAffectScopeHandler; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.CubicInstance; @@ -210,7 +210,7 @@ public class Skill implements IIdentifiable private final SkillBuffType _buffType; private final boolean _displayInList; - public Skill(StatsSet set) + public Skill(StatSet set) { _id = set.getInt(".id"); _level = set.getInt(".level"); @@ -391,7 +391,7 @@ public class Skill implements IIdentifiable _toggleGroupId = set.getInt("toggleGroupId", -1); _attachToggleGroupId = set.getInt("attachToggleGroupId", -1); - _attachSkills = set.getList("attachSkillList", StatsSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatsSet).collect(Collectors.toList()); + _attachSkills = set.getList("attachSkillList", StatSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatSet).collect(Collectors.toList()); final String abnormalResist = set.getString("abnormalResists", null); if (abnormalResist != null) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java index bfc25bddde..39b738dbca 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.ChanceLocation; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory; /** * @author UnAfraid */ -public class NpcSpawnTemplate implements Cloneable, IParameterized +public class NpcSpawnTemplate implements Cloneable, IParameterized { private static final Logger LOGGER = Logger.getLogger(NpcSpawnTemplate.class.getName()); @@ -56,7 +56,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized private final Duration _respawnTimeRandom; private List _locations; private SpawnTerritory _zone; - private StatsSet _parameters; + private StatSet _parameters; private final boolean _spawnAnimation; private final boolean _saveInDB; private final String _dbName; @@ -82,7 +82,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized _minions = template._minions; } - public NpcSpawnTemplate(SpawnTemplate spawnTemplate, SpawnGroup group, StatsSet set) + public NpcSpawnTemplate(SpawnTemplate spawnTemplate, SpawnGroup group, StatSet set) { _spawnTemplate = spawnTemplate; _group = group; @@ -128,14 +128,14 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized mergeParameters(spawnTemplate, group); } - private StatsSet mergeParameters(SpawnTemplate spawnTemplate, SpawnGroup group) + private StatSet mergeParameters(SpawnTemplate spawnTemplate, SpawnGroup group) { if ((_parameters == null) && (spawnTemplate.getParameters() == null) && (group.getParameters() == null)) { return null; } - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); if (spawnTemplate.getParameters() != null) { set.merge(spawnTemplate.getParameters()); @@ -206,13 +206,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized } @Override - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } @Override - public void setParameters(StatsSet parameters) + public void setParameters(StatSet parameters) { if (_parameters == null) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java index 6723863c93..7ceb2d46af 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IParameterized; import org.l2jmobius.gameserver.model.interfaces.ITerritorized; @@ -31,16 +31,16 @@ import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory; /** * @author UnAfraid */ -public class SpawnGroup implements Cloneable, ITerritorized, IParameterized +public class SpawnGroup implements Cloneable, ITerritorized, IParameterized { private final String _name; private final boolean _spawnByDefault; private List _territories; private List _bannedTerritories; private final List _spawns = new ArrayList<>(); - private StatsSet _parameters; + private StatSet _parameters; - public SpawnGroup(StatsSet set) + public SpawnGroup(StatSet set) { this(set.getString("name", null), set.getBoolean("spawnByDefault", true)); } @@ -104,13 +104,13 @@ public class SpawnGroup implements Cloneable, ITerritorized, IParameterized +public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized { private final String _name; private final String _ai; @@ -45,9 +45,9 @@ public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized _territories; private List _bannedTerritories; private final List _groups = new ArrayList<>(); - private StatsSet _parameters; + private StatSet _parameters; - public SpawnTemplate(StatsSet set, File file) + public SpawnTemplate(StatSet set, File file) { this(set.getString("name", null), set.getString("ai", null), set.getBoolean("spawnByDefault", true), file); } @@ -128,13 +128,13 @@ public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized _castleId; - public TeleportLocation(int id, StatsSet set) + public TeleportLocation(int id, StatSet set) { super(set); _id = id; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java index 916ae0790c..33cf6ac3bc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.variables; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.IRestorable; import org.l2jmobius.gameserver.model.interfaces.IStorable; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.interfaces.IStorable; /** * @author UnAfraid */ -public abstract class AbstractVariables extends StatsSet implements IRestorable, IStorable, IDeletable +public abstract class AbstractVariables extends StatSet implements IRestorable, IStorable, IDeletable { private final AtomicBoolean _hasChanges = new AtomicBoolean(false); @@ -41,42 +41,42 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, */ @Override - public StatsSet set(String name, boolean value) + public StatSet set(String name, boolean value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, double value) + public StatSet set(String name, double value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, Enum value) + public StatSet set(String name, Enum value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, int value) + public StatSet set(String name, int value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, long value) + public StatSet set(String name, long value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, String value) + public StatSet set(String name, String value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); @@ -89,7 +89,7 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, * @param markAsChanged * @return */ - public StatsSet set(String name, String value, boolean markAsChanged) + public StatSet set(String name, String value, boolean markAsChanged) { if (markAsChanged) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index 5c03122a62..4d97f0017a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExHeroList implements IClientOutgoingPacket { - private final Map _heroList; + private final Map _heroList; public ExHeroList() { @@ -42,7 +42,7 @@ public class ExHeroList implements IClientOutgoingPacket OutgoingPackets.EX_HERO_LIST.writeId(packet); packet.writeD(_heroList.size()); - for (StatsSet hero : _heroList.values()) + for (StatSet hero : _heroList.values()) { packet.writeS(hero.getString(Olympiad.CHAR_NAME)); packet.writeD(hero.getInt(Olympiad.CLASS_ID)); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/BypassParser.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/BypassParser.java index 414125bdeb..a80323ba1f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/BypassParser.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/BypassParser.java @@ -20,12 +20,12 @@ import java.util.LinkedHashMap; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid */ -public class BypassParser extends StatsSet +public class BypassParser extends StatSet { private static final String ALLOWED_CHARS = "a-zA-Z0-9-_`!@#%^&*()\\[\\]|\\\\/"; private static final Pattern PATTERN = Pattern.compile(String.format("([%s]*)=('([%s ]*)'|[%s]*)", ALLOWED_CHARS, ALLOWED_CHARS, ALLOWED_CHARS)); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index b837d839d8..d12c29d422 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -138,7 +138,7 @@ public class Antharas extends AbstractNpcAI addAttackId(ANTHARAS, BOMBER, BEHEMOTH, TERASQUE); addKillId(ANTHARAS, TERASQUE, BEHEMOTH); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANTHARAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANTHARAS); final double curr_hp = info.getDouble("currentHP"); final double curr_mp = info.getDouble("currentMP"); final int loc_x = info.getInt("loc_x"); @@ -761,7 +761,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(PlayerInstance attacker, int damage) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Baium/Baium.java index a1e8eb99d5..2686236add 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -112,7 +112,7 @@ public class Baium extends AbstractNpcAI addSeeCreatureId(BAIUM); addSpellFinishedId(BAIUM); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(BAIUM); + final StatSet info = GrandBossManager.getInstance().getStatSet(BAIUM); switch (getStatus()) { @@ -666,7 +666,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Core/Core.java index bfa7212b8c..c1452bf9de 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; @@ -85,7 +85,7 @@ public class Core extends AbstractNpcAI registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR); _firstAttacked = false; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. @@ -205,9 +205,9 @@ public class Core extends AbstractNpcAI final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000; startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(CORE, info); + GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index 38eebefc7b..5e525a6caa 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -92,7 +92,7 @@ public class Orfen extends AbstractNpcAI registerMobs(mobs); _IsTeleported = false; ZONE = ZoneManager.getInstance().getZoneById(12013); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); final int status = GrandBossManager.getInstance().getBossStatus(ORFEN); if (status == DEAD) { @@ -327,9 +327,9 @@ public class Orfen extends AbstractNpcAI respawnTime *= 3600000; startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(ORFEN, info); + GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); startQuestTimer("despawn_minions", 20000, null, null); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index c2564917c7..b9fdddaaf7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; @@ -91,7 +91,7 @@ public class QueenAnt extends AbstractNpcAI addFactionCallId(NURSE); _zone = ZoneManager.getInstance().getZoneById(12012); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); final int status = GrandBossManager.getInstance().getBossStatus(QUEEN); if (status == DEAD) { @@ -367,9 +367,9 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("action", npc, null); cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(QUEEN, info); + GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); _larva.deleteMe(); _larva = null; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java index 0964b5fd44..a322a608f2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java @@ -18,7 +18,7 @@ package ai.bosses.Zaken; import org.l2jmobius.Config; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -48,7 +48,7 @@ public class Zaken extends AbstractNpcAI { addKillId(ZAKEN); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ZAKEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN); final int status = GrandBossManager.getInstance().getBossStatus(ZAKEN); if (status == DEAD) { @@ -96,9 +96,9 @@ public class Zaken extends AbstractNpcAI final long respawnTime = (Config.ZAKEN_SPAWN_INTERVAL + getRandom(-Config.ZAKEN_SPAWN_RANDOM, Config.ZAKEN_SPAWN_RANDOM)) * 3600000; startQuestTimer("zaken_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ZAKEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(ZAKEN, info); + GrandBossManager.getInstance().setStatSet(ZAKEN, info); return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java index 25a584bdf9..1feccc805a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -101,7 +101,7 @@ public class CastleTeleporter extends AbstractNpcAI if (st.hasMoreTokens()) { final int unknowInt = Integer.parseInt(st.nextToken()); - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); Location teleLoc = null; switch (unknowInt) { @@ -191,7 +191,7 @@ public class CastleTeleporter extends AbstractNpcAI return htmltext; } - private Location getTeleportLocation(StatsSet npcParams, String paramName1, String paramName2, String paramName3) + private Location getTeleportLocation(StatSet npcParams, String paramName1, String paramName2, String paramName3) { final Location loc; if (getRandom(100) < 33) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java index f19f5dea69..c817501830 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java @@ -17,7 +17,7 @@ package ai.others.Servitors; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -52,7 +52,7 @@ public class TreeOfLife extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (player != null) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index d459bd2538..4f36bd6b51 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.zone.type.NoRestartZone; @@ -305,7 +305,7 @@ public class AdminGrandBoss implements IAdminCommandHandler } } - final StatsSet info = GrandBossManager.getInstance().getStatsSet(grandBossId); + final StatSet info = GrandBossManager.getInstance().getStatSet(grandBossId); final String bossRespawn = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(info.getLong("respawn_time")); final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java index f1109bf0e7..9489d8e1bb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java @@ -19,7 +19,7 @@ package handlers.admincommandhandlers; import java.util.StringTokenizer; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -114,7 +114,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.isNoble()) { - final StatsSet statDat = getPlayerSet(player); + final StatSet statDat = getPlayerSet(player); final int oldpoints = Olympiad.getInstance().getNoblePoints(player); final int points = Math.max(oldpoints + val, 0); if (points > 1000) @@ -155,7 +155,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.isNoble()) { - final StatsSet playerStat = Olympiad.getNobleStats(player.getObjectId()); + final StatSet playerStat = Olympiad.getNobleStats(player.getObjectId()); if (playerStat == null) { BuilderUtil.sendSysMessage(activeChar, "This player hasn't played on Olympiad yet!"); @@ -197,7 +197,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.isNoble()) { - final StatsSet statDat = getPlayerSet(player); + final StatSet statDat = getPlayerSet(player); final int oldpoints = Olympiad.getInstance().getNoblePoints(player); final int points = oldpoints - val; if ((points < 1) && (points > 1000)) @@ -237,12 +237,12 @@ public class AdminOlympiad implements IAdminCommandHandler return Integer.decode(token); } - private StatsSet getPlayerSet(PlayerInstance player) + private StatSet getPlayerSet(PlayerInstance player) { - StatsSet statDat = Olympiad.getNobleStats(player.getObjectId()); + StatSet statDat = Olympiad.getNobleStats(player.getObjectId()); if (statDat == null) { - statDat = new StatsSet(); + statDat = new StatSet(); statDat.set(Olympiad.CLASS_ID, player.getBaseClass()); statDat.set(Olympiad.CHAR_NAME, player.getName()); statDat.set(Olympiad.POINTS, Olympiad.DEFAULT_POINTS); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java index d8a3d6e5ce..6382651e6c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java @@ -19,7 +19,7 @@ package handlers.conditions; import java.util.List; import org.l2jmobius.gameserver.enums.CategoryType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -31,7 +31,7 @@ public class CategoryTypeCondition implements ICondition { private final List _categoryTypes; - public CategoryTypeCondition(StatsSet params) + public CategoryTypeCondition(StatSet params) { _categoryTypes = params.getEnumList("category", CategoryType.class); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java index b24cfa0f14..9a14cb6fa2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java @@ -16,7 +16,7 @@ */ package handlers.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -29,7 +29,7 @@ public class NpcLevelCondition implements ICondition private final int _minLevel; private final int _maxLevel; - public NpcLevelCondition(StatsSet params) + public NpcLevelCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java index afffe7a0c5..9e3deaa8ce 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java @@ -16,7 +16,7 @@ */ package handlers.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -29,7 +29,7 @@ public class PlayerLevelCondition implements ICondition private final int _minLevel; private final int _maxLevel; - public PlayerLevelCondition(StatsSet params) + public PlayerLevelCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 09f609dc37..0e81066579 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -32,7 +32,7 @@ public class AbnormalShield extends AbstractEffect { private final int _times; - public AbnormalShield(StatsSet params) + public AbnormalShield(StatSet params) { _times = params.getInt("times", -1); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 0496c9068d..9c508c8c52 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Objects; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class AbnormalTimeChange extends AbstractEffect private final int _time; private final int _mode; - public AbnormalTimeChange(StatsSet params) + public AbnormalTimeChange(StatSet params) { final String abnormals = params.getString("slot", null); if ((abnormals != null) && !abnormals.isEmpty()) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 98f85c7b21..3f9132b8e3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -37,7 +37,7 @@ public class AbsorbDamage extends AbstractEffect private final double _damage; private static final Map _damageHolder = new ConcurrentHashMap<>(); - public AbsorbDamage(StatsSet params) + public AbsorbDamage(StatSet params) { _damage = params.getDouble("damage", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 26f51d5351..86fef7cf6d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; @@ -38,7 +38,7 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect private final int _hpPercent; private final Map _updates = new ConcurrentHashMap<>(); - protected AbstractConditionalHpEffect(StatsSet params, Stat stat) + protected AbstractConditionalHpEffect(StatSet params, Stat stat) { super(params, stat); _hpPercent = params.getInt("hpPercent", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java index 2e40124e39..f010f84271 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AbstractStatAddEffect extends AbstractEffect private final Stat _stat; protected final double _amount; - public AbstractStatAddEffect(StatsSet params, Stat stat) + public AbstractStatAddEffect(StatSet params, Stat stat) { _stat = stat; _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index da6a575c44..29e439684b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; @@ -42,12 +42,12 @@ public abstract class AbstractStatEffect extends AbstractEffect protected final StatModifierType _mode; protected final List _conditions = new ArrayList<>(); - public AbstractStatEffect(StatsSet params, Stat stat) + public AbstractStatEffect(StatSet params, Stat stat) { this(params, stat, stat); } - public AbstractStatEffect(StatsSet params, Stat mulStat, Stat addStat) + public AbstractStatEffect(StatSet params, Stat mulStat, Stat addStat) { _addStat = addStat; _mulStat = mulStat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java index 9811f395aa..33d08bff36 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AbstractStatPercentEffect extends AbstractEffect private final Stat _stat; protected final double _amount; - public AbstractStatPercentEffect(StatsSet params, Stat stat) + public AbstractStatPercentEffect(StatSet params, Stat stat) { _stat = stat; _amount = params.getDouble("amount", 1); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java index 539814ef2a..79c022a23c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class Accuracy extends AbstractStatEffect { - public Accuracy(StatsSet params) + public Accuracy(StatSet params) { super(params, Stat.ACCURACY_COMBAT); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index 0c1fcbd92b..48d69968c5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddHate extends AbstractEffect private final double _power; private final boolean _affectSummoner; - public AddHate(StatsSet params) + public AddHate(StatSet params) { _power = params.getDouble("power", 0); _affectSummoner = params.getBoolean("affectSummoner", false); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java index e90d5cc7f3..324927947a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddSkillBySkill extends AbstractEffect private final int _existingSkillLevel; private final SkillHolder _addedSkill; - public AddSkillBySkill(StatsSet params) + public AddSkillBySkill(StatSet params) { _existingSkillId = params.getInt("existingSkillId"); _existingSkillLevel = params.getInt("existingSkillLevel"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index bdd8314dd7..205bc82200 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddTeleportBookmarkSlot extends AbstractEffect { private final int _amount; - public AddTeleportBookmarkSlot(StatsSet params) + public AddTeleportBookmarkSlot(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java index c26ec5442f..658931ecb2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionCp extends AbstractStatAddEffect { - public AdditionalPotionCp(StatsSet params) + public AdditionalPotionCp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_CP); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java index 6b68e40f32..57d54c7d3b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionHp extends AbstractStatAddEffect { - public AdditionalPotionHp(StatsSet params) + public AdditionalPotionHp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_HP); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java index c9e1cc237e..007547ebe7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionMp extends AbstractStatAddEffect { - public AdditionalPotionMp(StatsSet params) + public AdditionalPotionMp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_MP); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AgathionSlot.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AgathionSlot.java index 2d2a3cf6df..b8a91b683f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AgathionSlot.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AgathionSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AgathionSlot extends AbstractStatAddEffect { - public AgathionSlot(StatsSet params) + public AgathionSlot(StatSet params) { super(params, Stat.AGATHION_SLOTS); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java index f5cbb63465..9255ba1877 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AreaDamage extends AbstractStatAddEffect { - public AreaDamage(StatsSet params) + public AreaDamage(StatSet params) { super(params, Stat.DAMAGE_ZONE_VULN); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ArtifactSlot.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ArtifactSlot.java index 150e53d14e..0c146fc6a3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ArtifactSlot.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ArtifactSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ArtifactSlot extends AbstractStatAddEffect { - public ArtifactSlot(StatsSet params) + public ArtifactSlot(StatSet params) { super(params, Stat.ARTIFACT_SLOTS); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java index 2ded14e7ae..a5d56477f5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AttackAttribute extends AbstractEffect private final AttributeType _attribute; private final double _amount; - public AttackAttribute(StatsSet params) + public AttackAttribute(StatSet params) { _amount = params.getDouble("amount", 0); _attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java index ff58d09cc7..795366850d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class AttackAttributeAdd extends AbstractEffect { private final double _amount; - public AttackAttributeAdd(StatsSet params) + public AttackAttributeAdd(StatSet params) { _amount = params.getDouble("amount", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java index 37bfbf341a..fcd2b48c99 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class AttackBehind extends AbstractEffect { - public AttackBehind(StatsSet params) + public AttackBehind(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index 062c325a55..4136f5d530 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class AttackTrait extends AbstractEffect { private final Map _attackTraits = new EnumMap<>(TraitType.class); - public AttackTrait(StatsSet params) + public AttackTrait(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 02d6a8d78c..8ac42d45c3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -37,7 +37,7 @@ public class Backstab extends AbstractEffect private final double _criticalChance; private final boolean _overHit; - public Backstab(StatsSet params) + public Backstab(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Betray.java index 32e3c65c55..79e8bd3360 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Betray extends AbstractEffect { - public Betray(StatsSet params) + public Betray(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Blink.java index ba1caed6ac..56d3f628fd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -52,7 +52,7 @@ public class Blink extends AbstractEffect private final int _flyDelay; private final int _animationSpeed; - public Blink(StatsSet params) + public Blink(StatSet params) { _flyCourse = params.getInt("angle", 0); _flyRadius = params.getInt("range", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 8677f72407..596d4b752f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; */ public class BlinkSwap extends AbstractEffect { - public BlinkSwap(StatsSet params) + public BlinkSwap(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 7bec602aef..cea12039d2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -20,7 +20,7 @@ import java.util.Arrays; import java.util.Set; import java.util.stream.Collectors; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class BlockAbnormalSlot extends AbstractEffect { private final Set _blockAbnormalSlots; - public BlockAbnormalSlot(StatsSet params) + public BlockAbnormalSlot(StatSet params) { _blockAbnormalSlots = Arrays.stream(params.getString("slot").split(";")).map(slot -> Enum.valueOf(AbnormalType.class, slot)).collect(Collectors.toSet()); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index b4839ab322..348881f970 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -21,7 +21,7 @@ import java.util.Set; import org.l2jmobius.gameserver.datatables.BotReportTable; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class BlockAction extends AbstractEffect { private final Set _blockedActions = new HashSet<>(); - public BlockAction(StatsSet params) + public BlockAction(StatSet params) { final String[] actions = params.getString("blockedActions").split(","); for (String action : actions) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index 68f6586e3e..635d2735f9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -22,7 +22,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class BlockActions extends AbstractEffect { private final Set _allowedSkills; - public BlockActions(StatsSet params) + public BlockActions(StatSet params) { final String[] allowedSkills = params.getString("allowedSkills", "").split(";"); _allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 99af987208..3502d140d0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockChat extends AbstractEffect { - public BlockChat(StatsSet params) + public BlockChat(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java index 6160114414..a2b084c918 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; */ public class BlockControl extends AbstractEffect { - public BlockControl(StatsSet params) + public BlockControl(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java index 3d96329b6d..69b390ae8f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BlockEscape extends AbstractEffect { - public BlockEscape(StatsSet params) + public BlockEscape(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index 8bbd7ac018..85d89180e7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockMove extends AbstractEffect { - public BlockMove(StatsSet params) + public BlockMove(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index 316f82f855..9e28fc403a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockParty extends AbstractEffect { - public BlockParty(StatsSet params) + public BlockParty(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java index ae2ac8b035..d3235fc34f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BlockResurrection extends AbstractEffect { - public BlockResurrection(StatsSet params) + public BlockResurrection(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index f7f119691f..f2cc65b782 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -35,7 +35,7 @@ public class BlockSkill extends AbstractEffect { private final int[] _magicTypes; - public BlockSkill(StatsSet params) + public BlockSkill(StatSet params) { _magicTypes = params.getIntArray("magicTypes", ";"); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index d9b3d3a34d..9f0b7143d2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockTarget extends AbstractEffect { - public BlockTarget(StatsSet params) + public BlockTarget(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index bc4cbd6320..bef60ad003 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class Bluff extends AbstractEffect { private final int _chance; - public Bluff(StatsSet params) + public Bluff(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java index 2ace40a596..69583d613b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusDropAmount extends AbstractStatPercentEffect { - public BonusDropAmount(StatsSet params) + public BonusDropAmount(StatSet params) { super(params, Stat.BONUS_DROP_AMOUNT); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java index b81560b040..e63c8f79f4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusDropRate extends AbstractStatPercentEffect { - public BonusDropRate(StatsSet params) + public BonusDropRate(StatSet params) { super(params, Stat.BONUS_DROP_RATE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java index b984404cb2..e0fb54b162 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusSpoilRate extends AbstractStatPercentEffect { - public BonusSpoilRate(StatsSet params) + public BonusSpoilRate(StatSet params) { super(params, Stat.BONUS_SPOIL_RATE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Breath.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Breath.java index 859f341f3c..4235319f22 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Breath.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Breath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class Breath extends AbstractStatEffect { - public Breath(StatsSet params) + public Breath(StatSet params) { super(params, Stat.BREATH); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java index a6d25f3c36..4102506e6c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BuffBlock extends AbstractEffect { - public BuffBlock(StatsSet params) + public BuffBlock(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index de7497f8bf..4f470b06c7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class CallLearnedSkill extends AbstractEffect { private final int _skillId; - public CallLearnedSkill(StatsSet params) + public CallLearnedSkill(StatSet params) { _skillId = params.getInt("skillId"); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index e6096be4be..b41daf073c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CallParty extends AbstractEffect { - public CallParty(StatsSet params) + public CallParty(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index 0760fb675e..eb4bdf2349 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class CallPc extends AbstractEffect private final int _itemId; private final int _itemCount; - public CallPc(StatsSet params) + public CallPc(StatSet params) { _itemId = params.getInt("itemId", 0); _itemCount = params.getInt("itemCount", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index d6d5cb721d..0da3802665 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -35,7 +35,7 @@ public class CallRandomSkill extends AbstractEffect { private final List _skills = new ArrayList<>(); - public CallRandomSkill(StatsSet params) + public CallRandomSkill(StatSet params) { final String skills = params.getString("skills", null); if (skills != null) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index 99c1494223..f8e4b226c4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -35,7 +35,7 @@ public class CallSkill extends AbstractEffect private final SkillHolder _skill; private final int _skillLevelScaleTo; - public CallSkill(StatsSet params) + public CallSkill(StatSet params) { _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0)); _skillLevelScaleTo = params.getInt("skillLevelScaleTo", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index cec2706e81..4a18b31781 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.Collections; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ public class CallSkillOnActionTime extends AbstractEffect { private final SkillHolder _skill; - public CallSkillOnActionTime(StatsSet params) + public CallSkillOnActionTime(StatSet params) { _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0)); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index d48eb90fb3..32753a71a0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CallTargetParty extends AbstractEffect { - public CallTargetParty(StatsSet params) + public CallTargetParty(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index ef01f4a8ed..d4331bf5b7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ public class ChameleonRest extends AbstractEffect { private final double _power; - public ChameleonRest(StatsSet params) + public ChameleonRest(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index e3b846674d..37054f2fd0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; @@ -35,9 +35,9 @@ public class ChangeBody extends AbstractEffect { private final Set _transformations = new HashSet<>(); - public ChangeBody(StatsSet params) + public ChangeBody(StatSet params) { - for (StatsSet item : params.getList("templates", StatsSet.class)) + for (StatSet item : params.getList("templates", StatSet.class)) { _transformations.add(new TemplateChanceHolder(item.getInt(".templateId"), item.getInt(".minChance"), item.getInt(".maxChance"))); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 76c6e03aa6..6b6386909e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeFace extends AbstractEffect { private final int _value; - public ChangeFace(StatsSet params) + public ChangeFace(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java index cee3ac1a6f..304afa821c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; /** @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; */ public class ChangeFishingMastery extends AbstractEffect { - public ChangeFishingMastery(StatsSet params) + public ChangeFishingMastery(StatSet params) { } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index 0c583cbc13..64ac49f5d5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeHairColor extends AbstractEffect { private final int _value; - public ChangeHairColor(StatsSet params) + public ChangeHairColor(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index ad2efbe6a0..ae7d6c6da1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeHairStyle extends AbstractEffect { private final int _value; - public ChangeHairStyle(StatsSet params) + public ChangeHairStyle(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java index 2d536029fd..4d7c380c75 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class CheapShot extends AbstractEffect { - public CheapShot(StatsSet params) + public CheapShot(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index 5fa3df1676..0215ff6a5b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.SubclassInfoType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class ClassChange extends AbstractEffect private final int _index; private static final int IDENTITY_CRISIS_SKILL_ID = 1570; - public ClassChange(StatsSet params) + public ClassChange(StatSet params) { _index = params.getInt("index", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index ccf7598eff..e184022afc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.stats.Formulas; */ public class Compelling extends AbstractEffect { - public Compelling(StatsSet params) + public Compelling(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index b6aa30f604..f164ac6f3f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class Confuse extends AbstractEffect { private final int _chance; - public Confuse(StatsSet params) + public Confuse(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 25e29532eb..78293c1b0f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ConsumeBody extends AbstractEffect { - public ConsumeBody(StatsSet params) + public ConsumeBody(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index e915eb0391..6ddd0d72eb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class ConvertItem extends AbstractEffect { - public ConvertItem(StatsSet params) + public ConvertItem(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java index 9402fdb06d..857df659c0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CounterPhysicalSkill extends AbstractStatAddEffect { - public CounterPhysicalSkill(StatsSet params) + public CounterPhysicalSkill(StatSet params) { super(params, Stat.VENGEANCE_SKILL_PHYSICAL_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 67bca7fd1b..598682037b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Cp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Cp(StatsSet params) + public Cp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index e0cd52808e..37303b0e7a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class CpHeal extends AbstractEffect { private final double _power; - public CpHeal(StatsSet params) + public CpHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index e2e8ee3479..54de5adfc6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class CpHealOverTime extends AbstractEffect { private final double _power; - public CpHealOverTime(StatsSet params) + public CpHealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index 5665e937dc..b4a994d6df 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CpHealPercent extends AbstractEffect { private final double _power; - public CpHealPercent(StatsSet params) + public CpHealPercent(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java index 1cc851b2af..efb020bbd5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CpRegen extends AbstractStatEffect { - public CpRegen(StatsSet params) + public CpRegen(StatSet params) { super(params, Stat.REGENERATE_CP_RATE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java index 8983497026..0b93eef45e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CriticalDamage extends AbstractStatEffect { - public CriticalDamage(StatsSet params) + public CriticalDamage(StatSet params) { super(params, Stat.CRITICAL_DAMAGE, Stat.CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 7ef4f0ecb4..0630f087b7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.Position; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CriticalDamagePosition extends AbstractEffect private final double _amount; private final Position _position; - public CriticalDamagePosition(StatsSet params) + public CriticalDamagePosition(StatSet params) { _amount = params.getDouble("amount", 0); _position = params.getEnum("position", Position.class, Position.FRONT); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java index 01f49380eb..0d4bded60e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; public class CriticalRate extends AbstractConditionalHpEffect { - public CriticalRate(StatsSet params) + public CriticalRate(StatSet params) { super(params, Stat.CRITICAL_RATE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 863b385ca3..4d65fa84eb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.Position; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CriticalRatePositionBonus extends AbstractEffect private final double _amount; private final Position _position; - public CriticalRatePositionBonus(StatsSet params) + public CriticalRatePositionBonus(StatSet params) { _amount = params.getDouble("amount", 0); _position = params.getEnum("position", Position.class, Position.FRONT); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index 2e8ec38347..9d04575ae2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class CrystalGradeModify extends AbstractEffect { private final int _grade; - public CrystalGradeModify(StatsSet params) + public CrystalGradeModify(StatSet params) { _grade = params.getInt("grade", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java index 94ff8e64e2..79ee5b994e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CubicMastery extends AbstractStatAddEffect { - public CubicMastery(StatsSet params) + public CubicMastery(StatSet params) { super(params, Stat.MAX_CUBIC); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index 36abf0accf..e6bb53fdea 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class DamOverTime extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTime(StatsSet params) + public DamOverTime(StatSet params) { _canKill = params.getBoolean("canKill", false); _power = params.getDouble("power"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 13e57099e0..b5f25db4d8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class DamOverTimePercent extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTimePercent(StatsSet params) + public DamOverTimePercent(StatSet params) { _canKill = params.getBoolean("canKill", false); _power = params.getDouble("power"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java index dc7a45198f..c9567ea034 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ public class DamageBlock extends AbstractEffect private final boolean _blockHp; private final boolean _blockMp; - public DamageBlock(StatsSet params) + public DamageBlock(StatSet params) { final String type = params.getString("type", null); _blockHp = type.equalsIgnoreCase("BLOCK_HP"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java index 5bc9b5fff8..3d8985d1d8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DamageByAttackType; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -38,7 +38,7 @@ public class DamageByAttack extends AbstractEffect private final double _value; private final DamageByAttackType _type; - public DamageByAttack(StatsSet params) + public DamageByAttack(StatSet params) { _value = params.getDouble("amount"); _type = params.getEnum("type", DamageByAttackType.class, DamageByAttackType.NONE); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java index 5a7629482a..e823a9824a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DamageShield extends AbstractStatAddEffect { - public DamageShield(StatsSet params) + public DamageShield(StatSet params) { super(params, Stat.REFLECT_DAMAGE_PERCENT); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java index db1abe264d..3029a3f0aa 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DamageShieldResist extends AbstractStatAddEffect { - public DamageShieldResist(StatsSet params) + public DamageShieldResist(StatSet params) { super(params, Stat.REFLECT_DAMAGE_PERCENT_DEFENSE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index 8561ff46b0..369bd5483d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class DeathLink extends AbstractEffect { private final double _power; - public DeathLink(StatsSet params) + public DeathLink(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java index b948fad1fc..54261c6229 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class DebuffBlock extends AbstractEffect { - public DebuffBlock(StatsSet params) + public DebuffBlock(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java index 217ef3dfaa..4bc08271fa 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class DefenceAttribute extends AbstractEffect private final AttributeType _attribute; private final double _amount; - public DefenceAttribute(StatsSet params) + public DefenceAttribute(StatSet params) { _amount = params.getDouble("amount", 0); _attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java index 0c0c2e8d6a..daff53d9e1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceCriticalDamage extends AbstractStatEffect { - public DefenceCriticalDamage(StatsSet params) + public DefenceCriticalDamage(StatSet params) { super(params, Stat.DEFENCE_CRITICAL_DAMAGE, Stat.DEFENCE_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java index 131eb500ea..74a729e38c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceCriticalRate extends AbstractStatEffect { - public DefenceCriticalRate(StatsSet params) + public DefenceCriticalRate(StatSet params) { super(params, Stat.DEFENCE_CRITICAL_RATE, Stat.DEFENCE_CRITICAL_RATE_ADD); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java index 1abee78e08..c664939977 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceMagicCriticalDamage extends AbstractStatEffect { - public DefenceMagicCriticalDamage(StatsSet params) + public DefenceMagicCriticalDamage(StatSet params) { super(params, Stat.DEFENCE_MAGIC_CRITICAL_DAMAGE, Stat.DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java index 2146b89551..6594dda2b3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceMagicCriticalRate extends AbstractStatEffect { - public DefenceMagicCriticalRate(StatsSet params) + public DefenceMagicCriticalRate(StatSet params) { super(params, Stat.DEFENCE_MAGIC_CRITICAL_RATE, Stat.DEFENCE_MAGIC_CRITICAL_RATE_ADD); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index bd80f690cd..134ed56979 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class DefenceTrait extends AbstractEffect { private final Map _defenceTraits = new EnumMap<>(TraitType.class); - public DefenceTrait(StatsSet params) + public DefenceTrait(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index bab5e1a762..7cee616006 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class DeleteHate extends AbstractEffect { private final int _chance; - public DeleteHate(StatsSet params) + public DeleteHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index 85985653b8..f10f189e68 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class DeleteHateOfMe extends AbstractEffect { private final int _chance; - public DeleteHateOfMe(StatsSet params) + public DeleteHateOfMe(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index d3664ad00f..82833ac79d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class DeleteTopAgro extends AbstractEffect { private final int _chance; - public DeleteTopAgro(StatsSet params) + public DeleteTopAgro(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index ae1f2a5942..ba6dad4698 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DoorOpenType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DetectHiddenObjects extends AbstractEffect { - public DetectHiddenObjects(StatsSet params) + public DetectHiddenObjects(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Detection.java index 078360ff35..a20cbcb348 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Detection extends AbstractEffect { - public Detection(StatsSet params) + public Detection(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 8567a94d12..32ee715df7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DisableTargeting extends AbstractEffect { - public DisableTargeting(StatsSet params) + public DisableTargeting(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index fa06ec7221..5a80971f51 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Disarm extends AbstractEffect { - public Disarm(StatsSet params) + public Disarm(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index 2bf9a6cfe1..0693c6ebdc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class Disarmor extends AbstractEffect private final Map _unequippedItems; // PlayerObjId, ItemObjId private final long _slot; - public Disarmor(StatsSet params) + public Disarmor(StatSet params) { _unequippedItems = new ConcurrentHashMap<>(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 95de0300bb..a652a023f5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DispelAll extends AbstractEffect { - public DispelAll(StatsSet params) + public DispelAll(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 88d979a0d9..040271d2a7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.List; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -38,7 +38,7 @@ public class DispelByCategory extends AbstractEffect private final int _rate; private final int _max; - public DispelByCategory(StatsSet params) + public DispelByCategory(StatSet params) { _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); _rate = params.getInt("rate", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index a6e4c7cd19..ab79e046b2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.EnumMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -37,7 +37,7 @@ public class DispelBySlot extends AbstractEffect private final String _dispel; private final Map _dispelAbnormals; - public DispelBySlot(StatsSet params) + public DispelBySlot(StatSet params) { _dispel = params.getString("dispel"); if ((_dispel != null) && !_dispel.isEmpty()) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 1ba6612e23..d1341d10b9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class DispelBySlotMyself extends AbstractEffect { private final Set _dispelAbnormals; - public DispelBySlotMyself(StatsSet params) + public DispelBySlotMyself(StatSet params) { final String dispel = params.getString("dispel"); if ((dispel != null) && !dispel.isEmpty()) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 845980e59d..b58723058e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -37,7 +37,7 @@ public class DispelBySlotProbability extends AbstractEffect private final Set _dispelAbnormals; private final int _rate; - public DispelBySlotProbability(StatsSet params) + public DispelBySlotProbability(StatSet params) { final String[] dispelEffects = params.getString("dispel").split(";"); _rate = params.getInt("rate", 100); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index 7acd9c4a6c..688d77a703 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -45,7 +45,7 @@ public class DoubleCast extends AbstractEffect private final Map> _addedToggles; - public DoubleCast(StatsSet params) + public DoubleCast(StatSet params) { _addedToggles = new HashMap<>(); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java index d7f067a2a0..d1e21edeb0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DuelistFury extends AbstractEffect { - public DuelistFury(StatsSet params) + public DuelistFury(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ElementalSpiritAttack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ElementalSpiritAttack.java index 529c36277e..ff4c41f0e7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ElementalSpiritAttack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ElementalSpiritAttack.java @@ -17,14 +17,14 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ElementalType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author JoeAlisson */ public class ElementalSpiritAttack extends AbstractStatEffect { - public ElementalSpiritAttack(StatsSet params) + public ElementalSpiritAttack(StatSet params) { super(params, params.getEnum("type", ElementalType.class).getAttackStat()); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ElementalSpiritDefense.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ElementalSpiritDefense.java index 32d541bcb3..3669fbe259 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ElementalSpiritDefense.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ElementalSpiritDefense.java @@ -17,14 +17,14 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ElementalType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author JoeAlisson */ public class ElementalSpiritDefense extends AbstractStatEffect { - public ElementalSpiritDefense(StatsSet params) + public ElementalSpiritDefense(StatSet params) { super(params, params.getEnum("type", ElementalType.class).getDefenseStat()); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index 409fed6a23..de397bb5ff 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class EnableCloak extends AbstractEffect { - public EnableCloak(StatsSet params) + public EnableCloak(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index e855c4ba1a..2fe2bef99f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -43,7 +43,7 @@ public class EnergyAttack extends AbstractEffect private final boolean _overHit; private final double _pDefMod; - public EnergyAttack(StatsSet params) + public EnergyAttack(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getInt("criticalChance", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index a8f108573f..ae463ef2a4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class EnlargeAbnormalSlot extends AbstractEffect { private final int _slots; - public EnlargeAbnormalSlot(StatsSet params) + public EnlargeAbnormalSlot(StatSet params) { _slots = params.getInt("slots", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java index c43ea04413..c4073b1a47 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StorageType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class EnlargeSlot extends AbstractEffect private final StorageType _type; private final double _amount; - public EnlargeSlot(StatsSet params) + public EnlargeSlot(StatSet params) { _amount = params.getDouble("amount", 0); _type = params.getEnum("type", StorageType.class, StorageType.INVENTORY_NORMAL); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Escape.java index 936f82d8ce..f3a07c9d15 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class Escape extends AbstractEffect { private final TeleportWhereType _escapeType; - public Escape(StatsSet params) + public Escape(StatSet params) { _escapeType = params.getEnum("escapeType", TeleportWhereType.class, null); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java index 76dbc8171c..eb68d24af8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ExpModify extends AbstractStatAddEffect { - public ExpModify(StatsSet params) + public ExpModify(StatSet params) { super(params, Stat.BONUS_EXP); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java index bf11db6e4b..1100ca25be 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Faceoff extends AbstractEffect { - public Faceoff(StatsSet params) + public Faceoff(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index e256209e39..79f7b43503 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -34,7 +34,7 @@ public class FakeDeath extends AbstractEffect { private final double _power; - public FakeDeath(StatsSet params) + public FakeDeath(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index a94c75d310..780d5cefba 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -44,7 +44,7 @@ public class FatalBlow extends AbstractEffect private final double _abnormalPower; private final boolean _overHit; - public FatalBlow(StatsSet params) + public FatalBlow(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java index c8ff8f7acb..6e7597e63d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class FatalBlowRate extends AbstractEffect private final double _amount; private final StatModifierType _mode; - public FatalBlowRate(StatsSet params) + public FatalBlowRate(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 9731e75e5d..ec2659ea2c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DefenderInstance; import org.l2jmobius.gameserver.model.actor.instance.FortCommanderInstance; @@ -40,7 +40,7 @@ public class Fear extends AbstractEffect { private static final int FEAR_RANGE = 500; - public Fear(StatsSet params) + public Fear(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 5e04e46d60..94d9912bdf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.MountType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ public class Feed extends AbstractEffect private final int _ride; private final int _wyvern; - public Feed(StatsSet params) + public Feed(StatSet params) { _normal = params.getInt("normal", 0); _ride = params.getInt("ride", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java index 0b22a4d4c9..146e3b73e6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class FishingExpSpBonus extends AbstractStatPercentEffect { - public FishingExpSpBonus(StatsSet params) + public FishingExpSpBonus(StatSet params) { super(params, Stat.FISHING_EXP_SP_BONUS); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Flag.java index c1469eab19..2442cbdb35 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Flag extends AbstractEffect { - public Flag(StatsSet params) + public Flag(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index 0243f0f543..74a9754a95 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.BlockInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class FlipBlock extends AbstractEffect { - public FlipBlock(StatsSet params) + public FlipBlock(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 7fc7da5fe6..3412e4d36d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class FlyAway extends AbstractEffect { private final int _radius; - public FlyAway(StatsSet params) + public FlyAway(StatSet params) { _radius = params.getInt("radius"); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java index fd3216286d..590fbbcd44 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class FocusEnergy extends AbstractStatAddEffect { - public FocusEnergy(StatsSet params) + public FocusEnergy(StatSet params) { super(params, Stat.MAX_MOMENTUM); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index efbd93f304..19f0163e42 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class FocusMaxMomentum extends AbstractEffect { - public FocusMaxMomentum(StatsSet params) + public FocusMaxMomentum(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index 284d19ee5f..e8c18e9682 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -36,7 +36,7 @@ public class FocusMomentum extends AbstractEffect private final int _amount; private final int _maxCharges; - public FocusMomentum(StatsSet params) + public FocusMomentum(StatSet params) { _amount = params.getInt("amount", 1); _maxCharges = params.getInt("maxCharges", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 18a9864bbc..debd491cfe 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class FocusSouls extends AbstractEffect { private final int _charge; - public FocusSouls(StatsSet params) + public FocusSouls(StatSet params) { _charge = params.getInt("charge", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 8540ccd49c..23328db910 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Set; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class GetAgro extends AbstractEffect { - public GetAgro(StatsSet params) + public GetAgro(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java index 1ca8722709..e91002d04b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class GetDamageLimit extends AbstractStatAddEffect { - public GetDamageLimit(StatsSet params) + public GetDamageLimit(StatSet params) { super(params, Stat.DAMAGE_LIMIT); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 2dfd3bf8c4..439f3e8e3a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class GetMomentum extends AbstractEffect { private static int _ticks; - public GetMomentum(StatsSet params) + public GetMomentum(StatSet params) { _ticks = params.getInt("ticks", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index 7c1c0f3fa2..2c842101ed 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class GiveClanReputation extends AbstractEffect { private final int _reputation; - public GiveClanReputation(StatsSet params) + public GiveClanReputation(StatSet params) { _reputation = params.getInt("reputation", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index fd4d61fa73..9052c63154 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class GiveExpAndSp extends AbstractEffect private final int _xp; private final int _sp; - public GiveExpAndSp(StatsSet params) + public GiveExpAndSp(StatSet params) { _xp = params.getInt("xp", 0); _sp = params.getInt("sp", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index 3448e09797..9d41a4395b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ public class GiveFame extends AbstractEffect { private final int _fame; - public GiveFame(StatsSet params) + public GiveFame(StatSet params) { _fame = params.getInt("fame", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index c948fa0948..617a8ef88a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class GiveRecommendation extends AbstractEffect { private final int _amount; - public GiveRecommendation(StatsSet params) + public GiveRecommendation(StatSet params) { _amount = params.getInt("amount", 0); if (_amount == 0) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index 5fe06566c7..75a16fe828 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class GiveSp extends AbstractEffect { private final int _sp; - public GiveSp(StatsSet params) + public GiveSp(StatSet params) { _sp = params.getInt("sp", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index 5b1a04c165..ae7248c500 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class GiveXp extends AbstractEffect { private final int _xp; - public GiveXp(StatsSet params) + public GiveXp(StatSet params) { _xp = params.getInt("xp", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 17095c209a..5cf4994f32 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Grow extends AbstractEffect { - public Grow(StatsSet params) + public Grow(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index a2200e1a2f..350c8e659f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.UserInfoType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class HairAccessorySet extends AbstractEffect { - public HairAccessorySet(StatsSet params) + public HairAccessorySet(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index f881ed5027..1654fc650c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Harvesting extends AbstractEffect { - public Harvesting(StatsSet params) + public Harvesting(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java index ac1c9f49d8..097db6604a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HateAttack extends AbstractStatPercentEffect { - public HateAttack(StatsSet params) + public HateAttack(StatSet params) { super(params, Stat.HATE_ATTACK); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index 00f569eb17..9963ff1336 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlagInstance; @@ -34,7 +34,7 @@ public class HeadquarterCreate extends AbstractEffect private static final int HQ_NPC_ID = 35062; private final boolean _isAdvanced; - public HeadquarterCreate(StatsSet params) + public HeadquarterCreate(StatSet params) { _isAdvanced = params.getBoolean("isAdvanced", false); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 4c2218df9b..d2848a6242 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -40,7 +40,7 @@ public class Heal extends AbstractEffect { private final double _power; - public Heal(StatsSet params) + public Heal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java index 5a7457d3df..a9f75ab036 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HealEffect extends AbstractStatEffect { - public HealEffect(StatsSet params) + public HealEffect(StatSet params) { super(params, Stat.HEAL_EFFECT, Stat.HEAL_EFFECT_ADD); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 86e28dc8b4..da76f33058 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class HealOverTime extends AbstractEffect { private final double _power; - public HealOverTime(StatsSet params) + public HealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index b22cd7a42f..b86d0e7940 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class HealPercent extends AbstractEffect { private final int _power; - public HealPercent(StatsSet params) + public HealPercent(StatSet params) { _power = params.getInt("power", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Hide.java index e431277964..d02898bac5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Hide extends AbstractEffect { - public Hide(StatsSet params) + public Hide(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index e7e5f3f91b..78fa1c9392 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.GameTimeController; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HitAtNight extends AbstractStatEffect { - public HitAtNight(StatsSet params) + public HitAtNight(StatSet params) { super(params, Stat.HIT_AT_NIGHT); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java index 1fd98e7aa9..f14b922308 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HitNumber extends AbstractStatEffect { - public HitNumber(StatsSet params) + public HitNumber(StatSet params) { super(params, Stat.ATTACK_COUNT_MAX); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Hp.java index b2541b7835..a119947db5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Hp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Hp(StatsSet params) + public Hp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index 3d125565fe..6244c76428 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class HpByLevel extends AbstractEffect { private final double _power; - public HpByLevel(StatsSet params) + public HpByLevel(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index f9d9d0beeb..af3726c17f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -40,7 +40,7 @@ public class HpCpHeal extends AbstractEffect { private final double _power; - public HpCpHeal(StatsSet params) + public HpCpHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java index 0394dab996..6f96c2dcb3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class HpCpHealCritical extends AbstractEffect { - public HpCpHealCritical(StatsSet params) + public HpCpHealCritical(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 554b1cec79..7cf47c3a65 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class HpDrain extends AbstractEffect private final double _power; private final double _percentage; - public HpDrain(StatsSet params) + public HpDrain(StatSet params) { _power = params.getDouble("power", 0); _percentage = params.getDouble("percentage", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java index cb1d2bc3a7..b170bc62ba 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HpRegen extends AbstractStatEffect { - public HpRegen(StatsSet params) + public HpRegen(StatSet params) { super(params, Stat.REGENERATE_HP_RATE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 235e89a79b..f346fbaad8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class HpToOwner extends AbstractEffect private final double _power; private final int _stealAmount; - public HpToOwner(StatsSet params) + public HpToOwner(StatSet params) { _power = params.getDouble("power"); _stealAmount = params.getInt("stealAmount"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java index 9829519da9..c659684ae8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class IgnoreDeath extends AbstractEffect { - public IgnoreDeath(StatsSet params) + public IgnoreDeath(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index f7c9baa155..44dceba10e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ImmobilePetBuff extends AbstractEffect { - public ImmobilePetBuff(StatsSet params) + public ImmobilePetBuff(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java index a60fc45d15..a03eff933a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ public class InstantKillResist extends AbstractEffect { private final int _amount; - public InstantKillResist(StatsSet params) + public InstantKillResist(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java index 7e1fc8abe4..265a9aab97 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class JewelSlot extends AbstractStatAddEffect { - public JewelSlot(StatsSet params) + public JewelSlot(StatSet params) { super(params, Stat.BROOCH_JEWELS); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 3d5ff2dda3..a34d7cc5b3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class KarmaCount extends AbstractEffect private final int _amount; private final int _mode; - public KarmaCount(StatsSet params) + public KarmaCount(StatSet params) { _amount = params.getInt("amount", 0); switch (params.getString("mode", "DIFF")) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index dd58d33685..3af09931f8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -45,7 +45,7 @@ public class KnockBack extends AbstractEffect private final boolean _knockDown; private final FlyType _type; - public KnockBack(StatsSet params) + public KnockBack(StatSet params) { _distance = params.getInt("distance", 50); _speed = params.getInt("speed", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index 7bfac989cf..1affb1b141 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -38,7 +38,7 @@ public class Lethal extends AbstractEffect private final double _fullLethal; private final double _halfLethal; - public Lethal(StatsSet params) + public Lethal(StatSet params) { _fullLethal = params.getDouble("fullLethal", 0); _halfLethal = params.getDouble("halfLethal", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java index aeb42458a6..43b17877ad 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitCp extends AbstractStatEffect { - public LimitCp(StatsSet params) + public LimitCp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_CP); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java index cf76ec482a..45d8f37355 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitHp extends AbstractStatEffect { - public LimitHp(StatsSet params) + public LimitHp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_HP); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java index f5eda36ba6..8d31633d0a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitMp extends AbstractStatEffect { - public LimitMp(StatsSet params) + public LimitMp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_MP); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Lucky.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Lucky.java index 3775d2361d..4ff5ea9a01 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Lucky.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Lucky.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Lucky extends AbstractEffect { - public Lucky(StatsSet params) + public Lucky(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MAtk.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MAtk.java index 5f9ad5f32b..38c2fc9067 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MAtk.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MAtk.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MAtk extends AbstractStatEffect { - public MAtk(StatsSet params) + public MAtk(StatSet params) { super(params, Stat.MAGIC_ATTACK); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java index 2b9ae2e9e6..393d0d2d30 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicAccuracy extends AbstractStatEffect { - public MagicAccuracy(StatsSet params) + public MagicAccuracy(StatSet params) { super(params, Stat.ACCURACY_MAGIC); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java index 123706eb55..b9a58b09f3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicCriticalDamage extends AbstractStatEffect { - public MagicCriticalDamage(StatsSet params) + public MagicCriticalDamage(StatSet params) { super(params, Stat.MAGIC_CRITICAL_DAMAGE, Stat.MAGIC_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java index 0c10014e50..c9fa9a4240 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicCriticalRate extends AbstractStatEffect { - public MagicCriticalRate(StatsSet params) + public MagicCriticalRate(StatSet params) { super(params, Stat.MAGIC_CRITICAL_RATE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index e8b6f5e8bf..5281bf8445 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class MagicMpCost extends AbstractEffect private final int _magicType; private final double _amount; - public MagicMpCost(StatsSet params) + public MagicMpCost(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index ed4a3fca8b..283a99176c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class MagicalAbnormalDispelAttack extends AbstractEffect private final double _power; private final AbnormalType _abnormalType; - public MagicalAbnormalDispelAttack(StatsSet params) + public MagicalAbnormalDispelAttack(StatSet params) { _power = params.getDouble("power", 0); _abnormalType = AbnormalType.getAbnormalType(params.getString("abnormalType", null)); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java index 8234db1c43..be6403077c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAbnormalResist extends AbstractStatAddEffect { - public MagicalAbnormalResist(StatsSet params) + public MagicalAbnormalResist(StatSet params) { super(params, Stat.ABNORMAL_RESIST_MAGICAL); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index 4e938809f1..25c7d25954 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -37,7 +37,7 @@ public class MagicalAttack extends AbstractEffect private final boolean _overHit; private final double _debuffModifier; - public MagicalAttack(StatsSet params) + public MagicalAttack(StatSet params) { _power = params.getDouble("power", 0); _overHit = params.getBoolean("overHit", false); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 424480b76c..11c387780e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class MagicalAttackByAbnormal extends AbstractEffect { private final double _power; - public MagicalAttackByAbnormal(StatsSet params) + public MagicalAttackByAbnormal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9c3e263a05..348e904025 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -40,7 +40,7 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect private final double _power; private final Set _abnormals; - public MagicalAttackByAbnormalSlot(StatsSet params) + public MagicalAttackByAbnormalSlot(StatSet params) { _power = params.getDouble("power", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 49dd351046..de55dd0fcd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -38,7 +38,7 @@ public class MagicalAttackMp extends AbstractEffect private final boolean _critical; private final double _criticalLimit; - public MagicalAttackMp(StatsSet params) + public MagicalAttackMp(StatSet params) { _power = params.getDouble("power"); _critical = params.getBoolean("critical"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 4414b36fa7..93ac560169 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class MagicalAttackRange extends AbstractEffect private final double _power; private final double _shieldDefPercent; - public MagicalAttackRange(StatsSet params) + public MagicalAttackRange(StatSet params) { _power = params.getDouble("power"); _shieldDefPercent = params.getDouble("shieldDefPercent", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java index 2e304e5f8b..1cf39ed501 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAttackSpeed extends AbstractStatEffect { - public MagicalAttackSpeed(StatsSet params) + public MagicalAttackSpeed(StatSet params) { super(params, Stat.MAGIC_ATTACK_SPEED); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 9a3a776e32..880d71f0c5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class MagicalDamOverTime extends AbstractEffect private final double _power; private final boolean _canKill; - public MagicalDamOverTime(StatsSet params) + public MagicalDamOverTime(StatSet params) { _power = params.getDouble("power", 0); _canKill = params.getBoolean("canKill", false); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java index 80fdf87050..9b4e6061aa 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalDefence extends AbstractStatEffect { - public MagicalDefence(StatsSet params) + public MagicalDefence(StatSet params) { super(params, Stat.MAGICAL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java index c3c7c404f3..4e83b80e8b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalEvasion extends AbstractStatEffect { - public MagicalEvasion(StatsSet params) + public MagicalEvasion(StatSet params) { super(params, Stat.MAGIC_EVASION_RATE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java index 6253af7373..bf419a19f7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalSkillPower extends AbstractStatEffect { - public MagicalSkillPower(StatsSet params) + public MagicalSkillPower(StatSet params) { super(params, Stat.MAGICAL_SKILL_POWER, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index d0047fedef..f4388dc16f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class MagicalSoulAttack extends AbstractEffect { private final double _power; - public MagicalSoulAttack(StatsSet params) + public MagicalSoulAttack(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java index fcc143cd4b..688243d9e1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ManaCharge extends AbstractStatAddEffect { - public ManaCharge(StatsSet params) + public ManaCharge(StatSet params) { super(params, Stat.MANA_CHARGE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index 0c84b4ab61..b889e6e824 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class ManaDamOverTime extends AbstractEffect { private final double _power; - public ManaDamOverTime(StatsSet params) + public ManaDamOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index f48011c9a2..94286df1c8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -34,7 +34,7 @@ public class ManaHeal extends AbstractEffect { private final double _power; - public ManaHeal(StatsSet params) + public ManaHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index bfdfa54380..61f15449a0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -35,7 +35,7 @@ public class ManaHealByLevel extends AbstractEffect { private final double _power; - public ManaHealByLevel(StatsSet params) + public ManaHealByLevel(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 46937a8dd0..e505c9e7a2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class ManaHealOverTime extends AbstractEffect { private final double _power; - public ManaHealOverTime(StatsSet params) + public ManaHealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 101961d1c4..71085da549 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class ManaHealPercent extends AbstractEffect { private final double _power; - public ManaHealPercent(StatsSet params) + public ManaHealPercent(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 7c9c63e3ad..07d15d826c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxCp extends AbstractStatEffect { private final boolean _heal; - public MaxCp(StatsSet params) + public MaxCp(StatSet params) { super(params, Stat.MAX_CP); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 6d2c3449bd..85867bca96 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxHp extends AbstractStatEffect { private final boolean _heal; - public MaxHp(StatsSet params) + public MaxHp(StatSet params) { super(params, Stat.MAX_HP); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index e554c63055..9ca46fda8d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxMp extends AbstractStatEffect { private final boolean _heal; - public MaxMp(StatsSet params) + public MaxMp(StatSet params) { super(params, Stat.MAX_MP); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 39cf62a95b..c27284e5f6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -43,7 +43,7 @@ public class ModifyVital extends AbstractEffect private final int _mp; private final int _cp; - public ModifyVital(StatsSet params) + public ModifyVital(StatSet params) { _type = params.getEnum("type", ModifyType.class); if (_type != ModifyType.SET) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 29ee88f805..095d130f7f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Mp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Mp(StatsSet params) + public Mp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index 76d858ad8e..b13d7824d0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class MpConsumePerLevel extends AbstractEffect { private final double _power; - public MpConsumePerLevel(StatsSet params) + public MpConsumePerLevel(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java index 2051009805..ae7bf0c48c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpRegen extends AbstractStatEffect { - public MpRegen(StatsSet params) + public MpRegen(StatSet params) { super(params, Stat.REGENERATE_MP_RATE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MpShield.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MpShield.java index 82e307a562..a4eb3e663f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MpShield.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MpShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpShield extends AbstractStatAddEffect { - public MpShield(StatsSet params) + public MpShield(StatSet params) { super(params, Stat.MANA_SHIELD_PERCENT); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java index af2ce119cc..366e96b18f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpVampiricAttack extends AbstractStatAddEffect { - public MpVampiricAttack(StatsSet params) + public MpVampiricAttack(StatSet params) { super(params, Stat.ABSORB_MANA_DAMAGE_PERCENT); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Mute.java index a7f2f76e23..7e5b5a528f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Mute extends AbstractEffect { - public Mute(StatsSet params) + public Mute(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java index 3cc4cae96f..513dc46ec7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class NoblesseBless extends AbstractEffect { - public NoblesseBless(StatsSet params) + public NoblesseBless(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index bb0f02af5c..05f8c6a99b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpenChest extends AbstractEffect { - public OpenChest(StatsSet params) + public OpenChest(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 15cd9c2a64..de0414fd23 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.RecipeController; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpenCommonRecipeBook extends AbstractEffect { - public OpenCommonRecipeBook(StatsSet params) + public OpenCommonRecipeBook(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 21dd337982..7b5effc6b4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class OpenDoor extends AbstractEffect private final int _chance; private final boolean _isItem; - public OpenDoor(StatsSet params) + public OpenDoor(StatSet params) { _chance = params.getInt("chance", 0); _isItem = params.getBoolean("isItem", false); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index b99a8f9757..3526fa5fdc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.RecipeController; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpenDwarfRecipeBook extends AbstractEffect { - public OpenDwarfRecipeBook(StatsSet params) + public OpenDwarfRecipeBook(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PAtk.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PAtk.java index c353d03a00..7f10b9dcc7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PAtk.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PAtk.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PAtk extends AbstractConditionalHpEffect { - public PAtk(StatsSet params) + public PAtk(StatSet params) { super(params, Stat.PHYSICAL_ATTACK); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Passive.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Passive.java index cef680ca21..27ce15bb60 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Passive.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Passive.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Passive extends AbstractEffect { - public Passive(StatsSet params) + public Passive(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java index 05f55c7dac..1a9f29424f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAbnormalResist extends AbstractStatAddEffect { - public PhysicalAbnormalResist(StatsSet params) + public PhysicalAbnormalResist(StatSet params) { super(params, Stat.ABNORMAL_RESIST_PHYSICAL); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 098770705b..7e5fb14465 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -52,7 +52,7 @@ public class PhysicalAttack extends AbstractEffect private final Set _abnormals; private final double _abnormalPowerMod; - public PhysicalAttack(StatsSet params) + public PhysicalAttack(StatSet params) { _power = params.getDouble("power", 0); _pAtkMod = params.getDouble("pAtkMod", 1.0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index d325c3d5ed..f191867614 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -38,7 +38,7 @@ public class PhysicalAttackHpLink extends AbstractEffect private final double _criticalChance; private final boolean _overHit; - public PhysicalAttackHpLink(StatsSet params) + public PhysicalAttackHpLink(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index dc575c2c75..fe087a1bcc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class PhysicalAttackMute extends AbstractEffect { - public PhysicalAttackMute(StatsSet params) + public PhysicalAttackMute(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java index 112b41eb36..2093d45264 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAttackRange extends AbstractStatEffect { - public PhysicalAttackRange(StatsSet params) + public PhysicalAttackRange(StatSet params) { super(params, Stat.PHYSICAL_ATTACK_RANGE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index d3c2dcfaf2..5d66bd4c87 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ public class PhysicalAttackSaveHp extends AbstractEffect private final boolean _overHit; private final double _saveHp; - public PhysicalAttackSaveHp(StatsSet params) + public PhysicalAttackSaveHp(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java index 167b859572..cdf34eb6f6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAttackSpeed extends AbstractStatEffect { - public PhysicalAttackSpeed(StatsSet params) + public PhysicalAttackSpeed(StatSet params) { super(params, Stat.PHYSICAL_ATTACK_SPEED); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 61bed5561b..a1a6818a00 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class PhysicalAttackWeaponBonus extends AbstractEffect private final Map _weaponBonus = new EnumMap<>(WeaponType.class); - public PhysicalAttackWeaponBonus(StatsSet params) + public PhysicalAttackWeaponBonus(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java index fa3925e725..078c3673b9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalDefence extends AbstractConditionalHpEffect { - public PhysicalDefence(StatsSet params) + public PhysicalDefence(StatSet params) { super(params, Stat.PHYSICAL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java index 812c641ac8..9714220e1b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalEvasion extends AbstractConditionalHpEffect { - public PhysicalEvasion(StatsSet params) + public PhysicalEvasion(StatSet params) { super(params, Stat.EVASION_RATE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index b337fed6cb..fe7cf853c8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class PhysicalMute extends AbstractEffect { - public PhysicalMute(StatsSet params) + public PhysicalMute(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java index 0fd835f4e3..1b843dda3d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class PhysicalShieldAngleAll extends AbstractEffect { - public PhysicalShieldAngleAll(StatsSet params) + public PhysicalShieldAngleAll(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java index 9d3f051659..507eb57326 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalSkillPower extends AbstractStatEffect { - public PhysicalSkillPower(StatsSet params) + public PhysicalSkillPower(StatSet params) { super(params, Stat.PHYSICAL_SKILL_POWER, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index a958116ff7..9ceccea4cc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -42,7 +42,7 @@ public class PhysicalSoulAttack extends AbstractEffect private final boolean _ignoreShieldDefence; private final boolean _overHit; - public PhysicalSoulAttack(StatsSet params) + public PhysicalSoulAttack(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index e95e09ab90..fd2b23a2ae 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class PkCount extends AbstractEffect { private final int _amount; - public PkCount(StatsSet params) + public PkCount(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index 2d64d05406..b51d6a7961 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class Plunder extends AbstractEffect { - public Plunder(StatsSet params) + public Plunder(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index fd61584af1..3e885274b3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PolearmSingleTarget extends AbstractEffect { - public PolearmSingleTarget(StatsSet params) + public PolearmSingleTarget(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java index 86f2e2cee8..b2fb920379 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class ProtectDeathPenalty extends AbstractEffect { - public ProtectDeathPenalty(StatsSet params) + public ProtectDeathPenalty(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java index 890b8980bd..6664b36bae 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ProtectionBlessing extends AbstractEffect { - public ProtectionBlessing(StatsSet params) + public ProtectionBlessing(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index 6de78c2c82..62c480716d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class PullBack extends AbstractEffect private final int _animationSpeed; private final FlyType _type; - public PullBack(StatsSet params) + public PullBack(StatSet params) { _speed = params.getInt("speed", 0); _delay = params.getInt("delay", _speed); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java index 1019c56778..84a72299f3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveMagicalSkillDamageBonus extends AbstractStatPercentEffect { - public PveMagicalSkillDamageBonus(StatsSet params) + public PveMagicalSkillDamageBonus(StatSet params) { super(params, Stat.PVE_MAGICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java index 8da698c746..70870aa45c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveMagicalSkillDefenceBonus(StatsSet params) + public PveMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java index c7a82d4ded..8f60ea025c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalAttackDamageBonus extends AbstractStatPercentEffect { - public PvePhysicalAttackDamageBonus(StatsSet params) + public PvePhysicalAttackDamageBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_ATTACK_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java index 0717fe525b..ea01a4e1d8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PvePhysicalAttackDefenceBonus(StatsSet params) + public PvePhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java index 878f942877..1e8b9e76c4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvePhysicalSkillDamageBonus(StatsSet params) + public PvePhysicalSkillDamageBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java index bdfa0dcc67..b1dbb0b217 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvePhysicalSkillDefenceBonus(StatsSet params) + public PvePhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java index 94fdc26015..fbe3119ba8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveRaidMagicalSkillDefenceBonus(StatsSet params) + public PveRaidMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java index f54d849752..83352e1b2f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidPhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PveRaidPhysicalAttackDefenceBonus(StatsSet params) + public PveRaidPhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java index 0a344f96de..be05bec159 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidPhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveRaidPhysicalSkillDefenceBonus(StatsSet params) + public PveRaidPhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java index 542c019420..2f0153189a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpMagicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvpMagicalSkillDamageBonus(StatsSet params) + public PvpMagicalSkillDamageBonus(StatSet params) { super(params, Stat.PVP_MAGICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java index bb006280fc..41ad3b7749 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvpMagicalSkillDefenceBonus(StatsSet params) + public PvpMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVP_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java index 483d7b02e4..23488ea000 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalAttackDamageBonus extends AbstractStatPercentEffect { - public PvpPhysicalAttackDamageBonus(StatsSet params) + public PvpPhysicalAttackDamageBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_ATTACK_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java index 40c3a22ea2..ff942b3d4d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PvpPhysicalAttackDefenceBonus(StatsSet params) + public PvpPhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java index 225c7c1e39..19a7c96003 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvpPhysicalSkillDamageBonus(StatsSet params) + public PvpPhysicalSkillDamageBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java index ea2d1fa126..211d14c5e3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvpPhysicalSkillDefenceBonus(StatsSet params) + public PvpPhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 8a01583374..e500b487af 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -36,7 +36,7 @@ public class RandomizeHate extends AbstractEffect { private final int _chance; - public RandomizeHate(StatsSet params) + public RandomizeHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index 1fdf1296cc..452588fb12 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class RealDamage extends AbstractEffect { private final double _power; - public RealDamage(StatsSet params) + public RealDamage(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java index 4372c15bcf..86738fae0f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class RearDamage extends AbstractStatPercentEffect { - public RearDamage(StatsSet params) + public RearDamage(StatSet params) { super(params, Stat.REAR_DAMAGE_RATE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 31c7a4e4b3..82ed18faa1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RebalanceHP extends AbstractEffect { - public RebalanceHP(StatsSet params) + public RebalanceHP(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index 09d307be02..979809b533 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RebalanceHPSummon extends AbstractEffect { - public RebalanceHPSummon(StatsSet params) + public RebalanceHPSummon(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 7599b691ac..e76328929a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class RecoverVitalityInPeaceZone extends AbstractEffect private final double _amount; private final int _ticks; - public RecoverVitalityInPeaceZone(StatsSet params) + public RecoverVitalityInPeaceZone(StatSet params) { _amount = params.getDouble("amount", 0); _ticks = params.getInt("ticks", 10); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java index 824044ae21..e52b5abafb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ReduceCancel extends AbstractStatEffect { - public ReduceCancel(StatsSet params) + public ReduceCancel(StatSet params) { super(params, Stat.ATTACK_CANCEL); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index ecc7a10d31..be9188f3b0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -33,7 +33,7 @@ public class ReduceDamage extends AbstractEffect { private final double _amount; - public ReduceDamage(StatsSet params) + public ReduceDamage(StatSet params) { _amount = params.getDouble("amount"); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java index 8534a94fc6..7b8862f608 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ReduceDropType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -32,7 +32,7 @@ public class ReduceDropPenalty extends AbstractEffect private final double _deathPenalty; private final ReduceDropType _type; - public ReduceDropPenalty(StatsSet params) + public ReduceDropPenalty(StatSet params) { _exp = params.getDouble("exp", 0); _deathPenalty = params.getDouble("deathPenalty", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java index c15f7301b9..6436b488e0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ReflectMagic extends AbstractStatAddEffect { - public ReflectMagic(StatsSet params) + public ReflectMagic(StatSet params) { super(params, Stat.VENGEANCE_SKILL_MAGIC_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java index bf1d555351..583191fd4c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.BasicProperty; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ReflectSkill extends AbstractEffect private final Stat _stat; private final double _amount; - public ReflectSkill(StatsSet params) + public ReflectSkill(StatSet params) { _stat = params.getEnum("type", BasicProperty.class, BasicProperty.PHYSICAL) == BasicProperty.PHYSICAL ? Stat.REFLECT_SKILL_PHYSIC : Stat.REFLECT_SKILL_MAGIC; _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index e850ea6be9..77b96e4205 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class RefuelAirship extends AbstractEffect { private final int _value; - public RefuelAirship(StatsSet params) + public RefuelAirship(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Relax.java index c8c61fe47e..e2ba4420db 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ public class Relax extends AbstractEffect { private final double _power; - public Relax(StatsSet params) + public Relax(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 9678dc1174..0613c17234 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class ResetInstanceEntry extends AbstractEffect { private final Set _instanceId; - public ResetInstanceEntry(StatsSet params) + public ResetInstanceEntry(StatSet params) { final String instanceIds = params.getString("instanceId", null); if ((instanceIds != null) && !instanceIds.isEmpty()) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java index 940c731208..f15ff56189 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ResistAbnormalByCategory extends AbstractEffect private final DispelSlotType _slot; private final double _amount; - public ResistAbnormalByCategory(StatsSet params) + public ResistAbnormalByCategory(StatSet params) { _amount = params.getDouble("amount", 0); _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.DEBUFF); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java index dae38e5246..2e29b5cc8e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ResistDDMagic extends AbstractStatPercentEffect { - public ResistDDMagic(StatsSet params) + public ResistDDMagic(StatSet params) { super(params, Stat.MAGIC_SUCCESS_RES); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java index af2b203aad..d08fcb262a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ResistDispelByCategory extends AbstractEffect private final DispelSlotType _slot; private final double _amount; - public ResistDispelByCategory(StatsSet params) + public ResistDispelByCategory(StatSet params) { _amount = params.getDouble("amount", 0); _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index af1e40bea8..cd03f1a74a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -34,7 +34,7 @@ public class ResistSkill extends AbstractEffect { private final List _skills = new ArrayList<>(); - public ResistSkill(StatsSet params) + public ResistSkill(StatSet params) { for (int i = 1;; i++) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index feb5885fb0..6f887a07cf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class Restoration extends AbstractEffect private final int _itemCount; private final int _itemEnchantmentLevel; - public Restoration(StatsSet params) + public Restoration(StatSet params) { _itemId = params.getInt("itemId", 0); _itemCount = params.getInt("itemCount", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 37cd974643..0baf0aaae6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -25,7 +25,7 @@ import java.util.Map.Entry; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.ExtractableProductItem; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,12 +47,12 @@ public class RestorationRandom extends AbstractEffect { private final List _products = new ArrayList<>(); - public RestorationRandom(StatsSet params) + public RestorationRandom(StatSet params) { - for (StatsSet group : params.getList("items", StatsSet.class)) + for (StatSet group : params.getList("items", StatSet.class)) { final List items = new ArrayList<>(); - for (StatsSet item : group.getList(".", StatsSet.class)) + for (StatSet item : group.getList(".", StatSet.class)) { items.add(new RestorationItemHolder(item.getInt(".id"), item.getInt(".count"), item.getInt(".minEnchant", 0), item.getInt(".maxEnchant", 0))); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index f9c10b7ff2..9b287dd419 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class Resurrection extends AbstractEffect { private final int _power; - public Resurrection(StatsSet params) + public Resurrection(StatSet params) { _power = params.getInt("power", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 18d8bdb0bd..6ef063ce91 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -39,7 +39,7 @@ public class ResurrectionSpecial extends AbstractEffect private final int _power; private final Set _instanceId; - public ResurrectionSpecial(StatsSet params) + public ResurrectionSpecial(StatSet params) { _power = params.getInt("power", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index e4d66b43d3..0e7391681b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class Reuse extends AbstractEffect private final int _magicType; private final double _amount; - public Reuse(StatsSet params) + public Reuse(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index 3716fc1922..e17cd7cc25 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ReuseSkillById extends AbstractEffect { private final int _skillId; - public ReuseSkillById(StatsSet params) + public ReuseSkillById(StatSet params) { _skillId = params.getInt("skillId", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Root.java index 1ca3492949..b6876e8e13 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Root extends AbstractEffect { - public Root(StatsSet params) + public Root(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index 66fc8d82c8..4c7ee53239 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class SacrificeSummon extends AbstractEffect { - public SacrificeSummon(StatsSet params) + public SacrificeSummon(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java index d00856c9bd..683f45bb55 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SafeFallHeight extends AbstractStatEffect { - public SafeFallHeight(StatsSet params) + public SafeFallHeight(StatSet params) { super(params, Stat.FALL); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 7f6bf69ee3..797aa95263 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -33,7 +33,7 @@ public class SendSystemMessageToClan extends AbstractEffect { private final SystemMessage _message; - public SendSystemMessageToClan(StatsSet params) + public SendSystemMessageToClan(StatSet params) { final int id = params.getInt("id", 0); _message = new SystemMessage(id); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java index 7acbf846df..a0508d73b1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class ServitorShare extends AbstractEffect { private final Map _sharedStats = new EnumMap<>(Stat.class); - public ServitorShare(StatsSet params) + public ServitorShare(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 01dfd87c71..6e8187feae 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SetHp extends AbstractEffect private final double _amount; private final StatModifierType _mode; - public SetHp(StatsSet params) + public SetHp(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index 805d18160b..fae21baa51 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SetSkill extends AbstractEffect private final int _skillId; private final int _skillLvl; - public SetSkill(StatsSet params) + public SetSkill(StatSet params) { _skillId = params.getInt("skillId", 0); _skillLvl = params.getInt("skillLvl", 1); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java index a93bb5f253..354cb42b55 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ShieldDefence extends AbstractStatEffect { - public ShieldDefence(StatsSet params) + public ShieldDefence(StatSet params) { super(params, Stat.SHIELD_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java index f28d0e4ad2..1fdee75f69 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ShieldDefenceRate extends AbstractStatEffect { - public ShieldDefenceRate(StatsSet params) + public ShieldDefenceRate(StatSet params) { super(params, Stat.SHIELD_DEFENCE_RATE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java index 1d649082dc..533b631f10 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class SilentMove extends AbstractEffect { - public SilentMove(StatsSet params) + public SilentMove(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java index 89dad85514..7c929a7fe8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class SkillCritical extends AbstractEffect { private final BaseStat _stat; - public SkillCritical(StatsSet params) + public SkillCritical(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java index 369bef11f5..8f054f973b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillCriticalDamage extends AbstractStatEffect { - public SkillCriticalDamage(StatsSet params) + public SkillCriticalDamage(StatSet params) { super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java index c91f2d6b49..88ecf69e77 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillCriticalProbability extends AbstractStatPercentEffect { - public SkillCriticalProbability(StatsSet params) + public SkillCriticalProbability(StatSet params) { super(params, Stat.SKILL_CRITICAL_PROBABILITY); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 7b98a9e180..1664ea1827 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class SkillEvasion extends AbstractEffect private final int _magicType; private final double _amount; - public SkillEvasion(StatsSet params) + public SkillEvasion(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java index 9cc62532b4..2880d0ccef 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillPowerAdd extends AbstractStatAddEffect { - public SkillPowerAdd(StatsSet params) + public SkillPowerAdd(StatSet params) { super(params, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 9578c88f91..7156fff2df 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SkillTurning extends AbstractEffect private final int _chance; private final boolean _staticChance; - public SkillTurning(StatsSet params) + public SkillTurning(StatSet params) { _chance = params.getInt("chance", 100); _staticChance = params.getBoolean("staticChance", false); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 45b02206a4..04691304ed 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SkillTurningOverTime extends AbstractEffect private final int _chance; private final boolean _staticChance; - public SkillTurningOverTime(StatsSet params) + public SkillTurningOverTime(StatSet params) { _chance = params.getInt("chance", 100); _staticChance = params.getBoolean("staticChance", false); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index c1dd92cedb..b919c7acac 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -36,7 +36,7 @@ public class SoulBlow extends AbstractEffect private final double _chanceBoost; private final boolean _overHit; - public SoulBlow(StatsSet params) + public SoulBlow(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 8471aa236c..4f63a84081 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; @@ -40,7 +40,7 @@ public class SoulEating extends AbstractEffect private final int _expNeeded; private final int _maxSouls; - public SoulEating(StatsSet params) + public SoulEating(StatSet params) { _expNeeded = params.getInt("expNeeded"); _maxSouls = params.getInt("maxSouls"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a7d5c2628a..ad261845eb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Seed; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Sow extends AbstractEffect { - public Sow(StatsSet params) + public Sow(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SpModify.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SpModify.java index 24d124ecce..c3bc6193e9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SpModify.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SpModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SpModify extends AbstractStatAddEffect { - public SpModify(StatsSet params) + public SpModify(StatSet params) { super(params, Stat.BONUS_SP); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 0718408ca2..890438d65f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.enums.SpeedType; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -36,7 +36,7 @@ public class Speed extends AbstractEffect private final StatModifierType _mode; private List _speedType; - public Speed(StatsSet params) + public Speed(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index 91b91ad05e..db247775f3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SphericBarrier extends AbstractStatAddEffect { - public SphericBarrier(StatsSet params) + public SphericBarrier(StatSet params) { super(params, Stat.SPHERIC_BARRIER_RANGE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SpiritExpModify.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SpiritExpModify.java index 26e45409e4..d22f6f40b7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SpiritExpModify.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SpiritExpModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SpiritExpModify extends AbstractStatEffect { - public SpiritExpModify(StatsSet params) + public SpiritExpModify(StatSet params) { super(params, Stat.ELEMENTAL_SPIRIT_BONUS_EXP); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index d13eaf1c2e..385240377f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class Spoil extends AbstractEffect { - public Spoil(StatsSet params) + public Spoil(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index b63c24dc20..22c4132b63 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -36,7 +36,7 @@ public class StatBonusSkillCritical extends AbstractEffect private final BaseStat _stat; private final Condition _armorTypeCondition; - public StatBonusSkillCritical(StatsSet params) + public StatBonusSkillCritical(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.DEX); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index 41a20bfafe..49280eb774 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -36,7 +36,7 @@ public class StatBonusSpeed extends AbstractEffect private final BaseStat _stat; private final Condition _armorTypeCondition; - public StatBonusSpeed(StatsSet params) + public StatBonusSpeed(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.DEX); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index a007b118b2..bcf691e360 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class StatByMoveType extends AbstractEffect private final MoveType _type; private final double _value; - public StatByMoveType(StatsSet params) + public StatByMoveType(StatSet params) { _stat = params.getEnum("stat", Stat.class); _type = params.getEnum("type", MoveType.class); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StatUp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StatUp.java index b961ec8484..7abb1367af 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StatUp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StatUp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class StatUp extends AbstractEffect private final BaseStat _stat; private final double _amount; - public StatUp(StatsSet params) + public StatUp(StatSet params) { _amount = params.getDouble("amount", 0); _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index 0720057c19..23239887a7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.List; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -39,7 +39,7 @@ public class StealAbnormal extends AbstractEffect private final int _rate; private final int _max; - public StealAbnormal(StatsSet params) + public StealAbnormal(StatSet params) { _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); _rate = params.getInt("rate", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Summon.java index cd7bfabef8..62daa5ffdf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.ServitorInstance; @@ -43,7 +43,7 @@ public class Summon extends AbstractEffect private final int _lifeTime; private final int _consumeItemInterval; - public Summon(StatsSet params) + public Summon(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index 8929e1f2b0..50c025e572 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class SummonAgathion extends AbstractEffect { private final int _npcId; - public SummonAgathion(StatsSet params) + public SummonAgathion(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index 7716d58f16..49b816f272 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.CubicData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; @@ -42,7 +42,7 @@ public class SummonCubic extends AbstractEffect private final int _cubicId; private final int _cubicLvl; - public SummonCubic(StatsSet params) + public SummonCubic(StatSet params) { _cubicId = params.getInt("cubicId", -1); _cubicLvl = params.getInt("cubicLvl", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index d0a2a82738..13d5a2eac7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoppelgangerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ public class SummonHallucination extends AbstractEffect private final int _npcId; private final int _npcCount; - public SummonHallucination(StatsSet params) + public SummonHallucination(StatSet params) { _despawnDelay = params.getInt("despawnDelay", 20000); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index bcd050e084..d61a6e5c02 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.ServitorInstance; @@ -43,7 +43,7 @@ public class SummonMulti extends AbstractEffect private final int _consumeItemInterval; private final int _summonPoints; - public SummonMulti(StatsSet params) + public SummonMulti(StatSet params) { _npcId = params.getInt("npcId"); _expMultiplier = params.getFloat("expMultiplier", 1); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index 6f4090eef0..eaff214b7c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DecoyInstance; @@ -48,7 +48,7 @@ public class SummonNpc extends AbstractEffect private final boolean _isSummonSpawn; private final boolean _singleInstance; // Only one instance of this NPC is allowed. - public SummonNpc(StatsSet params) + public SummonNpc(StatSet params) { _despawnDelay = params.getInt("despawnDelay", 20000); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 5ef621819e..534a41ee16 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.data.xml.impl.PetDataTable; import org.l2jmobius.gameserver.model.PetData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PetItemList; */ public class SummonPet extends AbstractEffect { - public SummonPet(StatsSet params) + public SummonPet(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java index 7dd690587c..b1d5ec38cb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SummonPoints extends AbstractStatAddEffect { - public SummonPoints(StatsSet params) + public SummonPoints(StatSet params) { super(params, Stat.MAX_SUMMON_POINTS); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index d8a47b670f..ac1ddaa16a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; @@ -35,7 +35,7 @@ public class SummonTrap extends AbstractEffect private final int _despawnTime; private final int _npcId; - public SummonTrap(StatsSet params) + public SummonTrap(StatSet params) { _despawnTime = params.getInt("despawnTime", 0); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 84f6d070a8..3196bb949d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Collection; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Sweeper extends AbstractEffect { - public Sweeper(StatsSet params) + public Sweeper(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 559dfc6437..ec29554f2d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ public class Synergy extends AbstractEffect private final int _skillLevelScaleTo; private final int _minSlot; - public Synergy(StatsSet params) + public Synergy(StatSet params) { final String requiredSlots = params.getString("requiredSlots", null); if ((requiredSlots != null) && !requiredSlots.isEmpty()) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index e35516fef5..39ed981bbf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Castle; @@ -33,7 +33,7 @@ public class TakeCastle extends AbstractEffect { private final CastleSide _side; - public TakeCastle(StatsSet params) + public TakeCastle(StatSet params) { _side = params.getEnum("side", CastleSide.class); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 77fd9ec103..3be2bf5593 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Castle; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TakeCastleStart extends AbstractEffect { - public TakeCastleStart(StatsSet params) + public TakeCastleStart(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 70842191a7..18749c1aef 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Fort; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TakeFort extends AbstractEffect { - public TakeFort(StatsSet params) + public TakeFort(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 0eb23f6733..77355f9683 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TakeFortStart extends AbstractEffect { - public TakeFortStart(StatsSet params) + public TakeFortStart(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index cec32755ed..dd8e09278f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class TalismanSlot extends AbstractEffect { private final int _slots; - public TalismanSlot(StatsSet params) + public TalismanSlot(StatSet params) { _slots = params.getInt("slots", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 281b5322fd..32a126f499 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class TargetCancel extends AbstractEffect { private final int _chance; - public TargetCancel(StatsSet params) + public TargetCancel(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index b4463de391..86ff70c9ca 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMe extends AbstractEffect { - public TargetMe(StatsSet params) + public TargetMe(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index 11e581113e..e68a1e1faf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class TargetMeProbability extends AbstractEffect { private final int _chance; - public TargetMeProbability(StatsSet params) + public TargetMeProbability(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 6c30519678..9ca01faf50 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -32,7 +32,7 @@ public class Teleport extends AbstractEffect { private final Location _loc; - public Teleport(StatsSet params) + public Teleport(StatSet params) { _loc = new Location(params.getInt("x", 0), params.getInt("y", 0), params.getInt("z", 0)); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index e0e715818c..bdc53208d5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -38,7 +38,7 @@ public class TeleportToNpc extends AbstractEffect private final int _npcId; private final boolean _party; - public TeleportToNpc(StatsSet params) + public TeleportToNpc(StatSet params) { _npcId = params.getInt("npcId"); _party = params.getBoolean("party", false); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index c84c559322..4f4275fd41 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TeleportToPlayer extends AbstractEffect { - public TeleportToPlayer(StatsSet params) + public TeleportToPlayer(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index 1c9af0f535..b2d6b663de 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class TeleportToSummon extends AbstractEffect { private final double _maxDistance; - public TeleportToSummon(StatsSet params) + public TeleportToSummon(StatSet params) { _maxDistance = params.getDouble("distance", -1); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index e550302b02..c4bf787a10 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class TeleportToTarget extends AbstractEffect { - public TeleportToTarget(StatsSet params) + public TeleportToTarget(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index ba1c55c615..ff63eea817 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class TransferDamageToPlayer extends AbstractStatAddEffect { - public TransferDamageToPlayer(StatsSet params) + public TransferDamageToPlayer(StatSet params) { super(params, Stat.TRANSFER_DAMAGE_TO_PLAYER); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java index b084bfc1cb..c87d5f0554 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class TransferDamageToSummon extends AbstractStatAddEffect { - public TransferDamageToSummon(StatsSet params) + public TransferDamageToSummon(StatSet params) { super(params, Stat.TRANSFER_DAMAGE_SUMMON_PERCENT); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index e9f0292113..48bc5e3a1c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -34,7 +34,7 @@ public class TransferHate extends AbstractEffect { private final int _chance; - public TransferHate(StatsSet params) + public TransferHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 2ddf95a4db..bf593eaed8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Transformation extends AbstractEffect { private final List _id; - public Transformation(StatsSet params) + public Transformation(StatSet params) { final String ids = params.getString("transformationId", null); if ((ids != null) && !ids.isEmpty()) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 103ccdf8ce..2b4af0a1d3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class TrapDetect extends AbstractEffect { private final int _power; - public TrapDetect(StatsSet params) + public TrapDetect(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index eb7b073b36..c4a6c6aed9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.TrapAction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class TrapRemove extends AbstractEffect { private final int _power; - public TrapRemove(StatsSet params) + public TrapRemove(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 6df3874ab1..8fb87050b1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -59,7 +59,7 @@ public class TriggerSkillByAttack extends AbstractEffect * @param params */ - public TriggerSkillByAttack(StatsSet params) + public TriggerSkillByAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index ae6a3bc89f..78366b8047 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillByAvoid extends AbstractEffect /** * @param params */ - public TriggerSkillByAvoid(StatsSet params) + public TriggerSkillByAvoid(StatSet params) { _chance = params.getInt("chance", 100); _skill = new SkillHolder(params.getInt("skillId", 0), params.getInt("skillLevel", 0)); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index c24fb95246..9fe53c0622 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -48,7 +48,7 @@ public class TriggerSkillByDamage extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillByDamage(StatsSet params) + public TriggerSkillByDamage(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c086507336..8b84350293 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillByDeathBlow extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillByDeathBlow(StatsSet params) + public TriggerSkillByDeathBlow(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index a9bfcc320c..11802645f2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -37,7 +37,7 @@ public class TriggerSkillByKill extends AbstractEffect private final int _chance; private final SkillHolder _skill; - public TriggerSkillByKill(StatsSet params) + public TriggerSkillByKill(StatSet params) { _chance = params.getInt("chance", 100); _skill = new SkillHolder(params.getInt("skillId", 0), params.getInt("skillLevel", 0)); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 2893d46f33..7f2d3f9fa7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -52,7 +52,7 @@ public class TriggerSkillByMagicType extends AbstractEffect * @param params */ - public TriggerSkillByMagicType(StatsSet params) + public TriggerSkillByMagicType(StatSet params) { _chance = params.getInt("chance", 100); _magicTypes = params.getIntArray("magicTypes", ";"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 1524e3d4f4..b77da803f5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillBySkill extends AbstractEffect private final int _skillLevelScaleTo; private final TargetType _targetType; - public TriggerSkillBySkill(StatsSet params) + public TriggerSkillBySkill(StatSet params) { _castSkillId = params.getInt("castSkillId"); _chance = params.getInt("chance", 100); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index ec2124c44e..7bb68baec9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -53,7 +53,7 @@ public class TriggerSkillBySkillAttack extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillBySkillAttack(StatsSet params) + public TriggerSkillBySkillAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 3f58619f0a..c209decfb3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -69,7 +69,7 @@ public class TwoHandedBluntBonus extends AbstractEffect private final double _speedAmount; private final StatModifierType _speedMode; - public TwoHandedBluntBonus(StatsSet params) + public TwoHandedBluntBonus(StatSet params) { _pAtkAmount = params.getDouble("pAtkAmount", 0); _pAtkMode = params.getEnum("pAtkMode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index b2c50c4b88..344456a925 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -69,7 +69,7 @@ public class TwoHandedSwordBonus extends AbstractEffect private final double _speedAmount; private final StatModifierType _speedMode; - public TwoHandedSwordBonus(StatsSet params) + public TwoHandedSwordBonus(StatSet params) { _pAtkAmount = params.getDouble("pAtkAmount", 0); _pAtkMode = params.getEnum("pAtkMode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 01ae8122ec..20b418c29b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ public class Unsummon extends AbstractEffect { private final int _chance; - public Unsummon(StatsSet params) + public Unsummon(StatSet params) { _chance = params.getInt("chance", -1); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 57eb89196d..f73f0f57f0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; */ public class UnsummonAgathion extends AbstractEffect { - public UnsummonAgathion(StatsSet params) + public UnsummonAgathion(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index a4fdc2c0aa..0779d018cc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class UnsummonServitors extends AbstractEffect { - public UnsummonServitors(StatsSet params) + public UnsummonServitors(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index dbb0c700b5..ac33fcba0d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Untargetable extends AbstractEffect { - public Untargetable(StatsSet params) + public Untargetable(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java index ac6cae3d05..1c85196fe0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class VampiricAttack extends AbstractEffect private final double _amount; private final double _sum; - public VampiricAttack(StatsSet params) + public VampiricAttack(StatSet params) { _amount = params.getDouble("amount"); _sum = _amount * params.getDouble("chance"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java index ab724714e1..571ca55bbe 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ public class VampiricDefence extends AbstractEffect { private final int _amount; - public VampiricDefence(StatsSet params) + public VampiricDefence(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java index f8b9d76f3a..caaa8d02b4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class VitalityExpRate extends AbstractStatPercentEffect { - public VitalityExpRate(StatsSet params) + public VitalityExpRate(StatSet params) { super(params, Stat.VITALITY_EXP_RATE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index cba2b14c35..385595e03d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class VitalityPointUp extends AbstractEffect { private final int _value; - public VitalityPointUp(StatsSet params) + public VitalityPointUp(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java index 86612955dd..72f78ec177 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class VitalityPointsRate extends AbstractStatPercentEffect { - public VitalityPointsRate(StatsSet params) + public VitalityPointsRate(StatSet params) { super(params, Stat.VITALITY_CONSUME_RATE); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java index 09500b3823..bf20bd5018 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WeightLimit extends AbstractStatEffect { - public WeightLimit(StatsSet params) + public WeightLimit(StatSet params) { super(params, Stat.WEIGHT_LIMIT); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java index f9be68f493..6020399f85 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WeightPenalty extends AbstractStatAddEffect { - public WeightPenalty(StatsSet params) + public WeightPenalty(StatSet params) { super(params, Stat.WEIGHT_PENALTY); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java index bdf9aca48d..81eb9a9688 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WorldChatPoints extends AbstractStatEffect { - public WorldChatPoints(StatsSet params) + public WorldChatPoints(StatSet params) { super(params, Stat.WORLD_CHAT_POINTS); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java index 5a3842921d..127dadf9d2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class BuildAdvanceBaseSkillCondition implements ISkillCondition { - public BuildAdvanceBaseSkillCondition(StatsSet params) + public BuildAdvanceBaseSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java index 9328638400..b479302f61 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class BuildCampSkillCondition implements ISkillCondition { - public BuildCampSkillCondition(StatsSet params) + public BuildCampSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java index c1220c828a..aca51bafbf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanAddMaxEntranceInzoneSkillCondition implements ISkillCondition { - public CanAddMaxEntranceInzoneSkillCondition(StatsSet params) + public CanAddMaxEntranceInzoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java index eddd45771c..6ac3c2e199 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ public class CanBookmarkAddSlotSkillCondition implements ISkillCondition { private final int _teleportBookmarkSlots; - public CanBookmarkAddSlotSkillCondition(StatsSet params) + public CanBookmarkAddSlotSkillCondition(StatSet params) { _teleportBookmarkSlots = params.getInt("teleportBookmarkSlots"); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java index 30fdb7f36f..ee1bf96e69 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanChangeVitalItemCountSkillCondition implements ISkillCondition { - public CanChangeVitalItemCountSkillCondition(StatsSet params) + public CanChangeVitalItemCountSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java index da553a6d9f..48e28e7af7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanEnchantAttributeSkillCondition implements ISkillCondition { - public CanEnchantAttributeSkillCondition(StatsSet params) + public CanEnchantAttributeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java index c14f1ffe64..2908994776 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanMountForEventSkillCondition implements ISkillCondition { - public CanMountForEventSkillCondition(StatsSet params) + public CanMountForEventSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java index d07aa9a622..9dc5f99592 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShipInstance; @@ -31,7 +31,7 @@ public class CanRefuelAirshipSkillCondition implements ISkillCondition { private final int _amount; - public CanRefuelAirshipSkillCondition(StatsSet params) + public CanRefuelAirshipSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java index d451f3c997..67206b47bd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanRestoreVitalPointSkillCondition implements ISkillCondition { - public CanRestoreVitalPointSkillCondition(StatsSet params) + public CanRestoreVitalPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java index 7e519025b0..49232af88f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CanSummonCubicSkillCondition implements ISkillCondition { - public CanSummonCubicSkillCondition(StatsSet params) + public CanSummonCubicSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java index 8b550d164c..33541e82a8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class CanSummonMultiSkillCondition implements ISkillCondition { private final int _summonPoints; - public CanSummonMultiSkillCondition(StatsSet params) + public CanSummonMultiSkillCondition(StatSet params) { _summonPoints = params.getInt("summonPoints"); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java index aa9579e92a..b06ba00f32 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.CharSummonTable; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; */ public class CanSummonPetSkillCondition implements ISkillCondition { - public CanSummonPetSkillCondition(StatsSet params) + public CanSummonPetSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java index ea41a2e22e..3655e158cb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanSummonSiegeGolemSkillCondition implements ISkillCondition { - public CanSummonSiegeGolemSkillCondition(StatsSet params) + public CanSummonSiegeGolemSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java index 460d72a743..e07ce75c8f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanSummonSkillCondition implements ISkillCondition { - public CanSummonSkillCondition(StatsSet params) + public CanSummonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java index 309da529c9..bd8838d02f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanTransformInDominionSkillCondition implements ISkillCondition { - public CanTransformInDominionSkillCondition(StatsSet params) + public CanTransformInDominionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java index 81297944f1..2f4d780cab 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class CanTransformSkillCondition implements ISkillCondition // TODO: What to do with this? // private final int _transformId; - public CanTransformSkillCondition(StatsSet params) + public CanTransformSkillCondition(StatSet params) { // _transformId = params.getInt("transformId"); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java index 800d0375be..771873a553 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanUntransformSkillCondition implements ISkillCondition { - public CanUntransformSkillCondition(StatsSet params) + public CanUntransformSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java index e651b3b1d5..ffe2e4a026 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class CanUseInBattlefieldSkillCondition implements ISkillCondition { - public CanUseInBattlefieldSkillCondition(StatsSet params) + public CanUseInBattlefieldSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java index 5ff751abce..ba030b97a4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanUseInDragonLairSkillCondition implements ISkillCondition { - public CanUseInDragonLairSkillCondition(StatsSet params) + public CanUseInDragonLairSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java index 4d914c28fe..8a0cb18ac7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class CanUseSwoopCannonSkillCondition implements ISkillCondition { - public CanUseSwoopCannonSkillCondition(StatsSet params) + public CanUseSwoopCannonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java index 6a2d832a4c..e9996580fc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanUseVitalityConsumeItemSkillCondition implements ISkillCondition { - public CanUseVitalityConsumeItemSkillCondition(StatsSet params) + public CanUseVitalityConsumeItemSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java index f694956e7e..48dafb46c3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class CannotUseInTransformSkillCondition implements ISkillCondition { private final int _transformId; - public CannotUseInTransformSkillCondition(StatsSet params) + public CannotUseInTransformSkillCondition(StatSet params) { _transformId = params.getInt("transformId", -1); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java index 141c69322f..6591233504 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -32,7 +32,7 @@ public class CheckLevelSkillCondition implements ISkillCondition private final int _maxLevel; private final SkillConditionAffectType _affectType; - public CheckLevelSkillCondition(StatsSet params) + public CheckLevelSkillCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java index 15163a3373..d72f463c4e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class CheckSexSkillCondition implements ISkillCondition { private final boolean _isFemale; - public CheckSexSkillCondition(StatsSet params) + public CheckSexSkillCondition(StatSet params) { _isFemale = params.getBoolean("isFemale"); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java index 8dee11ef9c..12e49c23a7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConsumeBodySkillCondition implements ISkillCondition { - public ConsumeBodySkillCondition(StatsSet params) + public ConsumeBodySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java index c24da9ebcd..ba1b1cdd5f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class EnergySavedSkillCondition implements ISkillCondition { private final int _amount; - public EnergySavedSkillCondition(StatsSet params) + public EnergySavedSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 89d705e991..34f76973f0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -35,7 +35,7 @@ public class EquipArmorSkillCondition implements ISkillCondition { private int _armorTypesMask = 0; - public EquipArmorSkillCondition(StatsSet params) + public EquipArmorSkillCondition(StatSet params) { final List armorTypes = params.getEnumList("armorType", ArmorType.class); if (armorTypes != null) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index e5f22008fa..708b4dd1d4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class EquipShieldSkillCondition implements ISkillCondition { - public EquipShieldSkillCondition(StatsSet params) + public EquipShieldSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 4561945254..f733f81f62 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -33,7 +33,7 @@ public class EquipWeaponSkillCondition implements ISkillCondition { private int _weaponTypesMask = 0; - public EquipWeaponSkillCondition(StatsSet params) + public EquipWeaponSkillCondition(StatSet params) { final List weaponTypes = params.getEnumList("weaponType", WeaponType.class); if (weaponTypes != null) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java index 5f77215218..e36c06fa11 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class NotFearedSkillCondition implements ISkillCondition { - public NotFearedSkillCondition(StatsSet params) + public NotFearedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java index b9096cc1a9..b6e7bcd826 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class NotInUnderwaterSkillCondition implements ISkillCondition { - public NotInUnderwaterSkillCondition(StatsSet params) + public NotInUnderwaterSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index eee6ec73e9..18d8dc8a11 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -35,7 +35,7 @@ public class Op2hWeaponSkillCondition implements ISkillCondition { private final List _weaponTypes = new ArrayList<>(); - public Op2hWeaponSkillCondition(StatsSet params) + public Op2hWeaponSkillCondition(StatSet params) { final List weaponTypes = params.getList("weaponType", String.class); if (weaponTypes != null) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 3b91f36fe4..6223172dbc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; - public OpAffectedBySkillSkillCondition(StatsSet params) + public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java index 2eb561291e..3818df4736 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAgathionEnergySkillCondition implements ISkillCondition { - public OpAgathionEnergySkillCondition(StatsSet params) + public OpAgathionEnergySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java index 76a7ebc5a8..ee2b415021 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.enums.SkillConditionAlignment; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -32,7 +32,7 @@ public class OpAlignmentSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final SkillConditionAlignment _alignment; - public OpAlignmentSkillCondition(StatsSet params) + public OpAlignmentSkillCondition(StatSet params) { _affectType = params.getEnum("affectType", SkillConditionAffectType.class); _alignment = params.getEnum("alignment", SkillConditionAlignment.class); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index 1c83d18f4e..bcc6715bb2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -33,7 +33,7 @@ public class OpBlinkSkillCondition implements ISkillCondition private final int _angle; private final int _range; - public OpBlinkSkillCondition(StatsSet params) + public OpBlinkSkillCondition(StatSet params) { switch (params.getEnum("direction", Position.class)) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java index 5215f86ae6..fde0c7f0f8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpCallPcSkillCondition implements ISkillCondition { - public OpCallPcSkillCondition(StatsSet params) + public OpCallPcSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java index dddafec6f0..1de2a32550 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCanEscapeSkillCondition implements ISkillCondition { - public OpCanEscapeSkillCondition(StatsSet params) + public OpCanEscapeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java index 3f1685a1e0..a87fd8adb6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCanNotUseAirshipSkillCondition implements ISkillCondition { - public OpCanNotUseAirshipSkillCondition(StatsSet params) + public OpCanNotUseAirshipSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java index 8eec19a568..ac7a81c015 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCannotUseTargetWithPrivateStoreSkillCondition implements ISkillCondition { - public OpCannotUseTargetWithPrivateStoreSkillCondition(StatsSet params) + public OpCannotUseTargetWithPrivateStoreSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 91de0adc8c..4030b79d00 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Weapon; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpChangeWeaponSkillCondition implements ISkillCondition { - public OpChangeWeaponSkillCondition(StatsSet params) + public OpChangeWeaponSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java index c2de03de1e..3e304e7d9d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.AbnormalType; @@ -34,7 +34,7 @@ public class OpCheckAbnormalSkillCondition implements ISkillCondition private final boolean _hasAbnormal; private final SkillConditionAffectType _affectType; - public OpCheckAbnormalSkillCondition(StatsSet params) + public OpCheckAbnormalSkillCondition(StatSet params) { _type = params.getEnum("type", AbnormalType.class); _level = params.getInt("level"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java index 65084182b1..c70b58dc50 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCheckAccountTypeSkillCondition implements ISkillCondition { - public OpCheckAccountTypeSkillCondition(StatsSet params) + public OpCheckAccountTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java index 3d4f0a58a0..11eb804274 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpCheckCastRangeSkillCondition implements ISkillCondition { private final int _distance; - public OpCheckCastRangeSkillCondition(StatsSet params) + public OpCheckCastRangeSkillCondition(StatSet params) { _distance = params.getInt("distance"); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java index 7e2e391595..03af1ac63d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.ClassId; @@ -35,7 +35,7 @@ public class OpCheckClassListSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final boolean _isWithin; - public OpCheckClassListSkillCondition(StatsSet params) + public OpCheckClassListSkillCondition(StatSet params) { _classIds = params.getEnumList("classIds", ClassId.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java index 9f779f937a..9702804304 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.ClassId; @@ -33,7 +33,7 @@ public class OpCheckClassSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final boolean _isWithin; - public OpCheckClassSkillCondition(StatsSet params) + public OpCheckClassSkillCondition(StatSet params) { _classId = params.getEnum("classId", ClassId.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java index 3bf6b65dc8..ad997dced7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckCrtEffectSkillCondition implements ISkillCondition { - public OpCheckCrtEffectSkillCondition(StatsSet params) + public OpCheckCrtEffectSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java index 144dc95daa..1d5a3adff9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class OpCheckFlagSkillCondition implements ISkillCondition { - public OpCheckFlagSkillCondition(StatsSet params) + public OpCheckFlagSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java index 75af2ab89a..2e0c07d040 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckOnGoingEventCampaignSkillCondition implements ISkillCondition { - public OpCheckOnGoingEventCampaignSkillCondition(StatsSet params) + public OpCheckOnGoingEventCampaignSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java index c64f7c6722..f11569f43c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckPcbangPointSkillCondition implements ISkillCondition { - public OpCheckPcbangPointSkillCondition(StatsSet params) + public OpCheckPcbangPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java index 252519f7ff..997a4d0fec 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.data.xml.impl.ClanHallData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -35,7 +35,7 @@ public class OpCheckResidenceSkillCondition implements ISkillCondition private final List _residencesId; private final boolean _isWithin; - public OpCheckResidenceSkillCondition(StatsSet params) + public OpCheckResidenceSkillCondition(StatSet params) { _residencesId = params.getList("residencesId", Integer.class); _isWithin = params.getBoolean("isWithin"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java index 6abeed7d35..3a1bcf424c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -34,7 +34,7 @@ public class OpCheckSkillListSkillCondition implements ISkillCondition private final List _skillIds; private final SkillConditionAffectType _affectType; - public OpCheckSkillListSkillCondition(StatsSet params) + public OpCheckSkillListSkillCondition(StatSet params) { _skillIds = params.getList("skillIds", Integer.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java index 984338b2c0..af563d983f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpCheckSkillSkillCondition implements ISkillCondition private final int _skillId; private final SkillConditionAffectType _affectType; - public OpCheckSkillSkillCondition(StatsSet params) + public OpCheckSkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java index ea882c3635..5d85a2dbdb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionCompanionType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpCompanionSkillCondition implements ISkillCondition { private final SkillConditionCompanionType _type; - public OpCompanionSkillCondition(StatsSet params) + public OpCompanionSkillCondition(StatSet params) { _type = params.getEnum("type", SkillConditionCompanionType.class); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java index 069b9d1759..464853c00c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpEnchantRangeSkillCondition implements ISkillCondition { - public OpEnchantRangeSkillCondition(StatsSet params) + public OpEnchantRangeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java index 99f22bb16a..e12f3ae007 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class OpEncumberedSkillCondition implements ISkillCondition private final int _slotsPercent; private final int _weightPercent; - public OpEncumberedSkillCondition(StatsSet params) + public OpEncumberedSkillCondition(StatSet params) { _slotsPercent = params.getInt("slotsPercent"); _weightPercent = params.getInt("weightPercent"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java index 187dfba744..49cf8e2cb8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpEnergyMaxSkillCondition implements ISkillCondition { private final int _amount; - public OpEnergyMaxSkillCondition(StatsSet params) + public OpEnergyMaxSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 75bdf465e0..82eb70b770 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class OpEquipItemSkillCondition implements ISkillCondition private final int _itemId; private final SkillConditionAffectType _affectType; - public OpEquipItemSkillCondition(StatsSet params) + public OpEquipItemSkillCondition(StatSet params) { _itemId = params.getInt("itemId"); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java index 2c4576c2fa..fa6e82082b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ public class OpExistNpcSkillCondition implements ISkillCondition private final int _range; private final boolean _isAround; - public OpExistNpcSkillCondition(StatsSet params) + public OpExistNpcSkillCondition(StatSet params) { _npcIds = params.getList("npcIds", Integer.class); _range = params.getInt("range"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java index 27cc3e90a9..8299b40047 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingCastSkillCondition implements ISkillCondition { - public OpFishingCastSkillCondition(StatsSet params) + public OpFishingCastSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java index 84cc031a24..4b43eb834e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingPumpingSkillCondition implements ISkillCondition { - public OpFishingPumpingSkillCondition(StatsSet params) + public OpFishingPumpingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java index 86aa667bee..a6a400f96f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingReelingSkillCondition implements ISkillCondition { - public OpFishingReelingSkillCondition(StatsSet params) + public OpFishingReelingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java index d22733df7e..50e6dafb82 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpHaveSummonSkillCondition implements ISkillCondition { - public OpHaveSummonSkillCondition(StatsSet params) + public OpHaveSummonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 2e854ca2b8..cceb4e937b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { private final int _npcId; - public OpHaveSummonedNpcSkillCondition(StatsSet params) + public OpHaveSummonedNpcSkillCondition(StatSet params) { _npcId = params.getInt("npcId"); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java index 16932ce531..374a75bfab 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.impl.ClanHallData; import org.l2jmobius.gameserver.enums.ResidenceType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -34,7 +34,7 @@ public class OpHomeSkillCondition implements ISkillCondition { private final ResidenceType _type; - public OpHomeSkillCondition(StatsSet params) + public OpHomeSkillCondition(StatSet params) { _type = params.getEnum("type", ResidenceType.class); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java index 9482a0bf55..62ad48bdcc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpInSiegeTimeSkillCondition implements ISkillCondition { - public OpInSiegeTimeSkillCondition(StatsSet params) + public OpInSiegeTimeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java index 1bffdacd6c..f2fb298398 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -30,7 +30,7 @@ public class OpInstantzoneSkillCondition implements ISkillCondition { private final int _instanceId; - public OpInstantzoneSkillCondition(StatsSet params) + public OpInstantzoneSkillCondition(StatSet params) { _instanceId = params.getInt("instanceId"); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java index 76703cc53b..7418ef9b64 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpMainjobSkillCondition implements ISkillCondition { - public OpMainjobSkillCondition(StatsSet params) + public OpMainjobSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java index d4c9f1f331..3c81369bbb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNeedAgathionSkillCondition implements ISkillCondition { - public OpNeedAgathionSkillCondition(StatsSet params) + public OpNeedAgathionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java index 96f6774f25..e7a477b0ee 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; @@ -34,7 +34,7 @@ public class OpNeedSummonOrPetSkillCondition implements ISkillCondition { private final List _npcIds = new ArrayList<>(); - public OpNeedSummonOrPetSkillCondition(StatsSet params) + public OpNeedSummonOrPetSkillCondition(StatSet params) { final List npcIds = params.getList("npcIds", String.class); if (npcIds != null) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java index 9701002065..ae1edfd719 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotCursedSkillCondition implements ISkillCondition { - public OpNotCursedSkillCondition(StatsSet params) + public OpNotCursedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java index bf909425d8..1de79f388a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpNotInPeacezoneSkillCondition implements ISkillCondition { - public OpNotInPeacezoneSkillCondition(StatsSet params) + public OpNotInPeacezoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java index 0752ba4a6a..0d3e4cb4dd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotInstantzoneSkillCondition implements ISkillCondition { - public OpNotInstantzoneSkillCondition(StatsSet params) + public OpNotInstantzoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java index 45891cd0ac..7ea02159ba 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotOlympiadSkillCondition implements ISkillCondition { - public OpNotOlympiadSkillCondition(StatsSet params) + public OpNotOlympiadSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java index 5c5d293ae8..2397a68e99 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpNotTerritorySkillCondition implements ISkillCondition { - public OpNotTerritorySkillCondition(StatsSet params) + public OpNotTerritorySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java index 874872bb2e..d9f8c1fa3b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpPeacezoneSkillCondition implements ISkillCondition { - public OpPeacezoneSkillCondition(StatsSet params) + public OpPeacezoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java index c20c4665bb..08d6bb095a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpPkcountSkillCondition implements ISkillCondition { private final SkillConditionAffectType _affectType; - public OpPkcountSkillCondition(StatsSet params) + public OpPkcountSkillCondition(StatSet params) { _affectType = params.getEnum("affectType", SkillConditionAffectType.class); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java index 879fc88c4c..d393c5ddc3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -30,7 +30,7 @@ public class OpPledgeSkillCondition implements ISkillCondition { private final int _level; - public OpPledgeSkillCondition(StatsSet params) + public OpPledgeSkillCondition(StatSet params) { _level = params.getInt("level"); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java index 9adc89b98d..adf16f8feb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpRestartPointSkillCondition implements ISkillCondition { - public OpRestartPointSkillCondition(StatsSet params) + public OpRestartPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java index bbd1d9d7d1..6874091ba2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class OpResurrectionSkillCondition implements ISkillCondition { - public OpResurrectionSkillCondition(StatsSet params) + public OpResurrectionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java index 8bbf796ad2..566f935a50 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpSiegeHammerSkillCondition implements ISkillCondition { - public OpSiegeHammerSkillCondition(StatsSet params) + public OpSiegeHammerSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java index be3ad18e05..cbfc1a25b2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition private final int _skillId; private final boolean _hasLearned; - public OpSkillAcquireSkillCondition(StatsSet params) + public OpSkillAcquireSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _hasLearned = params.getBoolean("hasLearned"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java index c8789d28e4..a8382b83b3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpSkillSkillCondition implements ISkillCondition private final int _skillLevel; private final boolean _hasLearned; - public OpSkillSkillCondition(StatsSet params) + public OpSkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _skillLevel = params.getInt("skillLevel"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java index 5127071683..a3d188f3eb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpSocialClassSkillCondition implements ISkillCondition { private final int _socialClass; - public OpSocialClassSkillCondition(StatsSet params) + public OpSocialClassSkillCondition(StatSet params) { _socialClass = params.getInt("socialClass"); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java index b9d37d18c0..c86984a218 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class OpSoulMaxSkillCondition implements ISkillCondition { - public OpSoulMaxSkillCondition(StatsSet params) + public OpSoulMaxSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java index 4780c13a58..0faa676bbe 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpSubjobSkillCondition implements ISkillCondition { - public OpSubjobSkillCondition(StatsSet params) + public OpSubjobSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java index 17a9a1a9e3..a14192847a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.concurrent.atomic.AtomicBoolean; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpSweeperSkillCondition implements ISkillCondition { - public OpSweeperSkillCondition(StatsSet params) + public OpSweeperSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java index b36585bf00..c4b3923e92 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTargetAllItemTypeSkillCondition implements ISkillCondition { - public OpTargetAllItemTypeSkillCondition(StatsSet params) + public OpTargetAllItemTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 6b85389d62..5492e96e1a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTargetArmorTypeSkillCondition implements ISkillCondition { - public OpTargetArmorTypeSkillCondition(StatsSet params) + public OpTargetArmorTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java index 0c0090fbc4..97e07a1822 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpTargetDoorSkillCondition implements ISkillCondition { private final List _doorIds; - public OpTargetDoorSkillCondition(StatsSet params) + public OpTargetDoorSkillCondition(StatSet params) { _doorIds = params.getList("doorIds", Integer.class); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java index 6fbc3cda10..eaabf4a73d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpTargetMyPledgeAcademySkillCondition implements ISkillCondition { - public OpTargetMyPledgeAcademySkillCondition(StatsSet params) + public OpTargetMyPledgeAcademySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java index d5820600dd..14a744613d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpTargetNpcSkillCondition implements ISkillCondition { private final List _npcId; - public OpTargetNpcSkillCondition(StatsSet params) + public OpTargetNpcSkillCondition(StatSet params) { _npcId = params.getList("npcIds", Integer.class); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java index 854225a75a..b0c5e50ae3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpTargetPcSkillCondition implements ISkillCondition { - public OpTargetPcSkillCondition(StatsSet params) + public OpTargetPcSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index 7faecb2ffd..62fd4b365f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Weapon; @@ -34,7 +34,7 @@ public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition { private final List _weaponTypes = new ArrayList<>(); - public OpTargetWeaponAttackTypeSkillCondition(StatsSet params) + public OpTargetWeaponAttackTypeSkillCondition(StatSet params) { final List weaponTypes = params.getList("weaponType", String.class); if (weaponTypes != null) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java index 8451365885..e114c03412 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTerritorySkillCondition implements ISkillCondition { - public OpTerritorySkillCondition(StatsSet params) + public OpTerritorySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java index 13f287687e..fde1293086 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpUnlockSkillCondition implements ISkillCondition { - public OpUnlockSkillCondition(StatsSet params) + public OpUnlockSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java index 8cc76a34bb..46dea5bbcb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpUseFirecrackerSkillCondition implements ISkillCondition { - public OpUseFirecrackerSkillCondition(StatsSet params) + public OpUseFirecrackerSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java index f3b54bbad7..651dade274 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpUsePraseedSkillCondition implements ISkillCondition { - public OpUsePraseedSkillCondition(StatsSet params) + public OpUsePraseedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java index 890b0fcd5f..dd57df0e13 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.MountType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpWyvernSkillCondition implements ISkillCondition { - public OpWyvernSkillCondition(StatsSet params) + public OpWyvernSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java index 49085b6674..8590262afc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class PossessHolythingSkillCondition implements ISkillCondition { - public PossessHolythingSkillCondition(StatsSet params) + public PossessHolythingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java index 8b0fb55554..38b5644fb1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class RemainCpPerSkillCondition implements ISkillCondition private final int _amount; private final SkillConditionPercentType _percentType; - public RemainCpPerSkillCondition(StatsSet params) + public RemainCpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java index 612367a233..1ad96100ad 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -33,7 +33,7 @@ public class RemainHpPerSkillCondition implements ISkillCondition private final SkillConditionPercentType _percentType; private final SkillConditionAffectType _affectType; - public RemainHpPerSkillCondition(StatsSet params) + public RemainHpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java index 5455c1587a..39085349d9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class RemainMpPerSkillCondition implements ISkillCondition private final int _amount; private final SkillConditionPercentType _percentType; - public RemainMpPerSkillCondition(StatsSet params) + public RemainMpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java index 7de47f103f..6e9e5ad821 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class SoulSavedSkillCondition implements ISkillCondition { private final int _amount; - public SoulSavedSkillCondition(StatsSet params) + public SoulSavedSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java index 0b75a5a623..f4bdbaaecb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class TargetItemCrystalTypeSkillCondition implements ISkillCondition { - public TargetItemCrystalTypeSkillCondition(StatsSet params) + public TargetItemCrystalTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java index 51502ff209..604a41f904 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.MentorManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMyMenteeSkillCondition implements ISkillCondition { - public TargetMyMenteeSkillCondition(StatsSet params) + public TargetMyMenteeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java index fc621365a9..4bfb496634 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class TargetMyPartySkillCondition implements ISkillCondition { private final boolean _includeMe; - public TargetMyPartySkillCondition(StatsSet params) + public TargetMyPartySkillCondition(StatSet params) { _includeMe = params.getBoolean("includeMe"); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java index 9ebec0e691..d44a1bc8a9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMyPledgeSkillCondition implements ISkillCondition { - public TargetMyPledgeSkillCondition(StatsSet params) + public TargetMyPledgeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java index f4da8d6079..5045aa3848 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class TargetRaceSkillCondition implements ISkillCondition { private final Race _race; - public TargetRaceSkillCondition(StatsSet params) + public TargetRaceSkillCondition(StatSet params) { _race = params.getEnum("race", Race.class); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java index b1d0ec8553..7e9236b634 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.ActionDataHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -57,7 +57,7 @@ public class ActionData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "action", actionNode -> { - final ActionDataHolder holder = new ActionDataHolder(new StatsSet(parseAttributes(actionNode))); + final ActionDataHolder holder = new ActionDataHolder(new StatSet(parseAttributes(actionNode))); _actionData.put(holder.getId(), holder); })); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java index 36002572b0..f7762ab07b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java @@ -32,7 +32,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.AdminCommandAccessRight; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -72,7 +72,7 @@ public class AdminData implements IXmlReader { NamedNodeMap attrs; Node attr; - StatsSet set; + StatSet set; AccessLevel level; AdminCommandAccessRight command; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -83,7 +83,7 @@ public class AdminData implements IXmlReader { if ("access".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -99,7 +99,7 @@ public class AdminData implements IXmlReader } else if ("admin".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index a5de47d07c..c31f2ea750 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; @@ -83,7 +83,7 @@ public class AppearanceItemData implements IXmlReader { if ("appearance_stone".equalsIgnoreCase(d.getNodeName())) { - final AppearanceStone stone = new AppearanceStone(new StatsSet(parseAttributes(d))); + final AppearanceStone stone = new AppearanceStone(new StatSet(parseAttributes(d))); for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) { switch (c.getNodeName()) @@ -120,7 +120,7 @@ public class AppearanceItemData implements IXmlReader } case "visual": { - stone.addVisualId(new AppearanceHolder(new StatsSet(parseAttributes(c)))); + stone.addVisualId(new AppearanceHolder(new StatSet(parseAttributes(c)))); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java index 6c96d3874a..6eac3240e7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -64,7 +64,7 @@ public class AttendanceRewardData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "item", rewardNode -> { - final StatsSet set = new StatsSet(parseAttributes(rewardNode)); + final StatSet set = new StatSet(parseAttributes(rewardNode)); final int itemId = set.getInt("id"); final int itemCount = set.getInt("count"); if (ItemTable.getInstance().getTemplate(itemId) == null) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java index 891d19fcf2..3054b0e7ef 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.beautyshop.BeautyData; import org.l2jmobius.gameserver.model.beautyshop.BeautyItem; @@ -56,7 +56,7 @@ public class BeautyShopData implements IXmlReader public void parseDocument(Document doc, File f) { NamedNodeMap attrs; - StatsSet set; + StatSet set; Node att; Race race = null; Sex sex = null; @@ -92,7 +92,7 @@ public class BeautyShopData implements IXmlReader if ("hair".equalsIgnoreCase(a.getNodeName())) { attrs = a.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -105,7 +105,7 @@ public class BeautyShopData implements IXmlReader if ("color".equalsIgnoreCase(g.getNodeName())) { attrs = g.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -119,7 +119,7 @@ public class BeautyShopData implements IXmlReader else if ("face".equalsIgnoreCase(a.getNodeName())) { attrs = a.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java index 37e977c51e..530a5d975a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java @@ -34,7 +34,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.entity.ClanHall; @@ -66,7 +66,7 @@ public class ClanHallData implements IXmlReader final List doors = new ArrayList<>(); final List npcs = new ArrayList<>(); final List teleports = new ArrayList<>(); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); for (Node listNode = doc.getFirstChild(); listNode != null; listNode = listNode.getNextSibling()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java index ae608cefb6..f1a23734e0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.combination.CombinationItem; import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; @@ -57,7 +57,7 @@ public class CombinationItemsData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "item", itemNode -> { - final CombinationItem item = new CombinationItem(new StatsSet(parseAttributes(itemNode))); + final CombinationItem item = new CombinationItem(new StatSet(parseAttributes(itemNode))); forEach(itemNode, "reward", rewardNode -> { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java index 038738b138..4af039b48d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.CubicSkill; import org.l2jmobius.gameserver.model.cubic.ICubicConditionHolder; @@ -61,7 +61,7 @@ public class CubicData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - forEach(doc, "list", listNode -> forEach(listNode, "cubic", cubicNode -> parseTemplate(cubicNode, new CubicTemplate(new StatsSet(parseAttributes(cubicNode)))))); + forEach(doc, "list", listNode -> forEach(listNode, "cubic", cubicNode -> parseTemplate(cubicNode, new CubicTemplate(new StatSet(parseAttributes(cubicNode)))))); } /** @@ -137,7 +137,7 @@ public class CubicData implements IXmlReader { forEach(cubicNode, "skill", skillNode -> { - final CubicSkill skill = new CubicSkill(new StatsSet(parseAttributes(skillNode))); + final CubicSkill skill = new CubicSkill(new StatSet(parseAttributes(skillNode))); forEach(cubicNode, "conditions", conditionNode -> parseConditions(cubicNode, template, skill)); template.getSkills().add(skill); }); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java index 3d19bee079..ede9b72202 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -62,7 +62,7 @@ public class DailyMissionData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "reward", rewardNode -> { - final StatsSet set = new StatsSet(parseAttributes(rewardNode)); + final StatSet set = new StatSet(parseAttributes(rewardNode)); final List items = new ArrayList<>(1); forEach(rewardNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> @@ -80,14 +80,14 @@ public class DailyMissionData implements IXmlReader // Initial values in case handler doesn't exists set.set("handler", ""); - set.set("params", StatsSet.EMPTY_STATSET); + set.set("params", StatSet.EMPTY_STATSET); // Parse handler and parameters forEach(rewardNode, "handler", handlerNode -> { set.set("handler", parseString(handlerNode.getAttributes(), "name")); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); set.set("params", params); forEach(handlerNode, "param", paramNode -> params.set(parseString(paramNode.getAttributes(), "name"), paramNode.getTextContent())); }); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java index 835eab4fe9..53248de524 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java @@ -35,7 +35,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -51,7 +51,7 @@ public class DoorData implements IXmlReader // Info holders private final Map> _groups = new HashMap<>(); private final Map _doors = new HashMap<>(); - private final Map _templates = new HashMap<>(); + private final Map _templates = new HashMap<>(); private final Map> _regions = new HashMap<>(); protected DoorData() @@ -75,9 +75,9 @@ public class DoorData implements IXmlReader LOGGER.info(getClass().getSimpleName() + ": Loaded " + _doors.size() + " Door Templates for " + _regions.size() + " regions."); } - public StatsSet parseDoor(Node doorNode) + public StatSet parseDoor(Node doorNode) { - final StatsSet params = new StatsSet(parseAttributes(doorNode)); + final StatSet params = new StatSet(parseAttributes(doorNode)); params.set("baseHpMax", 1); // Avoid doors without HP value created dead due to default value 0 in CreatureTemplate forEach(doorNode, IXmlReader::isNode, innerDoorNode -> @@ -115,7 +115,7 @@ public class DoorData implements IXmlReader /** * @param set */ - private void applyCollisions(StatsSet set) + private void applyCollisions(StatSet set) { // Insert Collision data if (set.contains("nodeX_0") && set.contains("nodeY_0") && set.contains("nodeX_1") && set.contains("nodeY_1")) @@ -142,7 +142,7 @@ public class DoorData implements IXmlReader * @param set * @return */ - public DoorInstance spawnDoor(StatsSet set) + public DoorInstance spawnDoor(StatSet set) { // Create door template + door instance final DoorTemplate template = new DoorTemplate(set); @@ -183,7 +183,7 @@ public class DoorData implements IXmlReader return door; } - public StatsSet getDoorTemplate(int doorId) + public StatSet getDoorTemplate(int doorId) { return _templates.get(doorId); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java index eca42a9a34..637ef1e953 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -64,7 +64,7 @@ public class EnchantItemData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node att; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -76,7 +76,7 @@ public class EnchantItemData implements IXmlReader if ("enchant".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -107,7 +107,7 @@ public class EnchantItemData implements IXmlReader else if ("support".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java index 46701fd777..bb1e8026b7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.SkillEnchantType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.EnchantSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -69,10 +69,10 @@ public class EnchantSkillGroupsData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "enchant", enchantNode -> { - final EnchantSkillHolder enchantSkillHolder = new EnchantSkillHolder(new StatsSet(parseAttributes(enchantNode))); + final EnchantSkillHolder enchantSkillHolder = new EnchantSkillHolder(new StatSet(parseAttributes(enchantNode))); forEach(enchantNode, "sps", spsNode -> forEach(spsNode, "sp", spNode -> enchantSkillHolder.addSp(parseEnum(spNode.getAttributes(), SkillEnchantType.class, "type"), parseInteger(spNode.getAttributes(), "amount")))); forEach(enchantNode, "chances", chancesNode -> forEach(chancesNode, "chance", chanceNode -> enchantSkillHolder.addChance(parseEnum(chanceNode.getAttributes(), SkillEnchantType.class, "type"), parseInteger(chanceNode.getAttributes(), "value")))); - forEach(enchantNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> enchantSkillHolder.addRequiredItem(parseEnum(itemNode.getAttributes(), SkillEnchantType.class, "type"), new ItemHolder(new StatsSet(parseAttributes(itemNode)))))); + forEach(enchantNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> enchantSkillHolder.addRequiredItem(parseEnum(itemNode.getAttributes(), SkillEnchantType.class, "type"), new ItemHolder(new StatSet(parseAttributes(itemNode)))))); _enchantSkillHolders.put(parseInteger(enchantNode.getAttributes(), "level"), enchantSkillHolder); })); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java index a8bb0397ac..037af7e1ae 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java @@ -34,7 +34,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.eventengine.AbstractEventManager; import org.l2jmobius.gameserver.model.eventengine.EventMethodNotification; import org.l2jmobius.gameserver.model.eventengine.EventScheduler; @@ -156,7 +156,7 @@ public class EventEngineData implements IXmlReader */ private void parseVariables(AbstractEventManager eventManager, Node innerNode) { - final StatsSet variables = new StatsSet(LinkedHashMap::new); + final StatSet variables = new StatSet(LinkedHashMap::new); for (Node variableNode = innerNode.getFirstChild(); variableNode != null; variableNode = variableNode.getNextSibling()) { if ("variable".equals(variableNode.getNodeName())) @@ -188,7 +188,7 @@ public class EventEngineData implements IXmlReader { if ("schedule".equals(scheduleNode.getNodeName())) { - final StatsSet params = new StatsSet(LinkedHashMap::new); + final StatSet params = new StatSet(LinkedHashMap::new); final NamedNodeMap attrs = scheduleNode.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -235,7 +235,7 @@ public class EventEngineData implements IXmlReader } else if ("conditionalSchedule".equals(scheduleNode.getNodeName())) { - final StatsSet params = new StatsSet(LinkedHashMap::new); + final StatSet params = new StatSet(LinkedHashMap::new); final NamedNodeMap attrs = scheduleNode.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -346,7 +346,7 @@ public class EventEngineData implements IXmlReader * @param variableNode */ @SuppressWarnings("unchecked") - private void parseListVariables(AbstractEventManager eventManager, StatsSet variables, Node variableNode) + private void parseListVariables(AbstractEventManager eventManager, StatSet variables, Node variableNode) { final String name = parseString(variableNode.getAttributes(), "name"); final String type = parseString(variableNode.getAttributes(), "type"); @@ -419,7 +419,7 @@ public class EventEngineData implements IXmlReader * @param variableNode */ @SuppressWarnings("unchecked") - private void parseMapVariables(AbstractEventManager eventManager, StatsSet variables, Node variableNode) + private void parseMapVariables(AbstractEventManager eventManager, StatSet variables, Node variableNode) { final String name = parseString(variableNode.getAttributes(), "name"); final String keyType = parseString(variableNode.getAttributes(), "keyType"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java index db19c5fdff..0724877d9d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.ConditionHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.ICondition; import org.l2jmobius.gameserver.model.holders.ExtendDropDataHolder; import org.l2jmobius.gameserver.model.holders.ExtendDropItemHolder; @@ -62,7 +62,7 @@ public class ExtendDropData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "drop", dropNode -> { - final StatsSet set = new StatsSet(parseAttributes(dropNode)); + final StatSet set = new StatSet(parseAttributes(dropNode)); final List items = new ArrayList<>(1); forEach(dropNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> @@ -80,8 +80,8 @@ public class ExtendDropData implements IXmlReader forEach(dropNode, "conditions", conditionsNode -> forEach(conditionsNode, "condition", conditionNode -> { final String conditionName = parseString(conditionNode.getAttributes(), "name"); - final StatsSet params = (StatsSet) parseValue(conditionNode); - final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); + final StatSet params = (StatSet) parseValue(conditionNode); + final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); if (conditionFunction != null) { conditions.add(conditionFunction.apply(params)); @@ -109,7 +109,7 @@ public class ExtendDropData implements IXmlReader private Object parseValue(Node node) { - StatsSet statsSet = null; + StatSet statSet = null; List list = null; Object text = null; for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) @@ -145,12 +145,12 @@ public class ExtendDropData implements IXmlReader final Object value = parseValue(node); if (value != null) { - if (statsSet == null) + if (statSet == null) { - statsSet = new StatsSet(); + statSet = new StatSet(); } - statsSet.set(nodeName, value); + statSet.set(nodeName, value); } } } @@ -161,9 +161,9 @@ public class ExtendDropData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", list); + statSet.set(".", list); } else { @@ -176,16 +176,16 @@ public class ExtendDropData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", text); + statSet.set(".", text); } else { return text; } } - return statsSet; + return statSet; } public ExtendDropDataHolder getExtendDropById(int id) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java index 57a16d6390..608f4702b8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.FakePlayerHolder; @@ -72,7 +72,7 @@ public class FakePlayerData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayer", fakePlayerNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerNode)); final int npcId = set.getInt("npcId"); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); final String name = template.getName(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java index 18cc499b71..a5ade27c03 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.FenceState; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldRegion; import org.l2jmobius.gameserver.model.actor.instance.FenceInstance; @@ -79,7 +79,7 @@ public class FenceData implements IXmlReader private void spawnFence(Node fenceNode) { - final StatsSet set = new StatsSet(parseAttributes(fenceNode)); + final StatSet set = new StatSet(parseAttributes(fenceNode)); spawnFence(set.getInt("x"), set.getInt("y"), set.getInt("z"), set.getString("name"), set.getInt("width"), set.getInt("length"), set.getInt("height"), 0, set.getEnum("state", FenceState.class, FenceState.CLOSED)); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java index 67dd4e396b..02efb756f2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.Henna; import org.l2jmobius.gameserver.model.skills.Skill; @@ -86,7 +86,7 @@ public class HennaData implements IXmlReader */ private void parseHenna(Node d) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final List wearClassIds = new ArrayList<>(); final List skills = new ArrayList<>(); NamedNodeMap attrs = d.getAttributes(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java index 03ad8ab79e..d81e85948d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; @@ -93,7 +93,7 @@ public class InitialEquipmentData implements IXmlReader { if ("item".equalsIgnoreCase(c.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java index 72080aa4ac..54b1909d60 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemPointHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; @@ -55,17 +55,17 @@ public class LuckyGameData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "luckygame", rewardNode -> { - final LuckyGameDataHolder holder = new LuckyGameDataHolder(new StatsSet(parseAttributes(rewardNode))); + final LuckyGameDataHolder holder = new LuckyGameDataHolder(new StatSet(parseAttributes(rewardNode))); forEach(rewardNode, "common_reward", commonRewardNode -> forEach(commonRewardNode, "item", itemNode -> { - final StatsSet stats = new StatsSet(parseAttributes(itemNode)); + final StatSet stats = new StatSet(parseAttributes(itemNode)); holder.addCommonReward(new ItemChanceHolder(stats.getInt("id"), stats.getDouble("chance"), stats.getLong("count"))); })); forEach(rewardNode, "unique_reward", uniqueRewardNode -> forEach(uniqueRewardNode, "item", itemNode -> { - holder.addUniqueReward(new ItemPointHolder(new StatsSet(parseAttributes(itemNode)))); + holder.addUniqueReward(new ItemPointHolder(new StatSet(parseAttributes(itemNode)))); })); forEach(rewardNode, "modify_reward", uniqueRewardNode -> @@ -74,7 +74,7 @@ public class LuckyGameData implements IXmlReader holder.setMaxModifyRewardGame(parseInteger(uniqueRewardNode.getAttributes(), "max_game")); forEach(uniqueRewardNode, "item", itemNode -> { - final StatsSet stats = new StatsSet(parseAttributes(itemNode)); + final StatSet stats = new StatSet(parseAttributes(itemNode)); holder.addModifyReward(new ItemChanceHolder(stats.getInt("id"), stats.getDouble("chance"), stats.getLong("count"))); }); }); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java index 75bb48ed37..190653cdec 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java @@ -35,7 +35,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.SpecialItemType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; @@ -90,7 +90,7 @@ public class MultisellData implements IXmlReader { forEach(doc, "list", listNode -> { - final StatsSet set = new StatsSet(parseAttributes(listNode)); + final StatSet set = new StatSet(parseAttributes(listNode)); final int listId = Integer.parseInt(f.getName().substring(0, f.getName().length() - 4)); final List entries = new ArrayList<>(listNode.getChildNodes().getLength()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java index e6c9fd6758..4ce4d1f496 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java @@ -45,7 +45,7 @@ import org.l2jmobius.gameserver.enums.DropType; import org.l2jmobius.gameserver.enums.ElementalType; import org.l2jmobius.gameserver.enums.MpRewardAffectType; import org.l2jmobius.gameserver.enums.MpRewardType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.DropHolder; @@ -96,7 +96,7 @@ public class NpcData implements IXmlReader if ("npc".equalsIgnoreCase(listNode.getNodeName())) { NamedNodeMap attrs = listNode.getAttributes(); - final StatsSet set = new StatsSet(new HashMap<>()); + final StatSet set = new StatSet(new HashMap<>()); final int npcId = parseInteger(attrs, "id"); Map parameters = null; Map skills = null; @@ -517,11 +517,11 @@ public class NpcData implements IXmlReader if (parameters != null) { // Using unmodifiable map parameters of template are not meant to be changed at runtime. - template.setParameters(new StatsSet(Collections.unmodifiableMap(parameters))); + template.setParameters(new StatSet(Collections.unmodifiableMap(parameters))); } else { - template.setParameters(StatsSet.EMPTY_STATSET); + template.setParameters(StatSet.EMPTY_STATSET); } if (skills != null) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java index 3712cca6af..373f87ecfc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -79,7 +79,7 @@ public class NpcNameLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); NPC_NAME_LOCALISATIONS.get(_lang).put(set.getInt("id"), new String[] { set.getString("name"), diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 55dcd539aa..36c5897ecd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.EffectHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; @@ -71,7 +71,7 @@ public class OptionData implements IXmlReader forEach(innerNode, "effect", effectNode -> { final String name = parseString(effectNode.getAttributes(), "name"); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); forEach(effectNode, IXmlReader::isNode, paramNode -> params.set(paramNode.getNodeName(), SkillData.getInstance().parseValue(paramNode, true, false, Collections.emptyMap()))); option.addEffect(EffectHandler.getInstance().getHandlerFactory(name).apply(params)); }); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java index b1bb74baf6..c893725bc3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.PetLevelData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * This class parse and hold all pet parameters.
    @@ -116,7 +116,7 @@ public class PetDataTable implements IXmlReader if (s.getNodeName().equals("stat")) { final int level = Integer.parseInt(s.getAttributes().getNamedItem("level").getNodeValue()); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (Node bean = s.getFirstChild(); bean != null; bean = bean.getNextSibling()) { if (bean.getNodeName().equals("set")) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java index ab1cb3b257..b646782547 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.base.ClassId; @@ -83,7 +83,7 @@ public class PlayerTemplateData implements IXmlReader } else if ("staticData".equalsIgnoreCase(d.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.set("classId", classId); final List creationPoints = new ArrayList<>(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java index 34a04edd9b..35b879e73f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; @@ -83,7 +83,7 @@ public class PrimeShopData implements IXmlReader { NamedNodeMap attrs = d.getAttributes(); Node att; - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java index b7ed4c8fba..43e5d84784 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.RecipeInstance; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.RecipeStatInstance; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; /** @@ -82,7 +82,7 @@ public class RecipeData implements IXmlReader Node att; int id = -1; boolean haveRare = false; - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); att = attrs.getNamedItem("id"); if (att == null) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java index 796f5ae085..9a8397e085 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java @@ -29,7 +29,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate; /** @@ -60,7 +60,7 @@ public class ResidenceFunctionsData implements IXmlReader forEach(doc, "list", list -> forEach(list, "function", func -> { final NamedNodeMap attrs = func.getAttributes(); - final StatsSet set = new StatsSet(HashMap::new); + final StatSet set = new StatSet(HashMap::new); for (int i = 0; i < attrs.getLength(); i++) { final Node node = attrs.item(i); @@ -69,7 +69,7 @@ public class ResidenceFunctionsData implements IXmlReader forEach(func, "function", levelNode -> { final NamedNodeMap levelAttrs = levelNode.getAttributes(); - final StatsSet levelSet = new StatsSet(HashMap::new); + final StatSet levelSet = new StatSet(HashMap::new); levelSet.merge(set); for (int i = 0; i < levelAttrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java index 053d9089ce..d6b28a5962 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; /** @@ -82,7 +82,7 @@ public class SendMessageLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); SEND_MESSAGE_LOCALISATIONS.get(_lang).put(set.getString("message").split(SPLIT_STRING), set.getString("translation").split(SPLIT_STRING)); })); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java index e473030c56..c3eda1f3b8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.actor.instance.ShuttleInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; @@ -72,7 +72,7 @@ public class ShuttleData implements IXmlReader public void parseDocument(Document doc, File f) { NamedNodeMap attrs; - StatsSet set; + StatSet set; Node att; ShuttleDataHolder data; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -84,7 +84,7 @@ public class ShuttleData implements IXmlReader if ("shuttle".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -164,7 +164,7 @@ public class ShuttleData implements IXmlReader { for (ShuttleDataHolder data : _shuttles.values()) { - final ShuttleInstance shuttle = new ShuttleInstance(new CreatureTemplate(new StatsSet())); + final ShuttleInstance shuttle = new ShuttleInstance(new CreatureTemplate(new StatSet())); shuttle.setData(data); shuttle.setHeading(data.getLocation().getHeading()); shuttle.setLocationInvisible(data.getLocation()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java index 9db0b5f64b..ba000649f2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.SiegeScheduleDate; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.util.Util; /** @@ -54,7 +54,7 @@ public class SiegeScheduleData implements IXmlReader LOGGER.info(getClass().getSimpleName() + ": Loaded " + _scheduleData.size() + " siege schedulers."); if (_scheduleData.isEmpty()) { - _scheduleData.add(new SiegeScheduleDate(new StatsSet())); + _scheduleData.add(new SiegeScheduleDate(new StatSet())); LOGGER.info(getClass().getSimpleName() + ": Emergency loaded " + _scheduleData.size() + " default siege schedulers."); } } @@ -72,7 +72,7 @@ public class SiegeScheduleData implements IXmlReader { case "schedule": { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final NamedNodeMap attrs = cd.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java index cc019c4dbb..2592b3ed97 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java @@ -40,7 +40,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.EffectHandler; import org.l2jmobius.gameserver.handler.SkillConditionHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.EffectScope; @@ -67,9 +67,9 @@ public class SkillData implements IXmlReader private final Integer _toLevel; private final Integer _fromSubLevel; private final Integer _toSubLevel; - private final Map> _info; + private final Map> _info; - public NamedParamInfo(String name, Integer fromLevel, Integer toLevel, Integer fromSubLevel, Integer toSubLevel, Map> info) + public NamedParamInfo(String name, Integer fromLevel, Integer toLevel, Integer fromSubLevel, Integer toSubLevel, Map> info) { _name = name; _fromLevel = fromLevel; @@ -104,7 +104,7 @@ public class SkillData implements IXmlReader return _toSubLevel; } - public Map> getInfo() + public Map> getInfo() { return _info; } @@ -241,8 +241,8 @@ public class SkillData implements IXmlReader { NamedNodeMap attributes = listNode.getAttributes(); final Map> levels = new HashMap<>(); - final Map> skillInfo = new HashMap<>(); - final StatsSet generalSkillInfo = skillInfo.computeIfAbsent(-1, k -> new HashMap<>()).computeIfAbsent(-1, k -> new StatsSet()); + final Map> skillInfo = new HashMap<>(); + final StatSet generalSkillInfo = skillInfo.computeIfAbsent(-1, k -> new HashMap<>()).computeIfAbsent(-1, k -> new StatSet()); parseAttributes(attributes, "", generalSkillInfo); @@ -321,7 +321,7 @@ public class SkillData implements IXmlReader { return; } - subLevelMap.forEach((subLevel, statsSet) -> + subLevelMap.forEach((subLevel, statSet) -> { if (subLevel == -1) { @@ -339,7 +339,7 @@ public class SkillData implements IXmlReader { return; } - subLevelMap.forEach((subLevel, statsSet) -> + subLevelMap.forEach((subLevel, statSet) -> { if (subLevel == -1) { @@ -371,31 +371,31 @@ public class SkillData implements IXmlReader levels.forEach((level, subLevels) -> subLevels.forEach(subLevel -> { - final StatsSet statsSet = Optional.ofNullable(skillInfo.getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatsSet::new); - skillInfo.getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(statsSet.getSet()::putIfAbsent); - skillInfo.getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(statsSet.getSet()::putIfAbsent); - statsSet.set(".level", level); - statsSet.set(".subLevel", subLevel); - final Skill skill = new Skill(statsSet); + final StatSet statSet = Optional.ofNullable(skillInfo.getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatSet::new); + skillInfo.getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(statSet.getSet()::putIfAbsent); + skillInfo.getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(statSet.getSet()::putIfAbsent); + statSet.set(".level", level); + statSet.set(".subLevel", subLevel); + final Skill skill = new Skill(statSet); forEachNamedParamInfoParam(effectParamInfo, level, subLevel, ((effectScope, params) -> { final String effectName = params.getString(".name"); params.remove(".name"); try { - final Function effectFunction = EffectHandler.getInstance().getHandlerFactory(effectName); + final Function effectFunction = EffectHandler.getInstance().getHandlerFactory(effectName); if (effectFunction != null) { skill.addEffect(effectScope, effectFunction.apply(params)); } else { - LOGGER.warning(getClass().getSimpleName() + ": Missing effect for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]"); + LOGGER.warning(getClass().getSimpleName() + ": Missing effect for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]"); } } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading effect for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading effect for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]", e); } })); @@ -405,19 +405,19 @@ public class SkillData implements IXmlReader params.remove(".name"); try { - final Function conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName); + final Function conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName); if (conditionFunction != null) { skill.addCondition(skillConditionScope, conditionFunction.apply(params)); } else { - LOGGER.warning(getClass().getSimpleName() + ": Missing condition for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + skillConditionScope + "] Effect Name[" + conditionName + "]"); + LOGGER.warning(getClass().getSimpleName() + ": Missing condition for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + skillConditionScope + "] Effect Name[" + conditionName + "]"); } } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading condition for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Condition Scope[" + skillConditionScope + "] Condition Name[" + conditionName + "]", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading condition for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Condition Scope[" + skillConditionScope + "] Condition Name[" + conditionName + "]", e); } })); @@ -434,16 +434,16 @@ public class SkillData implements IXmlReader } } - private void forEachNamedParamInfoParam(Map> paramInfo, int level, int subLevel, BiConsumer consumer) + private void forEachNamedParamInfoParam(Map> paramInfo, int level, int subLevel, BiConsumer consumer) { paramInfo.forEach((scope, namedParamInfos) -> namedParamInfos.forEach(namedParamInfo -> { if ((((namedParamInfo.getFromLevel() == null) && (namedParamInfo.getToLevel() == null)) || ((namedParamInfo.getFromLevel() <= level) && (namedParamInfo.getToLevel() >= level))) // && (((namedParamInfo.getFromSubLevel() == null) && (namedParamInfo.getToSubLevel() == null)) || ((namedParamInfo.getFromSubLevel() <= subLevel) && (namedParamInfo.getToSubLevel() >= subLevel)))) { - final StatsSet params = Optional.ofNullable(namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatsSet::new); - namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); - namedParamInfo.getInfo().getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); + final StatSet params = Optional.ofNullable(namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatSet::new); + namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); + namedParamInfo.getInfo().getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); params.set(".name", namedParamInfo.getName()); consumer.accept(scope, params); } @@ -460,7 +460,7 @@ public class SkillData implements IXmlReader final Integer subLevel = parseInteger(attributes, "subLevel"); final Integer fromSubLevel = parseInteger(attributes, "fromSubLevel", subLevel); final Integer toSubLevel = parseInteger(attributes, "toSubLevel", subLevel); - final Map> info = new HashMap<>(); + final Map> info = new HashMap<>(); for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) { if (!node.getNodeName().equals("#text")) @@ -471,7 +471,7 @@ public class SkillData implements IXmlReader return new NamedParamInfo(name, fromLevel, toLevel, fromSubLevel, toSubLevel, info); } - private void parseInfo(Node node, Map>> variableValues, Map> info) + private void parseInfo(Node node, Map>> variableValues, Map> info) { Map> values = parseValues(node); final Object generalValue = values.getOrDefault(-1, Collections.emptyMap()).get(-1); @@ -492,7 +492,7 @@ public class SkillData implements IXmlReader } } - values.forEach((level, subLevelMap) -> subLevelMap.forEach((subLevel, value) -> info.computeIfAbsent(level, k -> new HashMap<>()).computeIfAbsent(subLevel, k -> new StatsSet()).set(node.getNodeName(), value))); + values.forEach((level, subLevelMap) -> subLevelMap.forEach((subLevel, value) -> info.computeIfAbsent(level, k -> new HashMap<>()).computeIfAbsent(subLevel, k -> new StatSet()).set(node.getNodeName(), value))); } private Map> parseValues(Node node) @@ -535,7 +535,7 @@ public class SkillData implements IXmlReader variables.put("index", (i - fromLevel) + 1d); variables.put("subIndex", (j - fromSubLevel) + 1d); final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1); - if ((base != null) && !(base instanceof StatsSet)) + if ((base != null) && !(base instanceof StatSet)) { variables.put("base", Double.parseDouble(String.valueOf(base))); } @@ -555,13 +555,13 @@ public class SkillData implements IXmlReader Object parseValue(Node node, boolean blockValue, boolean parseAttributes, Map variables) { - StatsSet statsSet = null; + StatSet statSet = null; List list = null; Object text = null; if (parseAttributes && (!node.getNodeName().equals("value") || !blockValue) && (node.getAttributes().getLength() > 0)) { - statsSet = new StatsSet(); - parseAttributes(node.getAttributes(), "", statsSet, variables); + statSet = new StatSet(); + parseAttributes(node.getAttributes(), "", statSet, variables); } for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) { @@ -604,12 +604,12 @@ public class SkillData implements IXmlReader final Object value = parseValue(node, false, true, variables); if (value != null) { - if (statsSet == null) + if (statSet == null) { - statsSet = new StatsSet(); + statSet = new StatSet(); } - statsSet.set(nodeName, value); + statSet.set(nodeName, value); } } } @@ -620,9 +620,9 @@ public class SkillData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", list); + statSet.set(".", list); } else { @@ -635,30 +635,30 @@ public class SkillData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", text); + statSet.set(".", text); } else { return text; } } - return statsSet; + return statSet; } - private void parseAttributes(NamedNodeMap attributes, String prefix, StatsSet statsSet, Map variables) + private void parseAttributes(NamedNodeMap attributes, String prefix, StatSet statSet, Map variables) { for (int i = 0; i < attributes.getLength(); i++) { final Node attributeNode = attributes.item(i); - statsSet.set(prefix + "." + attributeNode.getNodeName(), parseNodeValue(attributeNode.getNodeValue(), variables)); + statSet.set(prefix + "." + attributeNode.getNodeName(), parseNodeValue(attributeNode.getNodeValue(), variables)); } } - private void parseAttributes(NamedNodeMap attributes, String prefix, StatsSet statsSet) + private void parseAttributes(NamedNodeMap attributes, String prefix, StatSet statSet) { - parseAttributes(attributes, prefix, statsSet, Collections.emptyMap()); + parseAttributes(attributes, prefix, statSet, Collections.emptyMap()); } private Object parseNodeValue(String value, Map variables) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java index fdd0012ffe..d23d1ebee3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.SubclassType; import org.l2jmobius.gameserver.model.SkillLearn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.base.ClassId; @@ -229,7 +229,7 @@ public class SkillTreesData implements IXmlReader { if ("skill".equalsIgnoreCase(c.getNodeName())) { - final StatsSet learnSkillSet = new StatsSet(); + final StatSet learnSkillSet = new StatSet(); attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java index 87915d89eb..78c22d1e7d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java @@ -36,7 +36,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.ChanceLocation; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.MinionHolder; import org.l2jmobius.gameserver.model.interfaces.IParameterized; @@ -169,7 +169,7 @@ public class SpawnsData implements IXmlReader public void parseSpawn(Node spawnsNode, File file, Collection spawns) { - final SpawnTemplate spawnTemplate = new SpawnTemplate(new StatsSet(parseAttributes(spawnsNode)), file); + final SpawnTemplate spawnTemplate = new SpawnTemplate(new StatSet(parseAttributes(spawnsNode)), file); SpawnGroup defaultGroup = null; for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling()) { @@ -185,7 +185,7 @@ public class SpawnsData implements IXmlReader { if (defaultGroup == null) { - defaultGroup = new SpawnGroup(StatsSet.EMPTY_STATSET); + defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET); } parseNpc(innerNode, spawnTemplate, defaultGroup); } @@ -244,7 +244,7 @@ public class SpawnsData implements IXmlReader private void parseGroup(Node n, SpawnTemplate spawnTemplate) { - final SpawnGroup group = new SpawnGroup(new StatsSet(parseAttributes(n))); + final SpawnGroup group = new SpawnGroup(new StatSet(parseAttributes(n))); forEach(n, IXmlReader::isNode, npcNode -> { switch (npcNode.getNodeName()) @@ -271,7 +271,7 @@ public class SpawnsData implements IXmlReader */ private void parseNpc(Node n, SpawnTemplate spawnTemplate, SpawnGroup group) { - final NpcSpawnTemplate npcTemplate = new NpcSpawnTemplate(spawnTemplate, group, new StatsSet(parseAttributes(n))); + final NpcSpawnTemplate npcTemplate = new NpcSpawnTemplate(spawnTemplate, group, new StatSet(parseAttributes(n))); final NpcTemplate template = NpcData.getInstance().getTemplate(npcTemplate.getId()); if (template == null) { @@ -332,10 +332,10 @@ public class SpawnsData implements IXmlReader * @param n * @param npcTemplate */ - private void parseParameters(Node n, IParameterized npcTemplate) + private void parseParameters(Node n, IParameterized npcTemplate) { final Map params = parseParameters(n); - npcTemplate.setParameters(!params.isEmpty() ? new StatsSet(Collections.unmodifiableMap(params)) : StatsSet.EMPTY_STATSET); + npcTemplate.setParameters(!params.isEmpty() ? new StatSet(Collections.unmodifiableMap(params)) : StatSet.EMPTY_STATSET); } /** @@ -344,7 +344,7 @@ public class SpawnsData implements IXmlReader */ private void parseMinions(Node n, NpcSpawnTemplate npcTemplate) { - forEach(n, "minion", minionNode -> npcTemplate.addMinion(new MinionHolder(new StatsSet(parseAttributes(minionNode))))); + forEach(n, "minion", minionNode -> npcTemplate.addMinion(new MinionHolder(new StatSet(parseAttributes(minionNode))))); } /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java index 98d333446c..ef93935404 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; @@ -69,7 +69,7 @@ public class StaticObjectData implements IXmlReader if ("object".equalsIgnoreCase(d.getNodeName())) { final NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -86,9 +86,9 @@ public class StaticObjectData implements IXmlReader * Initialize an static object based on the stats set and add it to the map. * @param set the stats set to add. */ - private void addObject(StatsSet set) + private void addObject(StatSet set) { - final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatsSet()), set.getInt("id")); + final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatSet()), set.getInt("id")); obj.setType(set.getInt("type", 0)); obj.setName(set.getString("name")); obj.setMap(set.getString("texture", "none"), set.getInt("map_x", 0), set.getInt("map_y", 0)); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java index 7c8c9a538d..487bae9dea 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.TeleportType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.teleporter.TeleportHolder; /** @@ -74,7 +74,7 @@ public class TeleportersData implements IXmlReader final String name = parseString(nodeAttrs, "name", type.name()); // Parse locations final TeleportHolder holder = new TeleportHolder(name, type); - forEach(node, "location", location -> holder.registerLocation(new StatsSet(parseAttributes(location)))); + forEach(node, "location", location -> holder.registerLocation(new StatSet(parseAttributes(location)))); // Register holder if (teleList.putIfAbsent(name, holder) != null) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java index b6b3bf2e90..c2f5f94adb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java @@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.transform.Transform; import org.l2jmobius.gameserver.model.actor.transform.TransformLevelData; import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate; @@ -70,7 +70,7 @@ public class TransformData implements IXmlReader if ("transform".equalsIgnoreCase(d.getNodeName())) { NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -192,7 +192,7 @@ public class TransformData implements IXmlReader transform.setTemplate(isMale, templateData); } - final StatsSet levelsSet = new StatsSet(); + final StatSet levelsSet = new StatSet(); for (Node s = z.getFirstChild(); s != null; s = s.getNextSibling()) { if ("level".equals(s.getNodeName())) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/engines/DocumentBase.java index ba3fc7f6b4..d178b10006 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/engines/DocumentBase.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/engines/DocumentBase.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.PlayerState; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionCategoryType; @@ -178,7 +178,7 @@ public abstract class DocumentBase protected abstract void parseDocument(Document doc); - protected abstract StatsSet getStatsSet(); + protected abstract StatSet getStatSet(); protected abstract String getTableValue(String name); @@ -1245,7 +1245,7 @@ public abstract class DocumentBase setTable(name, array.toArray(new String[array.size()])); } - protected void parseBeanSet(Node n, StatsSet set, Integer level) + protected void parseBeanSet(Node n, StatSet set, Integer level) { final String name = n.getAttributes().getNamedItem("name").getNodeValue().trim(); final String value = n.getAttributes().getNamedItem("val").getNodeValue().trim(); @@ -1260,7 +1260,7 @@ public abstract class DocumentBase } } - protected void setExtractableSkillData(StatsSet set, String value) + protected void setExtractableSkillData(StatSet set, String value) { set.set("capsuled_items_skill", value); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java index e8c77b206e..46f8f9be1f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java @@ -21,7 +21,7 @@ import java.io.File; import org.w3c.dom.Document; import org.w3c.dom.Node; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; /** @@ -41,7 +41,7 @@ public class DocumentBaseGeneral extends DocumentBase } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return null; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java index 3ea7f41bb6..419552cf68 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.engines.DocumentBase; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -57,7 +57,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return _currentItem.set; } @@ -111,7 +111,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader _currentItem.id = itemId; _currentItem.name = itemName; _currentItem.type = className; - _currentItem.set = new StatsSet(); + _currentItem.set = new StatSet(); _currentItem.set.set("item_id", itemId); _currentItem.set.set("name", itemName); _currentItem.set.set("additionalName", additionalName); @@ -218,7 +218,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatsSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (Item) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java index 56e5b21a9f..967c1fc34d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.engines.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; public class ItemDataHolder @@ -24,7 +24,7 @@ public class ItemDataHolder int id; String type; String name; - StatsSet set; + StatSet set; int currentLevel; Item item; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/ConditionHandler.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/ConditionHandler.java index 47f24d690d..b53f170fb3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/ConditionHandler.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/ConditionHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.ICondition; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class ConditionHandler { - private final Map> _conditionHandlerFactories = new HashMap<>(); + private final Map> _conditionHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _conditionHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _conditionHandlerFactories.get(name); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/EffectHandler.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/EffectHandler.java index a58de8efb4..328265d9db 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/EffectHandler.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/EffectHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class EffectHandler { - private final Map> _effectHandlerFactories = new HashMap<>(); + private final Map> _effectHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _effectHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _effectHandlerFactories.get(name); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java index a6e2275d04..32438040e0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class SkillConditionHandler { - private final Map> _skillConditionHandlerFactories = new HashMap<>(); + private final Map> _skillConditionHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _skillConditionHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _skillConditionHandlerFactories.get(name); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java index 6992dd5366..65a8c52d7e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.model.AirShipTeleportList; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShipInstance; @@ -45,13 +45,13 @@ public class AirShipManager private static final String UPDATE_DB = "UPDATE airships SET fuel=? WHERE owner_id=?"; private CreatureTemplate _airShipTemplate = null; - private final Map _airShipsInfo = new HashMap<>(); + private final Map _airShipsInfo = new HashMap<>(); private final Map _airShips = new HashMap<>(); private final Map _teleports = new HashMap<>(); protected AirShipManager() { - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", 9); npcDat.set("level", 0); npcDat.set("jClass", "boat"); @@ -113,7 +113,7 @@ public class AirShipManager public AirShipInstance getNewAirShip(int x, int y, int z, int heading, int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return null; @@ -147,7 +147,7 @@ public class AirShipManager if (ship.getOwnerId() != 0) { storeInDb(ship.getOwnerId()); - final StatsSet info = _airShipsInfo.get(ship.getOwnerId()); + final StatSet info = _airShipsInfo.get(ship.getOwnerId()); if (info != null) { info.set("fuel", ship.getFuel()); @@ -164,7 +164,7 @@ public class AirShipManager { if (!_airShipsInfo.containsKey(ownerId)) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("fuel", 600); _airShipsInfo.put(ownerId, info); @@ -264,10 +264,10 @@ public class AirShipManager Statement s = con.createStatement(); ResultSet rs = s.executeQuery(LOAD_DB)) { - StatsSet info; + StatSet info; while (rs.next()) { - info = new StatsSet(); + info = new StatSet(); info.set("fuel", rs.getInt("fuel")); _airShipsInfo.put(rs.getInt("owner_id"), info); } @@ -285,7 +285,7 @@ public class AirShipManager private void storeInDb(int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java index 2db10dd045..e5c610b3f2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.BoatInstance; @@ -57,7 +57,7 @@ public class BoatManager return null; } - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", boatId); npcDat.set("level", 0); npcDat.set("jClass", "boat"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 99a9678ece..56f08422cd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.enums.ManorMode; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; import org.l2jmobius.gameserver.model.SeedProduction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.entity.Castle; @@ -126,7 +126,7 @@ public class CastleManorManager implements IXmlReader, IStorable @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; NamedNodeMap attrs; Node att; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -142,7 +142,7 @@ public class CastleManorManager implements IXmlReader, IStorable { if ("crop".equalsIgnoreCase(c.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); set.set("castleId", castleId); attrs = c.getAttributes(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java index da98c768c4..b9af19c329 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java @@ -27,7 +27,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosState; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -181,7 +181,7 @@ public class CeremonyOfChaosManager extends AbstractEventManager _npcs = new ConcurrentHashMap<>(); protected final Map _spawns = new ConcurrentHashMap<>(); - protected final Map _storedInfo = new ConcurrentHashMap<>(); + protected final Map _storedInfo = new ConcurrentHashMap<>(); protected final Map> _schedules = new ConcurrentHashMap<>(); /** @@ -161,7 +161,7 @@ public class DBSpawnManager { npc.setDBStatus(RaidBossStatus.ALIVE); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getCurrentHp()); info.set("currentMP", npc.getCurrentMp()); info.set("respawnTime", 0); @@ -181,7 +181,7 @@ public class DBSpawnManager */ public void updateStatus(Npc npc, boolean isNpcDead) { - final StatsSet info = _storedInfo.get(npc.getId()); + final StatSet info = _storedInfo.get(npc.getId()); if (info == null) { return; @@ -254,7 +254,7 @@ public class DBSpawnManager _npcs.put(npcId, npc); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", currentHP); info.set("currentMP", currentMP); info.set("respawnTime", 0); @@ -316,7 +316,7 @@ public class DBSpawnManager } npc.setDBStatus(RaidBossStatus.ALIVE); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", 0); @@ -401,7 +401,7 @@ public class DBSpawnManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("UPDATE npc_respawns SET respawnTime = ?, currentHP = ?, currentMP = ? WHERE id = ?")) { - for (Entry entry : _storedInfo.entrySet()) + for (Entry entry : _storedInfo.entrySet()) { final Integer npcId = entry.getKey(); if (npcId == null) @@ -420,7 +420,7 @@ public class DBSpawnManager updateStatus(npc, false); } - final StatsSet info = entry.getValue(); + final StatSet info = entry.getValue(); if (info == null) { continue; @@ -529,7 +529,7 @@ public class DBSpawnManager */ public void notifySpawnNightNpc(Npc npc) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getCurrentHp()); info.set("currentMP", npc.getCurrentMp()); info.set("respawnTime", 0); @@ -572,7 +572,7 @@ public class DBSpawnManager * Gets the stored info. * @return the stored info */ - public Map getStoredInfo() + public Map getStoredInfo() { return _storedInfo; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index 3dd4e3f652..767bed6954 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.datatables.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.FakePlayerChatHolder; @@ -73,7 +73,7 @@ public class FakePlayerChatManager implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayerChat", fakePlayerChatNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerChatNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerChatNode)); MESSAGES.add(new FakePlayerChatHolder(set.getString("fpcName"), set.getString("searchMethod"), set.getString("searchText"), set.getString("answers"))); })); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java index 07c111065e..52bab09349 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java @@ -33,7 +33,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.tasks.GrandBossManagerStoreTask; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; import org.l2jmobius.gameserver.model.interfaces.IStorable; @@ -51,7 +51,7 @@ public class GrandBossManager implements IStorable protected static Map _bosses = new ConcurrentHashMap<>(); - protected static Map _storedInfo = new HashMap<>(); + protected static Map _storedInfo = new HashMap<>(); private final Map _bossStatus = new HashMap<>(); @@ -72,7 +72,7 @@ public class GrandBossManager implements IStorable final int bossId = rs.getInt("boss_id"); if (NpcData.getInstance().getTemplate(bossId) != null) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("loc_x", rs.getInt("loc_x")); info.set("loc_y", rs.getInt("loc_y")); info.set("loc_z", rs.getInt("loc_z")); @@ -140,12 +140,12 @@ public class GrandBossManager implements IStorable return _bosses.get(bossId); } - public StatsSet getStatsSet(int bossId) + public StatSet getStatSet(int bossId) { return _storedInfo.get(bossId); } - public void setStatsSet(int bossId, StatsSet info) + public void setStatSet(int bossId, StatSet info) { _storedInfo.put(bossId, info); updateDb(bossId, false); @@ -156,10 +156,10 @@ public class GrandBossManager implements IStorable { try (Connection con = DatabaseFactory.getConnection()) { - for (Entry e : _storedInfo.entrySet()) + for (Entry e : _storedInfo.entrySet()) { final GrandBossInstance boss = _bosses.get(e.getKey()); - final StatsSet info = e.getValue(); + final StatSet info = e.getValue(); if ((boss == null) || (info == null)) { try (PreparedStatement update = con.prepareStatement(UPDATE_GRAND_BOSS_DATA2)) @@ -209,7 +209,7 @@ public class GrandBossManager implements IStorable try (Connection con = DatabaseFactory.getConnection()) { final GrandBossInstance boss = _bosses.get(bossId); - final StatsSet info = _storedInfo.get(bossId); + final StatSet info = _storedInfo.get(bossId); if (statusOnly || (boss == null) || (info == null)) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index d77642378f..29e517b0cd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.enums.InstanceReenterType; import org.l2jmobius.gameserver.enums.InstanceRemoveBuffType; import org.l2jmobius.gameserver.enums.InstanceTeleportType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.holders.InstanceReenterTimeHolder; @@ -151,7 +151,7 @@ public class InstanceManager implements IXmlReader return; } - final InstanceTemplate template = new InstanceTemplate(new StatsSet(parseAttributes(instanceNode))); + final InstanceTemplate template = new InstanceTemplate(new StatSet(parseAttributes(instanceNode))); // Update name if wasn't provided if (template.getName() == null) @@ -241,10 +241,10 @@ public class InstanceManager implements IXmlReader { if (doorNode.getNodeName().equals("door")) { - final StatsSet parsedSet = DoorData.getInstance().parseDoor(doorNode); - final StatsSet mergedSet = new StatsSet(); + final StatSet parsedSet = DoorData.getInstance().parseDoor(doorNode); + final StatSet mergedSet = new StatSet(); final int doorId = parsedSet.getInt("id"); - final StatsSet templateSet = DoorData.getInstance().getDoorTemplate(doorId); + final StatSet templateSet = DoorData.getInstance().getDoorTemplate(doorId); if (templateSet != null) { mergedSet.merge(templateSet); @@ -324,14 +324,14 @@ public class InstanceManager implements IXmlReader final boolean onlyLeader = parseBoolean(attrs, "onlyLeader", false); final boolean showMessageAndHtml = parseBoolean(attrs, "showMessageAndHtml", false); // Load parameters - StatsSet params = null; + StatSet params = null; for (Node f = conditionNode.getFirstChild(); f != null; f = f.getNextSibling()) { if (f.getNodeName().equals("param")) { if (params == null) { - params = new StatsSet(); + params = new StatSet(); } params.set(parseString(f.getAttributes(), "name"), parseString(f.getAttributes(), "value")); @@ -341,14 +341,14 @@ public class InstanceManager implements IXmlReader // If none parameters found then set empty StatSet if (params == null) { - params = StatsSet.EMPTY_STATSET; + params = StatSet.EMPTY_STATSET; } // Now when everything is loaded register condition to template try { final Class clazz = Class.forName("org.l2jmobius.gameserver.model.instancezone.conditions.Condition" + type); - final Constructor constructor = clazz.getConstructor(InstanceTemplate.class, StatsSet.class, boolean.class, boolean.class); + final Constructor constructor = clazz.getConstructor(InstanceTemplate.class, StatSet.class, boolean.class, boolean.class); conditions.add((Condition) constructor.newInstance(template, params, onlyLeader, showMessageAndHtml)); } catch (Exception ex) @@ -378,7 +378,7 @@ public class InstanceManager implements IXmlReader */ public Instance createInstance() { - return new Instance(getNewInstanceId(), new InstanceTemplate(StatsSet.EMPTY_STATSET), null); + return new Instance(getNewInstanceId(), new InstanceTemplate(StatSet.EMPTY_STATSET), null); } /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/AccessLevel.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/AccessLevel.java index 772c1fe77e..72b77905e1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/AccessLevel.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/AccessLevel.java @@ -52,7 +52,7 @@ public class AccessLevel /** Flag to gain exp in party */ private boolean _gainExp = false; - public AccessLevel(StatsSet set) + public AccessLevel(StatSet set) { _accessLevel = set.getInt("level"); _name = set.getString("name"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ActionDataHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ActionDataHolder.java index 4887bedba8..ca6d9ee685 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ActionDataHolder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ActionDataHolder.java @@ -25,7 +25,7 @@ public class ActionDataHolder private final String _handler; private final int _optionId; - public ActionDataHolder(StatsSet set) + public ActionDataHolder(StatSet set) { _id = set.getInt("id"); _handler = set.getString("handler"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java index 656119098e..3f88e455d7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java @@ -27,7 +27,7 @@ public class AdminCommandAccessRight private final int _accessLevel; private final boolean _requireConfirm; - public AdminCommandAccessRight(StatsSet set) + public AdminCommandAccessRight(StatSet set) { _adminCommand = set.getString("command"); _requireConfirm = set.getBoolean("confirmDlg", false); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index efc53c7e48..6102d39d06 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -36,7 +36,7 @@ public class DailyMissionDataHolder private final List _rewardsItems; private final List _classRestriction; private final int _requiredCompletions; - private final StatsSet _params; + private final StatSet _params; private final boolean _dailyReset; private final boolean _isOneTime; private final boolean _isMainClassOnly; @@ -44,7 +44,7 @@ public class DailyMissionDataHolder private final boolean _isDisplayedWhenNotAvailable; private final AbstractDailyMissionHandler _handler; - public DailyMissionDataHolder(StatsSet set) + public DailyMissionDataHolder(StatSet set) { final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); @@ -53,7 +53,7 @@ public class DailyMissionDataHolder _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); - _params = set.getObject("params", StatsSet.class); + _params = set.getObject("params", StatSet.class); _dailyReset = set.getBoolean("dailyReset", true); _isOneTime = set.getBoolean("isOneTime", true); _isMainClassOnly = set.getBoolean("isMainClassOnly", true); @@ -87,7 +87,7 @@ public class DailyMissionDataHolder return _requiredCompletions; } - public StatsSet getParams() + public StatSet getParams() { return _params; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Location.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Location.java index 1c61740e4d..024c71075f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Location.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Location.java @@ -49,7 +49,7 @@ public class Location implements IPositionable this(obj.getX(), obj.getY(), obj.getZ(), obj.getHeading()); } - public Location(StatsSet set) + public Location(StatSet set) { _x = set.getInt("x"); _y = set.getInt("y"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/PetLevelData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/PetLevelData.java index e46b215b5f..7cad1a225a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/PetLevelData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/PetLevelData.java @@ -46,7 +46,7 @@ public class PetLevelData private final double _slowFlySpeedOnRide; private final double _fastFlySpeedOnRide; - public PetLevelData(StatsSet set) + public PetLevelData(StatSet set) { _ownerExpTaken = set.getInt("get_exp_type"); _petMaxExp = set.getLong("exp"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/RecipeList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/RecipeList.java index 9e4a3b2387..a81bbb1802 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/RecipeList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/RecipeList.java @@ -68,7 +68,7 @@ public class RecipeList * @param set * @param haveRare */ - public RecipeList(StatsSet set, boolean haveRare) + public RecipeList(StatSet set, boolean haveRare) { _recipes = new RecipeInstance[0]; _statUse = new RecipeStatInstance[0]; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Seed.java index 6d31ffc60f..54ef8acd9f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Seed.java @@ -35,7 +35,7 @@ public class Seed private final int _seedReferencePrice; private final int _cropReferencePrice; - public Seed(StatsSet set) + public Seed(StatSet set) { _cropId = set.getInt("id"); _seedId = set.getInt("seedId"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java index 78897cf4f1..4de77df228 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java @@ -27,7 +27,7 @@ public class SiegeScheduleDate private final int _hour; private final int _maxConcurrent; - public SiegeScheduleDate(StatsSet set) + public SiegeScheduleDate(StatSet set) { _day = set.getInt("day", Calendar.SUNDAY); _hour = set.getInt("hour", 16); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/SkillLearn.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/SkillLearn.java index e2ccdd6331..00f53c0cb9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/SkillLearn.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/SkillLearn.java @@ -58,7 +58,7 @@ public class SkillLearn * Constructor for SkillLearn. * @param set the set with the SkillLearn data. */ - public SkillLearn(StatsSet set) + public SkillLearn(StatSet set) { _skillName = set.getString("skillName"); _skillId = set.getInt("skillId"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/StatSet.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/StatSet.java new file mode 100644 index 0000000000..3c824d9fa4 --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/StatSet.java @@ -0,0 +1,968 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Supplier; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.stream.Collectors; + +import org.l2jmobius.commons.util.TimeUtil; +import org.l2jmobius.gameserver.model.holders.MinionHolder; +import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.interfaces.IParserAdvUtils; +import org.l2jmobius.gameserver.util.Util; + +/** + * This class is meant to hold a set of (key,value) pairs.
    + * They are stored as object but can be retrieved in any type wanted. As long as cast is available.
    + * @author mkizub + */ +public class StatSet implements IParserAdvUtils +{ + private static final Logger LOGGER = Logger.getLogger(StatSet.class.getName()); + /** Static empty immutable map, used to avoid multiple null checks over the source. */ + public static final StatSet EMPTY_STATSET = new StatSet(Collections.emptyMap()); + + private final Map _set; + + public StatSet() + { + this(ConcurrentHashMap::new); + } + + public StatSet(Supplier> mapFactory) + { + this(mapFactory.get()); + } + + public StatSet(Map map) + { + _set = map; + } + + /** + * Returns the set of values + * @return HashMap + */ + public Map getSet() + { + return _set; + } + + /** + * Add a set of couple values in the current set + * @param newSet : StatSet pointing out the list of couples to add in the current set + */ + public void merge(StatSet newSet) + { + _set.putAll(newSet.getSet()); + } + + /** + * Verifies if the stat set is empty. + * @return {@code true} if the stat set is empty, {@code false} otherwise + */ + public boolean isEmpty() + { + return _set.isEmpty(); + } + + /** + * Return the boolean value associated with key. + * @param key : String designating the key in the set + * @return boolean : value associated to the key + * @throws IllegalArgumentException : If value is not set or value is not boolean + */ + @Override + public boolean getBoolean(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Boolean value required, but not specified"); + } + if (val instanceof Boolean) + { + return ((Boolean) val).booleanValue(); + } + try + { + return Boolean.parseBoolean((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Boolean value required, but found: " + val); + } + } + + /** + * Return the boolean value associated with key.
    + * If no value is associated with key, or type of value is wrong, returns defaultValue. + * @param key : String designating the key in the entry set + * @return boolean : value associated to the key + */ + @Override + public boolean getBoolean(String key, boolean defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Boolean) + { + return ((Boolean) val).booleanValue(); + } + try + { + return Boolean.parseBoolean((String) val); + } + catch (Exception e) + { + return defaultValue; + } + } + + @Override + public byte getByte(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Byte value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).byteValue(); + } + try + { + return Byte.parseByte((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + + @Override + public byte getByte(String key, byte defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).byteValue(); + } + try + { + return Byte.parseByte((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + + public short increaseByte(String key, byte increaseWith) + { + final byte newValue = (byte) (getByte(key) + increaseWith); + set(key, newValue); + return newValue; + } + + public short increaseByte(String key, byte defaultValue, byte increaseWith) + { + final byte newValue = (byte) (getByte(key, defaultValue) + increaseWith); + set(key, newValue); + return newValue; + } + + public byte[] getByteArray(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Byte value required, but not specified"); + } + if (val instanceof Number) + { + return new byte[] + { + ((Number) val).byteValue() + }; + } + int c = 0; + final String[] vals = ((String) val).split(splitOn); + final byte[] result = new byte[vals.length]; + for (String v : vals) + { + try + { + result[c++] = Byte.parseByte(v); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + return result; + } + + public List getByteList(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final List result = new ArrayList<>(); + for (Byte i : getByteArray(key, splitOn)) + { + result.add(i); + } + return result; + } + + @Override + public short getShort(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Short value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).shortValue(); + } + try + { + return Short.parseShort((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Short value required, but found: " + val); + } + } + + @Override + public short getShort(String key, short defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).shortValue(); + } + try + { + return Short.parseShort((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Short value required, but found: " + val); + } + } + + public short increaseShort(String key, short increaseWith) + { + final short newValue = (short) (getShort(key) + increaseWith); + set(key, newValue); + return newValue; + } + + public short increaseShort(String key, short defaultValue, short increaseWith) + { + final short newValue = (short) (getShort(key, defaultValue) + increaseWith); + set(key, newValue); + return newValue; + } + + @Override + public int getInt(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Integer value required, but not specified: " + key + "!"); + } + + if (val instanceof Number) + { + return ((Number) val).intValue(); + } + + try + { + return Integer.parseInt((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val + "!"); + } + } + + @Override + public int getInt(String key, int defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).intValue(); + } + try + { + return Integer.parseInt((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val); + } + } + + public int increaseInt(String key, int increaseWith) + { + final int newValue = getInt(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public int increaseInt(String key, int defaultValue, int increaseWith) + { + final int newValue = getInt(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + public int[] getIntArray(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Integer value required, but not specified"); + } + if (val instanceof Number) + { + return new int[] + { + ((Number) val).intValue() + }; + } + int c = 0; + final String[] vals = ((String) val).split(splitOn); + final int[] result = new int[vals.length]; + for (String v : vals) + { + try + { + result[c++] = Integer.parseInt(v); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val); + } + } + return result; + } + + public List getIntegerList(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final List result = new ArrayList<>(); + for (int i : getIntArray(key, splitOn)) + { + result.add(i); + } + return result; + } + + @Override + public long getLong(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Long value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).longValue(); + } + try + { + return Long.parseLong((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Long value required, but found: " + val); + } + } + + @Override + public long getLong(String key, long defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).longValue(); + } + try + { + return Long.parseLong((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Long value required, but found: " + val); + } + } + + public long increaseLong(String key, long increaseWith) + { + final long newValue = getLong(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public long increaseLong(String key, long defaultValue, long increaseWith) + { + final long newValue = getLong(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public float getFloat(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Float value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).floatValue(); + } + try + { + return Float.parseFloat((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Float value required, but found: " + val); + } + } + + @Override + public float getFloat(String key, float defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).floatValue(); + } + try + { + return Float.parseFloat((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Float value required, but found: " + val); + } + } + + public float increaseFloat(String key, float increaseWith) + { + final float newValue = getFloat(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public float increaseFloat(String key, float defaultValue, float increaseWith) + { + final float newValue = getFloat(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public double getDouble(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Double value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).doubleValue(); + } + try + { + return Double.parseDouble((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Double value required, but found: " + val); + } + } + + @Override + public double getDouble(String key, double defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).doubleValue(); + } + try + { + return Double.parseDouble((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Double value required, but found: " + val); + } + } + + public double increaseDouble(String key, double increaseWith) + { + final double newValue = getDouble(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public double increaseDouble(String key, double defaultValue, double increaseWith) + { + final double newValue = getDouble(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public String getString(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("String value required, but not specified"); + } + return String.valueOf(val); + } + + @Override + public String getString(String key, String defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + return String.valueOf(val); + } + + @Override + public Duration getDuration(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("String value required, but not specified"); + } + return TimeUtil.parseDuration(String.valueOf(val)); + } + + @Override + public Duration getDuration(String key, Duration defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + return TimeUtil.parseDuration(String.valueOf(val)); + } + + @Override + @SuppressWarnings("unchecked") + public > T getEnum(String key, Class enumClass) + { + Objects.requireNonNull(key); + Objects.requireNonNull(enumClass); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but not specified"); + } + if (enumClass.isInstance(val)) + { + return (T) val; + } + try + { + return Enum.valueOf(enumClass, String.valueOf(val)); + } + catch (Exception e) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); + } + } + + @Override + @SuppressWarnings("unchecked") + public > T getEnum(String key, Class enumClass, T defaultValue) + { + Objects.requireNonNull(key); + Objects.requireNonNull(enumClass); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (enumClass.isInstance(val)) + { + return (T) val; + } + try + { + return Enum.valueOf(enumClass, String.valueOf(val)); + } + catch (Exception e) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); + } + } + + @SuppressWarnings("unchecked") + public A getObject(String name, Class type) + { + Objects.requireNonNull(name); + Objects.requireNonNull(type); + final Object obj = _set.get(name); + if ((obj == null) || !type.isAssignableFrom(obj.getClass())) + { + return null; + } + + return (A) obj; + } + + @SuppressWarnings("unchecked") + public A getObject(String name, Class type, A defaultValue) + { + Objects.requireNonNull(name); + Objects.requireNonNull(type); + final Object obj = _set.get(name); + if ((obj == null) || !type.isAssignableFrom(obj.getClass())) + { + return defaultValue; + } + + return (A) obj; + } + + public SkillHolder getSkillHolder(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof SkillHolder)) + { + return null; + } + + return (SkillHolder) obj; + } + + public Location getLocation(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof Location)) + { + return null; + } + return (Location) obj; + } + + @SuppressWarnings("unchecked") + public List getMinionList(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return Collections.emptyList(); + } + + return (List) obj; + } + + @SuppressWarnings("unchecked") + public List getList(String key, Class clazz) + { + Objects.requireNonNull(key); + Objects.requireNonNull(clazz); + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return null; + } + + final List originalList = (List) obj; + if (!originalList.isEmpty() && !originalList.stream().allMatch(clazz::isInstance)) + { + if (clazz.getSuperclass() == Enum.class) + { + throw new IllegalAccessError("Please use getEnumList if you want to get list of Enums!"); + } + + // Attempt to convert the list + final List convertedList = convertList(originalList, clazz); + if (convertedList == null) + { + LOGGER.log(Level.WARNING, "getList(\"" + key + "\", " + clazz.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); + return null; + } + + // Overwrite the existing list with proper generic type + _set.put(key, convertedList); + return convertedList; + } + return (List) obj; + } + + public List getList(String key, Class clazz, List defaultValue) + { + final List list = getList(key, clazz); + return list == null ? defaultValue : list; + } + + @SuppressWarnings("unchecked") + public > List getEnumList(String key, Class clazz) + { + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return null; + } + + final List originalList = (List) obj; + if (!originalList.isEmpty() && (obj.getClass().getGenericInterfaces()[0] != clazz) && originalList.stream().allMatch(name -> Util.isEnum(name.toString(), clazz))) + { + final List convertedList = originalList.stream().map(Object::toString).map(name -> Enum.valueOf(clazz, name)).map(clazz::cast).collect(Collectors.toList()); + + // Overwrite the existing list with proper generic type + _set.put(key, convertedList); + return convertedList; + } + return (List) obj; + } + + /** + * @param + * @param originalList + * @param clazz + * @return + */ + private List convertList(List originalList, Class clazz) + { + if (clazz == Integer.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isInteger)) + { + return originalList.stream().map(Object::toString).map(Integer::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + else if (clazz == Float.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isFloat)) + { + return originalList.stream().map(Object::toString).map(Float::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + else if (clazz == Double.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isDouble)) + { + return originalList.stream().map(Object::toString).map(Double::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + return null; + } + + @SuppressWarnings("unchecked") + public Map getMap(String key, Class keyClass, Class valueClass) + { + final Object obj = _set.get(key); + if (!(obj instanceof Map)) + { + return null; + } + + final Map originalList = (Map) obj; + if (!originalList.isEmpty() && ((!originalList.keySet().stream().allMatch(keyClass::isInstance)) || (!originalList.values().stream().allMatch(valueClass::isInstance)))) + { + LOGGER.log(Level.WARNING, "getMap(\"" + key + "\", " + keyClass.getSimpleName() + ", " + valueClass.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); + } + return (Map) obj; + } + + public StatSet set(String name, Object value) + { + if (value == null) + { + return this; + } + _set.put(name, value); + return this; + } + + public StatSet set(String key, boolean value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, byte value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, short value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, int value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, long value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, float value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, double value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, String value) + { + if (value == null) + { + return this; + } + _set.put(key, value); + return this; + } + + public StatSet set(String key, Enum value) + { + if (value == null) + { + return this; + } + _set.put(key, value); + return this; + } + + public static StatSet valueOf(String key, Object value) + { + final StatSet set = new StatSet(); + set.set(key, value); + return set; + } + + public void remove(String key) + { + _set.remove(key); + } + + public boolean contains(String name) + { + return _set.containsKey(name); + } + + @Override + public String toString() + { + return "StatSet{_set=" + _set + '}'; + } +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/StatsSet.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/StatsSet.java deleted file mode 100644 index 5ce013ebd2..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/StatsSet.java +++ /dev/null @@ -1,968 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.ConcurrentHashMap; -import java.util.function.Supplier; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.stream.Collectors; - -import org.l2jmobius.commons.util.TimeUtil; -import org.l2jmobius.gameserver.model.holders.MinionHolder; -import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.interfaces.IParserAdvUtils; -import org.l2jmobius.gameserver.util.Util; - -/** - * This class is meant to hold a set of (key,value) pairs.
    - * They are stored as object but can be retrieved in any type wanted. As long as cast is available.
    - * @author mkizub - */ -public class StatsSet implements IParserAdvUtils -{ - private static final Logger LOGGER = Logger.getLogger(StatsSet.class.getName()); - /** Static empty immutable map, used to avoid multiple null checks over the source. */ - public static final StatsSet EMPTY_STATSET = new StatsSet(Collections.emptyMap()); - - private final Map _set; - - public StatsSet() - { - this(ConcurrentHashMap::new); - } - - public StatsSet(Supplier> mapFactory) - { - this(mapFactory.get()); - } - - public StatsSet(Map map) - { - _set = map; - } - - /** - * Returns the set of values - * @return HashMap - */ - public Map getSet() - { - return _set; - } - - /** - * Add a set of couple values in the current set - * @param newSet : StatsSet pointing out the list of couples to add in the current set - */ - public void merge(StatsSet newSet) - { - _set.putAll(newSet.getSet()); - } - - /** - * Verifies if the stat set is empty. - * @return {@code true} if the stat set is empty, {@code false} otherwise - */ - public boolean isEmpty() - { - return _set.isEmpty(); - } - - /** - * Return the boolean value associated with key. - * @param key : String designating the key in the set - * @return boolean : value associated to the key - * @throws IllegalArgumentException : If value is not set or value is not boolean - */ - @Override - public boolean getBoolean(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Boolean value required, but not specified"); - } - if (val instanceof Boolean) - { - return ((Boolean) val).booleanValue(); - } - try - { - return Boolean.parseBoolean((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Boolean value required, but found: " + val); - } - } - - /** - * Return the boolean value associated with key.
    - * If no value is associated with key, or type of value is wrong, returns defaultValue. - * @param key : String designating the key in the entry set - * @return boolean : value associated to the key - */ - @Override - public boolean getBoolean(String key, boolean defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Boolean) - { - return ((Boolean) val).booleanValue(); - } - try - { - return Boolean.parseBoolean((String) val); - } - catch (Exception e) - { - return defaultValue; - } - } - - @Override - public byte getByte(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Byte value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).byteValue(); - } - try - { - return Byte.parseByte((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - - @Override - public byte getByte(String key, byte defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).byteValue(); - } - try - { - return Byte.parseByte((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - - public short increaseByte(String key, byte increaseWith) - { - final byte newValue = (byte) (getByte(key) + increaseWith); - set(key, newValue); - return newValue; - } - - public short increaseByte(String key, byte defaultValue, byte increaseWith) - { - final byte newValue = (byte) (getByte(key, defaultValue) + increaseWith); - set(key, newValue); - return newValue; - } - - public byte[] getByteArray(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Byte value required, but not specified"); - } - if (val instanceof Number) - { - return new byte[] - { - ((Number) val).byteValue() - }; - } - int c = 0; - final String[] vals = ((String) val).split(splitOn); - final byte[] result = new byte[vals.length]; - for (String v : vals) - { - try - { - result[c++] = Byte.parseByte(v); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - return result; - } - - public List getByteList(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final List result = new ArrayList<>(); - for (Byte i : getByteArray(key, splitOn)) - { - result.add(i); - } - return result; - } - - @Override - public short getShort(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Short value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).shortValue(); - } - try - { - return Short.parseShort((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Short value required, but found: " + val); - } - } - - @Override - public short getShort(String key, short defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).shortValue(); - } - try - { - return Short.parseShort((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Short value required, but found: " + val); - } - } - - public short increaseShort(String key, short increaseWith) - { - final short newValue = (short) (getShort(key) + increaseWith); - set(key, newValue); - return newValue; - } - - public short increaseShort(String key, short defaultValue, short increaseWith) - { - final short newValue = (short) (getShort(key, defaultValue) + increaseWith); - set(key, newValue); - return newValue; - } - - @Override - public int getInt(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Integer value required, but not specified: " + key + "!"); - } - - if (val instanceof Number) - { - return ((Number) val).intValue(); - } - - try - { - return Integer.parseInt((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val + "!"); - } - } - - @Override - public int getInt(String key, int defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).intValue(); - } - try - { - return Integer.parseInt((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val); - } - } - - public int increaseInt(String key, int increaseWith) - { - final int newValue = getInt(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public int increaseInt(String key, int defaultValue, int increaseWith) - { - final int newValue = getInt(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - public int[] getIntArray(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Integer value required, but not specified"); - } - if (val instanceof Number) - { - return new int[] - { - ((Number) val).intValue() - }; - } - int c = 0; - final String[] vals = ((String) val).split(splitOn); - final int[] result = new int[vals.length]; - for (String v : vals) - { - try - { - result[c++] = Integer.parseInt(v); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val); - } - } - return result; - } - - public List getIntegerList(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final List result = new ArrayList<>(); - for (int i : getIntArray(key, splitOn)) - { - result.add(i); - } - return result; - } - - @Override - public long getLong(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Long value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).longValue(); - } - try - { - return Long.parseLong((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Long value required, but found: " + val); - } - } - - @Override - public long getLong(String key, long defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).longValue(); - } - try - { - return Long.parseLong((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Long value required, but found: " + val); - } - } - - public long increaseLong(String key, long increaseWith) - { - final long newValue = getLong(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public long increaseLong(String key, long defaultValue, long increaseWith) - { - final long newValue = getLong(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public float getFloat(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Float value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).floatValue(); - } - try - { - return Float.parseFloat((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Float value required, but found: " + val); - } - } - - @Override - public float getFloat(String key, float defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).floatValue(); - } - try - { - return Float.parseFloat((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Float value required, but found: " + val); - } - } - - public float increaseFloat(String key, float increaseWith) - { - final float newValue = getFloat(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public float increaseFloat(String key, float defaultValue, float increaseWith) - { - final float newValue = getFloat(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public double getDouble(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Double value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).doubleValue(); - } - try - { - return Double.parseDouble((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Double value required, but found: " + val); - } - } - - @Override - public double getDouble(String key, double defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).doubleValue(); - } - try - { - return Double.parseDouble((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Double value required, but found: " + val); - } - } - - public double increaseDouble(String key, double increaseWith) - { - final double newValue = getDouble(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public double increaseDouble(String key, double defaultValue, double increaseWith) - { - final double newValue = getDouble(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public String getString(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("String value required, but not specified"); - } - return String.valueOf(val); - } - - @Override - public String getString(String key, String defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - return String.valueOf(val); - } - - @Override - public Duration getDuration(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("String value required, but not specified"); - } - return TimeUtil.parseDuration(String.valueOf(val)); - } - - @Override - public Duration getDuration(String key, Duration defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - return TimeUtil.parseDuration(String.valueOf(val)); - } - - @Override - @SuppressWarnings("unchecked") - public > T getEnum(String key, Class enumClass) - { - Objects.requireNonNull(key); - Objects.requireNonNull(enumClass); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but not specified"); - } - if (enumClass.isInstance(val)) - { - return (T) val; - } - try - { - return Enum.valueOf(enumClass, String.valueOf(val)); - } - catch (Exception e) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); - } - } - - @Override - @SuppressWarnings("unchecked") - public > T getEnum(String key, Class enumClass, T defaultValue) - { - Objects.requireNonNull(key); - Objects.requireNonNull(enumClass); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (enumClass.isInstance(val)) - { - return (T) val; - } - try - { - return Enum.valueOf(enumClass, String.valueOf(val)); - } - catch (Exception e) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); - } - } - - @SuppressWarnings("unchecked") - public A getObject(String name, Class type) - { - Objects.requireNonNull(name); - Objects.requireNonNull(type); - final Object obj = _set.get(name); - if ((obj == null) || !type.isAssignableFrom(obj.getClass())) - { - return null; - } - - return (A) obj; - } - - @SuppressWarnings("unchecked") - public A getObject(String name, Class type, A defaultValue) - { - Objects.requireNonNull(name); - Objects.requireNonNull(type); - final Object obj = _set.get(name); - if ((obj == null) || !type.isAssignableFrom(obj.getClass())) - { - return defaultValue; - } - - return (A) obj; - } - - public SkillHolder getSkillHolder(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof SkillHolder)) - { - return null; - } - - return (SkillHolder) obj; - } - - public Location getLocation(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof Location)) - { - return null; - } - return (Location) obj; - } - - @SuppressWarnings("unchecked") - public List getMinionList(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return Collections.emptyList(); - } - - return (List) obj; - } - - @SuppressWarnings("unchecked") - public List getList(String key, Class clazz) - { - Objects.requireNonNull(key); - Objects.requireNonNull(clazz); - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return null; - } - - final List originalList = (List) obj; - if (!originalList.isEmpty() && !originalList.stream().allMatch(clazz::isInstance)) - { - if (clazz.getSuperclass() == Enum.class) - { - throw new IllegalAccessError("Please use getEnumList if you want to get list of Enums!"); - } - - // Attempt to convert the list - final List convertedList = convertList(originalList, clazz); - if (convertedList == null) - { - LOGGER.log(Level.WARNING, "getList(\"" + key + "\", " + clazz.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); - return null; - } - - // Overwrite the existing list with proper generic type - _set.put(key, convertedList); - return convertedList; - } - return (List) obj; - } - - public List getList(String key, Class clazz, List defaultValue) - { - final List list = getList(key, clazz); - return list == null ? defaultValue : list; - } - - @SuppressWarnings("unchecked") - public > List getEnumList(String key, Class clazz) - { - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return null; - } - - final List originalList = (List) obj; - if (!originalList.isEmpty() && (obj.getClass().getGenericInterfaces()[0] != clazz) && originalList.stream().allMatch(name -> Util.isEnum(name.toString(), clazz))) - { - final List convertedList = originalList.stream().map(Object::toString).map(name -> Enum.valueOf(clazz, name)).map(clazz::cast).collect(Collectors.toList()); - - // Overwrite the existing list with proper generic type - _set.put(key, convertedList); - return convertedList; - } - return (List) obj; - } - - /** - * @param - * @param originalList - * @param clazz - * @return - */ - private List convertList(List originalList, Class clazz) - { - if (clazz == Integer.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isInteger)) - { - return originalList.stream().map(Object::toString).map(Integer::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - else if (clazz == Float.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isFloat)) - { - return originalList.stream().map(Object::toString).map(Float::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - else if (clazz == Double.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isDouble)) - { - return originalList.stream().map(Object::toString).map(Double::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - return null; - } - - @SuppressWarnings("unchecked") - public Map getMap(String key, Class keyClass, Class valueClass) - { - final Object obj = _set.get(key); - if (!(obj instanceof Map)) - { - return null; - } - - final Map originalList = (Map) obj; - if (!originalList.isEmpty() && ((!originalList.keySet().stream().allMatch(keyClass::isInstance)) || (!originalList.values().stream().allMatch(valueClass::isInstance)))) - { - LOGGER.log(Level.WARNING, "getMap(\"" + key + "\", " + keyClass.getSimpleName() + ", " + valueClass.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); - } - return (Map) obj; - } - - public StatsSet set(String name, Object value) - { - if (value == null) - { - return this; - } - _set.put(name, value); - return this; - } - - public StatsSet set(String key, boolean value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, byte value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, short value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, int value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, long value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, float value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, double value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, String value) - { - if (value == null) - { - return this; - } - _set.put(key, value); - return this; - } - - public StatsSet set(String key, Enum value) - { - if (value == null) - { - return this; - } - _set.put(key, value); - return this; - } - - public static StatsSet valueOf(String key, Object value) - { - final StatsSet set = new StatsSet(); - set.set(key, value); - return set; - } - - public void remove(String key) - { - _set.remove(key); - } - - public boolean contains(String name) - { - return _set.containsKey(name); - } - - @Override - public String toString() - { - return "StatsSet{_set=" + _set + '}'; - } -} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Npc.java index 40f5f65ede..f74f986666 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -50,7 +50,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.MpRewardTask; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.FishermanInstance; @@ -149,7 +149,7 @@ public class Npc extends Creature private NpcStringId _titleString; private NpcStringId _nameString; - private StatsSet _params; + private StatSet _params; private RaidBossStatus _raidStatus; /** Contains information about local tax payments. */ @@ -1768,7 +1768,7 @@ public class Npc extends Creature /** * @return the parameters of the npc merged with the spawn parameters (if there are any) */ - public StatsSet getParameters() + public StatSet getParameters() { if (_params != null) { @@ -1780,10 +1780,10 @@ public class Npc extends Creature final NpcSpawnTemplate npcSpawnTemplate = _spawn.getNpcSpawnTemplate(); if ((npcSpawnTemplate != null) && (npcSpawnTemplate.getParameters() != null) && !npcSpawnTemplate.getParameters().isEmpty()) { - final StatsSet params = getTemplate().getParameters(); + final StatSet params = getTemplate().getParameters(); if ((params != null) && !params.getSet().isEmpty()) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.merge(params); set.merge(npcSpawnTemplate.getParameters()); _params = set; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index c8cbb989c0..a4d95ae3fc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -21,7 +21,7 @@ import java.util.EnumMap; import java.util.Map; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; @@ -49,12 +49,12 @@ public class CreatureTemplate extends ListenersContainer /** The creature's race. */ private Race _race; - public CreatureTemplate(StatsSet set) + public CreatureTemplate(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { // Base stats _baseValues.put(Stat.STAT_STR, set.getDouble("baseSTR", 0)); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java index 86441c678c..14f0e9cae8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.CubicInstance; @@ -46,7 +46,7 @@ public class CubicTemplate implements ICubicConditionHolder private final List _conditions = new ArrayList<>(); public List _skills = new ArrayList<>(); - public CubicTemplate(StatsSet set) + public CubicTemplate(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java index c40883ac75..410040bc86 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.templates; import org.l2jmobius.gameserver.enums.DoorOpenType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -57,7 +57,7 @@ public class DoorTemplate extends CreatureTemplate implements IIdentifiable private final boolean _stealth; private final boolean _isInverted; - public DoorTemplate(StatsSet set) + public DoorTemplate(StatSet set) { super(set); _doorId = set.getInt("id"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 14411761d5..285005f744 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.enums.MpRewardAffectType; import org.l2jmobius.gameserver.enums.MpRewardType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -64,7 +64,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private boolean _usingServerSideName; private String _title; private boolean _usingServerSideTitle; - private StatsSet _parameters; + private StatSet _parameters; private Sex _sex; private int _chestId; private int _rhandId; @@ -127,15 +127,15 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable /** * Constructor of Creature. - * @param set The StatsSet object to transfer data to the method + * @param set The StatSet object to transfer data to the method */ - public NpcTemplate(StatsSet set) + public NpcTemplate(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _id = set.getInt("id"); @@ -327,12 +327,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _usingServerSideTitle; } - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } - public void setParameters(StatsSet set) + public void setParameters(StatSet set) { _parameters = set; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 50292b8bc8..28458aa09e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -50,7 +50,7 @@ public class PlayerTemplate extends CreatureTemplate private final List _creationPoints; private final Map _baseSlotDef; - public PlayerTemplate(StatsSet set, List creationPoints) + public PlayerTemplate(StatSet set, List creationPoints) { super(set); _classId = ClassId.getClassId(set.getInt("classId")); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index aa28a0f648..260da48365 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -23,7 +23,7 @@ import java.util.Objects; import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import org.l2jmobius.gameserver.enums.InventoryBlockType; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -57,7 +57,7 @@ public class Transform implements IIdentifiable private TransformTemplate _maleTemplate; private TransformTemplate _femaleTemplate; - public Transform(StatsSet set) + public Transform(StatSet set) { _id = set.getInt("id"); _displayId = set.getInt("displayId", _id); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java index 5660852a01..729998503f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.actor.transform; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -31,7 +31,7 @@ public class TransformLevelData private final double _levelMod; private Map _stats; - public TransformLevelData(StatsSet set) + public TransformLevelData(StatSet set) { _level = set.getInt("val"); _levelMod = set.getDouble("levelMod"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 4de84b8bdc..7aca059f91 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -23,7 +23,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -49,7 +49,7 @@ public class TransformTemplate private ExBasicActionList _list; private final Map _data = new LinkedHashMap<>(100); - public TransformTemplate(StatsSet set) + public TransformTemplate(StatSet set) { _collisionRadius = set.contains("radius") ? set.getDouble("radius") : null; _collisionHeight = set.contains("height") ? set.getDouble("height") : null; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java index d808a6b8bf..02550d2818 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -36,7 +36,7 @@ public class AlchemyCraftData private ItemHolder _productionSuccess; private ItemHolder _productionFailure; - public AlchemyCraftData(StatsSet set) + public AlchemyCraftData(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java index 0bd061d3c4..79dd6c0207 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.beautyshop; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -32,7 +32,7 @@ public class BeautyItem private final int _beautyShopTicket; private final Map _colors = new HashMap<>(); - public BeautyItem(StatsSet set) + public BeautyItem(StatSet set) { _id = set.getInt("id"); _adena = set.getInt("adena", 0); @@ -60,7 +60,7 @@ public class BeautyItem return _beautyShopTicket; } - public void addColor(StatsSet set) + public void addColor(StatSet set) { final BeautyItem color = new BeautyItem(set); _colors.put(set.getInt("id"), color); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index e0d1486962..1c341e0c31 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party.MessageType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.appearance.PlayerAppearance; @@ -244,7 +244,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent player.teleToLocation(_instance.getEnterLocations().get(index++), 0, _instance); } - getTimers().addTimer("match_start_countdown", StatsSet.valueOf("time", 60), 100, null, null); + getTimers().addTimer("match_start_countdown", StatSet.valueOf("time", 60), 100, null, null); getTimers().addTimer("teleport_message1", 10000, null, null); getTimers().addTimer("teleport_message2", 14000, null, null); @@ -394,7 +394,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent } } getTimers().cancelTimer("update", null, null); - getTimers().addTimer("match_end_countdown", StatsSet.valueOf("time", 30), 30 * 1000, null, null); + getTimers().addTimer("match_end_countdown", StatSet.valueOf("time", 30), 30 * 1000, null, null); EventDispatcher.getInstance().notifyEvent(new OnCeremonyOfChaosMatchResult(winners, members)); } @@ -487,7 +487,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java index 39f9196d93..371f8dc459 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.conditions.ICubicCondition; @@ -38,7 +38,7 @@ public class CubicSkill extends SkillHolder implements ICubicConditionHolder private final List _conditions = new ArrayList<>(); private final boolean _targetDebuff; - public CubicSkill(StatsSet set) + public CubicSkill(StatSet set) { super(set.getInt("id"), set.getInt("level")); _triggerRate = set.getInt("triggerRate", 100); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/entity/ClanHall.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/entity/ClanHall.java index 8da77477fd..22af370709 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/entity/ClanHall.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/entity/ClanHall.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -75,7 +75,7 @@ public class ClanHall extends AbstractResidence private static final String LOAD_CLANHALL = "SELECT * FROM clanhall WHERE id=?"; private static final String UPDATE_CLANHALL = "UPDATE clanhall SET ownerId=?,paidUntil=? WHERE id=?"; - public ClanHall(StatsSet params) + public ClanHall(StatSet params) { super(params.getInt("id")); // Set static parameters diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/entity/Hero.java index ef005ff325..aee8b019ee 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/entity/Hero.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/entity/Hero.java @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.data.xml.impl.ClassListData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -74,13 +74,13 @@ public class Hero // delete hero items private static final String DELETE_ITEMS = "DELETE FROM items WHERE item_id IN (30392, 30393, 30394, 30395, 30396, 30397, 30398, 30399, 30400, 30401, 30402, 30403, 30404, 30405, 30372, 30373, 6842, 6611, 6612, 6613, 6614, 6615, 6616, 6617, 6618, 6619, 6620, 6621, 9388, 9389, 9390) AND owner_id NOT IN (SELECT charId FROM characters WHERE accesslevel > 0)"; - private static final Map HEROES = new ConcurrentHashMap<>(); - private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); + private static final Map HEROES = new ConcurrentHashMap<>(); + private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); - private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); - private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); + private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); + private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); - private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); + private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); private static final Map HERO_MESSAGE = new ConcurrentHashMap<>(); public static final String COUNT = "count"; @@ -118,7 +118,7 @@ public class Hero { while (rset.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset.getInt(Olympiad.CLASS_ID)); @@ -137,7 +137,7 @@ public class Hero while (rset2.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset2.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset2.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset2.getInt(Olympiad.CLASS_ID)); @@ -159,7 +159,7 @@ public class Hero LOGGER.info("Hero System: Loaded " + COMPLETE_HEROS.size() + " all time Heroes."); } - private void processHeros(PreparedStatement ps, int charId, StatsSet hero) throws SQLException + private void processHeros(PreparedStatement ps, int charId, StatSet hero) throws SQLException { ps.setInt(1, charId); try (ResultSet rs = ps.executeQuery()) @@ -224,7 +224,7 @@ public class Hero public void loadDiary(int charId) { - final List diary = new ArrayList<>(); + final List diary = new ArrayList<>(); int diaryentries = 0; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement("SELECT * FROM heroes_diary WHERE charId=? ORDER BY time ASC")) @@ -234,7 +234,7 @@ public class Hero { while (rset.next()) { - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final long time = rset.getLong("time"); final int action = rset.getInt("action"); @@ -279,8 +279,8 @@ public class Hero public void loadFights(int charId) { - final List fights = new ArrayList<>(); - final StatsSet heroCountData = new StatsSet(); + final List fights = new ArrayList<>(); + final StatSet heroCountData = new StatSet(); final Calendar data = Calendar.getInstance(); data.set(Calendar.DAY_OF_MONTH, 1); data.set(Calendar.HOUR_OF_DAY, 0); @@ -326,7 +326,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charTwoClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -362,7 +362,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charOneClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -410,14 +410,14 @@ public class Hero } } - public Map getHeroes() + public Map getHeroes() { return HEROES; } public int getHeroByClass(int classid) { - for (Entry e : HEROES.entrySet()) + for (Entry e : HEROES.entrySet()) { if (e.getValue().getInt(Olympiad.CLASS_ID) == classid) { @@ -438,7 +438,7 @@ public class Hero public void showHeroDiary(PlayerInstance player, int heroclass, int charid, int page) { final int perpage = 10; - final List mainList = HERO_DIARY.get(charid); + final List mainList = HERO_DIARY.get(charid); if (mainList != null) { final NpcHtmlMessage diaryReply = new NpcHtmlMessage(); @@ -453,7 +453,7 @@ public class Hero if (!mainList.isEmpty()) { - final List list = new ArrayList<>(mainList); + final List list = new ArrayList<>(mainList); Collections.reverse(list); boolean color = true; @@ -463,7 +463,7 @@ public class Hero for (int i = (page - 1) * perpage; i < list.size(); i++) { breakat = i; - final StatsSet diaryEntry = list.get(i); + final StatSet diaryEntry = list.get(i); fList.append(""); if (color) { @@ -524,7 +524,7 @@ public class Hero int loss = 0; int draw = 0; - final List heroFights = HERO_FIGHTS.get(charid); + final List heroFights = HERO_FIGHTS.get(charid); if (heroFights != null) { final NpcHtmlMessage fightReply = new NpcHtmlMessage(); @@ -536,7 +536,7 @@ public class Hero if (!heroFights.isEmpty()) { - final StatsSet heroCount = HERO_COUNTS.get(charid); + final StatSet heroCount = HERO_COUNTS.get(charid); if (heroCount != null) { win = heroCount.getInt("victory"); @@ -551,7 +551,7 @@ public class Hero for (int i = (page - 1) * perpage; i < heroFights.size(); i++) { breakat = i; - final StatsSet fight = heroFights.get(i); + final StatSet fight = heroFights.get(i); fList.append(""); if (color) { @@ -609,7 +609,7 @@ public class Hero } } - public synchronized void computeNewHeroes(List newHeroes) + public synchronized void computeNewHeroes(List newHeroes) { updateHeroes(true); @@ -659,13 +659,13 @@ public class Hero return; } - for (StatsSet hero : newHeroes) + for (StatSet hero : newHeroes) { final int charId = hero.getInt(Olympiad.CHAR_ID); if (COMPLETE_HEROS.containsKey(charId)) { - final StatsSet oldHero = COMPLETE_HEROS.get(charId); + final StatSet oldHero = COMPLETE_HEROS.get(charId); final int count = oldHero.getInt(COUNT); oldHero.set(COUNT, count + 1); oldHero.set(PLAYED, 1); @@ -674,7 +674,7 @@ public class Hero } else { - final StatsSet newHero = new StatsSet(); + final StatSet newHero = new StatSet(); newHero.set(Olympiad.CHAR_NAME, hero.getString(Olympiad.CHAR_NAME)); newHero.set(Olympiad.CLASS_ID, hero.getInt(Olympiad.CLASS_ID)); newHero.set(COUNT, 1); @@ -700,9 +700,9 @@ public class Hero } else { - StatsSet hero; + StatSet hero; int heroId; - for (Entry entry : HEROES.entrySet()) + for (Entry entry : HEROES.entrySet()) { hero = entry.getValue(); heroId = entry.getKey(); @@ -787,13 +787,13 @@ public class Hero setDiaryData(charId, ACTION_RAID_KILLED, npcId); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (template == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -806,13 +806,13 @@ public class Hero setDiaryData(charId, ACTION_CASTLE_TAKEN, castleId); final Castle castle = CastleManager.getInstance().getCastleById(castleId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (castle == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -922,10 +922,10 @@ public class Hero */ public void claimHero(PlayerInstance player) { - StatsSet hero = HEROES.get(player.getObjectId()); + StatSet hero = HEROES.get(player.getObjectId()); if (hero == null) { - hero = new StatsSet(); + hero = new StatSet(); HEROES.put(player.getObjectId(), hero); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java index f1263e8d44..c52f487402 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java @@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.atomic.AtomicReference; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.eventengine.drop.IEventDrop; import org.l2jmobius.gameserver.model.events.AbstractScript; @@ -42,7 +42,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout public abstract class AbstractEventManager>extends AbstractScript { private String _name; - private StatsSet _variables = StatsSet.EMPTY_STATSET; + private StatSet _variables = StatSet.EMPTY_STATSET; private Set _schedulers = Collections.emptySet(); private Set _conditionalSchedulers = Collections.emptySet(); private Map _rewards = Collections.emptyMap(); @@ -67,14 +67,14 @@ public abstract class AbstractEventManager>extends Ab /* ********************** */ - public StatsSet getVariables() + public StatSet getVariables() { return _variables; } - public void setVariables(StatsSet variables) + public void setVariables(StatSet variables) { - _variables = new StatsSet(Collections.unmodifiableMap(variables.getSet())); + _variables = new StatSet(Collections.unmodifiableMap(variables.getSet())); } /* ********************** */ diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java index 59c64b812c..e41af41d1a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.util.cron4j.PastPredictor; import org.l2jmobius.gameserver.util.cron4j.Predictor; @@ -45,7 +45,7 @@ public class EventScheduler private List _notifications; private ScheduledFuture _task; - public EventScheduler(AbstractEventManager manager, StatsSet set) + public EventScheduler(AbstractEventManager manager, StatSet set) { _eventManager = manager; _name = set.getString("name", ""); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 4fc2d3b8b0..819c3bf34d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -50,7 +50,7 @@ import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -181,12 +181,12 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime onTimerCancel(holder.getEvent(), holder.getParams(), holder.getNpc(), holder.getPlayer()); } - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { LOGGER.warning("[" + getClass().getSimpleName() + "]: Timer event arrived at non overriden onTimerEvent method event: " + event + " npc: " + npc + " player: " + player); } - public void onTimerCancel(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerCancel(String event, StatSet params, Npc npc, PlayerInstance player) { } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java index 400fb64b6e..861c4a9b31 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java @@ -24,7 +24,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.timers.IEventTimerCancel; @@ -69,7 +69,7 @@ public class TimerExecutor * @param eventTimer * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - public boolean addTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) + public boolean addTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) { return addTimer(new TimerHolder<>(event, params, time, npc, player, false, eventTimer, _cancelListener, this)); } @@ -95,7 +95,7 @@ public class TimerExecutor * @param player * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - public boolean addTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player) + public boolean addTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player) { return addTimer(event, params, time, npc, player, _eventListener); } @@ -123,7 +123,7 @@ public class TimerExecutor * @param eventTimer * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - private boolean addRepeatingTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) + private boolean addRepeatingTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) { return addTimer(new TimerHolder<>(event, params, time, npc, player, true, eventTimer, _cancelListener, this)); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java index ab8fa150ca..0fcafba759 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java @@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.gameserver.instancemanager.TimersManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.TimerExecutor; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.events.TimerExecutor; public class TimerHolder implements Runnable { private final T _event; - private final StatsSet _params; + private final StatSet _params; private final long _time; private final Npc _npc; private final PlayerInstance _player; @@ -44,7 +44,7 @@ public class TimerHolder implements Runnable private final TimerExecutor _postExecutor; private final ScheduledFuture _task; - public TimerHolder(T event, StatsSet params, long time, Npc npc, PlayerInstance player, boolean isRepeating, IEventTimerEvent eventScript, IEventTimerCancel cancelScript, TimerExecutor postExecutor) + public TimerHolder(T event, StatSet params, long time, Npc npc, PlayerInstance player, boolean isRepeating, IEventTimerEvent eventScript, IEventTimerCancel cancelScript, TimerExecutor postExecutor) { Objects.requireNonNull(event, getClass().getSimpleName() + ": \"event\" cannot be null!"); Objects.requireNonNull(eventScript, getClass().getSimpleName() + ": \"script\" cannot be null!"); @@ -73,7 +73,7 @@ public class TimerHolder implements Runnable /** * @return the parameters of this timer */ - public StatsSet getParams() + public StatSet getParams() { return _params; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index bcf2f14eec..38dfd26bba 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; @@ -37,7 +37,7 @@ public class AppearanceHolder private final AppearanceTargetType _targetType; private final long _bodyPart; - public AppearanceHolder(StatsSet set) + public AppearanceHolder(StatSet set) { _visualId = set.getInt("id", 0); _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java index 29740873cd..0f9488448d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Nik @@ -43,7 +43,7 @@ public class AttachSkillHolder extends SkillHolder return _requiredSkillLevel; } - public static AttachSkillHolder fromStatsSet(StatsSet set) + public static AttachSkillHolder fromStatSet(StatSet set) { return new AttachSkillHolder(set.getInt("skillId"), set.getInt("skillLevel", 1), set.getInt("requiredSkillId"), set.getInt("requiredSkillLevel", 1)); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java index cc41724532..57b6d47c40 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Set; import org.l2jmobius.gameserver.enums.SkillEnchantType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -36,7 +36,7 @@ public class EnchantSkillHolder private final Map _chance = new EnumMap<>(SkillEnchantType.class); private final Map> _requiredItems = new EnumMap<>(SkillEnchantType.class); - public EnchantSkillHolder(StatsSet set) + public EnchantSkillHolder(StatSet set) { _level = set.getInt("level"); _enchantFailLevel = set.getInt("enchantFailLevel"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java index e6706c8467..33d14e4345 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Map; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -36,7 +36,7 @@ public class ExtendDropDataHolder private final List _conditions; private final Map _systemMessages; - public ExtendDropDataHolder(StatsSet set) + public ExtendDropDataHolder(StatSet set) { _id = set.getInt("id"); _items = set.getList("items", ExtendDropItemHolder.class); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java index 16454d764a..d63d4eb775 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -52,7 +52,7 @@ public class FakePlayerHolder private final int _clanId; private final int _pledgeStatus; - public FakePlayerHolder(StatsSet set) + public FakePlayerHolder(StatSet set) { _classId = set.getInt("classId", 182); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java index a9c72776cd..86af0c1405 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -29,7 +29,7 @@ public class ItemHolder implements IIdentifiable private final int _id; private final long _count; - public ItemHolder(StatsSet set) + public ItemHolder(StatSet set) { _id = set.getInt("id"); _count = set.getLong("count"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java index 5b581c4cfe..a54dfa8300 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -25,7 +25,7 @@ public class ItemPointHolder extends ItemHolder { private final int _points; - public ItemPointHolder(StatsSet params) + public ItemPointHolder(StatSet params) { this(params.getInt("id"), params.getLong("count"), params.getInt("points")); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java index 22c6c327eb..0ba78224d3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.holders; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -34,7 +34,7 @@ public class LuckyGameDataHolder private int _minModifyRewardGame; private int _maxModifyRewardGame; - public LuckyGameDataHolder(StatsSet params) + public LuckyGameDataHolder(StatSet params) { _index = params.getInt("index"); _turningPoints = params.getInt("turning_point"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java index f77e380e8d..9fa8c99654 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.holders; import java.time.Duration; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -32,7 +32,7 @@ public class MinionHolder implements IIdentifiable private final long _respawnTime; private final int _weightPoint; - public MinionHolder(StatsSet set) + public MinionHolder(StatSet set) { _id = set.getInt("id"); _count = set.getInt("count", 1); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java index f4173594d1..36ac70176d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -52,7 +52,7 @@ public class MultisellListHolder implements IIdentifiable } @SuppressWarnings("unchecked") - public MultisellListHolder(StatsSet set) + public MultisellListHolder(StatSet set) { _listId = set.getInt("listId"); _isChanceMultisell = set.getBoolean("isChanceMultisell", false); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 3e3ea5d31b..c2f4ab4119 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -45,7 +45,7 @@ import org.l2jmobius.gameserver.enums.InstanceReenterType; import org.l2jmobius.gameserver.enums.InstanceTeleportType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -87,7 +87,7 @@ public class Instance implements IIdentifiable, INamable private final Set _players = ConcurrentHashMap.newKeySet(); // Players inside instance private final Set _npcs = ConcurrentHashMap.newKeySet(); // Spawned NPCs inside instance private final Map _doors = new HashMap<>(); // Spawned doors inside instance - private final StatsSet _parameters = new StatsSet(); + private final StatSet _parameters = new StatSet(); // Timers private final Map> _ejectDeadTasks = new ConcurrentHashMap<>(); private ScheduledFuture _cleanUpTask = null; @@ -171,7 +171,7 @@ public class Instance implements IIdentifiable, INamable * Get instance world parameters. * @return instance parameters */ - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } @@ -1020,7 +1020,7 @@ public class Instance implements IIdentifiable, INamable * Get parameters from instance template.
    * @return template parameters */ - public StatsSet getTemplateParameters() + public StatSet getTemplateParameters() { return _template.getParameters(); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 2a196f73ef..b53b0a819d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.AbstractPlayerGroup; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -71,7 +71,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl private float _spRate = Config.RATE_INSTANCE_SP; private float _expPartyRate = Config.RATE_INSTANCE_PARTY_XP; private float _spPartyRate = Config.RATE_INSTANCE_PARTY_SP; - private StatsSet _parameters = StatsSet.EMPTY_STATSET; + private StatSet _parameters = StatSet.EMPTY_STATSET; private final Map _doors = new HashMap<>(); private final List _spawns = new ArrayList<>(); // Locations @@ -92,7 +92,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl /** * @param set */ - public InstanceTemplate(StatsSet set) + public InstanceTemplate(StatSet set) { _templateId = set.getInt("id", 0); _name = set.getString("name", null); @@ -178,7 +178,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (!set.isEmpty()) { - _parameters = new StatsSet(Collections.unmodifiableMap(set)); + _parameters = new StatSet(Collections.unmodifiableMap(set)); } } @@ -469,7 +469,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl * Get instance template parameters. * @return parameters of template */ - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java index 3b67ff72f4..3627959662 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; import java.util.function.BiConsumer; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public abstract class Condition { private final InstanceTemplate _template; - private final StatsSet _parameters; + private final StatSet _parameters; private final boolean _leaderOnly; private final boolean _showMessageAndHtml; private SystemMessageId _systemMsg = null; @@ -46,7 +46,7 @@ public abstract class Condition * @param onlyLeader flag which means if only leader should be affected (leader means player who wants to enter not group leader!) * @param showMessageAndHtml if {@code true} and HTML message is defined then both are send, otherwise only HTML or message is send */ - public Condition(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public Condition(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { _template = template; _parameters = parameters; @@ -58,7 +58,7 @@ public abstract class Condition * Gets parameters of condition. * @return set of parameters */ - protected final StatsSet getParameters() + protected final StatSet getParameters() { return _parameters; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java index e379741b59..c27d92d662 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionCommandChannel extends Condition { - public ConditionCommandChannel(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionCommandChannel(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_CANNOT_ENTER_BECAUSE_YOU_ARE_NOT_ASSOCIATED_WITH_THE_CURRENT_COMMAND_CHANNEL); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java index ed434e3524..a828dcceae 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.model.AbstractPlayerGroup; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionCommandChannelLeader extends Condition { - public ConditionCommandChannelLeader(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionCommandChannelLeader(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java index d2a60816d0..423a37a94e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionDistance extends Condition { - public ConditionDistance(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionDistance(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); setSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED, (message, player) -> message.addString(player.getName())); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java index 3dc78a98c7..8aa68b7e08 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionGroupMax extends Condition { - public ConditionGroupMax(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionGroupMax(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_CANNOT_ENTER_DUE_TO_THE_PARTY_HAVING_EXCEEDED_THE_LIMIT); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java index 818803c844..70ea03c187 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionGroupMin extends Condition { - public ConditionGroupMin(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionGroupMin(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_MUST_HAVE_A_MINIMUM_OF_S1_PEOPLE_TO_ENTER_THIS_INSTANCE_ZONE, (msg, player) -> msg.addInt(getLimit())); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 3088d8ae64..53fee609aa 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.enums.ResidenceType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; */ public class ConditionHasResidence extends Condition { - public ConditionHasResidence(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionHasResidence(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); } @@ -43,7 +43,7 @@ public class ConditionHasResidence extends Condition return false; } - final StatsSet params = getParameters(); + final StatSet params = getParameters(); final int id = params.getInt("id"); boolean test = false; switch (params.getEnum("type", ResidenceType.class)) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java index 4e1c407325..eed350db38 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -32,7 +32,7 @@ public class ConditionItem extends Condition private final long _count; private final boolean _take; - public ConditionItem(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionItem(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Load params diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java index 7d509a20c7..b38f8c0e2c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -32,7 +32,7 @@ public class ConditionLevel extends Condition private final int _min; private final int _max; - public ConditionLevel(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionLevel(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Load params diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java index b91deeffdb..d71e6d0a39 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; */ public class ConditionNoParty extends Condition { - public ConditionNoParty(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionNoParty(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java index dd31bf3ca5..5bf768a03e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionParty extends Condition { - public ConditionParty(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionParty(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java index 524a59675a..0363715536 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionPartyLeader extends Condition { - public ConditionPartyLeader(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionPartyLeader(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java index 481cb251ce..48d7fc7981 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.instancemanager.QuestManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionQuest extends Condition { - public ConditionQuest(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionQuest(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Set message diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 899b17aff9..a073129734 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionReenter extends Condition { - public ConditionReenter(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionReenter(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); setSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET, (message, player) -> message.addString(player.getName())); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java index ec255025c3..fafafe5604 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.itemauction; import java.util.Calendar; import java.util.concurrent.TimeUnit; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Forsaiken @@ -40,7 +40,7 @@ public class AuctionDateGenerator private int _hour_of_day; private int _minute_of_hour; - public AuctionDateGenerator(StatsSet config) + public AuctionDateGenerator(StatSet config) { _calendar = Calendar.getInstance(); _interval = config.getInt(FIELD_INTERVAL, -1); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 64bf0a6ff1..cb554e4dce 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.itemauction; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.idfactory.IdFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,9 +34,9 @@ public class AuctionItem private final int _itemId; private final long _itemCount; @SuppressWarnings("unused") - private final StatsSet _itemExtra; + private final StatSet _itemExtra; - public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatsSet itemExtra) + public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatSet itemExtra) { _auctionItemId = auctionItemId; _auctionLength = auctionLength; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 6dff6e3a4d..dc3a7f6f6b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -44,7 +44,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -84,7 +84,7 @@ public class ItemAuctionInstance _items = new ArrayList<>(); final NamedNodeMap nanode = node.getAttributes(); - final StatsSet generatorConfig = new StatsSet(); + final StatSet generatorConfig = new StatSet(); for (int i = nanode.getLength(); i-- > 0;) { final Node n = nanode.item(i); @@ -115,7 +115,7 @@ public class ItemAuctionInstance throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } - final StatsSet itemExtra = new StatsSet(); + final StatSet itemExtra = new StatSet(); final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Armor.java index d4fd97ef10..bfc90d126d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Armor.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.type.ArmorType; /** @@ -28,15 +28,15 @@ public class Armor extends Item /** * Constructor for Armor. - * @param set the StatsSet designating the set of couples (key,value) characterizing the armor. + * @param set the StatSet designating the set of couples (key,value) characterizing the armor. */ - public Armor(StatsSet set) + public Armor(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/EtcItem.java index 86d7291595..a902860c0d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/EtcItem.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -38,15 +38,15 @@ public class EtcItem extends Item /** * Constructor for EtcItem. - * @param set StatsSet designating the set of couples (key,value) for description of the Etc + * @param set StatSet designating the set of couples (key,value) for description of the Etc */ - public EtcItem(StatsSet set) + public EtcItem(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Henna.java index 921fa10dfb..87cea36031 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; @@ -44,7 +44,7 @@ public class Henna private final List _skills; private final List _wear_class; - public Henna(StatsSet set) + public Henna(StatSet set) { _dyeId = set.getInt("dyeId"); _dyeItemId = set.getInt("dyeItemId"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Item.java index 8f8d49e9d8..4f2d125bdf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Item.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.enums.ItemGrade; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; @@ -178,14 +178,14 @@ public abstract class Item extends ListenersContainer implements IIdentifiable /** * Constructor of the Item that fill class variables.
    *
    - * @param set : StatsSet corresponding to a set of couples (key,value) for description of the item + * @param set : StatSet corresponding to a set of couples (key,value) for description of the item */ - protected Item(StatsSet set) + protected Item(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { _itemId = set.getInt("item_id"); _displayId = set.getInt("displayId", _itemId); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java index ab196007a8..3ca228cbe5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -29,7 +29,7 @@ public class PlayerItemTemplate extends ItemHolder /** * @param set the set containing the values for this object */ - public PlayerItemTemplate(StatsSet set) + public PlayerItemTemplate(StatSet set) { super(set.getInt("id"), set.getInt("count")); _equipped = set.getBoolean("equipped", false); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Weapon.java index 16f0c47287..5f9f8507bd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Weapon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.items; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ItemSkillType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -58,15 +58,15 @@ public class Weapon extends Item /** * Constructor for Weapon. - * @param set the StatsSet designating the set of couples (key,value) characterizing the weapon. + * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. */ - public Weapon(StatsSet set) + public Weapon(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java index 7bdd968d90..6d05c20ff3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java @@ -23,7 +23,7 @@ import java.util.List; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -54,7 +54,7 @@ public class AppearanceStone private List _racesNot; private List _allVisualIds; - public AppearanceStone(StatsSet set) + public AppearanceStone(StatSet set) { _id = set.getInt("id"); _visualId = set.getInt("visualId", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java index f3b53f1a67..a2897ba911 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.items.combination; import java.util.EnumMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -31,7 +31,7 @@ public class CombinationItem private final int _chance; private final Map _rewards = new EnumMap<>(CombinationItemType.class); - public CombinationItem(StatsSet set) + public CombinationItem(StatSet set) { _itemOne = set.getInt("one"); _itemTwo = set.getInt("two"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java index 1cde38a6d6..a7f1326bd8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.CrystalType; @@ -59,7 +59,7 @@ public abstract class AbstractEnchantItem private final int _maxEnchantLevel; private final double _bonusRate; - public AbstractEnchantItem(StatsSet set) + public AbstractEnchantItem(StatSet set) { _id = set.getInt("id"); if (getItem() == null) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java index b6b34cc667..7329d8728e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -40,7 +40,7 @@ public class EnchantScroll extends AbstractEnchantItem private final int _scrollGroupId; private Set _items; - public EnchantScroll(StatsSet set) + public EnchantScroll(StatSet set) { super(set); _scrollGroupId = set.getInt("scrollGroupId", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java index c02095428b..978e38d533 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items.enchant; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.items.type.ItemType; @@ -30,7 +30,7 @@ public class EnchantSupportItem extends AbstractEnchantItem private final boolean _isGiant; private final ItemType type; - public EnchantSupportItem(StatsSet set) + public EnchantSupportItem(StatSet set) { super(set); type = getItem().getItemType(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index c965e15d4c..36efcc2103 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -45,7 +45,7 @@ import org.l2jmobius.gameserver.data.xml.impl.ClassListData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.ClassId; @@ -63,7 +63,7 @@ public class Olympiad extends ListenersContainer protected static final Logger LOGGER = Logger.getLogger(Olympiad.class.getName()); protected static final Logger LOGGER_OLYMPIAD = Logger.getLogger("olympiad"); - private static final Map NOBLES = new ConcurrentHashMap<>(); + private static final Map NOBLES = new ConcurrentHashMap<>(); private static final Map NOBLES_RANK = new HashMap<>(); public static final String OLYMPIAD_HTML_PATH = "data/html/olympiad/"; @@ -228,10 +228,10 @@ public class Olympiad extends ListenersContainer PreparedStatement statement = con.prepareStatement(OLYMPIAD_LOAD_NOBLES); ResultSet rset = statement.executeQuery()) { - StatsSet statData; + StatSet statData; while (rset.next()) { - statData = new StatsSet(); + statData = new StatSet(); statData.set(CLASS_ID, rset.getInt(CLASS_ID)); statData.set(CHAR_NAME, rset.getString(CHAR_NAME)); statData.set(POINTS, rset.getInt(POINTS)); @@ -454,7 +454,7 @@ public class Olympiad extends ListenersContainer saveNobleData(); _period = 1; - final List heroesToBe = sortHerosToBe(); + final List heroesToBe = sortHerosToBe(); Hero.getInstance().resetData(); Hero.getInstance().computeNewHeroes(heroesToBe); @@ -488,7 +488,7 @@ public class Olympiad extends ListenersContainer return NOBLES.size(); } - public static StatsSet getNobleStats(int playerId) + public static StatSet getNobleStats(int playerId) { return NOBLES.get(playerId); } @@ -787,7 +787,7 @@ public class Olympiad extends ListenersContainer } int currentPoints; - for (StatsSet nobleInfo : NOBLES.values()) + for (StatSet nobleInfo : NOBLES.values()) { currentPoints = nobleInfo.getInt(POINTS); currentPoints += WEEKLY_POINTS; @@ -805,7 +805,7 @@ public class Olympiad extends ListenersContainer return; } - for (StatsSet nobleInfo : NOBLES.values()) + for (StatSet nobleInfo : NOBLES.values()) { nobleInfo.set(COMP_DONE_WEEK, 0); } @@ -838,9 +838,9 @@ public class Olympiad extends ListenersContainer try (Connection con = DatabaseFactory.getConnection()) { - for (Entry entry : NOBLES.entrySet()) + for (Entry entry : NOBLES.entrySet()) { - final StatsSet nobleInfo = entry.getValue(); + final StatSet nobleInfo = entry.getValue(); if (nobleInfo == null) { @@ -953,7 +953,7 @@ public class Olympiad extends ListenersContainer } } - protected List sortHerosToBe() + protected List sortHerosToBe() { if (_period != 1) { @@ -961,8 +961,8 @@ public class Olympiad extends ListenersContainer } LOGGER_OLYMPIAD.info("Noble,charid,classid,compDone,points"); - StatsSet nobleInfo; - for (Entry entry : NOBLES.entrySet()) + StatSet nobleInfo; + for (Entry entry : NOBLES.entrySet()) { nobleInfo = entry.getValue(); if (nobleInfo == null) @@ -979,12 +979,12 @@ public class Olympiad extends ListenersContainer LOGGER_OLYMPIAD.info(charName + "," + charId + "," + classId + "," + compDone + "," + points); } - final List heroesToBe = new LinkedList<>(); + final List heroesToBe = new LinkedList<>(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(OLYMPIAD_GET_HEROS)) { - StatsSet hero; + StatSet hero; for (int element : HERO_IDS) { // Classic can have 2nd and 3rd class competitors, but only 1 hero @@ -996,7 +996,7 @@ public class Olympiad extends ListenersContainer { if (rset.next()) { - hero = new StatsSet(); + hero = new StatSet(); hero.set(CLASS_ID, element); // save the 3rd class title hero.set(CHAR_ID, rset.getInt(CHAR_ID)); hero.set(CHAR_NAME, rset.getString(CHAR_NAME)); @@ -1050,7 +1050,7 @@ public class Olympiad extends ListenersContainer return 0; } - final StatsSet noble = NOBLES.get(objectId); + final StatSet noble = NOBLES.get(objectId); if ((noble == null) || (noble.getInt(POINTS) == 0)) { return 0; @@ -1100,7 +1100,7 @@ public class Olympiad extends ListenersContainer { if (!NOBLES.containsKey(player.getObjectId())) { - final StatsSet statDat = new StatsSet(); + final StatSet statDat = new StatSet(); statDat.set(CLASS_ID, player.getBaseClass()); statDat.set(CHAR_NAME, player.getName()); statDat.set(POINTS, DEFAULT_POINTS); @@ -1207,7 +1207,7 @@ public class Olympiad extends ListenersContainer * @param data the stats set data to add. * @return the old stats set if the noble is already present, null otherwise. */ - public static StatsSet addNobleStats(int charId, StatsSet data) + public static StatSet addNobleStats(int charId, StatSet data) { return NOBLES.put(charId, data); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/Participant.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/Participant.java index 670066ac32..b6d879b902 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/Participant.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/Participant.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.olympiad; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class Participant private final int baseClass; private boolean disconnected = false; private boolean defaulted = false; - private final StatsSet stats; + private final StatSet stats; public String clanName; public int clanId; @@ -125,7 +125,7 @@ public class Participant /** * @return the stats */ - public StatsSet getStats() + public StatSet getStats() { return stats; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java index 4d5231ca5d..c1fb0f88f6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.primeshop; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -49,7 +49,7 @@ public class PrimeShopGroup private final int _availableCount; private final List _items; - public PrimeShopGroup(StatsSet set, List items) + public PrimeShopGroup(StatSet set, List items) { _brId = set.getInt("id"); _category = set.getInt("cat", 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java index d150ec98cd..88795e0721 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.residences; import java.time.Duration; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -33,7 +33,7 @@ public class ResidenceFunctionTemplate private final Duration _duration; private final double _value; - public ResidenceFunctionTemplate(StatsSet set) + public ResidenceFunctionTemplate(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java index 4f15efda0b..b19f8e59d5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; /** @@ -34,7 +34,7 @@ public class ShuttleDataHolder private final List _stops = new ArrayList<>(2); private final List _routes = new ArrayList<>(2); - public ShuttleDataHolder(StatsSet set) + public ShuttleDataHolder(StatSet set) { _id = set.getInt("id"); _loc = new Location(set); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/Skill.java index c44b45a781..0e97466a3a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.handler.IAffectScopeHandler; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.CubicInstance; @@ -210,7 +210,7 @@ public class Skill implements IIdentifiable private final SkillBuffType _buffType; private final boolean _displayInList; - public Skill(StatsSet set) + public Skill(StatSet set) { _id = set.getInt(".id"); _level = set.getInt(".level"); @@ -391,7 +391,7 @@ public class Skill implements IIdentifiable _toggleGroupId = set.getInt("toggleGroupId", -1); _attachToggleGroupId = set.getInt("attachToggleGroupId", -1); - _attachSkills = set.getList("attachSkillList", StatsSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatsSet).collect(Collectors.toList()); + _attachSkills = set.getList("attachSkillList", StatSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatSet).collect(Collectors.toList()); final String abnormalResist = set.getString("abnormalResists", null); if (abnormalResist != null) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java index bfc25bddde..39b738dbca 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.ChanceLocation; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory; /** * @author UnAfraid */ -public class NpcSpawnTemplate implements Cloneable, IParameterized +public class NpcSpawnTemplate implements Cloneable, IParameterized { private static final Logger LOGGER = Logger.getLogger(NpcSpawnTemplate.class.getName()); @@ -56,7 +56,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized private final Duration _respawnTimeRandom; private List _locations; private SpawnTerritory _zone; - private StatsSet _parameters; + private StatSet _parameters; private final boolean _spawnAnimation; private final boolean _saveInDB; private final String _dbName; @@ -82,7 +82,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized _minions = template._minions; } - public NpcSpawnTemplate(SpawnTemplate spawnTemplate, SpawnGroup group, StatsSet set) + public NpcSpawnTemplate(SpawnTemplate spawnTemplate, SpawnGroup group, StatSet set) { _spawnTemplate = spawnTemplate; _group = group; @@ -128,14 +128,14 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized mergeParameters(spawnTemplate, group); } - private StatsSet mergeParameters(SpawnTemplate spawnTemplate, SpawnGroup group) + private StatSet mergeParameters(SpawnTemplate spawnTemplate, SpawnGroup group) { if ((_parameters == null) && (spawnTemplate.getParameters() == null) && (group.getParameters() == null)) { return null; } - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); if (spawnTemplate.getParameters() != null) { set.merge(spawnTemplate.getParameters()); @@ -206,13 +206,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized } @Override - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } @Override - public void setParameters(StatsSet parameters) + public void setParameters(StatSet parameters) { if (_parameters == null) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java index 6723863c93..7ceb2d46af 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IParameterized; import org.l2jmobius.gameserver.model.interfaces.ITerritorized; @@ -31,16 +31,16 @@ import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory; /** * @author UnAfraid */ -public class SpawnGroup implements Cloneable, ITerritorized, IParameterized +public class SpawnGroup implements Cloneable, ITerritorized, IParameterized { private final String _name; private final boolean _spawnByDefault; private List _territories; private List _bannedTerritories; private final List _spawns = new ArrayList<>(); - private StatsSet _parameters; + private StatSet _parameters; - public SpawnGroup(StatsSet set) + public SpawnGroup(StatSet set) { this(set.getString("name", null), set.getBoolean("spawnByDefault", true)); } @@ -104,13 +104,13 @@ public class SpawnGroup implements Cloneable, ITerritorized, IParameterized +public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized { private final String _name; private final String _ai; @@ -45,9 +45,9 @@ public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized _territories; private List _bannedTerritories; private final List _groups = new ArrayList<>(); - private StatsSet _parameters; + private StatSet _parameters; - public SpawnTemplate(StatsSet set, File file) + public SpawnTemplate(StatSet set, File file) { this(set.getString("name", null), set.getString("ai", null), set.getBoolean("spawnByDefault", true), file); } @@ -128,13 +128,13 @@ public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized _castleId; - public TeleportLocation(int id, StatsSet set) + public TeleportLocation(int id, StatSet set) { super(set); _id = id; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java index 916ae0790c..33cf6ac3bc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.variables; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.IRestorable; import org.l2jmobius.gameserver.model.interfaces.IStorable; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.interfaces.IStorable; /** * @author UnAfraid */ -public abstract class AbstractVariables extends StatsSet implements IRestorable, IStorable, IDeletable +public abstract class AbstractVariables extends StatSet implements IRestorable, IStorable, IDeletable { private final AtomicBoolean _hasChanges = new AtomicBoolean(false); @@ -41,42 +41,42 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, */ @Override - public StatsSet set(String name, boolean value) + public StatSet set(String name, boolean value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, double value) + public StatSet set(String name, double value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, Enum value) + public StatSet set(String name, Enum value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, int value) + public StatSet set(String name, int value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, long value) + public StatSet set(String name, long value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, String value) + public StatSet set(String name, String value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); @@ -89,7 +89,7 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, * @param markAsChanged * @return */ - public StatsSet set(String name, String value, boolean markAsChanged) + public StatSet set(String name, String value, boolean markAsChanged) { if (markAsChanged) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index 5c03122a62..4d97f0017a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExHeroList implements IClientOutgoingPacket { - private final Map _heroList; + private final Map _heroList; public ExHeroList() { @@ -42,7 +42,7 @@ public class ExHeroList implements IClientOutgoingPacket OutgoingPackets.EX_HERO_LIST.writeId(packet); packet.writeD(_heroList.size()); - for (StatsSet hero : _heroList.values()) + for (StatSet hero : _heroList.values()) { packet.writeS(hero.getString(Olympiad.CHAR_NAME)); packet.writeD(hero.getInt(Olympiad.CLASS_ID)); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/BypassParser.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/BypassParser.java index 414125bdeb..a80323ba1f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/BypassParser.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/BypassParser.java @@ -20,12 +20,12 @@ import java.util.LinkedHashMap; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid */ -public class BypassParser extends StatsSet +public class BypassParser extends StatSet { private static final String ALLOWED_CHARS = "a-zA-Z0-9-_`!@#%^&*()\\[\\]|\\\\/"; private static final Pattern PATTERN = Pattern.compile(String.format("([%s]*)=('([%s ]*)'|[%s]*)", ALLOWED_CHARS, ALLOWED_CHARS, ALLOWED_CHARS)); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index b837d839d8..d12c29d422 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -138,7 +138,7 @@ public class Antharas extends AbstractNpcAI addAttackId(ANTHARAS, BOMBER, BEHEMOTH, TERASQUE); addKillId(ANTHARAS, TERASQUE, BEHEMOTH); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANTHARAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANTHARAS); final double curr_hp = info.getDouble("currentHP"); final double curr_mp = info.getDouble("currentMP"); final int loc_x = info.getInt("loc_x"); @@ -761,7 +761,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(PlayerInstance attacker, int damage) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Baium/Baium.java index a1e8eb99d5..2686236add 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -112,7 +112,7 @@ public class Baium extends AbstractNpcAI addSeeCreatureId(BAIUM); addSpellFinishedId(BAIUM); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(BAIUM); + final StatSet info = GrandBossManager.getInstance().getStatSet(BAIUM); switch (getStatus()) { @@ -666,7 +666,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Core/Core.java index bfa7212b8c..c1452bf9de 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; @@ -85,7 +85,7 @@ public class Core extends AbstractNpcAI registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR); _firstAttacked = false; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. @@ -205,9 +205,9 @@ public class Core extends AbstractNpcAI final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000; startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(CORE, info); + GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index 38eebefc7b..5e525a6caa 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -92,7 +92,7 @@ public class Orfen extends AbstractNpcAI registerMobs(mobs); _IsTeleported = false; ZONE = ZoneManager.getInstance().getZoneById(12013); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); final int status = GrandBossManager.getInstance().getBossStatus(ORFEN); if (status == DEAD) { @@ -327,9 +327,9 @@ public class Orfen extends AbstractNpcAI respawnTime *= 3600000; startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(ORFEN, info); + GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); startQuestTimer("despawn_minions", 20000, null, null); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index c2564917c7..b9fdddaaf7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; @@ -91,7 +91,7 @@ public class QueenAnt extends AbstractNpcAI addFactionCallId(NURSE); _zone = ZoneManager.getInstance().getZoneById(12012); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); final int status = GrandBossManager.getInstance().getBossStatus(QUEEN); if (status == DEAD) { @@ -367,9 +367,9 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("action", npc, null); cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(QUEEN, info); + GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); _larva.deleteMe(); _larva = null; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java index 0964b5fd44..a322a608f2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java @@ -18,7 +18,7 @@ package ai.bosses.Zaken; import org.l2jmobius.Config; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -48,7 +48,7 @@ public class Zaken extends AbstractNpcAI { addKillId(ZAKEN); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ZAKEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN); final int status = GrandBossManager.getInstance().getBossStatus(ZAKEN); if (status == DEAD) { @@ -96,9 +96,9 @@ public class Zaken extends AbstractNpcAI final long respawnTime = (Config.ZAKEN_SPAWN_INTERVAL + getRandom(-Config.ZAKEN_SPAWN_RANDOM, Config.ZAKEN_SPAWN_RANDOM)) * 3600000; startQuestTimer("zaken_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ZAKEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(ZAKEN, info); + GrandBossManager.getInstance().setStatSet(ZAKEN, info); return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java index 25a584bdf9..1feccc805a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -101,7 +101,7 @@ public class CastleTeleporter extends AbstractNpcAI if (st.hasMoreTokens()) { final int unknowInt = Integer.parseInt(st.nextToken()); - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); Location teleLoc = null; switch (unknowInt) { @@ -191,7 +191,7 @@ public class CastleTeleporter extends AbstractNpcAI return htmltext; } - private Location getTeleportLocation(StatsSet npcParams, String paramName1, String paramName2, String paramName3) + private Location getTeleportLocation(StatSet npcParams, String paramName1, String paramName2, String paramName3) { final Location loc; if (getRandom(100) < 33) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java index f19f5dea69..c817501830 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java @@ -17,7 +17,7 @@ package ai.others.Servitors; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -52,7 +52,7 @@ public class TreeOfLife extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (player != null) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index d459bd2538..4f36bd6b51 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.zone.type.NoRestartZone; @@ -305,7 +305,7 @@ public class AdminGrandBoss implements IAdminCommandHandler } } - final StatsSet info = GrandBossManager.getInstance().getStatsSet(grandBossId); + final StatSet info = GrandBossManager.getInstance().getStatSet(grandBossId); final String bossRespawn = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(info.getLong("respawn_time")); final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java index f1109bf0e7..9489d8e1bb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java @@ -19,7 +19,7 @@ package handlers.admincommandhandlers; import java.util.StringTokenizer; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -114,7 +114,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.isNoble()) { - final StatsSet statDat = getPlayerSet(player); + final StatSet statDat = getPlayerSet(player); final int oldpoints = Olympiad.getInstance().getNoblePoints(player); final int points = Math.max(oldpoints + val, 0); if (points > 1000) @@ -155,7 +155,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.isNoble()) { - final StatsSet playerStat = Olympiad.getNobleStats(player.getObjectId()); + final StatSet playerStat = Olympiad.getNobleStats(player.getObjectId()); if (playerStat == null) { BuilderUtil.sendSysMessage(activeChar, "This player hasn't played on Olympiad yet!"); @@ -197,7 +197,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.isNoble()) { - final StatsSet statDat = getPlayerSet(player); + final StatSet statDat = getPlayerSet(player); final int oldpoints = Olympiad.getInstance().getNoblePoints(player); final int points = oldpoints - val; if ((points < 1) && (points > 1000)) @@ -237,12 +237,12 @@ public class AdminOlympiad implements IAdminCommandHandler return Integer.decode(token); } - private StatsSet getPlayerSet(PlayerInstance player) + private StatSet getPlayerSet(PlayerInstance player) { - StatsSet statDat = Olympiad.getNobleStats(player.getObjectId()); + StatSet statDat = Olympiad.getNobleStats(player.getObjectId()); if (statDat == null) { - statDat = new StatsSet(); + statDat = new StatSet(); statDat.set(Olympiad.CLASS_ID, player.getBaseClass()); statDat.set(Olympiad.CHAR_NAME, player.getName()); statDat.set(Olympiad.POINTS, Olympiad.DEFAULT_POINTS); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java index d8a3d6e5ce..6382651e6c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java @@ -19,7 +19,7 @@ package handlers.conditions; import java.util.List; import org.l2jmobius.gameserver.enums.CategoryType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -31,7 +31,7 @@ public class CategoryTypeCondition implements ICondition { private final List _categoryTypes; - public CategoryTypeCondition(StatsSet params) + public CategoryTypeCondition(StatSet params) { _categoryTypes = params.getEnumList("category", CategoryType.class); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java index b24cfa0f14..9a14cb6fa2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java @@ -16,7 +16,7 @@ */ package handlers.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -29,7 +29,7 @@ public class NpcLevelCondition implements ICondition private final int _minLevel; private final int _maxLevel; - public NpcLevelCondition(StatsSet params) + public NpcLevelCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java index afffe7a0c5..9e3deaa8ce 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java @@ -16,7 +16,7 @@ */ package handlers.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -29,7 +29,7 @@ public class PlayerLevelCondition implements ICondition private final int _minLevel; private final int _maxLevel; - public PlayerLevelCondition(StatsSet params) + public PlayerLevelCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 09f609dc37..0e81066579 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -32,7 +32,7 @@ public class AbnormalShield extends AbstractEffect { private final int _times; - public AbnormalShield(StatsSet params) + public AbnormalShield(StatSet params) { _times = params.getInt("times", -1); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 0496c9068d..9c508c8c52 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Objects; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class AbnormalTimeChange extends AbstractEffect private final int _time; private final int _mode; - public AbnormalTimeChange(StatsSet params) + public AbnormalTimeChange(StatSet params) { final String abnormals = params.getString("slot", null); if ((abnormals != null) && !abnormals.isEmpty()) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 98f85c7b21..3f9132b8e3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -37,7 +37,7 @@ public class AbsorbDamage extends AbstractEffect private final double _damage; private static final Map _damageHolder = new ConcurrentHashMap<>(); - public AbsorbDamage(StatsSet params) + public AbsorbDamage(StatSet params) { _damage = params.getDouble("damage", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 26f51d5351..86fef7cf6d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; @@ -38,7 +38,7 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect private final int _hpPercent; private final Map _updates = new ConcurrentHashMap<>(); - protected AbstractConditionalHpEffect(StatsSet params, Stat stat) + protected AbstractConditionalHpEffect(StatSet params, Stat stat) { super(params, stat); _hpPercent = params.getInt("hpPercent", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java index 2e40124e39..f010f84271 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AbstractStatAddEffect extends AbstractEffect private final Stat _stat; protected final double _amount; - public AbstractStatAddEffect(StatsSet params, Stat stat) + public AbstractStatAddEffect(StatSet params, Stat stat) { _stat = stat; _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index da6a575c44..29e439684b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; @@ -42,12 +42,12 @@ public abstract class AbstractStatEffect extends AbstractEffect protected final StatModifierType _mode; protected final List _conditions = new ArrayList<>(); - public AbstractStatEffect(StatsSet params, Stat stat) + public AbstractStatEffect(StatSet params, Stat stat) { this(params, stat, stat); } - public AbstractStatEffect(StatsSet params, Stat mulStat, Stat addStat) + public AbstractStatEffect(StatSet params, Stat mulStat, Stat addStat) { _addStat = addStat; _mulStat = mulStat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java index 9811f395aa..33d08bff36 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AbstractStatPercentEffect extends AbstractEffect private final Stat _stat; protected final double _amount; - public AbstractStatPercentEffect(StatsSet params, Stat stat) + public AbstractStatPercentEffect(StatSet params, Stat stat) { _stat = stat; _amount = params.getDouble("amount", 1); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java index 539814ef2a..79c022a23c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class Accuracy extends AbstractStatEffect { - public Accuracy(StatsSet params) + public Accuracy(StatSet params) { super(params, Stat.ACCURACY_COMBAT); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index 0c1fcbd92b..48d69968c5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddHate extends AbstractEffect private final double _power; private final boolean _affectSummoner; - public AddHate(StatsSet params) + public AddHate(StatSet params) { _power = params.getDouble("power", 0); _affectSummoner = params.getBoolean("affectSummoner", false); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java index e90d5cc7f3..324927947a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddSkillBySkill extends AbstractEffect private final int _existingSkillLevel; private final SkillHolder _addedSkill; - public AddSkillBySkill(StatsSet params) + public AddSkillBySkill(StatSet params) { _existingSkillId = params.getInt("existingSkillId"); _existingSkillLevel = params.getInt("existingSkillLevel"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index bdd8314dd7..205bc82200 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddTeleportBookmarkSlot extends AbstractEffect { private final int _amount; - public AddTeleportBookmarkSlot(StatsSet params) + public AddTeleportBookmarkSlot(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java index c26ec5442f..658931ecb2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionCp extends AbstractStatAddEffect { - public AdditionalPotionCp(StatsSet params) + public AdditionalPotionCp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_CP); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java index 6b68e40f32..57d54c7d3b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionHp extends AbstractStatAddEffect { - public AdditionalPotionHp(StatsSet params) + public AdditionalPotionHp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_HP); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java index c9e1cc237e..007547ebe7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionMp extends AbstractStatAddEffect { - public AdditionalPotionMp(StatsSet params) + public AdditionalPotionMp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_MP); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AgathionSlot.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AgathionSlot.java index 2d2a3cf6df..b8a91b683f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AgathionSlot.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AgathionSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AgathionSlot extends AbstractStatAddEffect { - public AgathionSlot(StatsSet params) + public AgathionSlot(StatSet params) { super(params, Stat.AGATHION_SLOTS); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java index f5cbb63465..9255ba1877 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AreaDamage extends AbstractStatAddEffect { - public AreaDamage(StatsSet params) + public AreaDamage(StatSet params) { super(params, Stat.DAMAGE_ZONE_VULN); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ArtifactSlot.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ArtifactSlot.java index 150e53d14e..0c146fc6a3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ArtifactSlot.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ArtifactSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ArtifactSlot extends AbstractStatAddEffect { - public ArtifactSlot(StatsSet params) + public ArtifactSlot(StatSet params) { super(params, Stat.ARTIFACT_SLOTS); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java index 2ded14e7ae..a5d56477f5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AttackAttribute extends AbstractEffect private final AttributeType _attribute; private final double _amount; - public AttackAttribute(StatsSet params) + public AttackAttribute(StatSet params) { _amount = params.getDouble("amount", 0); _attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java index ff58d09cc7..795366850d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class AttackAttributeAdd extends AbstractEffect { private final double _amount; - public AttackAttributeAdd(StatsSet params) + public AttackAttributeAdd(StatSet params) { _amount = params.getDouble("amount", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java index 37bfbf341a..fcd2b48c99 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class AttackBehind extends AbstractEffect { - public AttackBehind(StatsSet params) + public AttackBehind(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index 062c325a55..4136f5d530 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class AttackTrait extends AbstractEffect { private final Map _attackTraits = new EnumMap<>(TraitType.class); - public AttackTrait(StatsSet params) + public AttackTrait(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 02d6a8d78c..8ac42d45c3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -37,7 +37,7 @@ public class Backstab extends AbstractEffect private final double _criticalChance; private final boolean _overHit; - public Backstab(StatsSet params) + public Backstab(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Betray.java index 32e3c65c55..79e8bd3360 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Betray extends AbstractEffect { - public Betray(StatsSet params) + public Betray(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Blink.java index ba1caed6ac..56d3f628fd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -52,7 +52,7 @@ public class Blink extends AbstractEffect private final int _flyDelay; private final int _animationSpeed; - public Blink(StatsSet params) + public Blink(StatSet params) { _flyCourse = params.getInt("angle", 0); _flyRadius = params.getInt("range", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 8677f72407..596d4b752f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; */ public class BlinkSwap extends AbstractEffect { - public BlinkSwap(StatsSet params) + public BlinkSwap(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 7bec602aef..cea12039d2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -20,7 +20,7 @@ import java.util.Arrays; import java.util.Set; import java.util.stream.Collectors; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class BlockAbnormalSlot extends AbstractEffect { private final Set _blockAbnormalSlots; - public BlockAbnormalSlot(StatsSet params) + public BlockAbnormalSlot(StatSet params) { _blockAbnormalSlots = Arrays.stream(params.getString("slot").split(";")).map(slot -> Enum.valueOf(AbnormalType.class, slot)).collect(Collectors.toSet()); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index b4839ab322..348881f970 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -21,7 +21,7 @@ import java.util.Set; import org.l2jmobius.gameserver.datatables.BotReportTable; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class BlockAction extends AbstractEffect { private final Set _blockedActions = new HashSet<>(); - public BlockAction(StatsSet params) + public BlockAction(StatSet params) { final String[] actions = params.getString("blockedActions").split(","); for (String action : actions) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index 68f6586e3e..635d2735f9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -22,7 +22,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class BlockActions extends AbstractEffect { private final Set _allowedSkills; - public BlockActions(StatsSet params) + public BlockActions(StatSet params) { final String[] allowedSkills = params.getString("allowedSkills", "").split(";"); _allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 99af987208..3502d140d0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockChat extends AbstractEffect { - public BlockChat(StatsSet params) + public BlockChat(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java index 6160114414..a2b084c918 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; */ public class BlockControl extends AbstractEffect { - public BlockControl(StatsSet params) + public BlockControl(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java index 3d96329b6d..69b390ae8f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BlockEscape extends AbstractEffect { - public BlockEscape(StatsSet params) + public BlockEscape(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index 8bbd7ac018..85d89180e7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockMove extends AbstractEffect { - public BlockMove(StatsSet params) + public BlockMove(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index 316f82f855..9e28fc403a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockParty extends AbstractEffect { - public BlockParty(StatsSet params) + public BlockParty(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java index ae2ac8b035..d3235fc34f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BlockResurrection extends AbstractEffect { - public BlockResurrection(StatsSet params) + public BlockResurrection(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index f7f119691f..f2cc65b782 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -35,7 +35,7 @@ public class BlockSkill extends AbstractEffect { private final int[] _magicTypes; - public BlockSkill(StatsSet params) + public BlockSkill(StatSet params) { _magicTypes = params.getIntArray("magicTypes", ";"); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index d9b3d3a34d..9f0b7143d2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockTarget extends AbstractEffect { - public BlockTarget(StatsSet params) + public BlockTarget(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index bc4cbd6320..bef60ad003 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class Bluff extends AbstractEffect { private final int _chance; - public Bluff(StatsSet params) + public Bluff(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java index 2ace40a596..69583d613b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusDropAmount extends AbstractStatPercentEffect { - public BonusDropAmount(StatsSet params) + public BonusDropAmount(StatSet params) { super(params, Stat.BONUS_DROP_AMOUNT); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java index b81560b040..e63c8f79f4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusDropRate extends AbstractStatPercentEffect { - public BonusDropRate(StatsSet params) + public BonusDropRate(StatSet params) { super(params, Stat.BONUS_DROP_RATE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java index b984404cb2..e0fb54b162 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusSpoilRate extends AbstractStatPercentEffect { - public BonusSpoilRate(StatsSet params) + public BonusSpoilRate(StatSet params) { super(params, Stat.BONUS_SPOIL_RATE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Breath.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Breath.java index 859f341f3c..4235319f22 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Breath.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Breath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class Breath extends AbstractStatEffect { - public Breath(StatsSet params) + public Breath(StatSet params) { super(params, Stat.BREATH); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java index a6d25f3c36..4102506e6c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BuffBlock extends AbstractEffect { - public BuffBlock(StatsSet params) + public BuffBlock(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index de7497f8bf..4f470b06c7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class CallLearnedSkill extends AbstractEffect { private final int _skillId; - public CallLearnedSkill(StatsSet params) + public CallLearnedSkill(StatSet params) { _skillId = params.getInt("skillId"); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index e6096be4be..b41daf073c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CallParty extends AbstractEffect { - public CallParty(StatsSet params) + public CallParty(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index 0760fb675e..eb4bdf2349 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class CallPc extends AbstractEffect private final int _itemId; private final int _itemCount; - public CallPc(StatsSet params) + public CallPc(StatSet params) { _itemId = params.getInt("itemId", 0); _itemCount = params.getInt("itemCount", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index d6d5cb721d..0da3802665 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -35,7 +35,7 @@ public class CallRandomSkill extends AbstractEffect { private final List _skills = new ArrayList<>(); - public CallRandomSkill(StatsSet params) + public CallRandomSkill(StatSet params) { final String skills = params.getString("skills", null); if (skills != null) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index 99c1494223..f8e4b226c4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -35,7 +35,7 @@ public class CallSkill extends AbstractEffect private final SkillHolder _skill; private final int _skillLevelScaleTo; - public CallSkill(StatsSet params) + public CallSkill(StatSet params) { _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0)); _skillLevelScaleTo = params.getInt("skillLevelScaleTo", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index cec2706e81..4a18b31781 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.Collections; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ public class CallSkillOnActionTime extends AbstractEffect { private final SkillHolder _skill; - public CallSkillOnActionTime(StatsSet params) + public CallSkillOnActionTime(StatSet params) { _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0)); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index d48eb90fb3..32753a71a0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CallTargetParty extends AbstractEffect { - public CallTargetParty(StatsSet params) + public CallTargetParty(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index ef01f4a8ed..d4331bf5b7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ public class ChameleonRest extends AbstractEffect { private final double _power; - public ChameleonRest(StatsSet params) + public ChameleonRest(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index e3b846674d..37054f2fd0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; @@ -35,9 +35,9 @@ public class ChangeBody extends AbstractEffect { private final Set _transformations = new HashSet<>(); - public ChangeBody(StatsSet params) + public ChangeBody(StatSet params) { - for (StatsSet item : params.getList("templates", StatsSet.class)) + for (StatSet item : params.getList("templates", StatSet.class)) { _transformations.add(new TemplateChanceHolder(item.getInt(".templateId"), item.getInt(".minChance"), item.getInt(".maxChance"))); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 76c6e03aa6..6b6386909e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeFace extends AbstractEffect { private final int _value; - public ChangeFace(StatsSet params) + public ChangeFace(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java index cee3ac1a6f..304afa821c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; /** @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; */ public class ChangeFishingMastery extends AbstractEffect { - public ChangeFishingMastery(StatsSet params) + public ChangeFishingMastery(StatSet params) { } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index 0c583cbc13..64ac49f5d5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeHairColor extends AbstractEffect { private final int _value; - public ChangeHairColor(StatsSet params) + public ChangeHairColor(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index ad2efbe6a0..ae7d6c6da1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeHairStyle extends AbstractEffect { private final int _value; - public ChangeHairStyle(StatsSet params) + public ChangeHairStyle(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java index 2d536029fd..4d7c380c75 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class CheapShot extends AbstractEffect { - public CheapShot(StatsSet params) + public CheapShot(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index 5fa3df1676..0215ff6a5b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.SubclassInfoType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class ClassChange extends AbstractEffect private final int _index; private static final int IDENTITY_CRISIS_SKILL_ID = 1570; - public ClassChange(StatsSet params) + public ClassChange(StatSet params) { _index = params.getInt("index", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index ccf7598eff..e184022afc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.stats.Formulas; */ public class Compelling extends AbstractEffect { - public Compelling(StatsSet params) + public Compelling(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index b6aa30f604..f164ac6f3f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class Confuse extends AbstractEffect { private final int _chance; - public Confuse(StatsSet params) + public Confuse(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 25e29532eb..78293c1b0f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ConsumeBody extends AbstractEffect { - public ConsumeBody(StatsSet params) + public ConsumeBody(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 0cf786c656..da47135afd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class ConvertItem extends AbstractEffect { - public ConvertItem(StatsSet params) + public ConvertItem(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java index 9402fdb06d..857df659c0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CounterPhysicalSkill extends AbstractStatAddEffect { - public CounterPhysicalSkill(StatsSet params) + public CounterPhysicalSkill(StatSet params) { super(params, Stat.VENGEANCE_SKILL_PHYSICAL_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 67bca7fd1b..598682037b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Cp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Cp(StatsSet params) + public Cp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index e0cd52808e..37303b0e7a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class CpHeal extends AbstractEffect { private final double _power; - public CpHeal(StatsSet params) + public CpHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index e2e8ee3479..54de5adfc6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class CpHealOverTime extends AbstractEffect { private final double _power; - public CpHealOverTime(StatsSet params) + public CpHealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index 5665e937dc..b4a994d6df 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CpHealPercent extends AbstractEffect { private final double _power; - public CpHealPercent(StatsSet params) + public CpHealPercent(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java index 1cc851b2af..efb020bbd5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CpRegen extends AbstractStatEffect { - public CpRegen(StatsSet params) + public CpRegen(StatSet params) { super(params, Stat.REGENERATE_CP_RATE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java index 8983497026..0b93eef45e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CriticalDamage extends AbstractStatEffect { - public CriticalDamage(StatsSet params) + public CriticalDamage(StatSet params) { super(params, Stat.CRITICAL_DAMAGE, Stat.CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 7ef4f0ecb4..0630f087b7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.Position; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CriticalDamagePosition extends AbstractEffect private final double _amount; private final Position _position; - public CriticalDamagePosition(StatsSet params) + public CriticalDamagePosition(StatSet params) { _amount = params.getDouble("amount", 0); _position = params.getEnum("position", Position.class, Position.FRONT); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java index 01f49380eb..0d4bded60e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; public class CriticalRate extends AbstractConditionalHpEffect { - public CriticalRate(StatsSet params) + public CriticalRate(StatSet params) { super(params, Stat.CRITICAL_RATE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 863b385ca3..4d65fa84eb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.Position; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CriticalRatePositionBonus extends AbstractEffect private final double _amount; private final Position _position; - public CriticalRatePositionBonus(StatsSet params) + public CriticalRatePositionBonus(StatSet params) { _amount = params.getDouble("amount", 0); _position = params.getEnum("position", Position.class, Position.FRONT); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index 2e8ec38347..9d04575ae2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class CrystalGradeModify extends AbstractEffect { private final int _grade; - public CrystalGradeModify(StatsSet params) + public CrystalGradeModify(StatSet params) { _grade = params.getInt("grade", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java index 94ff8e64e2..79ee5b994e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CubicMastery extends AbstractStatAddEffect { - public CubicMastery(StatsSet params) + public CubicMastery(StatSet params) { super(params, Stat.MAX_CUBIC); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index 36abf0accf..e6bb53fdea 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class DamOverTime extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTime(StatsSet params) + public DamOverTime(StatSet params) { _canKill = params.getBoolean("canKill", false); _power = params.getDouble("power"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 13e57099e0..b5f25db4d8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class DamOverTimePercent extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTimePercent(StatsSet params) + public DamOverTimePercent(StatSet params) { _canKill = params.getBoolean("canKill", false); _power = params.getDouble("power"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java index dc7a45198f..c9567ea034 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ public class DamageBlock extends AbstractEffect private final boolean _blockHp; private final boolean _blockMp; - public DamageBlock(StatsSet params) + public DamageBlock(StatSet params) { final String type = params.getString("type", null); _blockHp = type.equalsIgnoreCase("BLOCK_HP"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java index 5bc9b5fff8..3d8985d1d8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DamageByAttackType; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -38,7 +38,7 @@ public class DamageByAttack extends AbstractEffect private final double _value; private final DamageByAttackType _type; - public DamageByAttack(StatsSet params) + public DamageByAttack(StatSet params) { _value = params.getDouble("amount"); _type = params.getEnum("type", DamageByAttackType.class, DamageByAttackType.NONE); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java index 5a7629482a..e823a9824a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DamageShield extends AbstractStatAddEffect { - public DamageShield(StatsSet params) + public DamageShield(StatSet params) { super(params, Stat.REFLECT_DAMAGE_PERCENT); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java index db1abe264d..3029a3f0aa 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DamageShieldResist extends AbstractStatAddEffect { - public DamageShieldResist(StatsSet params) + public DamageShieldResist(StatSet params) { super(params, Stat.REFLECT_DAMAGE_PERCENT_DEFENSE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index 8561ff46b0..369bd5483d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class DeathLink extends AbstractEffect { private final double _power; - public DeathLink(StatsSet params) + public DeathLink(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java index b948fad1fc..54261c6229 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class DebuffBlock extends AbstractEffect { - public DebuffBlock(StatsSet params) + public DebuffBlock(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java index 217ef3dfaa..4bc08271fa 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class DefenceAttribute extends AbstractEffect private final AttributeType _attribute; private final double _amount; - public DefenceAttribute(StatsSet params) + public DefenceAttribute(StatSet params) { _amount = params.getDouble("amount", 0); _attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java index 0c0c2e8d6a..daff53d9e1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceCriticalDamage extends AbstractStatEffect { - public DefenceCriticalDamage(StatsSet params) + public DefenceCriticalDamage(StatSet params) { super(params, Stat.DEFENCE_CRITICAL_DAMAGE, Stat.DEFENCE_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java index 131eb500ea..74a729e38c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceCriticalRate extends AbstractStatEffect { - public DefenceCriticalRate(StatsSet params) + public DefenceCriticalRate(StatSet params) { super(params, Stat.DEFENCE_CRITICAL_RATE, Stat.DEFENCE_CRITICAL_RATE_ADD); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java index 1abee78e08..c664939977 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceMagicCriticalDamage extends AbstractStatEffect { - public DefenceMagicCriticalDamage(StatsSet params) + public DefenceMagicCriticalDamage(StatSet params) { super(params, Stat.DEFENCE_MAGIC_CRITICAL_DAMAGE, Stat.DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java index 2146b89551..6594dda2b3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceMagicCriticalRate extends AbstractStatEffect { - public DefenceMagicCriticalRate(StatsSet params) + public DefenceMagicCriticalRate(StatSet params) { super(params, Stat.DEFENCE_MAGIC_CRITICAL_RATE, Stat.DEFENCE_MAGIC_CRITICAL_RATE_ADD); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index bd80f690cd..134ed56979 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class DefenceTrait extends AbstractEffect { private final Map _defenceTraits = new EnumMap<>(TraitType.class); - public DefenceTrait(StatsSet params) + public DefenceTrait(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index bab5e1a762..7cee616006 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class DeleteHate extends AbstractEffect { private final int _chance; - public DeleteHate(StatsSet params) + public DeleteHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index 85985653b8..f10f189e68 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class DeleteHateOfMe extends AbstractEffect { private final int _chance; - public DeleteHateOfMe(StatsSet params) + public DeleteHateOfMe(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index d3664ad00f..82833ac79d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class DeleteTopAgro extends AbstractEffect { private final int _chance; - public DeleteTopAgro(StatsSet params) + public DeleteTopAgro(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index ae1f2a5942..ba6dad4698 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DoorOpenType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DetectHiddenObjects extends AbstractEffect { - public DetectHiddenObjects(StatsSet params) + public DetectHiddenObjects(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Detection.java index 078360ff35..a20cbcb348 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Detection extends AbstractEffect { - public Detection(StatsSet params) + public Detection(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 8567a94d12..32ee715df7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DisableTargeting extends AbstractEffect { - public DisableTargeting(StatsSet params) + public DisableTargeting(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index fa06ec7221..5a80971f51 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Disarm extends AbstractEffect { - public Disarm(StatsSet params) + public Disarm(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index 7cf0889b57..95d32dd083 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class Disarmor extends AbstractEffect private final Map _unequippedItems; // PlayerObjId, ItemObjId private final long _slot; - public Disarmor(StatsSet params) + public Disarmor(StatSet params) { _unequippedItems = new ConcurrentHashMap<>(); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 95de0300bb..a652a023f5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DispelAll extends AbstractEffect { - public DispelAll(StatsSet params) + public DispelAll(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 88d979a0d9..040271d2a7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.List; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -38,7 +38,7 @@ public class DispelByCategory extends AbstractEffect private final int _rate; private final int _max; - public DispelByCategory(StatsSet params) + public DispelByCategory(StatSet params) { _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); _rate = params.getInt("rate", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index a6e4c7cd19..ab79e046b2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.EnumMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -37,7 +37,7 @@ public class DispelBySlot extends AbstractEffect private final String _dispel; private final Map _dispelAbnormals; - public DispelBySlot(StatsSet params) + public DispelBySlot(StatSet params) { _dispel = params.getString("dispel"); if ((_dispel != null) && !_dispel.isEmpty()) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 1ba6612e23..d1341d10b9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class DispelBySlotMyself extends AbstractEffect { private final Set _dispelAbnormals; - public DispelBySlotMyself(StatsSet params) + public DispelBySlotMyself(StatSet params) { final String dispel = params.getString("dispel"); if ((dispel != null) && !dispel.isEmpty()) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 845980e59d..b58723058e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -37,7 +37,7 @@ public class DispelBySlotProbability extends AbstractEffect private final Set _dispelAbnormals; private final int _rate; - public DispelBySlotProbability(StatsSet params) + public DispelBySlotProbability(StatSet params) { final String[] dispelEffects = params.getString("dispel").split(";"); _rate = params.getInt("rate", 100); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index 7acd9c4a6c..688d77a703 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -45,7 +45,7 @@ public class DoubleCast extends AbstractEffect private final Map> _addedToggles; - public DoubleCast(StatsSet params) + public DoubleCast(StatSet params) { _addedToggles = new HashMap<>(); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java index d7f067a2a0..d1e21edeb0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DuelistFury extends AbstractEffect { - public DuelistFury(StatsSet params) + public DuelistFury(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ElementalSpiritAttack.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ElementalSpiritAttack.java index b069c26601..347affa72f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ElementalSpiritAttack.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ElementalSpiritAttack.java @@ -17,14 +17,14 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ElementalType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author JoeAlisson */ public class ElementalSpiritAttack extends AbstractStatEffect { - public ElementalSpiritAttack(StatsSet params) + public ElementalSpiritAttack(StatSet params) { super(params, params.getEnum("type", ElementalType.class).getAttackStat()); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ElementalSpiritDefense.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ElementalSpiritDefense.java index 4d270b97a6..fe74e7a709 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ElementalSpiritDefense.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ElementalSpiritDefense.java @@ -17,14 +17,14 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ElementalType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author JoeAlisson */ public class ElementalSpiritDefense extends AbstractStatEffect { - public ElementalSpiritDefense(StatsSet params) + public ElementalSpiritDefense(StatSet params) { super(params, params.getEnum("type", ElementalType.class).getDefenseStat()); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index 409fed6a23..de397bb5ff 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class EnableCloak extends AbstractEffect { - public EnableCloak(StatsSet params) + public EnableCloak(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index e855c4ba1a..2fe2bef99f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -43,7 +43,7 @@ public class EnergyAttack extends AbstractEffect private final boolean _overHit; private final double _pDefMod; - public EnergyAttack(StatsSet params) + public EnergyAttack(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getInt("criticalChance", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index a8f108573f..ae463ef2a4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class EnlargeAbnormalSlot extends AbstractEffect { private final int _slots; - public EnlargeAbnormalSlot(StatsSet params) + public EnlargeAbnormalSlot(StatSet params) { _slots = params.getInt("slots", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java index c43ea04413..c4073b1a47 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StorageType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class EnlargeSlot extends AbstractEffect private final StorageType _type; private final double _amount; - public EnlargeSlot(StatsSet params) + public EnlargeSlot(StatSet params) { _amount = params.getDouble("amount", 0); _type = params.getEnum("type", StorageType.class, StorageType.INVENTORY_NORMAL); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Escape.java index 936f82d8ce..f3a07c9d15 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class Escape extends AbstractEffect { private final TeleportWhereType _escapeType; - public Escape(StatsSet params) + public Escape(StatSet params) { _escapeType = params.getEnum("escapeType", TeleportWhereType.class, null); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java index 76dbc8171c..eb68d24af8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ExpModify extends AbstractStatAddEffect { - public ExpModify(StatsSet params) + public ExpModify(StatSet params) { super(params, Stat.BONUS_EXP); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java index bf11db6e4b..1100ca25be 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Faceoff extends AbstractEffect { - public Faceoff(StatsSet params) + public Faceoff(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index e256209e39..79f7b43503 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -34,7 +34,7 @@ public class FakeDeath extends AbstractEffect { private final double _power; - public FakeDeath(StatsSet params) + public FakeDeath(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index a94c75d310..780d5cefba 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -44,7 +44,7 @@ public class FatalBlow extends AbstractEffect private final double _abnormalPower; private final boolean _overHit; - public FatalBlow(StatsSet params) + public FatalBlow(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java index c8ff8f7acb..6e7597e63d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class FatalBlowRate extends AbstractEffect private final double _amount; private final StatModifierType _mode; - public FatalBlowRate(StatsSet params) + public FatalBlowRate(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 9731e75e5d..ec2659ea2c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DefenderInstance; import org.l2jmobius.gameserver.model.actor.instance.FortCommanderInstance; @@ -40,7 +40,7 @@ public class Fear extends AbstractEffect { private static final int FEAR_RANGE = 500; - public Fear(StatsSet params) + public Fear(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 5e04e46d60..94d9912bdf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.MountType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ public class Feed extends AbstractEffect private final int _ride; private final int _wyvern; - public Feed(StatsSet params) + public Feed(StatSet params) { _normal = params.getInt("normal", 0); _ride = params.getInt("ride", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java index d61a1dd277..c2ed4e3af5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class FishingExpSpBonus extends AbstractStatPercentEffect { - public FishingExpSpBonus(StatsSet params) + public FishingExpSpBonus(StatSet params) { super(params, Stat.FISHING_EXP_SP_BONUS); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Flag.java index c1469eab19..2442cbdb35 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Flag extends AbstractEffect { - public Flag(StatsSet params) + public Flag(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index 0243f0f543..74a9754a95 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.BlockInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class FlipBlock extends AbstractEffect { - public FlipBlock(StatsSet params) + public FlipBlock(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 7fc7da5fe6..3412e4d36d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class FlyAway extends AbstractEffect { private final int _radius; - public FlyAway(StatsSet params) + public FlyAway(StatSet params) { _radius = params.getInt("radius"); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java index fd3216286d..590fbbcd44 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class FocusEnergy extends AbstractStatAddEffect { - public FocusEnergy(StatsSet params) + public FocusEnergy(StatSet params) { super(params, Stat.MAX_MOMENTUM); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index efbd93f304..19f0163e42 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class FocusMaxMomentum extends AbstractEffect { - public FocusMaxMomentum(StatsSet params) + public FocusMaxMomentum(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index 284d19ee5f..e8c18e9682 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -36,7 +36,7 @@ public class FocusMomentum extends AbstractEffect private final int _amount; private final int _maxCharges; - public FocusMomentum(StatsSet params) + public FocusMomentum(StatSet params) { _amount = params.getInt("amount", 1); _maxCharges = params.getInt("maxCharges", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 18a9864bbc..debd491cfe 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class FocusSouls extends AbstractEffect { private final int _charge; - public FocusSouls(StatsSet params) + public FocusSouls(StatSet params) { _charge = params.getInt("charge", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 8540ccd49c..23328db910 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Set; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class GetAgro extends AbstractEffect { - public GetAgro(StatsSet params) + public GetAgro(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java index 1ca8722709..e91002d04b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class GetDamageLimit extends AbstractStatAddEffect { - public GetDamageLimit(StatsSet params) + public GetDamageLimit(StatSet params) { super(params, Stat.DAMAGE_LIMIT); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 2dfd3bf8c4..439f3e8e3a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class GetMomentum extends AbstractEffect { private static int _ticks; - public GetMomentum(StatsSet params) + public GetMomentum(StatSet params) { _ticks = params.getInt("ticks", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index 7c1c0f3fa2..2c842101ed 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class GiveClanReputation extends AbstractEffect { private final int _reputation; - public GiveClanReputation(StatsSet params) + public GiveClanReputation(StatSet params) { _reputation = params.getInt("reputation", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index fd4d61fa73..9052c63154 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class GiveExpAndSp extends AbstractEffect private final int _xp; private final int _sp; - public GiveExpAndSp(StatsSet params) + public GiveExpAndSp(StatSet params) { _xp = params.getInt("xp", 0); _sp = params.getInt("sp", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index 3448e09797..9d41a4395b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ public class GiveFame extends AbstractEffect { private final int _fame; - public GiveFame(StatsSet params) + public GiveFame(StatSet params) { _fame = params.getInt("fame", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index c948fa0948..617a8ef88a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class GiveRecommendation extends AbstractEffect { private final int _amount; - public GiveRecommendation(StatsSet params) + public GiveRecommendation(StatSet params) { _amount = params.getInt("amount", 0); if (_amount == 0) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index 5fe06566c7..75a16fe828 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class GiveSp extends AbstractEffect { private final int _sp; - public GiveSp(StatsSet params) + public GiveSp(StatSet params) { _sp = params.getInt("sp", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index 5b1a04c165..ae7248c500 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class GiveXp extends AbstractEffect { private final int _xp; - public GiveXp(StatsSet params) + public GiveXp(StatSet params) { _xp = params.getInt("xp", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 17095c209a..5cf4994f32 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Grow extends AbstractEffect { - public Grow(StatsSet params) + public Grow(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index a2200e1a2f..350c8e659f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.UserInfoType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class HairAccessorySet extends AbstractEffect { - public HairAccessorySet(StatsSet params) + public HairAccessorySet(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index f881ed5027..1654fc650c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Harvesting extends AbstractEffect { - public Harvesting(StatsSet params) + public Harvesting(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java index ac1c9f49d8..097db6604a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HateAttack extends AbstractStatPercentEffect { - public HateAttack(StatsSet params) + public HateAttack(StatSet params) { super(params, Stat.HATE_ATTACK); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index 00f569eb17..9963ff1336 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlagInstance; @@ -34,7 +34,7 @@ public class HeadquarterCreate extends AbstractEffect private static final int HQ_NPC_ID = 35062; private final boolean _isAdvanced; - public HeadquarterCreate(StatsSet params) + public HeadquarterCreate(StatSet params) { _isAdvanced = params.getBoolean("isAdvanced", false); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 4c2218df9b..d2848a6242 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -40,7 +40,7 @@ public class Heal extends AbstractEffect { private final double _power; - public Heal(StatsSet params) + public Heal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java index 5a7457d3df..a9f75ab036 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HealEffect extends AbstractStatEffect { - public HealEffect(StatsSet params) + public HealEffect(StatSet params) { super(params, Stat.HEAL_EFFECT, Stat.HEAL_EFFECT_ADD); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 86e28dc8b4..da76f33058 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class HealOverTime extends AbstractEffect { private final double _power; - public HealOverTime(StatsSet params) + public HealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index b22cd7a42f..b86d0e7940 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class HealPercent extends AbstractEffect { private final int _power; - public HealPercent(StatsSet params) + public HealPercent(StatSet params) { _power = params.getInt("power", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Hide.java index e431277964..d02898bac5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Hide extends AbstractEffect { - public Hide(StatsSet params) + public Hide(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index e7e5f3f91b..78fa1c9392 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.GameTimeController; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HitAtNight extends AbstractStatEffect { - public HitAtNight(StatsSet params) + public HitAtNight(StatSet params) { super(params, Stat.HIT_AT_NIGHT); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java index 1fd98e7aa9..f14b922308 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HitNumber extends AbstractStatEffect { - public HitNumber(StatsSet params) + public HitNumber(StatSet params) { super(params, Stat.ATTACK_COUNT_MAX); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Hp.java index b2541b7835..a119947db5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Hp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Hp(StatsSet params) + public Hp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index 3d125565fe..6244c76428 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class HpByLevel extends AbstractEffect { private final double _power; - public HpByLevel(StatsSet params) + public HpByLevel(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index f9d9d0beeb..af3726c17f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -40,7 +40,7 @@ public class HpCpHeal extends AbstractEffect { private final double _power; - public HpCpHeal(StatsSet params) + public HpCpHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java index 0394dab996..6f96c2dcb3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class HpCpHealCritical extends AbstractEffect { - public HpCpHealCritical(StatsSet params) + public HpCpHealCritical(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 554b1cec79..7cf47c3a65 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class HpDrain extends AbstractEffect private final double _power; private final double _percentage; - public HpDrain(StatsSet params) + public HpDrain(StatSet params) { _power = params.getDouble("power", 0); _percentage = params.getDouble("percentage", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java index cb1d2bc3a7..b170bc62ba 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HpRegen extends AbstractStatEffect { - public HpRegen(StatsSet params) + public HpRegen(StatSet params) { super(params, Stat.REGENERATE_HP_RATE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 235e89a79b..f346fbaad8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class HpToOwner extends AbstractEffect private final double _power; private final int _stealAmount; - public HpToOwner(StatsSet params) + public HpToOwner(StatSet params) { _power = params.getDouble("power"); _stealAmount = params.getInt("stealAmount"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java index 9829519da9..c659684ae8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class IgnoreDeath extends AbstractEffect { - public IgnoreDeath(StatsSet params) + public IgnoreDeath(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index f7c9baa155..44dceba10e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ImmobilePetBuff extends AbstractEffect { - public ImmobilePetBuff(StatsSet params) + public ImmobilePetBuff(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java index a60fc45d15..a03eff933a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ public class InstantKillResist extends AbstractEffect { private final int _amount; - public InstantKillResist(StatsSet params) + public InstantKillResist(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java index 7e1fc8abe4..265a9aab97 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class JewelSlot extends AbstractStatAddEffect { - public JewelSlot(StatsSet params) + public JewelSlot(StatSet params) { super(params, Stat.BROOCH_JEWELS); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 3d5ff2dda3..a34d7cc5b3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class KarmaCount extends AbstractEffect private final int _amount; private final int _mode; - public KarmaCount(StatsSet params) + public KarmaCount(StatSet params) { _amount = params.getInt("amount", 0); switch (params.getString("mode", "DIFF")) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index dd58d33685..3af09931f8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -45,7 +45,7 @@ public class KnockBack extends AbstractEffect private final boolean _knockDown; private final FlyType _type; - public KnockBack(StatsSet params) + public KnockBack(StatSet params) { _distance = params.getInt("distance", 50); _speed = params.getInt("speed", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index 7bfac989cf..1affb1b141 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -38,7 +38,7 @@ public class Lethal extends AbstractEffect private final double _fullLethal; private final double _halfLethal; - public Lethal(StatsSet params) + public Lethal(StatSet params) { _fullLethal = params.getDouble("fullLethal", 0); _halfLethal = params.getDouble("halfLethal", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java index aeb42458a6..43b17877ad 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitCp extends AbstractStatEffect { - public LimitCp(StatsSet params) + public LimitCp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_CP); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java index cf76ec482a..45d8f37355 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitHp extends AbstractStatEffect { - public LimitHp(StatsSet params) + public LimitHp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_HP); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java index f5eda36ba6..8d31633d0a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitMp extends AbstractStatEffect { - public LimitMp(StatsSet params) + public LimitMp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_MP); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Lucky.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Lucky.java index 3775d2361d..4ff5ea9a01 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Lucky.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Lucky.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Lucky extends AbstractEffect { - public Lucky(StatsSet params) + public Lucky(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MAtk.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MAtk.java index 5f9ad5f32b..38c2fc9067 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MAtk.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MAtk.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MAtk extends AbstractStatEffect { - public MAtk(StatsSet params) + public MAtk(StatSet params) { super(params, Stat.MAGIC_ATTACK); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java index 2b9ae2e9e6..393d0d2d30 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicAccuracy extends AbstractStatEffect { - public MagicAccuracy(StatsSet params) + public MagicAccuracy(StatSet params) { super(params, Stat.ACCURACY_MAGIC); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java index 123706eb55..b9a58b09f3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicCriticalDamage extends AbstractStatEffect { - public MagicCriticalDamage(StatsSet params) + public MagicCriticalDamage(StatSet params) { super(params, Stat.MAGIC_CRITICAL_DAMAGE, Stat.MAGIC_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java index 0c10014e50..c9fa9a4240 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicCriticalRate extends AbstractStatEffect { - public MagicCriticalRate(StatsSet params) + public MagicCriticalRate(StatSet params) { super(params, Stat.MAGIC_CRITICAL_RATE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index e8b6f5e8bf..5281bf8445 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class MagicMpCost extends AbstractEffect private final int _magicType; private final double _amount; - public MagicMpCost(StatsSet params) + public MagicMpCost(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index ed4a3fca8b..283a99176c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class MagicalAbnormalDispelAttack extends AbstractEffect private final double _power; private final AbnormalType _abnormalType; - public MagicalAbnormalDispelAttack(StatsSet params) + public MagicalAbnormalDispelAttack(StatSet params) { _power = params.getDouble("power", 0); _abnormalType = AbnormalType.getAbnormalType(params.getString("abnormalType", null)); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java index 8234db1c43..be6403077c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAbnormalResist extends AbstractStatAddEffect { - public MagicalAbnormalResist(StatsSet params) + public MagicalAbnormalResist(StatSet params) { super(params, Stat.ABNORMAL_RESIST_MAGICAL); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index 4e938809f1..25c7d25954 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -37,7 +37,7 @@ public class MagicalAttack extends AbstractEffect private final boolean _overHit; private final double _debuffModifier; - public MagicalAttack(StatsSet params) + public MagicalAttack(StatSet params) { _power = params.getDouble("power", 0); _overHit = params.getBoolean("overHit", false); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 424480b76c..11c387780e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class MagicalAttackByAbnormal extends AbstractEffect { private final double _power; - public MagicalAttackByAbnormal(StatsSet params) + public MagicalAttackByAbnormal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9c3e263a05..348e904025 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -40,7 +40,7 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect private final double _power; private final Set _abnormals; - public MagicalAttackByAbnormalSlot(StatsSet params) + public MagicalAttackByAbnormalSlot(StatSet params) { _power = params.getDouble("power", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 49dd351046..de55dd0fcd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -38,7 +38,7 @@ public class MagicalAttackMp extends AbstractEffect private final boolean _critical; private final double _criticalLimit; - public MagicalAttackMp(StatsSet params) + public MagicalAttackMp(StatSet params) { _power = params.getDouble("power"); _critical = params.getBoolean("critical"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 4414b36fa7..93ac560169 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class MagicalAttackRange extends AbstractEffect private final double _power; private final double _shieldDefPercent; - public MagicalAttackRange(StatsSet params) + public MagicalAttackRange(StatSet params) { _power = params.getDouble("power"); _shieldDefPercent = params.getDouble("shieldDefPercent", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java index 2e304e5f8b..1cf39ed501 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAttackSpeed extends AbstractStatEffect { - public MagicalAttackSpeed(StatsSet params) + public MagicalAttackSpeed(StatSet params) { super(params, Stat.MAGIC_ATTACK_SPEED); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 9a3a776e32..880d71f0c5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class MagicalDamOverTime extends AbstractEffect private final double _power; private final boolean _canKill; - public MagicalDamOverTime(StatsSet params) + public MagicalDamOverTime(StatSet params) { _power = params.getDouble("power", 0); _canKill = params.getBoolean("canKill", false); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java index 80fdf87050..9b4e6061aa 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalDefence extends AbstractStatEffect { - public MagicalDefence(StatsSet params) + public MagicalDefence(StatSet params) { super(params, Stat.MAGICAL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java index c3c7c404f3..4e83b80e8b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalEvasion extends AbstractStatEffect { - public MagicalEvasion(StatsSet params) + public MagicalEvasion(StatSet params) { super(params, Stat.MAGIC_EVASION_RATE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java index 6253af7373..bf419a19f7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalSkillPower extends AbstractStatEffect { - public MagicalSkillPower(StatsSet params) + public MagicalSkillPower(StatSet params) { super(params, Stat.MAGICAL_SKILL_POWER, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index d0047fedef..f4388dc16f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class MagicalSoulAttack extends AbstractEffect { private final double _power; - public MagicalSoulAttack(StatsSet params) + public MagicalSoulAttack(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java index fcc143cd4b..688243d9e1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ManaCharge extends AbstractStatAddEffect { - public ManaCharge(StatsSet params) + public ManaCharge(StatSet params) { super(params, Stat.MANA_CHARGE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index 0c84b4ab61..b889e6e824 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class ManaDamOverTime extends AbstractEffect { private final double _power; - public ManaDamOverTime(StatsSet params) + public ManaDamOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index f48011c9a2..94286df1c8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -34,7 +34,7 @@ public class ManaHeal extends AbstractEffect { private final double _power; - public ManaHeal(StatsSet params) + public ManaHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index bfdfa54380..61f15449a0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -35,7 +35,7 @@ public class ManaHealByLevel extends AbstractEffect { private final double _power; - public ManaHealByLevel(StatsSet params) + public ManaHealByLevel(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 46937a8dd0..e505c9e7a2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class ManaHealOverTime extends AbstractEffect { private final double _power; - public ManaHealOverTime(StatsSet params) + public ManaHealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 101961d1c4..71085da549 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class ManaHealPercent extends AbstractEffect { private final double _power; - public ManaHealPercent(StatsSet params) + public ManaHealPercent(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 7c9c63e3ad..07d15d826c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxCp extends AbstractStatEffect { private final boolean _heal; - public MaxCp(StatsSet params) + public MaxCp(StatSet params) { super(params, Stat.MAX_CP); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 6d2c3449bd..85867bca96 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxHp extends AbstractStatEffect { private final boolean _heal; - public MaxHp(StatsSet params) + public MaxHp(StatSet params) { super(params, Stat.MAX_HP); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index e554c63055..9ca46fda8d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxMp extends AbstractStatEffect { private final boolean _heal; - public MaxMp(StatsSet params) + public MaxMp(StatSet params) { super(params, Stat.MAX_MP); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 39cf62a95b..c27284e5f6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -43,7 +43,7 @@ public class ModifyVital extends AbstractEffect private final int _mp; private final int _cp; - public ModifyVital(StatsSet params) + public ModifyVital(StatSet params) { _type = params.getEnum("type", ModifyType.class); if (_type != ModifyType.SET) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 29ee88f805..095d130f7f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Mp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Mp(StatsSet params) + public Mp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index 76d858ad8e..b13d7824d0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class MpConsumePerLevel extends AbstractEffect { private final double _power; - public MpConsumePerLevel(StatsSet params) + public MpConsumePerLevel(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java index 2051009805..ae7bf0c48c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpRegen extends AbstractStatEffect { - public MpRegen(StatsSet params) + public MpRegen(StatSet params) { super(params, Stat.REGENERATE_MP_RATE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MpShield.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MpShield.java index 82e307a562..a4eb3e663f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MpShield.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MpShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpShield extends AbstractStatAddEffect { - public MpShield(StatsSet params) + public MpShield(StatSet params) { super(params, Stat.MANA_SHIELD_PERCENT); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java index af2ce119cc..366e96b18f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpVampiricAttack extends AbstractStatAddEffect { - public MpVampiricAttack(StatsSet params) + public MpVampiricAttack(StatSet params) { super(params, Stat.ABSORB_MANA_DAMAGE_PERCENT); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Mute.java index a7f2f76e23..7e5b5a528f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Mute extends AbstractEffect { - public Mute(StatsSet params) + public Mute(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java index 3cc4cae96f..513dc46ec7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class NoblesseBless extends AbstractEffect { - public NoblesseBless(StatsSet params) + public NoblesseBless(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index bb0f02af5c..05f8c6a99b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpenChest extends AbstractEffect { - public OpenChest(StatsSet params) + public OpenChest(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 15cd9c2a64..de0414fd23 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.RecipeController; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpenCommonRecipeBook extends AbstractEffect { - public OpenCommonRecipeBook(StatsSet params) + public OpenCommonRecipeBook(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 21dd337982..7b5effc6b4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class OpenDoor extends AbstractEffect private final int _chance; private final boolean _isItem; - public OpenDoor(StatsSet params) + public OpenDoor(StatSet params) { _chance = params.getInt("chance", 0); _isItem = params.getBoolean("isItem", false); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index b99a8f9757..3526fa5fdc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.RecipeController; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpenDwarfRecipeBook extends AbstractEffect { - public OpenDwarfRecipeBook(StatsSet params) + public OpenDwarfRecipeBook(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PAtk.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PAtk.java index c353d03a00..7f10b9dcc7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PAtk.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PAtk.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PAtk extends AbstractConditionalHpEffect { - public PAtk(StatsSet params) + public PAtk(StatSet params) { super(params, Stat.PHYSICAL_ATTACK); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Passive.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Passive.java index cef680ca21..27ce15bb60 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Passive.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Passive.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Passive extends AbstractEffect { - public Passive(StatsSet params) + public Passive(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java index 05f55c7dac..1a9f29424f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAbnormalResist extends AbstractStatAddEffect { - public PhysicalAbnormalResist(StatsSet params) + public PhysicalAbnormalResist(StatSet params) { super(params, Stat.ABNORMAL_RESIST_PHYSICAL); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 098770705b..7e5fb14465 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -52,7 +52,7 @@ public class PhysicalAttack extends AbstractEffect private final Set _abnormals; private final double _abnormalPowerMod; - public PhysicalAttack(StatsSet params) + public PhysicalAttack(StatSet params) { _power = params.getDouble("power", 0); _pAtkMod = params.getDouble("pAtkMod", 1.0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index d325c3d5ed..f191867614 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -38,7 +38,7 @@ public class PhysicalAttackHpLink extends AbstractEffect private final double _criticalChance; private final boolean _overHit; - public PhysicalAttackHpLink(StatsSet params) + public PhysicalAttackHpLink(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index dc575c2c75..fe087a1bcc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class PhysicalAttackMute extends AbstractEffect { - public PhysicalAttackMute(StatsSet params) + public PhysicalAttackMute(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java index 112b41eb36..2093d45264 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAttackRange extends AbstractStatEffect { - public PhysicalAttackRange(StatsSet params) + public PhysicalAttackRange(StatSet params) { super(params, Stat.PHYSICAL_ATTACK_RANGE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index d3c2dcfaf2..5d66bd4c87 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ public class PhysicalAttackSaveHp extends AbstractEffect private final boolean _overHit; private final double _saveHp; - public PhysicalAttackSaveHp(StatsSet params) + public PhysicalAttackSaveHp(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java index 167b859572..cdf34eb6f6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAttackSpeed extends AbstractStatEffect { - public PhysicalAttackSpeed(StatsSet params) + public PhysicalAttackSpeed(StatSet params) { super(params, Stat.PHYSICAL_ATTACK_SPEED); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 61bed5561b..a1a6818a00 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class PhysicalAttackWeaponBonus extends AbstractEffect private final Map _weaponBonus = new EnumMap<>(WeaponType.class); - public PhysicalAttackWeaponBonus(StatsSet params) + public PhysicalAttackWeaponBonus(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java index fa3925e725..078c3673b9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalDefence extends AbstractConditionalHpEffect { - public PhysicalDefence(StatsSet params) + public PhysicalDefence(StatSet params) { super(params, Stat.PHYSICAL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java index 812c641ac8..9714220e1b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalEvasion extends AbstractConditionalHpEffect { - public PhysicalEvasion(StatsSet params) + public PhysicalEvasion(StatSet params) { super(params, Stat.EVASION_RATE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index b337fed6cb..fe7cf853c8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class PhysicalMute extends AbstractEffect { - public PhysicalMute(StatsSet params) + public PhysicalMute(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java index 0fd835f4e3..1b843dda3d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class PhysicalShieldAngleAll extends AbstractEffect { - public PhysicalShieldAngleAll(StatsSet params) + public PhysicalShieldAngleAll(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java index 9d3f051659..507eb57326 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalSkillPower extends AbstractStatEffect { - public PhysicalSkillPower(StatsSet params) + public PhysicalSkillPower(StatSet params) { super(params, Stat.PHYSICAL_SKILL_POWER, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index a958116ff7..9ceccea4cc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -42,7 +42,7 @@ public class PhysicalSoulAttack extends AbstractEffect private final boolean _ignoreShieldDefence; private final boolean _overHit; - public PhysicalSoulAttack(StatsSet params) + public PhysicalSoulAttack(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index e95e09ab90..fd2b23a2ae 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class PkCount extends AbstractEffect { private final int _amount; - public PkCount(StatsSet params) + public PkCount(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index 2d64d05406..b51d6a7961 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class Plunder extends AbstractEffect { - public Plunder(StatsSet params) + public Plunder(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index fd61584af1..3e885274b3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PolearmSingleTarget extends AbstractEffect { - public PolearmSingleTarget(StatsSet params) + public PolearmSingleTarget(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java index 86f2e2cee8..b2fb920379 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class ProtectDeathPenalty extends AbstractEffect { - public ProtectDeathPenalty(StatsSet params) + public ProtectDeathPenalty(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java index 890b8980bd..6664b36bae 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ProtectionBlessing extends AbstractEffect { - public ProtectionBlessing(StatsSet params) + public ProtectionBlessing(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index 6de78c2c82..62c480716d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class PullBack extends AbstractEffect private final int _animationSpeed; private final FlyType _type; - public PullBack(StatsSet params) + public PullBack(StatSet params) { _speed = params.getInt("speed", 0); _delay = params.getInt("delay", _speed); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java index 1019c56778..84a72299f3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveMagicalSkillDamageBonus extends AbstractStatPercentEffect { - public PveMagicalSkillDamageBonus(StatsSet params) + public PveMagicalSkillDamageBonus(StatSet params) { super(params, Stat.PVE_MAGICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java index 8da698c746..70870aa45c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveMagicalSkillDefenceBonus(StatsSet params) + public PveMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java index c7a82d4ded..8f60ea025c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalAttackDamageBonus extends AbstractStatPercentEffect { - public PvePhysicalAttackDamageBonus(StatsSet params) + public PvePhysicalAttackDamageBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_ATTACK_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java index 0717fe525b..ea01a4e1d8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PvePhysicalAttackDefenceBonus(StatsSet params) + public PvePhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java index 878f942877..1e8b9e76c4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvePhysicalSkillDamageBonus(StatsSet params) + public PvePhysicalSkillDamageBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java index bdfa0dcc67..b1dbb0b217 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvePhysicalSkillDefenceBonus(StatsSet params) + public PvePhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java index 94fdc26015..fbe3119ba8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveRaidMagicalSkillDefenceBonus(StatsSet params) + public PveRaidMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java index f54d849752..83352e1b2f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidPhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PveRaidPhysicalAttackDefenceBonus(StatsSet params) + public PveRaidPhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java index 0a344f96de..be05bec159 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidPhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveRaidPhysicalSkillDefenceBonus(StatsSet params) + public PveRaidPhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java index 542c019420..2f0153189a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpMagicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvpMagicalSkillDamageBonus(StatsSet params) + public PvpMagicalSkillDamageBonus(StatSet params) { super(params, Stat.PVP_MAGICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java index bb006280fc..41ad3b7749 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvpMagicalSkillDefenceBonus(StatsSet params) + public PvpMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVP_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java index 483d7b02e4..23488ea000 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalAttackDamageBonus extends AbstractStatPercentEffect { - public PvpPhysicalAttackDamageBonus(StatsSet params) + public PvpPhysicalAttackDamageBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_ATTACK_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java index 40c3a22ea2..ff942b3d4d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PvpPhysicalAttackDefenceBonus(StatsSet params) + public PvpPhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java index 225c7c1e39..19a7c96003 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvpPhysicalSkillDamageBonus(StatsSet params) + public PvpPhysicalSkillDamageBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java index ea2d1fa126..211d14c5e3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvpPhysicalSkillDefenceBonus(StatsSet params) + public PvpPhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 8a01583374..e500b487af 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -36,7 +36,7 @@ public class RandomizeHate extends AbstractEffect { private final int _chance; - public RandomizeHate(StatsSet params) + public RandomizeHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index 1fdf1296cc..452588fb12 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class RealDamage extends AbstractEffect { private final double _power; - public RealDamage(StatsSet params) + public RealDamage(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java index 4372c15bcf..86738fae0f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class RearDamage extends AbstractStatPercentEffect { - public RearDamage(StatsSet params) + public RearDamage(StatSet params) { super(params, Stat.REAR_DAMAGE_RATE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 31c7a4e4b3..82ed18faa1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RebalanceHP extends AbstractEffect { - public RebalanceHP(StatsSet params) + public RebalanceHP(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index 09d307be02..979809b533 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RebalanceHPSummon extends AbstractEffect { - public RebalanceHPSummon(StatsSet params) + public RebalanceHPSummon(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 7599b691ac..e76328929a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class RecoverVitalityInPeaceZone extends AbstractEffect private final double _amount; private final int _ticks; - public RecoverVitalityInPeaceZone(StatsSet params) + public RecoverVitalityInPeaceZone(StatSet params) { _amount = params.getDouble("amount", 0); _ticks = params.getInt("ticks", 10); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java index 824044ae21..e52b5abafb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ReduceCancel extends AbstractStatEffect { - public ReduceCancel(StatsSet params) + public ReduceCancel(StatSet params) { super(params, Stat.ATTACK_CANCEL); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index ecc7a10d31..be9188f3b0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -33,7 +33,7 @@ public class ReduceDamage extends AbstractEffect { private final double _amount; - public ReduceDamage(StatsSet params) + public ReduceDamage(StatSet params) { _amount = params.getDouble("amount"); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java index 8534a94fc6..7b8862f608 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ReduceDropType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -32,7 +32,7 @@ public class ReduceDropPenalty extends AbstractEffect private final double _deathPenalty; private final ReduceDropType _type; - public ReduceDropPenalty(StatsSet params) + public ReduceDropPenalty(StatSet params) { _exp = params.getDouble("exp", 0); _deathPenalty = params.getDouble("deathPenalty", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java index c15f7301b9..6436b488e0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ReflectMagic extends AbstractStatAddEffect { - public ReflectMagic(StatsSet params) + public ReflectMagic(StatSet params) { super(params, Stat.VENGEANCE_SKILL_MAGIC_DAMAGE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java index bf1d555351..583191fd4c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.BasicProperty; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ReflectSkill extends AbstractEffect private final Stat _stat; private final double _amount; - public ReflectSkill(StatsSet params) + public ReflectSkill(StatSet params) { _stat = params.getEnum("type", BasicProperty.class, BasicProperty.PHYSICAL) == BasicProperty.PHYSICAL ? Stat.REFLECT_SKILL_PHYSIC : Stat.REFLECT_SKILL_MAGIC; _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index e850ea6be9..77b96e4205 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class RefuelAirship extends AbstractEffect { private final int _value; - public RefuelAirship(StatsSet params) + public RefuelAirship(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Relax.java index c8c61fe47e..e2ba4420db 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ public class Relax extends AbstractEffect { private final double _power; - public Relax(StatsSet params) + public Relax(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 9678dc1174..0613c17234 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class ResetInstanceEntry extends AbstractEffect { private final Set _instanceId; - public ResetInstanceEntry(StatsSet params) + public ResetInstanceEntry(StatSet params) { final String instanceIds = params.getString("instanceId", null); if ((instanceIds != null) && !instanceIds.isEmpty()) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java index 940c731208..f15ff56189 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ResistAbnormalByCategory extends AbstractEffect private final DispelSlotType _slot; private final double _amount; - public ResistAbnormalByCategory(StatsSet params) + public ResistAbnormalByCategory(StatSet params) { _amount = params.getDouble("amount", 0); _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.DEBUFF); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java index dae38e5246..2e29b5cc8e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ResistDDMagic extends AbstractStatPercentEffect { - public ResistDDMagic(StatsSet params) + public ResistDDMagic(StatSet params) { super(params, Stat.MAGIC_SUCCESS_RES); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java index af2b203aad..d08fcb262a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ResistDispelByCategory extends AbstractEffect private final DispelSlotType _slot; private final double _amount; - public ResistDispelByCategory(StatsSet params) + public ResistDispelByCategory(StatSet params) { _amount = params.getDouble("amount", 0); _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index af1e40bea8..cd03f1a74a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -34,7 +34,7 @@ public class ResistSkill extends AbstractEffect { private final List _skills = new ArrayList<>(); - public ResistSkill(StatsSet params) + public ResistSkill(StatSet params) { for (int i = 1;; i++) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index feb5885fb0..6f887a07cf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class Restoration extends AbstractEffect private final int _itemCount; private final int _itemEnchantmentLevel; - public Restoration(StatsSet params) + public Restoration(StatSet params) { _itemId = params.getInt("itemId", 0); _itemCount = params.getInt("itemCount", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 37cd974643..0baf0aaae6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -25,7 +25,7 @@ import java.util.Map.Entry; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.ExtractableProductItem; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,12 +47,12 @@ public class RestorationRandom extends AbstractEffect { private final List _products = new ArrayList<>(); - public RestorationRandom(StatsSet params) + public RestorationRandom(StatSet params) { - for (StatsSet group : params.getList("items", StatsSet.class)) + for (StatSet group : params.getList("items", StatSet.class)) { final List items = new ArrayList<>(); - for (StatsSet item : group.getList(".", StatsSet.class)) + for (StatSet item : group.getList(".", StatSet.class)) { items.add(new RestorationItemHolder(item.getInt(".id"), item.getInt(".count"), item.getInt(".minEnchant", 0), item.getInt(".maxEnchant", 0))); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index f9c10b7ff2..9b287dd419 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class Resurrection extends AbstractEffect { private final int _power; - public Resurrection(StatsSet params) + public Resurrection(StatSet params) { _power = params.getInt("power", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 18d8bdb0bd..6ef063ce91 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -39,7 +39,7 @@ public class ResurrectionSpecial extends AbstractEffect private final int _power; private final Set _instanceId; - public ResurrectionSpecial(StatsSet params) + public ResurrectionSpecial(StatSet params) { _power = params.getInt("power", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index e4d66b43d3..0e7391681b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class Reuse extends AbstractEffect private final int _magicType; private final double _amount; - public Reuse(StatsSet params) + public Reuse(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index 3716fc1922..e17cd7cc25 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ReuseSkillById extends AbstractEffect { private final int _skillId; - public ReuseSkillById(StatsSet params) + public ReuseSkillById(StatSet params) { _skillId = params.getInt("skillId", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Root.java index 1ca3492949..b6876e8e13 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Root extends AbstractEffect { - public Root(StatsSet params) + public Root(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index 66fc8d82c8..4c7ee53239 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class SacrificeSummon extends AbstractEffect { - public SacrificeSummon(StatsSet params) + public SacrificeSummon(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java index d00856c9bd..683f45bb55 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SafeFallHeight extends AbstractStatEffect { - public SafeFallHeight(StatsSet params) + public SafeFallHeight(StatSet params) { super(params, Stat.FALL); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 7f6bf69ee3..797aa95263 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -33,7 +33,7 @@ public class SendSystemMessageToClan extends AbstractEffect { private final SystemMessage _message; - public SendSystemMessageToClan(StatsSet params) + public SendSystemMessageToClan(StatSet params) { final int id = params.getInt("id", 0); _message = new SystemMessage(id); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java index 7acbf846df..a0508d73b1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class ServitorShare extends AbstractEffect { private final Map _sharedStats = new EnumMap<>(Stat.class); - public ServitorShare(StatsSet params) + public ServitorShare(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 01dfd87c71..6e8187feae 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SetHp extends AbstractEffect private final double _amount; private final StatModifierType _mode; - public SetHp(StatsSet params) + public SetHp(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index 805d18160b..fae21baa51 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SetSkill extends AbstractEffect private final int _skillId; private final int _skillLvl; - public SetSkill(StatsSet params) + public SetSkill(StatSet params) { _skillId = params.getInt("skillId", 0); _skillLvl = params.getInt("skillLvl", 1); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java index a93bb5f253..354cb42b55 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ShieldDefence extends AbstractStatEffect { - public ShieldDefence(StatsSet params) + public ShieldDefence(StatSet params) { super(params, Stat.SHIELD_DEFENCE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java index f28d0e4ad2..1fdee75f69 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ShieldDefenceRate extends AbstractStatEffect { - public ShieldDefenceRate(StatsSet params) + public ShieldDefenceRate(StatSet params) { super(params, Stat.SHIELD_DEFENCE_RATE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java index 1d649082dc..533b631f10 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class SilentMove extends AbstractEffect { - public SilentMove(StatsSet params) + public SilentMove(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java index 89dad85514..7c929a7fe8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class SkillCritical extends AbstractEffect { private final BaseStat _stat; - public SkillCritical(StatsSet params) + public SkillCritical(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java index 369bef11f5..8f054f973b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillCriticalDamage extends AbstractStatEffect { - public SkillCriticalDamage(StatsSet params) + public SkillCriticalDamage(StatSet params) { super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java index c91f2d6b49..88ecf69e77 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillCriticalProbability extends AbstractStatPercentEffect { - public SkillCriticalProbability(StatsSet params) + public SkillCriticalProbability(StatSet params) { super(params, Stat.SKILL_CRITICAL_PROBABILITY); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 7b98a9e180..1664ea1827 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class SkillEvasion extends AbstractEffect private final int _magicType; private final double _amount; - public SkillEvasion(StatsSet params) + public SkillEvasion(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java index 9cc62532b4..2880d0ccef 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillPowerAdd extends AbstractStatAddEffect { - public SkillPowerAdd(StatsSet params) + public SkillPowerAdd(StatSet params) { super(params, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 9578c88f91..7156fff2df 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SkillTurning extends AbstractEffect private final int _chance; private final boolean _staticChance; - public SkillTurning(StatsSet params) + public SkillTurning(StatSet params) { _chance = params.getInt("chance", 100); _staticChance = params.getBoolean("staticChance", false); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 45b02206a4..04691304ed 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SkillTurningOverTime extends AbstractEffect private final int _chance; private final boolean _staticChance; - public SkillTurningOverTime(StatsSet params) + public SkillTurningOverTime(StatSet params) { _chance = params.getInt("chance", 100); _staticChance = params.getBoolean("staticChance", false); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index c1dd92cedb..b919c7acac 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -36,7 +36,7 @@ public class SoulBlow extends AbstractEffect private final double _chanceBoost; private final boolean _overHit; - public SoulBlow(StatsSet params) + public SoulBlow(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 8471aa236c..4f63a84081 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; @@ -40,7 +40,7 @@ public class SoulEating extends AbstractEffect private final int _expNeeded; private final int _maxSouls; - public SoulEating(StatsSet params) + public SoulEating(StatSet params) { _expNeeded = params.getInt("expNeeded"); _maxSouls = params.getInt("maxSouls"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a7d5c2628a..ad261845eb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Seed; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Sow extends AbstractEffect { - public Sow(StatsSet params) + public Sow(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SpModify.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SpModify.java index 24d124ecce..c3bc6193e9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SpModify.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SpModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SpModify extends AbstractStatAddEffect { - public SpModify(StatsSet params) + public SpModify(StatSet params) { super(params, Stat.BONUS_SP); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 0718408ca2..890438d65f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.enums.SpeedType; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -36,7 +36,7 @@ public class Speed extends AbstractEffect private final StatModifierType _mode; private List _speedType; - public Speed(StatsSet params) + public Speed(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index 91b91ad05e..db247775f3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SphericBarrier extends AbstractStatAddEffect { - public SphericBarrier(StatsSet params) + public SphericBarrier(StatSet params) { super(params, Stat.SPHERIC_BARRIER_RANGE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SpiritExpModify.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SpiritExpModify.java index 11de35695a..6e3306fa0d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SpiritExpModify.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SpiritExpModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SpiritExpModify extends AbstractStatEffect { - public SpiritExpModify(StatsSet params) + public SpiritExpModify(StatSet params) { super(params, Stat.ELEMENTAL_SPIRIT_BONUS_EXP); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index d13eaf1c2e..385240377f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class Spoil extends AbstractEffect { - public Spoil(StatsSet params) + public Spoil(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index b63c24dc20..22c4132b63 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -36,7 +36,7 @@ public class StatBonusSkillCritical extends AbstractEffect private final BaseStat _stat; private final Condition _armorTypeCondition; - public StatBonusSkillCritical(StatsSet params) + public StatBonusSkillCritical(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.DEX); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index 41a20bfafe..49280eb774 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -36,7 +36,7 @@ public class StatBonusSpeed extends AbstractEffect private final BaseStat _stat; private final Condition _armorTypeCondition; - public StatBonusSpeed(StatsSet params) + public StatBonusSpeed(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.DEX); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index a007b118b2..bcf691e360 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class StatByMoveType extends AbstractEffect private final MoveType _type; private final double _value; - public StatByMoveType(StatsSet params) + public StatByMoveType(StatSet params) { _stat = params.getEnum("stat", Stat.class); _type = params.getEnum("type", MoveType.class); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StatUp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StatUp.java index b961ec8484..7abb1367af 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StatUp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StatUp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class StatUp extends AbstractEffect private final BaseStat _stat; private final double _amount; - public StatUp(StatsSet params) + public StatUp(StatSet params) { _amount = params.getDouble("amount", 0); _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index 0720057c19..23239887a7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.List; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -39,7 +39,7 @@ public class StealAbnormal extends AbstractEffect private final int _rate; private final int _max; - public StealAbnormal(StatsSet params) + public StealAbnormal(StatSet params) { _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); _rate = params.getInt("rate", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Summon.java index cd7bfabef8..62daa5ffdf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.ServitorInstance; @@ -43,7 +43,7 @@ public class Summon extends AbstractEffect private final int _lifeTime; private final int _consumeItemInterval; - public Summon(StatsSet params) + public Summon(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index 8929e1f2b0..50c025e572 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class SummonAgathion extends AbstractEffect { private final int _npcId; - public SummonAgathion(StatsSet params) + public SummonAgathion(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index 7716d58f16..49b816f272 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.CubicData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; @@ -42,7 +42,7 @@ public class SummonCubic extends AbstractEffect private final int _cubicId; private final int _cubicLvl; - public SummonCubic(StatsSet params) + public SummonCubic(StatSet params) { _cubicId = params.getInt("cubicId", -1); _cubicLvl = params.getInt("cubicLvl", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index d0a2a82738..13d5a2eac7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoppelgangerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ public class SummonHallucination extends AbstractEffect private final int _npcId; private final int _npcCount; - public SummonHallucination(StatsSet params) + public SummonHallucination(StatSet params) { _despawnDelay = params.getInt("despawnDelay", 20000); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index bcd050e084..d61a6e5c02 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.ServitorInstance; @@ -43,7 +43,7 @@ public class SummonMulti extends AbstractEffect private final int _consumeItemInterval; private final int _summonPoints; - public SummonMulti(StatsSet params) + public SummonMulti(StatSet params) { _npcId = params.getInt("npcId"); _expMultiplier = params.getFloat("expMultiplier", 1); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index 6f4090eef0..eaff214b7c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DecoyInstance; @@ -48,7 +48,7 @@ public class SummonNpc extends AbstractEffect private final boolean _isSummonSpawn; private final boolean _singleInstance; // Only one instance of this NPC is allowed. - public SummonNpc(StatsSet params) + public SummonNpc(StatSet params) { _despawnDelay = params.getInt("despawnDelay", 20000); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 5ef621819e..534a41ee16 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.data.xml.impl.PetDataTable; import org.l2jmobius.gameserver.model.PetData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PetItemList; */ public class SummonPet extends AbstractEffect { - public SummonPet(StatsSet params) + public SummonPet(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java index 7dd690587c..b1d5ec38cb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SummonPoints extends AbstractStatAddEffect { - public SummonPoints(StatsSet params) + public SummonPoints(StatSet params) { super(params, Stat.MAX_SUMMON_POINTS); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index d8a47b670f..ac1ddaa16a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; @@ -35,7 +35,7 @@ public class SummonTrap extends AbstractEffect private final int _despawnTime; private final int _npcId; - public SummonTrap(StatsSet params) + public SummonTrap(StatSet params) { _despawnTime = params.getInt("despawnTime", 0); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 84f6d070a8..3196bb949d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Collection; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Sweeper extends AbstractEffect { - public Sweeper(StatsSet params) + public Sweeper(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 559dfc6437..ec29554f2d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ public class Synergy extends AbstractEffect private final int _skillLevelScaleTo; private final int _minSlot; - public Synergy(StatsSet params) + public Synergy(StatSet params) { final String requiredSlots = params.getString("requiredSlots", null); if ((requiredSlots != null) && !requiredSlots.isEmpty()) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index e35516fef5..39ed981bbf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Castle; @@ -33,7 +33,7 @@ public class TakeCastle extends AbstractEffect { private final CastleSide _side; - public TakeCastle(StatsSet params) + public TakeCastle(StatSet params) { _side = params.getEnum("side", CastleSide.class); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 77fd9ec103..3be2bf5593 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Castle; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TakeCastleStart extends AbstractEffect { - public TakeCastleStart(StatsSet params) + public TakeCastleStart(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 70842191a7..18749c1aef 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Fort; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TakeFort extends AbstractEffect { - public TakeFort(StatsSet params) + public TakeFort(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 0eb23f6733..77355f9683 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TakeFortStart extends AbstractEffect { - public TakeFortStart(StatsSet params) + public TakeFortStart(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index cec32755ed..dd8e09278f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class TalismanSlot extends AbstractEffect { private final int _slots; - public TalismanSlot(StatsSet params) + public TalismanSlot(StatSet params) { _slots = params.getInt("slots", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 281b5322fd..32a126f499 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class TargetCancel extends AbstractEffect { private final int _chance; - public TargetCancel(StatsSet params) + public TargetCancel(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index b4463de391..86ff70c9ca 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMe extends AbstractEffect { - public TargetMe(StatsSet params) + public TargetMe(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index 11e581113e..e68a1e1faf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class TargetMeProbability extends AbstractEffect { private final int _chance; - public TargetMeProbability(StatsSet params) + public TargetMeProbability(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 6c30519678..9ca01faf50 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -32,7 +32,7 @@ public class Teleport extends AbstractEffect { private final Location _loc; - public Teleport(StatsSet params) + public Teleport(StatSet params) { _loc = new Location(params.getInt("x", 0), params.getInt("y", 0), params.getInt("z", 0)); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index e0e715818c..bdc53208d5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -38,7 +38,7 @@ public class TeleportToNpc extends AbstractEffect private final int _npcId; private final boolean _party; - public TeleportToNpc(StatsSet params) + public TeleportToNpc(StatSet params) { _npcId = params.getInt("npcId"); _party = params.getBoolean("party", false); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index c84c559322..4f4275fd41 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TeleportToPlayer extends AbstractEffect { - public TeleportToPlayer(StatsSet params) + public TeleportToPlayer(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index 1c9af0f535..b2d6b663de 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class TeleportToSummon extends AbstractEffect { private final double _maxDistance; - public TeleportToSummon(StatsSet params) + public TeleportToSummon(StatSet params) { _maxDistance = params.getDouble("distance", -1); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index e550302b02..c4bf787a10 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class TeleportToTarget extends AbstractEffect { - public TeleportToTarget(StatsSet params) + public TeleportToTarget(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index ba1c55c615..ff63eea817 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class TransferDamageToPlayer extends AbstractStatAddEffect { - public TransferDamageToPlayer(StatsSet params) + public TransferDamageToPlayer(StatSet params) { super(params, Stat.TRANSFER_DAMAGE_TO_PLAYER); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java index b084bfc1cb..c87d5f0554 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class TransferDamageToSummon extends AbstractStatAddEffect { - public TransferDamageToSummon(StatsSet params) + public TransferDamageToSummon(StatSet params) { super(params, Stat.TRANSFER_DAMAGE_SUMMON_PERCENT); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index e9f0292113..48bc5e3a1c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -34,7 +34,7 @@ public class TransferHate extends AbstractEffect { private final int _chance; - public TransferHate(StatsSet params) + public TransferHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 2ddf95a4db..bf593eaed8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Transformation extends AbstractEffect { private final List _id; - public Transformation(StatsSet params) + public Transformation(StatSet params) { final String ids = params.getString("transformationId", null); if ((ids != null) && !ids.isEmpty()) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 103ccdf8ce..2b4af0a1d3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class TrapDetect extends AbstractEffect { private final int _power; - public TrapDetect(StatsSet params) + public TrapDetect(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index eb7b073b36..c4a6c6aed9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.TrapAction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class TrapRemove extends AbstractEffect { private final int _power; - public TrapRemove(StatsSet params) + public TrapRemove(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 6df3874ab1..8fb87050b1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -59,7 +59,7 @@ public class TriggerSkillByAttack extends AbstractEffect * @param params */ - public TriggerSkillByAttack(StatsSet params) + public TriggerSkillByAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index ae6a3bc89f..78366b8047 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillByAvoid extends AbstractEffect /** * @param params */ - public TriggerSkillByAvoid(StatsSet params) + public TriggerSkillByAvoid(StatSet params) { _chance = params.getInt("chance", 100); _skill = new SkillHolder(params.getInt("skillId", 0), params.getInt("skillLevel", 0)); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index c24fb95246..9fe53c0622 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -48,7 +48,7 @@ public class TriggerSkillByDamage extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillByDamage(StatsSet params) + public TriggerSkillByDamage(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c086507336..8b84350293 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillByDeathBlow extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillByDeathBlow(StatsSet params) + public TriggerSkillByDeathBlow(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index a9bfcc320c..11802645f2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -37,7 +37,7 @@ public class TriggerSkillByKill extends AbstractEffect private final int _chance; private final SkillHolder _skill; - public TriggerSkillByKill(StatsSet params) + public TriggerSkillByKill(StatSet params) { _chance = params.getInt("chance", 100); _skill = new SkillHolder(params.getInt("skillId", 0), params.getInt("skillLevel", 0)); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 2893d46f33..7f2d3f9fa7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -52,7 +52,7 @@ public class TriggerSkillByMagicType extends AbstractEffect * @param params */ - public TriggerSkillByMagicType(StatsSet params) + public TriggerSkillByMagicType(StatSet params) { _chance = params.getInt("chance", 100); _magicTypes = params.getIntArray("magicTypes", ";"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 1524e3d4f4..b77da803f5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillBySkill extends AbstractEffect private final int _skillLevelScaleTo; private final TargetType _targetType; - public TriggerSkillBySkill(StatsSet params) + public TriggerSkillBySkill(StatSet params) { _castSkillId = params.getInt("castSkillId"); _chance = params.getInt("chance", 100); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index ec2124c44e..7bb68baec9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -53,7 +53,7 @@ public class TriggerSkillBySkillAttack extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillBySkillAttack(StatsSet params) + public TriggerSkillBySkillAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 3f58619f0a..c209decfb3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -69,7 +69,7 @@ public class TwoHandedBluntBonus extends AbstractEffect private final double _speedAmount; private final StatModifierType _speedMode; - public TwoHandedBluntBonus(StatsSet params) + public TwoHandedBluntBonus(StatSet params) { _pAtkAmount = params.getDouble("pAtkAmount", 0); _pAtkMode = params.getEnum("pAtkMode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index b2c50c4b88..344456a925 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -69,7 +69,7 @@ public class TwoHandedSwordBonus extends AbstractEffect private final double _speedAmount; private final StatModifierType _speedMode; - public TwoHandedSwordBonus(StatsSet params) + public TwoHandedSwordBonus(StatSet params) { _pAtkAmount = params.getDouble("pAtkAmount", 0); _pAtkMode = params.getEnum("pAtkMode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 01ae8122ec..20b418c29b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ public class Unsummon extends AbstractEffect { private final int _chance; - public Unsummon(StatsSet params) + public Unsummon(StatSet params) { _chance = params.getInt("chance", -1); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 57eb89196d..f73f0f57f0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; */ public class UnsummonAgathion extends AbstractEffect { - public UnsummonAgathion(StatsSet params) + public UnsummonAgathion(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index a4fdc2c0aa..0779d018cc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class UnsummonServitors extends AbstractEffect { - public UnsummonServitors(StatsSet params) + public UnsummonServitors(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index dbb0c700b5..ac33fcba0d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Untargetable extends AbstractEffect { - public Untargetable(StatsSet params) + public Untargetable(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java index ac6cae3d05..1c85196fe0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class VampiricAttack extends AbstractEffect private final double _amount; private final double _sum; - public VampiricAttack(StatsSet params) + public VampiricAttack(StatSet params) { _amount = params.getDouble("amount"); _sum = _amount * params.getDouble("chance"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java index ab724714e1..571ca55bbe 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ public class VampiricDefence extends AbstractEffect { private final int _amount; - public VampiricDefence(StatsSet params) + public VampiricDefence(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java index f8b9d76f3a..caaa8d02b4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class VitalityExpRate extends AbstractStatPercentEffect { - public VitalityExpRate(StatsSet params) + public VitalityExpRate(StatSet params) { super(params, Stat.VITALITY_EXP_RATE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index cba2b14c35..385595e03d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class VitalityPointUp extends AbstractEffect { private final int _value; - public VitalityPointUp(StatsSet params) + public VitalityPointUp(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java index 86612955dd..72f78ec177 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class VitalityPointsRate extends AbstractStatPercentEffect { - public VitalityPointsRate(StatsSet params) + public VitalityPointsRate(StatSet params) { super(params, Stat.VITALITY_CONSUME_RATE); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java index 09500b3823..bf20bd5018 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WeightLimit extends AbstractStatEffect { - public WeightLimit(StatsSet params) + public WeightLimit(StatSet params) { super(params, Stat.WEIGHT_LIMIT); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java index f9be68f493..6020399f85 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WeightPenalty extends AbstractStatAddEffect { - public WeightPenalty(StatsSet params) + public WeightPenalty(StatSet params) { super(params, Stat.WEIGHT_PENALTY); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java index bdf9aca48d..81eb9a9688 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WorldChatPoints extends AbstractStatEffect { - public WorldChatPoints(StatsSet params) + public WorldChatPoints(StatSet params) { super(params, Stat.WORLD_CHAT_POINTS); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java index 5a3842921d..127dadf9d2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class BuildAdvanceBaseSkillCondition implements ISkillCondition { - public BuildAdvanceBaseSkillCondition(StatsSet params) + public BuildAdvanceBaseSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java index 9328638400..b479302f61 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class BuildCampSkillCondition implements ISkillCondition { - public BuildCampSkillCondition(StatsSet params) + public BuildCampSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java index c1220c828a..aca51bafbf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanAddMaxEntranceInzoneSkillCondition implements ISkillCondition { - public CanAddMaxEntranceInzoneSkillCondition(StatsSet params) + public CanAddMaxEntranceInzoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java index eddd45771c..6ac3c2e199 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ public class CanBookmarkAddSlotSkillCondition implements ISkillCondition { private final int _teleportBookmarkSlots; - public CanBookmarkAddSlotSkillCondition(StatsSet params) + public CanBookmarkAddSlotSkillCondition(StatSet params) { _teleportBookmarkSlots = params.getInt("teleportBookmarkSlots"); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java index 30fdb7f36f..ee1bf96e69 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanChangeVitalItemCountSkillCondition implements ISkillCondition { - public CanChangeVitalItemCountSkillCondition(StatsSet params) + public CanChangeVitalItemCountSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java index da553a6d9f..48e28e7af7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanEnchantAttributeSkillCondition implements ISkillCondition { - public CanEnchantAttributeSkillCondition(StatsSet params) + public CanEnchantAttributeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java index c14f1ffe64..2908994776 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanMountForEventSkillCondition implements ISkillCondition { - public CanMountForEventSkillCondition(StatsSet params) + public CanMountForEventSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java index d07aa9a622..9dc5f99592 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShipInstance; @@ -31,7 +31,7 @@ public class CanRefuelAirshipSkillCondition implements ISkillCondition { private final int _amount; - public CanRefuelAirshipSkillCondition(StatsSet params) + public CanRefuelAirshipSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java index d451f3c997..67206b47bd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanRestoreVitalPointSkillCondition implements ISkillCondition { - public CanRestoreVitalPointSkillCondition(StatsSet params) + public CanRestoreVitalPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java index 7e519025b0..49232af88f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CanSummonCubicSkillCondition implements ISkillCondition { - public CanSummonCubicSkillCondition(StatsSet params) + public CanSummonCubicSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java index 8b550d164c..33541e82a8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class CanSummonMultiSkillCondition implements ISkillCondition { private final int _summonPoints; - public CanSummonMultiSkillCondition(StatsSet params) + public CanSummonMultiSkillCondition(StatSet params) { _summonPoints = params.getInt("summonPoints"); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java index aa9579e92a..b06ba00f32 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.CharSummonTable; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; */ public class CanSummonPetSkillCondition implements ISkillCondition { - public CanSummonPetSkillCondition(StatsSet params) + public CanSummonPetSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java index ea41a2e22e..3655e158cb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanSummonSiegeGolemSkillCondition implements ISkillCondition { - public CanSummonSiegeGolemSkillCondition(StatsSet params) + public CanSummonSiegeGolemSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java index 460d72a743..e07ce75c8f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanSummonSkillCondition implements ISkillCondition { - public CanSummonSkillCondition(StatsSet params) + public CanSummonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java index 309da529c9..bd8838d02f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanTransformInDominionSkillCondition implements ISkillCondition { - public CanTransformInDominionSkillCondition(StatsSet params) + public CanTransformInDominionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java index 81297944f1..2f4d780cab 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class CanTransformSkillCondition implements ISkillCondition // TODO: What to do with this? // private final int _transformId; - public CanTransformSkillCondition(StatsSet params) + public CanTransformSkillCondition(StatSet params) { // _transformId = params.getInt("transformId"); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java index 800d0375be..771873a553 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanUntransformSkillCondition implements ISkillCondition { - public CanUntransformSkillCondition(StatsSet params) + public CanUntransformSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java index e651b3b1d5..ffe2e4a026 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class CanUseInBattlefieldSkillCondition implements ISkillCondition { - public CanUseInBattlefieldSkillCondition(StatsSet params) + public CanUseInBattlefieldSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java index 5ff751abce..ba030b97a4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanUseInDragonLairSkillCondition implements ISkillCondition { - public CanUseInDragonLairSkillCondition(StatsSet params) + public CanUseInDragonLairSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java index 4d914c28fe..8a0cb18ac7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class CanUseSwoopCannonSkillCondition implements ISkillCondition { - public CanUseSwoopCannonSkillCondition(StatsSet params) + public CanUseSwoopCannonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java index 6a2d832a4c..e9996580fc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanUseVitalityConsumeItemSkillCondition implements ISkillCondition { - public CanUseVitalityConsumeItemSkillCondition(StatsSet params) + public CanUseVitalityConsumeItemSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java index f694956e7e..48dafb46c3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class CannotUseInTransformSkillCondition implements ISkillCondition { private final int _transformId; - public CannotUseInTransformSkillCondition(StatsSet params) + public CannotUseInTransformSkillCondition(StatSet params) { _transformId = params.getInt("transformId", -1); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java index 141c69322f..6591233504 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -32,7 +32,7 @@ public class CheckLevelSkillCondition implements ISkillCondition private final int _maxLevel; private final SkillConditionAffectType _affectType; - public CheckLevelSkillCondition(StatsSet params) + public CheckLevelSkillCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java index 15163a3373..d72f463c4e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class CheckSexSkillCondition implements ISkillCondition { private final boolean _isFemale; - public CheckSexSkillCondition(StatsSet params) + public CheckSexSkillCondition(StatSet params) { _isFemale = params.getBoolean("isFemale"); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java index 8dee11ef9c..12e49c23a7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConsumeBodySkillCondition implements ISkillCondition { - public ConsumeBodySkillCondition(StatsSet params) + public ConsumeBodySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java index c24da9ebcd..ba1b1cdd5f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class EnergySavedSkillCondition implements ISkillCondition { private final int _amount; - public EnergySavedSkillCondition(StatsSet params) + public EnergySavedSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 89d705e991..34f76973f0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -35,7 +35,7 @@ public class EquipArmorSkillCondition implements ISkillCondition { private int _armorTypesMask = 0; - public EquipArmorSkillCondition(StatsSet params) + public EquipArmorSkillCondition(StatSet params) { final List armorTypes = params.getEnumList("armorType", ArmorType.class); if (armorTypes != null) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index e5f22008fa..708b4dd1d4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class EquipShieldSkillCondition implements ISkillCondition { - public EquipShieldSkillCondition(StatsSet params) + public EquipShieldSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 4561945254..f733f81f62 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -33,7 +33,7 @@ public class EquipWeaponSkillCondition implements ISkillCondition { private int _weaponTypesMask = 0; - public EquipWeaponSkillCondition(StatsSet params) + public EquipWeaponSkillCondition(StatSet params) { final List weaponTypes = params.getEnumList("weaponType", WeaponType.class); if (weaponTypes != null) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java index 5f77215218..e36c06fa11 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class NotFearedSkillCondition implements ISkillCondition { - public NotFearedSkillCondition(StatsSet params) + public NotFearedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java index b9096cc1a9..b6e7bcd826 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class NotInUnderwaterSkillCondition implements ISkillCondition { - public NotInUnderwaterSkillCondition(StatsSet params) + public NotInUnderwaterSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index eee6ec73e9..18d8dc8a11 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -35,7 +35,7 @@ public class Op2hWeaponSkillCondition implements ISkillCondition { private final List _weaponTypes = new ArrayList<>(); - public Op2hWeaponSkillCondition(StatsSet params) + public Op2hWeaponSkillCondition(StatSet params) { final List weaponTypes = params.getList("weaponType", String.class); if (weaponTypes != null) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 3b91f36fe4..6223172dbc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; - public OpAffectedBySkillSkillCondition(StatsSet params) + public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java index 2eb561291e..3818df4736 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAgathionEnergySkillCondition implements ISkillCondition { - public OpAgathionEnergySkillCondition(StatsSet params) + public OpAgathionEnergySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java index 76a7ebc5a8..ee2b415021 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.enums.SkillConditionAlignment; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -32,7 +32,7 @@ public class OpAlignmentSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final SkillConditionAlignment _alignment; - public OpAlignmentSkillCondition(StatsSet params) + public OpAlignmentSkillCondition(StatSet params) { _affectType = params.getEnum("affectType", SkillConditionAffectType.class); _alignment = params.getEnum("alignment", SkillConditionAlignment.class); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index 1c83d18f4e..bcc6715bb2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -33,7 +33,7 @@ public class OpBlinkSkillCondition implements ISkillCondition private final int _angle; private final int _range; - public OpBlinkSkillCondition(StatsSet params) + public OpBlinkSkillCondition(StatSet params) { switch (params.getEnum("direction", Position.class)) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java index 5215f86ae6..fde0c7f0f8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpCallPcSkillCondition implements ISkillCondition { - public OpCallPcSkillCondition(StatsSet params) + public OpCallPcSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java index dddafec6f0..1de2a32550 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCanEscapeSkillCondition implements ISkillCondition { - public OpCanEscapeSkillCondition(StatsSet params) + public OpCanEscapeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java index 3f1685a1e0..a87fd8adb6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCanNotUseAirshipSkillCondition implements ISkillCondition { - public OpCanNotUseAirshipSkillCondition(StatsSet params) + public OpCanNotUseAirshipSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java index 8eec19a568..ac7a81c015 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCannotUseTargetWithPrivateStoreSkillCondition implements ISkillCondition { - public OpCannotUseTargetWithPrivateStoreSkillCondition(StatsSet params) + public OpCannotUseTargetWithPrivateStoreSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 91de0adc8c..4030b79d00 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Weapon; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpChangeWeaponSkillCondition implements ISkillCondition { - public OpChangeWeaponSkillCondition(StatsSet params) + public OpChangeWeaponSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java index c2de03de1e..3e304e7d9d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.AbnormalType; @@ -34,7 +34,7 @@ public class OpCheckAbnormalSkillCondition implements ISkillCondition private final boolean _hasAbnormal; private final SkillConditionAffectType _affectType; - public OpCheckAbnormalSkillCondition(StatsSet params) + public OpCheckAbnormalSkillCondition(StatSet params) { _type = params.getEnum("type", AbnormalType.class); _level = params.getInt("level"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java index 65084182b1..c70b58dc50 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCheckAccountTypeSkillCondition implements ISkillCondition { - public OpCheckAccountTypeSkillCondition(StatsSet params) + public OpCheckAccountTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java index 3d4f0a58a0..11eb804274 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpCheckCastRangeSkillCondition implements ISkillCondition { private final int _distance; - public OpCheckCastRangeSkillCondition(StatsSet params) + public OpCheckCastRangeSkillCondition(StatSet params) { _distance = params.getInt("distance"); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java index 7e2e391595..03af1ac63d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.ClassId; @@ -35,7 +35,7 @@ public class OpCheckClassListSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final boolean _isWithin; - public OpCheckClassListSkillCondition(StatsSet params) + public OpCheckClassListSkillCondition(StatSet params) { _classIds = params.getEnumList("classIds", ClassId.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java index 9f779f937a..9702804304 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.ClassId; @@ -33,7 +33,7 @@ public class OpCheckClassSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final boolean _isWithin; - public OpCheckClassSkillCondition(StatsSet params) + public OpCheckClassSkillCondition(StatSet params) { _classId = params.getEnum("classId", ClassId.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java index 3bf6b65dc8..ad997dced7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckCrtEffectSkillCondition implements ISkillCondition { - public OpCheckCrtEffectSkillCondition(StatsSet params) + public OpCheckCrtEffectSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java index 144dc95daa..1d5a3adff9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class OpCheckFlagSkillCondition implements ISkillCondition { - public OpCheckFlagSkillCondition(StatsSet params) + public OpCheckFlagSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java index 75af2ab89a..2e0c07d040 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckOnGoingEventCampaignSkillCondition implements ISkillCondition { - public OpCheckOnGoingEventCampaignSkillCondition(StatsSet params) + public OpCheckOnGoingEventCampaignSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java index c64f7c6722..f11569f43c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckPcbangPointSkillCondition implements ISkillCondition { - public OpCheckPcbangPointSkillCondition(StatsSet params) + public OpCheckPcbangPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java index 252519f7ff..997a4d0fec 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.data.xml.impl.ClanHallData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -35,7 +35,7 @@ public class OpCheckResidenceSkillCondition implements ISkillCondition private final List _residencesId; private final boolean _isWithin; - public OpCheckResidenceSkillCondition(StatsSet params) + public OpCheckResidenceSkillCondition(StatSet params) { _residencesId = params.getList("residencesId", Integer.class); _isWithin = params.getBoolean("isWithin"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java index 6abeed7d35..3a1bcf424c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -34,7 +34,7 @@ public class OpCheckSkillListSkillCondition implements ISkillCondition private final List _skillIds; private final SkillConditionAffectType _affectType; - public OpCheckSkillListSkillCondition(StatsSet params) + public OpCheckSkillListSkillCondition(StatSet params) { _skillIds = params.getList("skillIds", Integer.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java index 984338b2c0..af563d983f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpCheckSkillSkillCondition implements ISkillCondition private final int _skillId; private final SkillConditionAffectType _affectType; - public OpCheckSkillSkillCondition(StatsSet params) + public OpCheckSkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java index ea882c3635..5d85a2dbdb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionCompanionType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpCompanionSkillCondition implements ISkillCondition { private final SkillConditionCompanionType _type; - public OpCompanionSkillCondition(StatsSet params) + public OpCompanionSkillCondition(StatSet params) { _type = params.getEnum("type", SkillConditionCompanionType.class); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java index 069b9d1759..464853c00c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpEnchantRangeSkillCondition implements ISkillCondition { - public OpEnchantRangeSkillCondition(StatsSet params) + public OpEnchantRangeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java index 99f22bb16a..e12f3ae007 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class OpEncumberedSkillCondition implements ISkillCondition private final int _slotsPercent; private final int _weightPercent; - public OpEncumberedSkillCondition(StatsSet params) + public OpEncumberedSkillCondition(StatSet params) { _slotsPercent = params.getInt("slotsPercent"); _weightPercent = params.getInt("weightPercent"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java index 187dfba744..49cf8e2cb8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpEnergyMaxSkillCondition implements ISkillCondition { private final int _amount; - public OpEnergyMaxSkillCondition(StatsSet params) + public OpEnergyMaxSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 75bdf465e0..82eb70b770 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class OpEquipItemSkillCondition implements ISkillCondition private final int _itemId; private final SkillConditionAffectType _affectType; - public OpEquipItemSkillCondition(StatsSet params) + public OpEquipItemSkillCondition(StatSet params) { _itemId = params.getInt("itemId"); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java index 2c4576c2fa..fa6e82082b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ public class OpExistNpcSkillCondition implements ISkillCondition private final int _range; private final boolean _isAround; - public OpExistNpcSkillCondition(StatsSet params) + public OpExistNpcSkillCondition(StatSet params) { _npcIds = params.getList("npcIds", Integer.class); _range = params.getInt("range"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java index 27cc3e90a9..8299b40047 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingCastSkillCondition implements ISkillCondition { - public OpFishingCastSkillCondition(StatsSet params) + public OpFishingCastSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java index 84cc031a24..4b43eb834e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingPumpingSkillCondition implements ISkillCondition { - public OpFishingPumpingSkillCondition(StatsSet params) + public OpFishingPumpingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java index 86aa667bee..a6a400f96f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingReelingSkillCondition implements ISkillCondition { - public OpFishingReelingSkillCondition(StatsSet params) + public OpFishingReelingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java index d22733df7e..50e6dafb82 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpHaveSummonSkillCondition implements ISkillCondition { - public OpHaveSummonSkillCondition(StatsSet params) + public OpHaveSummonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 2e854ca2b8..cceb4e937b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { private final int _npcId; - public OpHaveSummonedNpcSkillCondition(StatsSet params) + public OpHaveSummonedNpcSkillCondition(StatSet params) { _npcId = params.getInt("npcId"); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java index 16932ce531..374a75bfab 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.impl.ClanHallData; import org.l2jmobius.gameserver.enums.ResidenceType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -34,7 +34,7 @@ public class OpHomeSkillCondition implements ISkillCondition { private final ResidenceType _type; - public OpHomeSkillCondition(StatsSet params) + public OpHomeSkillCondition(StatSet params) { _type = params.getEnum("type", ResidenceType.class); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java index 9482a0bf55..62ad48bdcc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpInSiegeTimeSkillCondition implements ISkillCondition { - public OpInSiegeTimeSkillCondition(StatsSet params) + public OpInSiegeTimeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java index 1bffdacd6c..f2fb298398 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -30,7 +30,7 @@ public class OpInstantzoneSkillCondition implements ISkillCondition { private final int _instanceId; - public OpInstantzoneSkillCondition(StatsSet params) + public OpInstantzoneSkillCondition(StatSet params) { _instanceId = params.getInt("instanceId"); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java index 76703cc53b..7418ef9b64 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpMainjobSkillCondition implements ISkillCondition { - public OpMainjobSkillCondition(StatsSet params) + public OpMainjobSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java index d4c9f1f331..3c81369bbb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNeedAgathionSkillCondition implements ISkillCondition { - public OpNeedAgathionSkillCondition(StatsSet params) + public OpNeedAgathionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java index 96f6774f25..e7a477b0ee 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; @@ -34,7 +34,7 @@ public class OpNeedSummonOrPetSkillCondition implements ISkillCondition { private final List _npcIds = new ArrayList<>(); - public OpNeedSummonOrPetSkillCondition(StatsSet params) + public OpNeedSummonOrPetSkillCondition(StatSet params) { final List npcIds = params.getList("npcIds", String.class); if (npcIds != null) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java index 9701002065..ae1edfd719 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotCursedSkillCondition implements ISkillCondition { - public OpNotCursedSkillCondition(StatsSet params) + public OpNotCursedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java index bf909425d8..1de79f388a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpNotInPeacezoneSkillCondition implements ISkillCondition { - public OpNotInPeacezoneSkillCondition(StatsSet params) + public OpNotInPeacezoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java index 0752ba4a6a..0d3e4cb4dd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotInstantzoneSkillCondition implements ISkillCondition { - public OpNotInstantzoneSkillCondition(StatsSet params) + public OpNotInstantzoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java index 45891cd0ac..7ea02159ba 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotOlympiadSkillCondition implements ISkillCondition { - public OpNotOlympiadSkillCondition(StatsSet params) + public OpNotOlympiadSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java index 5c5d293ae8..2397a68e99 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpNotTerritorySkillCondition implements ISkillCondition { - public OpNotTerritorySkillCondition(StatsSet params) + public OpNotTerritorySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java index 874872bb2e..d9f8c1fa3b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpPeacezoneSkillCondition implements ISkillCondition { - public OpPeacezoneSkillCondition(StatsSet params) + public OpPeacezoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java index c20c4665bb..08d6bb095a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpPkcountSkillCondition implements ISkillCondition { private final SkillConditionAffectType _affectType; - public OpPkcountSkillCondition(StatsSet params) + public OpPkcountSkillCondition(StatSet params) { _affectType = params.getEnum("affectType", SkillConditionAffectType.class); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java index 879fc88c4c..d393c5ddc3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -30,7 +30,7 @@ public class OpPledgeSkillCondition implements ISkillCondition { private final int _level; - public OpPledgeSkillCondition(StatsSet params) + public OpPledgeSkillCondition(StatSet params) { _level = params.getInt("level"); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java index 9adc89b98d..adf16f8feb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpRestartPointSkillCondition implements ISkillCondition { - public OpRestartPointSkillCondition(StatsSet params) + public OpRestartPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java index bbd1d9d7d1..6874091ba2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class OpResurrectionSkillCondition implements ISkillCondition { - public OpResurrectionSkillCondition(StatsSet params) + public OpResurrectionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java index 8bbf796ad2..566f935a50 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpSiegeHammerSkillCondition implements ISkillCondition { - public OpSiegeHammerSkillCondition(StatsSet params) + public OpSiegeHammerSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java index be3ad18e05..cbfc1a25b2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition private final int _skillId; private final boolean _hasLearned; - public OpSkillAcquireSkillCondition(StatsSet params) + public OpSkillAcquireSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _hasLearned = params.getBoolean("hasLearned"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java index c8789d28e4..a8382b83b3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpSkillSkillCondition implements ISkillCondition private final int _skillLevel; private final boolean _hasLearned; - public OpSkillSkillCondition(StatsSet params) + public OpSkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _skillLevel = params.getInt("skillLevel"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java index 5127071683..a3d188f3eb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpSocialClassSkillCondition implements ISkillCondition { private final int _socialClass; - public OpSocialClassSkillCondition(StatsSet params) + public OpSocialClassSkillCondition(StatSet params) { _socialClass = params.getInt("socialClass"); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java index b9d37d18c0..c86984a218 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class OpSoulMaxSkillCondition implements ISkillCondition { - public OpSoulMaxSkillCondition(StatsSet params) + public OpSoulMaxSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java index 4780c13a58..0faa676bbe 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpSubjobSkillCondition implements ISkillCondition { - public OpSubjobSkillCondition(StatsSet params) + public OpSubjobSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java index 17a9a1a9e3..a14192847a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.concurrent.atomic.AtomicBoolean; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpSweeperSkillCondition implements ISkillCondition { - public OpSweeperSkillCondition(StatsSet params) + public OpSweeperSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java index b36585bf00..c4b3923e92 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTargetAllItemTypeSkillCondition implements ISkillCondition { - public OpTargetAllItemTypeSkillCondition(StatsSet params) + public OpTargetAllItemTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 6b85389d62..5492e96e1a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTargetArmorTypeSkillCondition implements ISkillCondition { - public OpTargetArmorTypeSkillCondition(StatsSet params) + public OpTargetArmorTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java index 0c0090fbc4..97e07a1822 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpTargetDoorSkillCondition implements ISkillCondition { private final List _doorIds; - public OpTargetDoorSkillCondition(StatsSet params) + public OpTargetDoorSkillCondition(StatSet params) { _doorIds = params.getList("doorIds", Integer.class); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java index 6fbc3cda10..eaabf4a73d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpTargetMyPledgeAcademySkillCondition implements ISkillCondition { - public OpTargetMyPledgeAcademySkillCondition(StatsSet params) + public OpTargetMyPledgeAcademySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java index d5820600dd..14a744613d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpTargetNpcSkillCondition implements ISkillCondition { private final List _npcId; - public OpTargetNpcSkillCondition(StatsSet params) + public OpTargetNpcSkillCondition(StatSet params) { _npcId = params.getList("npcIds", Integer.class); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java index 854225a75a..b0c5e50ae3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpTargetPcSkillCondition implements ISkillCondition { - public OpTargetPcSkillCondition(StatsSet params) + public OpTargetPcSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index 7faecb2ffd..62fd4b365f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Weapon; @@ -34,7 +34,7 @@ public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition { private final List _weaponTypes = new ArrayList<>(); - public OpTargetWeaponAttackTypeSkillCondition(StatsSet params) + public OpTargetWeaponAttackTypeSkillCondition(StatSet params) { final List weaponTypes = params.getList("weaponType", String.class); if (weaponTypes != null) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java index 8451365885..e114c03412 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTerritorySkillCondition implements ISkillCondition { - public OpTerritorySkillCondition(StatsSet params) + public OpTerritorySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java index 13f287687e..fde1293086 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpUnlockSkillCondition implements ISkillCondition { - public OpUnlockSkillCondition(StatsSet params) + public OpUnlockSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java index 8cc76a34bb..46dea5bbcb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpUseFirecrackerSkillCondition implements ISkillCondition { - public OpUseFirecrackerSkillCondition(StatsSet params) + public OpUseFirecrackerSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java index f3b54bbad7..651dade274 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpUsePraseedSkillCondition implements ISkillCondition { - public OpUsePraseedSkillCondition(StatsSet params) + public OpUsePraseedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java index 890b0fcd5f..dd57df0e13 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.MountType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpWyvernSkillCondition implements ISkillCondition { - public OpWyvernSkillCondition(StatsSet params) + public OpWyvernSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java index 49085b6674..8590262afc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class PossessHolythingSkillCondition implements ISkillCondition { - public PossessHolythingSkillCondition(StatsSet params) + public PossessHolythingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java index 8b0fb55554..38b5644fb1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class RemainCpPerSkillCondition implements ISkillCondition private final int _amount; private final SkillConditionPercentType _percentType; - public RemainCpPerSkillCondition(StatsSet params) + public RemainCpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java index 612367a233..1ad96100ad 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -33,7 +33,7 @@ public class RemainHpPerSkillCondition implements ISkillCondition private final SkillConditionPercentType _percentType; private final SkillConditionAffectType _affectType; - public RemainHpPerSkillCondition(StatsSet params) + public RemainHpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java index 5455c1587a..39085349d9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class RemainMpPerSkillCondition implements ISkillCondition private final int _amount; private final SkillConditionPercentType _percentType; - public RemainMpPerSkillCondition(StatsSet params) + public RemainMpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java index 7de47f103f..6e9e5ad821 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class SoulSavedSkillCondition implements ISkillCondition { private final int _amount; - public SoulSavedSkillCondition(StatsSet params) + public SoulSavedSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java index 0b75a5a623..f4bdbaaecb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class TargetItemCrystalTypeSkillCondition implements ISkillCondition { - public TargetItemCrystalTypeSkillCondition(StatsSet params) + public TargetItemCrystalTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java index 51502ff209..604a41f904 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.MentorManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMyMenteeSkillCondition implements ISkillCondition { - public TargetMyMenteeSkillCondition(StatsSet params) + public TargetMyMenteeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java index fc621365a9..4bfb496634 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class TargetMyPartySkillCondition implements ISkillCondition { private final boolean _includeMe; - public TargetMyPartySkillCondition(StatsSet params) + public TargetMyPartySkillCondition(StatSet params) { _includeMe = params.getBoolean("includeMe"); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java index 9ebec0e691..d44a1bc8a9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMyPledgeSkillCondition implements ISkillCondition { - public TargetMyPledgeSkillCondition(StatsSet params) + public TargetMyPledgeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java index f4da8d6079..5045aa3848 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class TargetRaceSkillCondition implements ISkillCondition { private final Race _race; - public TargetRaceSkillCondition(StatsSet params) + public TargetRaceSkillCondition(StatSet params) { _race = params.getEnum("race", Race.class); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java index b1d0ec8553..7e9236b634 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.ActionDataHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -57,7 +57,7 @@ public class ActionData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "action", actionNode -> { - final ActionDataHolder holder = new ActionDataHolder(new StatsSet(parseAttributes(actionNode))); + final ActionDataHolder holder = new ActionDataHolder(new StatSet(parseAttributes(actionNode))); _actionData.put(holder.getId(), holder); })); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java index 36002572b0..f7762ab07b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java @@ -32,7 +32,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.AdminCommandAccessRight; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -72,7 +72,7 @@ public class AdminData implements IXmlReader { NamedNodeMap attrs; Node attr; - StatsSet set; + StatSet set; AccessLevel level; AdminCommandAccessRight command; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -83,7 +83,7 @@ public class AdminData implements IXmlReader { if ("access".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -99,7 +99,7 @@ public class AdminData implements IXmlReader } else if ("admin".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index a5de47d07c..c31f2ea750 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; @@ -83,7 +83,7 @@ public class AppearanceItemData implements IXmlReader { if ("appearance_stone".equalsIgnoreCase(d.getNodeName())) { - final AppearanceStone stone = new AppearanceStone(new StatsSet(parseAttributes(d))); + final AppearanceStone stone = new AppearanceStone(new StatSet(parseAttributes(d))); for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) { switch (c.getNodeName()) @@ -120,7 +120,7 @@ public class AppearanceItemData implements IXmlReader } case "visual": { - stone.addVisualId(new AppearanceHolder(new StatsSet(parseAttributes(c)))); + stone.addVisualId(new AppearanceHolder(new StatSet(parseAttributes(c)))); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java index 6c96d3874a..6eac3240e7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -64,7 +64,7 @@ public class AttendanceRewardData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "item", rewardNode -> { - final StatsSet set = new StatsSet(parseAttributes(rewardNode)); + final StatSet set = new StatSet(parseAttributes(rewardNode)); final int itemId = set.getInt("id"); final int itemCount = set.getInt("count"); if (ItemTable.getInstance().getTemplate(itemId) == null) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java index 891d19fcf2..3054b0e7ef 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.beautyshop.BeautyData; import org.l2jmobius.gameserver.model.beautyshop.BeautyItem; @@ -56,7 +56,7 @@ public class BeautyShopData implements IXmlReader public void parseDocument(Document doc, File f) { NamedNodeMap attrs; - StatsSet set; + StatSet set; Node att; Race race = null; Sex sex = null; @@ -92,7 +92,7 @@ public class BeautyShopData implements IXmlReader if ("hair".equalsIgnoreCase(a.getNodeName())) { attrs = a.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -105,7 +105,7 @@ public class BeautyShopData implements IXmlReader if ("color".equalsIgnoreCase(g.getNodeName())) { attrs = g.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -119,7 +119,7 @@ public class BeautyShopData implements IXmlReader else if ("face".equalsIgnoreCase(a.getNodeName())) { attrs = a.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java index 37e977c51e..530a5d975a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java @@ -34,7 +34,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.entity.ClanHall; @@ -66,7 +66,7 @@ public class ClanHallData implements IXmlReader final List doors = new ArrayList<>(); final List npcs = new ArrayList<>(); final List teleports = new ArrayList<>(); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); for (Node listNode = doc.getFirstChild(); listNode != null; listNode = listNode.getNextSibling()) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java index ae608cefb6..f1a23734e0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.combination.CombinationItem; import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; @@ -57,7 +57,7 @@ public class CombinationItemsData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "item", itemNode -> { - final CombinationItem item = new CombinationItem(new StatsSet(parseAttributes(itemNode))); + final CombinationItem item = new CombinationItem(new StatSet(parseAttributes(itemNode))); forEach(itemNode, "reward", rewardNode -> { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java index 038738b138..4af039b48d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.CubicSkill; import org.l2jmobius.gameserver.model.cubic.ICubicConditionHolder; @@ -61,7 +61,7 @@ public class CubicData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - forEach(doc, "list", listNode -> forEach(listNode, "cubic", cubicNode -> parseTemplate(cubicNode, new CubicTemplate(new StatsSet(parseAttributes(cubicNode)))))); + forEach(doc, "list", listNode -> forEach(listNode, "cubic", cubicNode -> parseTemplate(cubicNode, new CubicTemplate(new StatSet(parseAttributes(cubicNode)))))); } /** @@ -137,7 +137,7 @@ public class CubicData implements IXmlReader { forEach(cubicNode, "skill", skillNode -> { - final CubicSkill skill = new CubicSkill(new StatsSet(parseAttributes(skillNode))); + final CubicSkill skill = new CubicSkill(new StatSet(parseAttributes(skillNode))); forEach(cubicNode, "conditions", conditionNode -> parseConditions(cubicNode, template, skill)); template.getSkills().add(skill); }); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java index 3d19bee079..ede9b72202 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -62,7 +62,7 @@ public class DailyMissionData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "reward", rewardNode -> { - final StatsSet set = new StatsSet(parseAttributes(rewardNode)); + final StatSet set = new StatSet(parseAttributes(rewardNode)); final List items = new ArrayList<>(1); forEach(rewardNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> @@ -80,14 +80,14 @@ public class DailyMissionData implements IXmlReader // Initial values in case handler doesn't exists set.set("handler", ""); - set.set("params", StatsSet.EMPTY_STATSET); + set.set("params", StatSet.EMPTY_STATSET); // Parse handler and parameters forEach(rewardNode, "handler", handlerNode -> { set.set("handler", parseString(handlerNode.getAttributes(), "name")); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); set.set("params", params); forEach(handlerNode, "param", paramNode -> params.set(parseString(paramNode.getAttributes(), "name"), paramNode.getTextContent())); }); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java index 835eab4fe9..53248de524 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java @@ -35,7 +35,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -51,7 +51,7 @@ public class DoorData implements IXmlReader // Info holders private final Map> _groups = new HashMap<>(); private final Map _doors = new HashMap<>(); - private final Map _templates = new HashMap<>(); + private final Map _templates = new HashMap<>(); private final Map> _regions = new HashMap<>(); protected DoorData() @@ -75,9 +75,9 @@ public class DoorData implements IXmlReader LOGGER.info(getClass().getSimpleName() + ": Loaded " + _doors.size() + " Door Templates for " + _regions.size() + " regions."); } - public StatsSet parseDoor(Node doorNode) + public StatSet parseDoor(Node doorNode) { - final StatsSet params = new StatsSet(parseAttributes(doorNode)); + final StatSet params = new StatSet(parseAttributes(doorNode)); params.set("baseHpMax", 1); // Avoid doors without HP value created dead due to default value 0 in CreatureTemplate forEach(doorNode, IXmlReader::isNode, innerDoorNode -> @@ -115,7 +115,7 @@ public class DoorData implements IXmlReader /** * @param set */ - private void applyCollisions(StatsSet set) + private void applyCollisions(StatSet set) { // Insert Collision data if (set.contains("nodeX_0") && set.contains("nodeY_0") && set.contains("nodeX_1") && set.contains("nodeY_1")) @@ -142,7 +142,7 @@ public class DoorData implements IXmlReader * @param set * @return */ - public DoorInstance spawnDoor(StatsSet set) + public DoorInstance spawnDoor(StatSet set) { // Create door template + door instance final DoorTemplate template = new DoorTemplate(set); @@ -183,7 +183,7 @@ public class DoorData implements IXmlReader return door; } - public StatsSet getDoorTemplate(int doorId) + public StatSet getDoorTemplate(int doorId) { return _templates.get(doorId); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java index eca42a9a34..637ef1e953 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -64,7 +64,7 @@ public class EnchantItemData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node att; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -76,7 +76,7 @@ public class EnchantItemData implements IXmlReader if ("enchant".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -107,7 +107,7 @@ public class EnchantItemData implements IXmlReader else if ("support".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java index 46701fd777..bb1e8026b7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.SkillEnchantType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.EnchantSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -69,10 +69,10 @@ public class EnchantSkillGroupsData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "enchant", enchantNode -> { - final EnchantSkillHolder enchantSkillHolder = new EnchantSkillHolder(new StatsSet(parseAttributes(enchantNode))); + final EnchantSkillHolder enchantSkillHolder = new EnchantSkillHolder(new StatSet(parseAttributes(enchantNode))); forEach(enchantNode, "sps", spsNode -> forEach(spsNode, "sp", spNode -> enchantSkillHolder.addSp(parseEnum(spNode.getAttributes(), SkillEnchantType.class, "type"), parseInteger(spNode.getAttributes(), "amount")))); forEach(enchantNode, "chances", chancesNode -> forEach(chancesNode, "chance", chanceNode -> enchantSkillHolder.addChance(parseEnum(chanceNode.getAttributes(), SkillEnchantType.class, "type"), parseInteger(chanceNode.getAttributes(), "value")))); - forEach(enchantNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> enchantSkillHolder.addRequiredItem(parseEnum(itemNode.getAttributes(), SkillEnchantType.class, "type"), new ItemHolder(new StatsSet(parseAttributes(itemNode)))))); + forEach(enchantNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> enchantSkillHolder.addRequiredItem(parseEnum(itemNode.getAttributes(), SkillEnchantType.class, "type"), new ItemHolder(new StatSet(parseAttributes(itemNode)))))); _enchantSkillHolders.put(parseInteger(enchantNode.getAttributes(), "level"), enchantSkillHolder); })); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/EquipmentUpgradeData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/EquipmentUpgradeData.java index 4700307bd0..c6745249f6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/EquipmentUpgradeData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/EquipmentUpgradeData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.EquipmentUpgradeHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -57,7 +57,7 @@ public class EquipmentUpgradeData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "upgrade", upgradeNode -> { - final StatsSet set = new StatsSet(parseAttributes(upgradeNode)); + final StatSet set = new StatSet(parseAttributes(upgradeNode)); final int id = set.getInt("id"); final String[] item = set.getString("item").split(","); final int requiredItemId = Integer.parseInt(item[0]); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java index a8bb0397ac..037af7e1ae 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java @@ -34,7 +34,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.eventengine.AbstractEventManager; import org.l2jmobius.gameserver.model.eventengine.EventMethodNotification; import org.l2jmobius.gameserver.model.eventengine.EventScheduler; @@ -156,7 +156,7 @@ public class EventEngineData implements IXmlReader */ private void parseVariables(AbstractEventManager eventManager, Node innerNode) { - final StatsSet variables = new StatsSet(LinkedHashMap::new); + final StatSet variables = new StatSet(LinkedHashMap::new); for (Node variableNode = innerNode.getFirstChild(); variableNode != null; variableNode = variableNode.getNextSibling()) { if ("variable".equals(variableNode.getNodeName())) @@ -188,7 +188,7 @@ public class EventEngineData implements IXmlReader { if ("schedule".equals(scheduleNode.getNodeName())) { - final StatsSet params = new StatsSet(LinkedHashMap::new); + final StatSet params = new StatSet(LinkedHashMap::new); final NamedNodeMap attrs = scheduleNode.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -235,7 +235,7 @@ public class EventEngineData implements IXmlReader } else if ("conditionalSchedule".equals(scheduleNode.getNodeName())) { - final StatsSet params = new StatsSet(LinkedHashMap::new); + final StatSet params = new StatSet(LinkedHashMap::new); final NamedNodeMap attrs = scheduleNode.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -346,7 +346,7 @@ public class EventEngineData implements IXmlReader * @param variableNode */ @SuppressWarnings("unchecked") - private void parseListVariables(AbstractEventManager eventManager, StatsSet variables, Node variableNode) + private void parseListVariables(AbstractEventManager eventManager, StatSet variables, Node variableNode) { final String name = parseString(variableNode.getAttributes(), "name"); final String type = parseString(variableNode.getAttributes(), "type"); @@ -419,7 +419,7 @@ public class EventEngineData implements IXmlReader * @param variableNode */ @SuppressWarnings("unchecked") - private void parseMapVariables(AbstractEventManager eventManager, StatsSet variables, Node variableNode) + private void parseMapVariables(AbstractEventManager eventManager, StatSet variables, Node variableNode) { final String name = parseString(variableNode.getAttributes(), "name"); final String keyType = parseString(variableNode.getAttributes(), "keyType"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java index db19c5fdff..0724877d9d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.ConditionHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.ICondition; import org.l2jmobius.gameserver.model.holders.ExtendDropDataHolder; import org.l2jmobius.gameserver.model.holders.ExtendDropItemHolder; @@ -62,7 +62,7 @@ public class ExtendDropData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "drop", dropNode -> { - final StatsSet set = new StatsSet(parseAttributes(dropNode)); + final StatSet set = new StatSet(parseAttributes(dropNode)); final List items = new ArrayList<>(1); forEach(dropNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> @@ -80,8 +80,8 @@ public class ExtendDropData implements IXmlReader forEach(dropNode, "conditions", conditionsNode -> forEach(conditionsNode, "condition", conditionNode -> { final String conditionName = parseString(conditionNode.getAttributes(), "name"); - final StatsSet params = (StatsSet) parseValue(conditionNode); - final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); + final StatSet params = (StatSet) parseValue(conditionNode); + final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); if (conditionFunction != null) { conditions.add(conditionFunction.apply(params)); @@ -109,7 +109,7 @@ public class ExtendDropData implements IXmlReader private Object parseValue(Node node) { - StatsSet statsSet = null; + StatSet statSet = null; List list = null; Object text = null; for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) @@ -145,12 +145,12 @@ public class ExtendDropData implements IXmlReader final Object value = parseValue(node); if (value != null) { - if (statsSet == null) + if (statSet == null) { - statsSet = new StatsSet(); + statSet = new StatSet(); } - statsSet.set(nodeName, value); + statSet.set(nodeName, value); } } } @@ -161,9 +161,9 @@ public class ExtendDropData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", list); + statSet.set(".", list); } else { @@ -176,16 +176,16 @@ public class ExtendDropData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", text); + statSet.set(".", text); } else { return text; } } - return statsSet; + return statSet; } public ExtendDropDataHolder getExtendDropById(int id) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java index 57a16d6390..608f4702b8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.FakePlayerHolder; @@ -72,7 +72,7 @@ public class FakePlayerData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayer", fakePlayerNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerNode)); final int npcId = set.getInt("npcId"); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); final String name = template.getName(); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java index 18cc499b71..a5ade27c03 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.FenceState; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldRegion; import org.l2jmobius.gameserver.model.actor.instance.FenceInstance; @@ -79,7 +79,7 @@ public class FenceData implements IXmlReader private void spawnFence(Node fenceNode) { - final StatsSet set = new StatsSet(parseAttributes(fenceNode)); + final StatSet set = new StatSet(parseAttributes(fenceNode)); spawnFence(set.getInt("x"), set.getInt("y"), set.getInt("z"), set.getString("name"), set.getInt("width"), set.getInt("length"), set.getInt("height"), 0, set.getEnum("state", FenceState.class, FenceState.CLOSED)); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java index 67dd4e396b..02efb756f2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.Henna; import org.l2jmobius.gameserver.model.skills.Skill; @@ -86,7 +86,7 @@ public class HennaData implements IXmlReader */ private void parseHenna(Node d) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final List wearClassIds = new ArrayList<>(); final List skills = new ArrayList<>(); NamedNodeMap attrs = d.getAttributes(); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java index 03ad8ab79e..d81e85948d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; @@ -93,7 +93,7 @@ public class InitialEquipmentData implements IXmlReader { if ("item".equalsIgnoreCase(c.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java index 72080aa4ac..54b1909d60 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemPointHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; @@ -55,17 +55,17 @@ public class LuckyGameData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "luckygame", rewardNode -> { - final LuckyGameDataHolder holder = new LuckyGameDataHolder(new StatsSet(parseAttributes(rewardNode))); + final LuckyGameDataHolder holder = new LuckyGameDataHolder(new StatSet(parseAttributes(rewardNode))); forEach(rewardNode, "common_reward", commonRewardNode -> forEach(commonRewardNode, "item", itemNode -> { - final StatsSet stats = new StatsSet(parseAttributes(itemNode)); + final StatSet stats = new StatSet(parseAttributes(itemNode)); holder.addCommonReward(new ItemChanceHolder(stats.getInt("id"), stats.getDouble("chance"), stats.getLong("count"))); })); forEach(rewardNode, "unique_reward", uniqueRewardNode -> forEach(uniqueRewardNode, "item", itemNode -> { - holder.addUniqueReward(new ItemPointHolder(new StatsSet(parseAttributes(itemNode)))); + holder.addUniqueReward(new ItemPointHolder(new StatSet(parseAttributes(itemNode)))); })); forEach(rewardNode, "modify_reward", uniqueRewardNode -> @@ -74,7 +74,7 @@ public class LuckyGameData implements IXmlReader holder.setMaxModifyRewardGame(parseInteger(uniqueRewardNode.getAttributes(), "max_game")); forEach(uniqueRewardNode, "item", itemNode -> { - final StatsSet stats = new StatsSet(parseAttributes(itemNode)); + final StatSet stats = new StatSet(parseAttributes(itemNode)); holder.addModifyReward(new ItemChanceHolder(stats.getInt("id"), stats.getDouble("chance"), stats.getLong("count"))); }); }); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java index 75bb48ed37..190653cdec 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java @@ -35,7 +35,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.SpecialItemType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; @@ -90,7 +90,7 @@ public class MultisellData implements IXmlReader { forEach(doc, "list", listNode -> { - final StatsSet set = new StatsSet(parseAttributes(listNode)); + final StatSet set = new StatSet(parseAttributes(listNode)); final int listId = Integer.parseInt(f.getName().substring(0, f.getName().length() - 4)); final List entries = new ArrayList<>(listNode.getChildNodes().getLength()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java index e6c9fd6758..4ce4d1f496 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java @@ -45,7 +45,7 @@ import org.l2jmobius.gameserver.enums.DropType; import org.l2jmobius.gameserver.enums.ElementalType; import org.l2jmobius.gameserver.enums.MpRewardAffectType; import org.l2jmobius.gameserver.enums.MpRewardType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.DropHolder; @@ -96,7 +96,7 @@ public class NpcData implements IXmlReader if ("npc".equalsIgnoreCase(listNode.getNodeName())) { NamedNodeMap attrs = listNode.getAttributes(); - final StatsSet set = new StatsSet(new HashMap<>()); + final StatSet set = new StatSet(new HashMap<>()); final int npcId = parseInteger(attrs, "id"); Map parameters = null; Map skills = null; @@ -517,11 +517,11 @@ public class NpcData implements IXmlReader if (parameters != null) { // Using unmodifiable map parameters of template are not meant to be changed at runtime. - template.setParameters(new StatsSet(Collections.unmodifiableMap(parameters))); + template.setParameters(new StatSet(Collections.unmodifiableMap(parameters))); } else { - template.setParameters(StatsSet.EMPTY_STATSET); + template.setParameters(StatSet.EMPTY_STATSET); } if (skills != null) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java index 3712cca6af..373f87ecfc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -79,7 +79,7 @@ public class NpcNameLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); NPC_NAME_LOCALISATIONS.get(_lang).put(set.getInt("id"), new String[] { set.getString("name"), diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 55dcd539aa..36c5897ecd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.EffectHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; @@ -71,7 +71,7 @@ public class OptionData implements IXmlReader forEach(innerNode, "effect", effectNode -> { final String name = parseString(effectNode.getAttributes(), "name"); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); forEach(effectNode, IXmlReader::isNode, paramNode -> params.set(paramNode.getNodeName(), SkillData.getInstance().parseValue(paramNode, true, false, Collections.emptyMap()))); option.addEffect(EffectHandler.getInstance().getHandlerFactory(name).apply(params)); }); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java index b1bb74baf6..c893725bc3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.PetLevelData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * This class parse and hold all pet parameters.
    @@ -116,7 +116,7 @@ public class PetDataTable implements IXmlReader if (s.getNodeName().equals("stat")) { final int level = Integer.parseInt(s.getAttributes().getNamedItem("level").getNodeValue()); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (Node bean = s.getFirstChild(); bean != null; bean = bean.getNextSibling()) { if (bean.getNodeName().equals("set")) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java index ab1cb3b257..b646782547 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.base.ClassId; @@ -83,7 +83,7 @@ public class PlayerTemplateData implements IXmlReader } else if ("staticData".equalsIgnoreCase(d.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.set("classId", classId); final List creationPoints = new ArrayList<>(); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java index 34a04edd9b..35b879e73f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; @@ -83,7 +83,7 @@ public class PrimeShopData implements IXmlReader { NamedNodeMap attrs = d.getAttributes(); Node att; - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java index b7ed4c8fba..43e5d84784 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.RecipeInstance; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.RecipeStatInstance; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; /** @@ -82,7 +82,7 @@ public class RecipeData implements IXmlReader Node att; int id = -1; boolean haveRare = false; - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); att = attrs.getNamedItem("id"); if (att == null) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java index 796f5ae085..9a8397e085 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java @@ -29,7 +29,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate; /** @@ -60,7 +60,7 @@ public class ResidenceFunctionsData implements IXmlReader forEach(doc, "list", list -> forEach(list, "function", func -> { final NamedNodeMap attrs = func.getAttributes(); - final StatsSet set = new StatsSet(HashMap::new); + final StatSet set = new StatSet(HashMap::new); for (int i = 0; i < attrs.getLength(); i++) { final Node node = attrs.item(i); @@ -69,7 +69,7 @@ public class ResidenceFunctionsData implements IXmlReader forEach(func, "function", levelNode -> { final NamedNodeMap levelAttrs = levelNode.getAttributes(); - final StatsSet levelSet = new StatsSet(HashMap::new); + final StatSet levelSet = new StatSet(HashMap::new); levelSet.merge(set); for (int i = 0; i < levelAttrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java index 053d9089ce..d6b28a5962 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; /** @@ -82,7 +82,7 @@ public class SendMessageLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); SEND_MESSAGE_LOCALISATIONS.get(_lang).put(set.getString("message").split(SPLIT_STRING), set.getString("translation").split(SPLIT_STRING)); })); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java index e473030c56..c3eda1f3b8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.actor.instance.ShuttleInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; @@ -72,7 +72,7 @@ public class ShuttleData implements IXmlReader public void parseDocument(Document doc, File f) { NamedNodeMap attrs; - StatsSet set; + StatSet set; Node att; ShuttleDataHolder data; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -84,7 +84,7 @@ public class ShuttleData implements IXmlReader if ("shuttle".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -164,7 +164,7 @@ public class ShuttleData implements IXmlReader { for (ShuttleDataHolder data : _shuttles.values()) { - final ShuttleInstance shuttle = new ShuttleInstance(new CreatureTemplate(new StatsSet())); + final ShuttleInstance shuttle = new ShuttleInstance(new CreatureTemplate(new StatSet())); shuttle.setData(data); shuttle.setHeading(data.getLocation().getHeading()); shuttle.setLocationInvisible(data.getLocation()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java index 9db0b5f64b..ba000649f2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.SiegeScheduleDate; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.util.Util; /** @@ -54,7 +54,7 @@ public class SiegeScheduleData implements IXmlReader LOGGER.info(getClass().getSimpleName() + ": Loaded " + _scheduleData.size() + " siege schedulers."); if (_scheduleData.isEmpty()) { - _scheduleData.add(new SiegeScheduleDate(new StatsSet())); + _scheduleData.add(new SiegeScheduleDate(new StatSet())); LOGGER.info(getClass().getSimpleName() + ": Emergency loaded " + _scheduleData.size() + " default siege schedulers."); } } @@ -72,7 +72,7 @@ public class SiegeScheduleData implements IXmlReader { case "schedule": { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final NamedNodeMap attrs = cd.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java index cc019c4dbb..2592b3ed97 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java @@ -40,7 +40,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.EffectHandler; import org.l2jmobius.gameserver.handler.SkillConditionHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.EffectScope; @@ -67,9 +67,9 @@ public class SkillData implements IXmlReader private final Integer _toLevel; private final Integer _fromSubLevel; private final Integer _toSubLevel; - private final Map> _info; + private final Map> _info; - public NamedParamInfo(String name, Integer fromLevel, Integer toLevel, Integer fromSubLevel, Integer toSubLevel, Map> info) + public NamedParamInfo(String name, Integer fromLevel, Integer toLevel, Integer fromSubLevel, Integer toSubLevel, Map> info) { _name = name; _fromLevel = fromLevel; @@ -104,7 +104,7 @@ public class SkillData implements IXmlReader return _toSubLevel; } - public Map> getInfo() + public Map> getInfo() { return _info; } @@ -241,8 +241,8 @@ public class SkillData implements IXmlReader { NamedNodeMap attributes = listNode.getAttributes(); final Map> levels = new HashMap<>(); - final Map> skillInfo = new HashMap<>(); - final StatsSet generalSkillInfo = skillInfo.computeIfAbsent(-1, k -> new HashMap<>()).computeIfAbsent(-1, k -> new StatsSet()); + final Map> skillInfo = new HashMap<>(); + final StatSet generalSkillInfo = skillInfo.computeIfAbsent(-1, k -> new HashMap<>()).computeIfAbsent(-1, k -> new StatSet()); parseAttributes(attributes, "", generalSkillInfo); @@ -321,7 +321,7 @@ public class SkillData implements IXmlReader { return; } - subLevelMap.forEach((subLevel, statsSet) -> + subLevelMap.forEach((subLevel, statSet) -> { if (subLevel == -1) { @@ -339,7 +339,7 @@ public class SkillData implements IXmlReader { return; } - subLevelMap.forEach((subLevel, statsSet) -> + subLevelMap.forEach((subLevel, statSet) -> { if (subLevel == -1) { @@ -371,31 +371,31 @@ public class SkillData implements IXmlReader levels.forEach((level, subLevels) -> subLevels.forEach(subLevel -> { - final StatsSet statsSet = Optional.ofNullable(skillInfo.getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatsSet::new); - skillInfo.getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(statsSet.getSet()::putIfAbsent); - skillInfo.getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(statsSet.getSet()::putIfAbsent); - statsSet.set(".level", level); - statsSet.set(".subLevel", subLevel); - final Skill skill = new Skill(statsSet); + final StatSet statSet = Optional.ofNullable(skillInfo.getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatSet::new); + skillInfo.getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(statSet.getSet()::putIfAbsent); + skillInfo.getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(statSet.getSet()::putIfAbsent); + statSet.set(".level", level); + statSet.set(".subLevel", subLevel); + final Skill skill = new Skill(statSet); forEachNamedParamInfoParam(effectParamInfo, level, subLevel, ((effectScope, params) -> { final String effectName = params.getString(".name"); params.remove(".name"); try { - final Function effectFunction = EffectHandler.getInstance().getHandlerFactory(effectName); + final Function effectFunction = EffectHandler.getInstance().getHandlerFactory(effectName); if (effectFunction != null) { skill.addEffect(effectScope, effectFunction.apply(params)); } else { - LOGGER.warning(getClass().getSimpleName() + ": Missing effect for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]"); + LOGGER.warning(getClass().getSimpleName() + ": Missing effect for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]"); } } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading effect for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading effect for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]", e); } })); @@ -405,19 +405,19 @@ public class SkillData implements IXmlReader params.remove(".name"); try { - final Function conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName); + final Function conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName); if (conditionFunction != null) { skill.addCondition(skillConditionScope, conditionFunction.apply(params)); } else { - LOGGER.warning(getClass().getSimpleName() + ": Missing condition for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + skillConditionScope + "] Effect Name[" + conditionName + "]"); + LOGGER.warning(getClass().getSimpleName() + ": Missing condition for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + skillConditionScope + "] Effect Name[" + conditionName + "]"); } } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading condition for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Condition Scope[" + skillConditionScope + "] Condition Name[" + conditionName + "]", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading condition for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Condition Scope[" + skillConditionScope + "] Condition Name[" + conditionName + "]", e); } })); @@ -434,16 +434,16 @@ public class SkillData implements IXmlReader } } - private void forEachNamedParamInfoParam(Map> paramInfo, int level, int subLevel, BiConsumer consumer) + private void forEachNamedParamInfoParam(Map> paramInfo, int level, int subLevel, BiConsumer consumer) { paramInfo.forEach((scope, namedParamInfos) -> namedParamInfos.forEach(namedParamInfo -> { if ((((namedParamInfo.getFromLevel() == null) && (namedParamInfo.getToLevel() == null)) || ((namedParamInfo.getFromLevel() <= level) && (namedParamInfo.getToLevel() >= level))) // && (((namedParamInfo.getFromSubLevel() == null) && (namedParamInfo.getToSubLevel() == null)) || ((namedParamInfo.getFromSubLevel() <= subLevel) && (namedParamInfo.getToSubLevel() >= subLevel)))) { - final StatsSet params = Optional.ofNullable(namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatsSet::new); - namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); - namedParamInfo.getInfo().getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); + final StatSet params = Optional.ofNullable(namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatSet::new); + namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); + namedParamInfo.getInfo().getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); params.set(".name", namedParamInfo.getName()); consumer.accept(scope, params); } @@ -460,7 +460,7 @@ public class SkillData implements IXmlReader final Integer subLevel = parseInteger(attributes, "subLevel"); final Integer fromSubLevel = parseInteger(attributes, "fromSubLevel", subLevel); final Integer toSubLevel = parseInteger(attributes, "toSubLevel", subLevel); - final Map> info = new HashMap<>(); + final Map> info = new HashMap<>(); for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) { if (!node.getNodeName().equals("#text")) @@ -471,7 +471,7 @@ public class SkillData implements IXmlReader return new NamedParamInfo(name, fromLevel, toLevel, fromSubLevel, toSubLevel, info); } - private void parseInfo(Node node, Map>> variableValues, Map> info) + private void parseInfo(Node node, Map>> variableValues, Map> info) { Map> values = parseValues(node); final Object generalValue = values.getOrDefault(-1, Collections.emptyMap()).get(-1); @@ -492,7 +492,7 @@ public class SkillData implements IXmlReader } } - values.forEach((level, subLevelMap) -> subLevelMap.forEach((subLevel, value) -> info.computeIfAbsent(level, k -> new HashMap<>()).computeIfAbsent(subLevel, k -> new StatsSet()).set(node.getNodeName(), value))); + values.forEach((level, subLevelMap) -> subLevelMap.forEach((subLevel, value) -> info.computeIfAbsent(level, k -> new HashMap<>()).computeIfAbsent(subLevel, k -> new StatSet()).set(node.getNodeName(), value))); } private Map> parseValues(Node node) @@ -535,7 +535,7 @@ public class SkillData implements IXmlReader variables.put("index", (i - fromLevel) + 1d); variables.put("subIndex", (j - fromSubLevel) + 1d); final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1); - if ((base != null) && !(base instanceof StatsSet)) + if ((base != null) && !(base instanceof StatSet)) { variables.put("base", Double.parseDouble(String.valueOf(base))); } @@ -555,13 +555,13 @@ public class SkillData implements IXmlReader Object parseValue(Node node, boolean blockValue, boolean parseAttributes, Map variables) { - StatsSet statsSet = null; + StatSet statSet = null; List list = null; Object text = null; if (parseAttributes && (!node.getNodeName().equals("value") || !blockValue) && (node.getAttributes().getLength() > 0)) { - statsSet = new StatsSet(); - parseAttributes(node.getAttributes(), "", statsSet, variables); + statSet = new StatSet(); + parseAttributes(node.getAttributes(), "", statSet, variables); } for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) { @@ -604,12 +604,12 @@ public class SkillData implements IXmlReader final Object value = parseValue(node, false, true, variables); if (value != null) { - if (statsSet == null) + if (statSet == null) { - statsSet = new StatsSet(); + statSet = new StatSet(); } - statsSet.set(nodeName, value); + statSet.set(nodeName, value); } } } @@ -620,9 +620,9 @@ public class SkillData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", list); + statSet.set(".", list); } else { @@ -635,30 +635,30 @@ public class SkillData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", text); + statSet.set(".", text); } else { return text; } } - return statsSet; + return statSet; } - private void parseAttributes(NamedNodeMap attributes, String prefix, StatsSet statsSet, Map variables) + private void parseAttributes(NamedNodeMap attributes, String prefix, StatSet statSet, Map variables) { for (int i = 0; i < attributes.getLength(); i++) { final Node attributeNode = attributes.item(i); - statsSet.set(prefix + "." + attributeNode.getNodeName(), parseNodeValue(attributeNode.getNodeValue(), variables)); + statSet.set(prefix + "." + attributeNode.getNodeName(), parseNodeValue(attributeNode.getNodeValue(), variables)); } } - private void parseAttributes(NamedNodeMap attributes, String prefix, StatsSet statsSet) + private void parseAttributes(NamedNodeMap attributes, String prefix, StatSet statSet) { - parseAttributes(attributes, prefix, statsSet, Collections.emptyMap()); + parseAttributes(attributes, prefix, statSet, Collections.emptyMap()); } private Object parseNodeValue(String value, Map variables) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java index fdd0012ffe..d23d1ebee3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.SubclassType; import org.l2jmobius.gameserver.model.SkillLearn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.base.ClassId; @@ -229,7 +229,7 @@ public class SkillTreesData implements IXmlReader { if ("skill".equalsIgnoreCase(c.getNodeName())) { - final StatsSet learnSkillSet = new StatsSet(); + final StatSet learnSkillSet = new StatSet(); attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java index 87915d89eb..78c22d1e7d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java @@ -36,7 +36,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.ChanceLocation; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.MinionHolder; import org.l2jmobius.gameserver.model.interfaces.IParameterized; @@ -169,7 +169,7 @@ public class SpawnsData implements IXmlReader public void parseSpawn(Node spawnsNode, File file, Collection spawns) { - final SpawnTemplate spawnTemplate = new SpawnTemplate(new StatsSet(parseAttributes(spawnsNode)), file); + final SpawnTemplate spawnTemplate = new SpawnTemplate(new StatSet(parseAttributes(spawnsNode)), file); SpawnGroup defaultGroup = null; for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling()) { @@ -185,7 +185,7 @@ public class SpawnsData implements IXmlReader { if (defaultGroup == null) { - defaultGroup = new SpawnGroup(StatsSet.EMPTY_STATSET); + defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET); } parseNpc(innerNode, spawnTemplate, defaultGroup); } @@ -244,7 +244,7 @@ public class SpawnsData implements IXmlReader private void parseGroup(Node n, SpawnTemplate spawnTemplate) { - final SpawnGroup group = new SpawnGroup(new StatsSet(parseAttributes(n))); + final SpawnGroup group = new SpawnGroup(new StatSet(parseAttributes(n))); forEach(n, IXmlReader::isNode, npcNode -> { switch (npcNode.getNodeName()) @@ -271,7 +271,7 @@ public class SpawnsData implements IXmlReader */ private void parseNpc(Node n, SpawnTemplate spawnTemplate, SpawnGroup group) { - final NpcSpawnTemplate npcTemplate = new NpcSpawnTemplate(spawnTemplate, group, new StatsSet(parseAttributes(n))); + final NpcSpawnTemplate npcTemplate = new NpcSpawnTemplate(spawnTemplate, group, new StatSet(parseAttributes(n))); final NpcTemplate template = NpcData.getInstance().getTemplate(npcTemplate.getId()); if (template == null) { @@ -332,10 +332,10 @@ public class SpawnsData implements IXmlReader * @param n * @param npcTemplate */ - private void parseParameters(Node n, IParameterized npcTemplate) + private void parseParameters(Node n, IParameterized npcTemplate) { final Map params = parseParameters(n); - npcTemplate.setParameters(!params.isEmpty() ? new StatsSet(Collections.unmodifiableMap(params)) : StatsSet.EMPTY_STATSET); + npcTemplate.setParameters(!params.isEmpty() ? new StatSet(Collections.unmodifiableMap(params)) : StatSet.EMPTY_STATSET); } /** @@ -344,7 +344,7 @@ public class SpawnsData implements IXmlReader */ private void parseMinions(Node n, NpcSpawnTemplate npcTemplate) { - forEach(n, "minion", minionNode -> npcTemplate.addMinion(new MinionHolder(new StatsSet(parseAttributes(minionNode))))); + forEach(n, "minion", minionNode -> npcTemplate.addMinion(new MinionHolder(new StatSet(parseAttributes(minionNode))))); } /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java index 98d333446c..ef93935404 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; @@ -69,7 +69,7 @@ public class StaticObjectData implements IXmlReader if ("object".equalsIgnoreCase(d.getNodeName())) { final NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -86,9 +86,9 @@ public class StaticObjectData implements IXmlReader * Initialize an static object based on the stats set and add it to the map. * @param set the stats set to add. */ - private void addObject(StatsSet set) + private void addObject(StatSet set) { - final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatsSet()), set.getInt("id")); + final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatSet()), set.getInt("id")); obj.setType(set.getInt("type", 0)); obj.setName(set.getString("name")); obj.setMap(set.getString("texture", "none"), set.getInt("map_x", 0), set.getInt("map_y", 0)); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java index 7c8c9a538d..487bae9dea 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.TeleportType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.teleporter.TeleportHolder; /** @@ -74,7 +74,7 @@ public class TeleportersData implements IXmlReader final String name = parseString(nodeAttrs, "name", type.name()); // Parse locations final TeleportHolder holder = new TeleportHolder(name, type); - forEach(node, "location", location -> holder.registerLocation(new StatsSet(parseAttributes(location)))); + forEach(node, "location", location -> holder.registerLocation(new StatSet(parseAttributes(location)))); // Register holder if (teleList.putIfAbsent(name, holder) != null) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java index b6b3bf2e90..c2f5f94adb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java @@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.transform.Transform; import org.l2jmobius.gameserver.model.actor.transform.TransformLevelData; import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate; @@ -70,7 +70,7 @@ public class TransformData implements IXmlReader if ("transform".equalsIgnoreCase(d.getNodeName())) { NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -192,7 +192,7 @@ public class TransformData implements IXmlReader transform.setTemplate(isMale, templateData); } - final StatsSet levelsSet = new StatsSet(); + final StatSet levelsSet = new StatSet(); for (Node s = z.getFirstChild(); s != null; s = s.getNextSibling()) { if ("level".equals(s.getNodeName())) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/engines/DocumentBase.java index ba3fc7f6b4..d178b10006 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/engines/DocumentBase.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/engines/DocumentBase.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.PlayerState; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionCategoryType; @@ -178,7 +178,7 @@ public abstract class DocumentBase protected abstract void parseDocument(Document doc); - protected abstract StatsSet getStatsSet(); + protected abstract StatSet getStatSet(); protected abstract String getTableValue(String name); @@ -1245,7 +1245,7 @@ public abstract class DocumentBase setTable(name, array.toArray(new String[array.size()])); } - protected void parseBeanSet(Node n, StatsSet set, Integer level) + protected void parseBeanSet(Node n, StatSet set, Integer level) { final String name = n.getAttributes().getNamedItem("name").getNodeValue().trim(); final String value = n.getAttributes().getNamedItem("val").getNodeValue().trim(); @@ -1260,7 +1260,7 @@ public abstract class DocumentBase } } - protected void setExtractableSkillData(StatsSet set, String value) + protected void setExtractableSkillData(StatSet set, String value) { set.set("capsuled_items_skill", value); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java index e8c77b206e..46f8f9be1f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java @@ -21,7 +21,7 @@ import java.io.File; import org.w3c.dom.Document; import org.w3c.dom.Node; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; /** @@ -41,7 +41,7 @@ public class DocumentBaseGeneral extends DocumentBase } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return null; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java index 3ea7f41bb6..419552cf68 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.engines.DocumentBase; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -57,7 +57,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return _currentItem.set; } @@ -111,7 +111,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader _currentItem.id = itemId; _currentItem.name = itemName; _currentItem.type = className; - _currentItem.set = new StatsSet(); + _currentItem.set = new StatSet(); _currentItem.set.set("item_id", itemId); _currentItem.set.set("name", itemName); _currentItem.set.set("additionalName", additionalName); @@ -218,7 +218,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatsSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (Item) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java index 56e5b21a9f..967c1fc34d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.engines.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; public class ItemDataHolder @@ -24,7 +24,7 @@ public class ItemDataHolder int id; String type; String name; - StatsSet set; + StatSet set; int currentLevel; Item item; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/ConditionHandler.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/ConditionHandler.java index 47f24d690d..b53f170fb3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/ConditionHandler.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/ConditionHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.ICondition; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class ConditionHandler { - private final Map> _conditionHandlerFactories = new HashMap<>(); + private final Map> _conditionHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _conditionHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _conditionHandlerFactories.get(name); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/EffectHandler.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/EffectHandler.java index a58de8efb4..328265d9db 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/EffectHandler.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/EffectHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class EffectHandler { - private final Map> _effectHandlerFactories = new HashMap<>(); + private final Map> _effectHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _effectHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _effectHandlerFactories.get(name); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java index a6e2275d04..32438040e0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class SkillConditionHandler { - private final Map> _skillConditionHandlerFactories = new HashMap<>(); + private final Map> _skillConditionHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _skillConditionHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _skillConditionHandlerFactories.get(name); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java index 6992dd5366..65a8c52d7e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.model.AirShipTeleportList; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShipInstance; @@ -45,13 +45,13 @@ public class AirShipManager private static final String UPDATE_DB = "UPDATE airships SET fuel=? WHERE owner_id=?"; private CreatureTemplate _airShipTemplate = null; - private final Map _airShipsInfo = new HashMap<>(); + private final Map _airShipsInfo = new HashMap<>(); private final Map _airShips = new HashMap<>(); private final Map _teleports = new HashMap<>(); protected AirShipManager() { - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", 9); npcDat.set("level", 0); npcDat.set("jClass", "boat"); @@ -113,7 +113,7 @@ public class AirShipManager public AirShipInstance getNewAirShip(int x, int y, int z, int heading, int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return null; @@ -147,7 +147,7 @@ public class AirShipManager if (ship.getOwnerId() != 0) { storeInDb(ship.getOwnerId()); - final StatsSet info = _airShipsInfo.get(ship.getOwnerId()); + final StatSet info = _airShipsInfo.get(ship.getOwnerId()); if (info != null) { info.set("fuel", ship.getFuel()); @@ -164,7 +164,7 @@ public class AirShipManager { if (!_airShipsInfo.containsKey(ownerId)) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("fuel", 600); _airShipsInfo.put(ownerId, info); @@ -264,10 +264,10 @@ public class AirShipManager Statement s = con.createStatement(); ResultSet rs = s.executeQuery(LOAD_DB)) { - StatsSet info; + StatSet info; while (rs.next()) { - info = new StatsSet(); + info = new StatSet(); info.set("fuel", rs.getInt("fuel")); _airShipsInfo.put(rs.getInt("owner_id"), info); } @@ -285,7 +285,7 @@ public class AirShipManager private void storeInDb(int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java index 2db10dd045..e5c610b3f2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.BoatInstance; @@ -57,7 +57,7 @@ public class BoatManager return null; } - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", boatId); npcDat.set("level", 0); npcDat.set("jClass", "boat"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 99a9678ece..56f08422cd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.enums.ManorMode; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; import org.l2jmobius.gameserver.model.SeedProduction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.entity.Castle; @@ -126,7 +126,7 @@ public class CastleManorManager implements IXmlReader, IStorable @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; NamedNodeMap attrs; Node att; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -142,7 +142,7 @@ public class CastleManorManager implements IXmlReader, IStorable { if ("crop".equalsIgnoreCase(c.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); set.set("castleId", castleId); attrs = c.getAttributes(); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java index da98c768c4..b9af19c329 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java @@ -27,7 +27,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosState; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -181,7 +181,7 @@ public class CeremonyOfChaosManager extends AbstractEventManager _npcs = new ConcurrentHashMap<>(); protected final Map _spawns = new ConcurrentHashMap<>(); - protected final Map _storedInfo = new ConcurrentHashMap<>(); + protected final Map _storedInfo = new ConcurrentHashMap<>(); protected final Map> _schedules = new ConcurrentHashMap<>(); /** @@ -161,7 +161,7 @@ public class DBSpawnManager { npc.setDBStatus(RaidBossStatus.ALIVE); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getCurrentHp()); info.set("currentMP", npc.getCurrentMp()); info.set("respawnTime", 0); @@ -181,7 +181,7 @@ public class DBSpawnManager */ public void updateStatus(Npc npc, boolean isNpcDead) { - final StatsSet info = _storedInfo.get(npc.getId()); + final StatSet info = _storedInfo.get(npc.getId()); if (info == null) { return; @@ -254,7 +254,7 @@ public class DBSpawnManager _npcs.put(npcId, npc); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", currentHP); info.set("currentMP", currentMP); info.set("respawnTime", 0); @@ -316,7 +316,7 @@ public class DBSpawnManager } npc.setDBStatus(RaidBossStatus.ALIVE); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", 0); @@ -401,7 +401,7 @@ public class DBSpawnManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("UPDATE npc_respawns SET respawnTime = ?, currentHP = ?, currentMP = ? WHERE id = ?")) { - for (Entry entry : _storedInfo.entrySet()) + for (Entry entry : _storedInfo.entrySet()) { final Integer npcId = entry.getKey(); if (npcId == null) @@ -420,7 +420,7 @@ public class DBSpawnManager updateStatus(npc, false); } - final StatsSet info = entry.getValue(); + final StatSet info = entry.getValue(); if (info == null) { continue; @@ -529,7 +529,7 @@ public class DBSpawnManager */ public void notifySpawnNightNpc(Npc npc) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getCurrentHp()); info.set("currentMP", npc.getCurrentMp()); info.set("respawnTime", 0); @@ -572,7 +572,7 @@ public class DBSpawnManager * Gets the stored info. * @return the stored info */ - public Map getStoredInfo() + public Map getStoredInfo() { return _storedInfo; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index 3dd4e3f652..767bed6954 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.datatables.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.FakePlayerChatHolder; @@ -73,7 +73,7 @@ public class FakePlayerChatManager implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayerChat", fakePlayerChatNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerChatNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerChatNode)); MESSAGES.add(new FakePlayerChatHolder(set.getString("fpcName"), set.getString("searchMethod"), set.getString("searchText"), set.getString("answers"))); })); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java index 07c111065e..52bab09349 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java @@ -33,7 +33,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.tasks.GrandBossManagerStoreTask; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; import org.l2jmobius.gameserver.model.interfaces.IStorable; @@ -51,7 +51,7 @@ public class GrandBossManager implements IStorable protected static Map _bosses = new ConcurrentHashMap<>(); - protected static Map _storedInfo = new HashMap<>(); + protected static Map _storedInfo = new HashMap<>(); private final Map _bossStatus = new HashMap<>(); @@ -72,7 +72,7 @@ public class GrandBossManager implements IStorable final int bossId = rs.getInt("boss_id"); if (NpcData.getInstance().getTemplate(bossId) != null) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("loc_x", rs.getInt("loc_x")); info.set("loc_y", rs.getInt("loc_y")); info.set("loc_z", rs.getInt("loc_z")); @@ -140,12 +140,12 @@ public class GrandBossManager implements IStorable return _bosses.get(bossId); } - public StatsSet getStatsSet(int bossId) + public StatSet getStatSet(int bossId) { return _storedInfo.get(bossId); } - public void setStatsSet(int bossId, StatsSet info) + public void setStatSet(int bossId, StatSet info) { _storedInfo.put(bossId, info); updateDb(bossId, false); @@ -156,10 +156,10 @@ public class GrandBossManager implements IStorable { try (Connection con = DatabaseFactory.getConnection()) { - for (Entry e : _storedInfo.entrySet()) + for (Entry e : _storedInfo.entrySet()) { final GrandBossInstance boss = _bosses.get(e.getKey()); - final StatsSet info = e.getValue(); + final StatSet info = e.getValue(); if ((boss == null) || (info == null)) { try (PreparedStatement update = con.prepareStatement(UPDATE_GRAND_BOSS_DATA2)) @@ -209,7 +209,7 @@ public class GrandBossManager implements IStorable try (Connection con = DatabaseFactory.getConnection()) { final GrandBossInstance boss = _bosses.get(bossId); - final StatsSet info = _storedInfo.get(bossId); + final StatSet info = _storedInfo.get(bossId); if (statusOnly || (boss == null) || (info == null)) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index d77642378f..29e517b0cd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.enums.InstanceReenterType; import org.l2jmobius.gameserver.enums.InstanceRemoveBuffType; import org.l2jmobius.gameserver.enums.InstanceTeleportType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.holders.InstanceReenterTimeHolder; @@ -151,7 +151,7 @@ public class InstanceManager implements IXmlReader return; } - final InstanceTemplate template = new InstanceTemplate(new StatsSet(parseAttributes(instanceNode))); + final InstanceTemplate template = new InstanceTemplate(new StatSet(parseAttributes(instanceNode))); // Update name if wasn't provided if (template.getName() == null) @@ -241,10 +241,10 @@ public class InstanceManager implements IXmlReader { if (doorNode.getNodeName().equals("door")) { - final StatsSet parsedSet = DoorData.getInstance().parseDoor(doorNode); - final StatsSet mergedSet = new StatsSet(); + final StatSet parsedSet = DoorData.getInstance().parseDoor(doorNode); + final StatSet mergedSet = new StatSet(); final int doorId = parsedSet.getInt("id"); - final StatsSet templateSet = DoorData.getInstance().getDoorTemplate(doorId); + final StatSet templateSet = DoorData.getInstance().getDoorTemplate(doorId); if (templateSet != null) { mergedSet.merge(templateSet); @@ -324,14 +324,14 @@ public class InstanceManager implements IXmlReader final boolean onlyLeader = parseBoolean(attrs, "onlyLeader", false); final boolean showMessageAndHtml = parseBoolean(attrs, "showMessageAndHtml", false); // Load parameters - StatsSet params = null; + StatSet params = null; for (Node f = conditionNode.getFirstChild(); f != null; f = f.getNextSibling()) { if (f.getNodeName().equals("param")) { if (params == null) { - params = new StatsSet(); + params = new StatSet(); } params.set(parseString(f.getAttributes(), "name"), parseString(f.getAttributes(), "value")); @@ -341,14 +341,14 @@ public class InstanceManager implements IXmlReader // If none parameters found then set empty StatSet if (params == null) { - params = StatsSet.EMPTY_STATSET; + params = StatSet.EMPTY_STATSET; } // Now when everything is loaded register condition to template try { final Class clazz = Class.forName("org.l2jmobius.gameserver.model.instancezone.conditions.Condition" + type); - final Constructor constructor = clazz.getConstructor(InstanceTemplate.class, StatsSet.class, boolean.class, boolean.class); + final Constructor constructor = clazz.getConstructor(InstanceTemplate.class, StatSet.class, boolean.class, boolean.class); conditions.add((Condition) constructor.newInstance(template, params, onlyLeader, showMessageAndHtml)); } catch (Exception ex) @@ -378,7 +378,7 @@ public class InstanceManager implements IXmlReader */ public Instance createInstance() { - return new Instance(getNewInstanceId(), new InstanceTemplate(StatsSet.EMPTY_STATSET), null); + return new Instance(getNewInstanceId(), new InstanceTemplate(StatSet.EMPTY_STATSET), null); } /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/AccessLevel.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/AccessLevel.java index 772c1fe77e..72b77905e1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/AccessLevel.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/AccessLevel.java @@ -52,7 +52,7 @@ public class AccessLevel /** Flag to gain exp in party */ private boolean _gainExp = false; - public AccessLevel(StatsSet set) + public AccessLevel(StatSet set) { _accessLevel = set.getInt("level"); _name = set.getString("name"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ActionDataHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ActionDataHolder.java index 4887bedba8..ca6d9ee685 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ActionDataHolder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ActionDataHolder.java @@ -25,7 +25,7 @@ public class ActionDataHolder private final String _handler; private final int _optionId; - public ActionDataHolder(StatsSet set) + public ActionDataHolder(StatSet set) { _id = set.getInt("id"); _handler = set.getString("handler"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java index 656119098e..3f88e455d7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java @@ -27,7 +27,7 @@ public class AdminCommandAccessRight private final int _accessLevel; private final boolean _requireConfirm; - public AdminCommandAccessRight(StatsSet set) + public AdminCommandAccessRight(StatSet set) { _adminCommand = set.getString("command"); _requireConfirm = set.getBoolean("confirmDlg", false); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index efc53c7e48..6102d39d06 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -36,7 +36,7 @@ public class DailyMissionDataHolder private final List _rewardsItems; private final List _classRestriction; private final int _requiredCompletions; - private final StatsSet _params; + private final StatSet _params; private final boolean _dailyReset; private final boolean _isOneTime; private final boolean _isMainClassOnly; @@ -44,7 +44,7 @@ public class DailyMissionDataHolder private final boolean _isDisplayedWhenNotAvailable; private final AbstractDailyMissionHandler _handler; - public DailyMissionDataHolder(StatsSet set) + public DailyMissionDataHolder(StatSet set) { final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); @@ -53,7 +53,7 @@ public class DailyMissionDataHolder _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); - _params = set.getObject("params", StatsSet.class); + _params = set.getObject("params", StatSet.class); _dailyReset = set.getBoolean("dailyReset", true); _isOneTime = set.getBoolean("isOneTime", true); _isMainClassOnly = set.getBoolean("isMainClassOnly", true); @@ -87,7 +87,7 @@ public class DailyMissionDataHolder return _requiredCompletions; } - public StatsSet getParams() + public StatSet getParams() { return _params; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Location.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Location.java index 1c61740e4d..024c71075f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Location.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Location.java @@ -49,7 +49,7 @@ public class Location implements IPositionable this(obj.getX(), obj.getY(), obj.getZ(), obj.getHeading()); } - public Location(StatsSet set) + public Location(StatSet set) { _x = set.getInt("x"); _y = set.getInt("y"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/PetLevelData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/PetLevelData.java index e46b215b5f..7cad1a225a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/PetLevelData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/PetLevelData.java @@ -46,7 +46,7 @@ public class PetLevelData private final double _slowFlySpeedOnRide; private final double _fastFlySpeedOnRide; - public PetLevelData(StatsSet set) + public PetLevelData(StatSet set) { _ownerExpTaken = set.getInt("get_exp_type"); _petMaxExp = set.getLong("exp"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/RecipeList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/RecipeList.java index 9e4a3b2387..a81bbb1802 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/RecipeList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/RecipeList.java @@ -68,7 +68,7 @@ public class RecipeList * @param set * @param haveRare */ - public RecipeList(StatsSet set, boolean haveRare) + public RecipeList(StatSet set, boolean haveRare) { _recipes = new RecipeInstance[0]; _statUse = new RecipeStatInstance[0]; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Seed.java index 6d31ffc60f..54ef8acd9f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Seed.java @@ -35,7 +35,7 @@ public class Seed private final int _seedReferencePrice; private final int _cropReferencePrice; - public Seed(StatsSet set) + public Seed(StatSet set) { _cropId = set.getInt("id"); _seedId = set.getInt("seedId"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java index 78897cf4f1..4de77df228 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java @@ -27,7 +27,7 @@ public class SiegeScheduleDate private final int _hour; private final int _maxConcurrent; - public SiegeScheduleDate(StatsSet set) + public SiegeScheduleDate(StatSet set) { _day = set.getInt("day", Calendar.SUNDAY); _hour = set.getInt("hour", 16); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/SkillLearn.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/SkillLearn.java index e2ccdd6331..00f53c0cb9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/SkillLearn.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/SkillLearn.java @@ -58,7 +58,7 @@ public class SkillLearn * Constructor for SkillLearn. * @param set the set with the SkillLearn data. */ - public SkillLearn(StatsSet set) + public SkillLearn(StatSet set) { _skillName = set.getString("skillName"); _skillId = set.getInt("skillId"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/StatSet.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/StatSet.java new file mode 100644 index 0000000000..3c824d9fa4 --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/StatSet.java @@ -0,0 +1,968 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Supplier; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.stream.Collectors; + +import org.l2jmobius.commons.util.TimeUtil; +import org.l2jmobius.gameserver.model.holders.MinionHolder; +import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.interfaces.IParserAdvUtils; +import org.l2jmobius.gameserver.util.Util; + +/** + * This class is meant to hold a set of (key,value) pairs.
    + * They are stored as object but can be retrieved in any type wanted. As long as cast is available.
    + * @author mkizub + */ +public class StatSet implements IParserAdvUtils +{ + private static final Logger LOGGER = Logger.getLogger(StatSet.class.getName()); + /** Static empty immutable map, used to avoid multiple null checks over the source. */ + public static final StatSet EMPTY_STATSET = new StatSet(Collections.emptyMap()); + + private final Map _set; + + public StatSet() + { + this(ConcurrentHashMap::new); + } + + public StatSet(Supplier> mapFactory) + { + this(mapFactory.get()); + } + + public StatSet(Map map) + { + _set = map; + } + + /** + * Returns the set of values + * @return HashMap + */ + public Map getSet() + { + return _set; + } + + /** + * Add a set of couple values in the current set + * @param newSet : StatSet pointing out the list of couples to add in the current set + */ + public void merge(StatSet newSet) + { + _set.putAll(newSet.getSet()); + } + + /** + * Verifies if the stat set is empty. + * @return {@code true} if the stat set is empty, {@code false} otherwise + */ + public boolean isEmpty() + { + return _set.isEmpty(); + } + + /** + * Return the boolean value associated with key. + * @param key : String designating the key in the set + * @return boolean : value associated to the key + * @throws IllegalArgumentException : If value is not set or value is not boolean + */ + @Override + public boolean getBoolean(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Boolean value required, but not specified"); + } + if (val instanceof Boolean) + { + return ((Boolean) val).booleanValue(); + } + try + { + return Boolean.parseBoolean((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Boolean value required, but found: " + val); + } + } + + /** + * Return the boolean value associated with key.
    + * If no value is associated with key, or type of value is wrong, returns defaultValue. + * @param key : String designating the key in the entry set + * @return boolean : value associated to the key + */ + @Override + public boolean getBoolean(String key, boolean defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Boolean) + { + return ((Boolean) val).booleanValue(); + } + try + { + return Boolean.parseBoolean((String) val); + } + catch (Exception e) + { + return defaultValue; + } + } + + @Override + public byte getByte(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Byte value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).byteValue(); + } + try + { + return Byte.parseByte((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + + @Override + public byte getByte(String key, byte defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).byteValue(); + } + try + { + return Byte.parseByte((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + + public short increaseByte(String key, byte increaseWith) + { + final byte newValue = (byte) (getByte(key) + increaseWith); + set(key, newValue); + return newValue; + } + + public short increaseByte(String key, byte defaultValue, byte increaseWith) + { + final byte newValue = (byte) (getByte(key, defaultValue) + increaseWith); + set(key, newValue); + return newValue; + } + + public byte[] getByteArray(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Byte value required, but not specified"); + } + if (val instanceof Number) + { + return new byte[] + { + ((Number) val).byteValue() + }; + } + int c = 0; + final String[] vals = ((String) val).split(splitOn); + final byte[] result = new byte[vals.length]; + for (String v : vals) + { + try + { + result[c++] = Byte.parseByte(v); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + return result; + } + + public List getByteList(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final List result = new ArrayList<>(); + for (Byte i : getByteArray(key, splitOn)) + { + result.add(i); + } + return result; + } + + @Override + public short getShort(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Short value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).shortValue(); + } + try + { + return Short.parseShort((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Short value required, but found: " + val); + } + } + + @Override + public short getShort(String key, short defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).shortValue(); + } + try + { + return Short.parseShort((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Short value required, but found: " + val); + } + } + + public short increaseShort(String key, short increaseWith) + { + final short newValue = (short) (getShort(key) + increaseWith); + set(key, newValue); + return newValue; + } + + public short increaseShort(String key, short defaultValue, short increaseWith) + { + final short newValue = (short) (getShort(key, defaultValue) + increaseWith); + set(key, newValue); + return newValue; + } + + @Override + public int getInt(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Integer value required, but not specified: " + key + "!"); + } + + if (val instanceof Number) + { + return ((Number) val).intValue(); + } + + try + { + return Integer.parseInt((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val + "!"); + } + } + + @Override + public int getInt(String key, int defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).intValue(); + } + try + { + return Integer.parseInt((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val); + } + } + + public int increaseInt(String key, int increaseWith) + { + final int newValue = getInt(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public int increaseInt(String key, int defaultValue, int increaseWith) + { + final int newValue = getInt(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + public int[] getIntArray(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Integer value required, but not specified"); + } + if (val instanceof Number) + { + return new int[] + { + ((Number) val).intValue() + }; + } + int c = 0; + final String[] vals = ((String) val).split(splitOn); + final int[] result = new int[vals.length]; + for (String v : vals) + { + try + { + result[c++] = Integer.parseInt(v); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val); + } + } + return result; + } + + public List getIntegerList(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final List result = new ArrayList<>(); + for (int i : getIntArray(key, splitOn)) + { + result.add(i); + } + return result; + } + + @Override + public long getLong(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Long value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).longValue(); + } + try + { + return Long.parseLong((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Long value required, but found: " + val); + } + } + + @Override + public long getLong(String key, long defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).longValue(); + } + try + { + return Long.parseLong((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Long value required, but found: " + val); + } + } + + public long increaseLong(String key, long increaseWith) + { + final long newValue = getLong(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public long increaseLong(String key, long defaultValue, long increaseWith) + { + final long newValue = getLong(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public float getFloat(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Float value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).floatValue(); + } + try + { + return Float.parseFloat((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Float value required, but found: " + val); + } + } + + @Override + public float getFloat(String key, float defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).floatValue(); + } + try + { + return Float.parseFloat((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Float value required, but found: " + val); + } + } + + public float increaseFloat(String key, float increaseWith) + { + final float newValue = getFloat(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public float increaseFloat(String key, float defaultValue, float increaseWith) + { + final float newValue = getFloat(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public double getDouble(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Double value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).doubleValue(); + } + try + { + return Double.parseDouble((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Double value required, but found: " + val); + } + } + + @Override + public double getDouble(String key, double defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).doubleValue(); + } + try + { + return Double.parseDouble((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Double value required, but found: " + val); + } + } + + public double increaseDouble(String key, double increaseWith) + { + final double newValue = getDouble(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public double increaseDouble(String key, double defaultValue, double increaseWith) + { + final double newValue = getDouble(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public String getString(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("String value required, but not specified"); + } + return String.valueOf(val); + } + + @Override + public String getString(String key, String defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + return String.valueOf(val); + } + + @Override + public Duration getDuration(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("String value required, but not specified"); + } + return TimeUtil.parseDuration(String.valueOf(val)); + } + + @Override + public Duration getDuration(String key, Duration defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + return TimeUtil.parseDuration(String.valueOf(val)); + } + + @Override + @SuppressWarnings("unchecked") + public > T getEnum(String key, Class enumClass) + { + Objects.requireNonNull(key); + Objects.requireNonNull(enumClass); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but not specified"); + } + if (enumClass.isInstance(val)) + { + return (T) val; + } + try + { + return Enum.valueOf(enumClass, String.valueOf(val)); + } + catch (Exception e) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); + } + } + + @Override + @SuppressWarnings("unchecked") + public > T getEnum(String key, Class enumClass, T defaultValue) + { + Objects.requireNonNull(key); + Objects.requireNonNull(enumClass); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (enumClass.isInstance(val)) + { + return (T) val; + } + try + { + return Enum.valueOf(enumClass, String.valueOf(val)); + } + catch (Exception e) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); + } + } + + @SuppressWarnings("unchecked") + public A getObject(String name, Class type) + { + Objects.requireNonNull(name); + Objects.requireNonNull(type); + final Object obj = _set.get(name); + if ((obj == null) || !type.isAssignableFrom(obj.getClass())) + { + return null; + } + + return (A) obj; + } + + @SuppressWarnings("unchecked") + public A getObject(String name, Class type, A defaultValue) + { + Objects.requireNonNull(name); + Objects.requireNonNull(type); + final Object obj = _set.get(name); + if ((obj == null) || !type.isAssignableFrom(obj.getClass())) + { + return defaultValue; + } + + return (A) obj; + } + + public SkillHolder getSkillHolder(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof SkillHolder)) + { + return null; + } + + return (SkillHolder) obj; + } + + public Location getLocation(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof Location)) + { + return null; + } + return (Location) obj; + } + + @SuppressWarnings("unchecked") + public List getMinionList(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return Collections.emptyList(); + } + + return (List) obj; + } + + @SuppressWarnings("unchecked") + public List getList(String key, Class clazz) + { + Objects.requireNonNull(key); + Objects.requireNonNull(clazz); + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return null; + } + + final List originalList = (List) obj; + if (!originalList.isEmpty() && !originalList.stream().allMatch(clazz::isInstance)) + { + if (clazz.getSuperclass() == Enum.class) + { + throw new IllegalAccessError("Please use getEnumList if you want to get list of Enums!"); + } + + // Attempt to convert the list + final List convertedList = convertList(originalList, clazz); + if (convertedList == null) + { + LOGGER.log(Level.WARNING, "getList(\"" + key + "\", " + clazz.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); + return null; + } + + // Overwrite the existing list with proper generic type + _set.put(key, convertedList); + return convertedList; + } + return (List) obj; + } + + public List getList(String key, Class clazz, List defaultValue) + { + final List list = getList(key, clazz); + return list == null ? defaultValue : list; + } + + @SuppressWarnings("unchecked") + public > List getEnumList(String key, Class clazz) + { + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return null; + } + + final List originalList = (List) obj; + if (!originalList.isEmpty() && (obj.getClass().getGenericInterfaces()[0] != clazz) && originalList.stream().allMatch(name -> Util.isEnum(name.toString(), clazz))) + { + final List convertedList = originalList.stream().map(Object::toString).map(name -> Enum.valueOf(clazz, name)).map(clazz::cast).collect(Collectors.toList()); + + // Overwrite the existing list with proper generic type + _set.put(key, convertedList); + return convertedList; + } + return (List) obj; + } + + /** + * @param + * @param originalList + * @param clazz + * @return + */ + private List convertList(List originalList, Class clazz) + { + if (clazz == Integer.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isInteger)) + { + return originalList.stream().map(Object::toString).map(Integer::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + else if (clazz == Float.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isFloat)) + { + return originalList.stream().map(Object::toString).map(Float::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + else if (clazz == Double.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isDouble)) + { + return originalList.stream().map(Object::toString).map(Double::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + return null; + } + + @SuppressWarnings("unchecked") + public Map getMap(String key, Class keyClass, Class valueClass) + { + final Object obj = _set.get(key); + if (!(obj instanceof Map)) + { + return null; + } + + final Map originalList = (Map) obj; + if (!originalList.isEmpty() && ((!originalList.keySet().stream().allMatch(keyClass::isInstance)) || (!originalList.values().stream().allMatch(valueClass::isInstance)))) + { + LOGGER.log(Level.WARNING, "getMap(\"" + key + "\", " + keyClass.getSimpleName() + ", " + valueClass.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); + } + return (Map) obj; + } + + public StatSet set(String name, Object value) + { + if (value == null) + { + return this; + } + _set.put(name, value); + return this; + } + + public StatSet set(String key, boolean value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, byte value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, short value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, int value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, long value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, float value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, double value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, String value) + { + if (value == null) + { + return this; + } + _set.put(key, value); + return this; + } + + public StatSet set(String key, Enum value) + { + if (value == null) + { + return this; + } + _set.put(key, value); + return this; + } + + public static StatSet valueOf(String key, Object value) + { + final StatSet set = new StatSet(); + set.set(key, value); + return set; + } + + public void remove(String key) + { + _set.remove(key); + } + + public boolean contains(String name) + { + return _set.containsKey(name); + } + + @Override + public String toString() + { + return "StatSet{_set=" + _set + '}'; + } +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/StatsSet.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/StatsSet.java deleted file mode 100644 index 5ce013ebd2..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/StatsSet.java +++ /dev/null @@ -1,968 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.ConcurrentHashMap; -import java.util.function.Supplier; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.stream.Collectors; - -import org.l2jmobius.commons.util.TimeUtil; -import org.l2jmobius.gameserver.model.holders.MinionHolder; -import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.interfaces.IParserAdvUtils; -import org.l2jmobius.gameserver.util.Util; - -/** - * This class is meant to hold a set of (key,value) pairs.
    - * They are stored as object but can be retrieved in any type wanted. As long as cast is available.
    - * @author mkizub - */ -public class StatsSet implements IParserAdvUtils -{ - private static final Logger LOGGER = Logger.getLogger(StatsSet.class.getName()); - /** Static empty immutable map, used to avoid multiple null checks over the source. */ - public static final StatsSet EMPTY_STATSET = new StatsSet(Collections.emptyMap()); - - private final Map _set; - - public StatsSet() - { - this(ConcurrentHashMap::new); - } - - public StatsSet(Supplier> mapFactory) - { - this(mapFactory.get()); - } - - public StatsSet(Map map) - { - _set = map; - } - - /** - * Returns the set of values - * @return HashMap - */ - public Map getSet() - { - return _set; - } - - /** - * Add a set of couple values in the current set - * @param newSet : StatsSet pointing out the list of couples to add in the current set - */ - public void merge(StatsSet newSet) - { - _set.putAll(newSet.getSet()); - } - - /** - * Verifies if the stat set is empty. - * @return {@code true} if the stat set is empty, {@code false} otherwise - */ - public boolean isEmpty() - { - return _set.isEmpty(); - } - - /** - * Return the boolean value associated with key. - * @param key : String designating the key in the set - * @return boolean : value associated to the key - * @throws IllegalArgumentException : If value is not set or value is not boolean - */ - @Override - public boolean getBoolean(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Boolean value required, but not specified"); - } - if (val instanceof Boolean) - { - return ((Boolean) val).booleanValue(); - } - try - { - return Boolean.parseBoolean((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Boolean value required, but found: " + val); - } - } - - /** - * Return the boolean value associated with key.
    - * If no value is associated with key, or type of value is wrong, returns defaultValue. - * @param key : String designating the key in the entry set - * @return boolean : value associated to the key - */ - @Override - public boolean getBoolean(String key, boolean defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Boolean) - { - return ((Boolean) val).booleanValue(); - } - try - { - return Boolean.parseBoolean((String) val); - } - catch (Exception e) - { - return defaultValue; - } - } - - @Override - public byte getByte(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Byte value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).byteValue(); - } - try - { - return Byte.parseByte((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - - @Override - public byte getByte(String key, byte defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).byteValue(); - } - try - { - return Byte.parseByte((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - - public short increaseByte(String key, byte increaseWith) - { - final byte newValue = (byte) (getByte(key) + increaseWith); - set(key, newValue); - return newValue; - } - - public short increaseByte(String key, byte defaultValue, byte increaseWith) - { - final byte newValue = (byte) (getByte(key, defaultValue) + increaseWith); - set(key, newValue); - return newValue; - } - - public byte[] getByteArray(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Byte value required, but not specified"); - } - if (val instanceof Number) - { - return new byte[] - { - ((Number) val).byteValue() - }; - } - int c = 0; - final String[] vals = ((String) val).split(splitOn); - final byte[] result = new byte[vals.length]; - for (String v : vals) - { - try - { - result[c++] = Byte.parseByte(v); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - return result; - } - - public List getByteList(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final List result = new ArrayList<>(); - for (Byte i : getByteArray(key, splitOn)) - { - result.add(i); - } - return result; - } - - @Override - public short getShort(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Short value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).shortValue(); - } - try - { - return Short.parseShort((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Short value required, but found: " + val); - } - } - - @Override - public short getShort(String key, short defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).shortValue(); - } - try - { - return Short.parseShort((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Short value required, but found: " + val); - } - } - - public short increaseShort(String key, short increaseWith) - { - final short newValue = (short) (getShort(key) + increaseWith); - set(key, newValue); - return newValue; - } - - public short increaseShort(String key, short defaultValue, short increaseWith) - { - final short newValue = (short) (getShort(key, defaultValue) + increaseWith); - set(key, newValue); - return newValue; - } - - @Override - public int getInt(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Integer value required, but not specified: " + key + "!"); - } - - if (val instanceof Number) - { - return ((Number) val).intValue(); - } - - try - { - return Integer.parseInt((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val + "!"); - } - } - - @Override - public int getInt(String key, int defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).intValue(); - } - try - { - return Integer.parseInt((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val); - } - } - - public int increaseInt(String key, int increaseWith) - { - final int newValue = getInt(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public int increaseInt(String key, int defaultValue, int increaseWith) - { - final int newValue = getInt(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - public int[] getIntArray(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Integer value required, but not specified"); - } - if (val instanceof Number) - { - return new int[] - { - ((Number) val).intValue() - }; - } - int c = 0; - final String[] vals = ((String) val).split(splitOn); - final int[] result = new int[vals.length]; - for (String v : vals) - { - try - { - result[c++] = Integer.parseInt(v); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val); - } - } - return result; - } - - public List getIntegerList(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final List result = new ArrayList<>(); - for (int i : getIntArray(key, splitOn)) - { - result.add(i); - } - return result; - } - - @Override - public long getLong(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Long value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).longValue(); - } - try - { - return Long.parseLong((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Long value required, but found: " + val); - } - } - - @Override - public long getLong(String key, long defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).longValue(); - } - try - { - return Long.parseLong((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Long value required, but found: " + val); - } - } - - public long increaseLong(String key, long increaseWith) - { - final long newValue = getLong(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public long increaseLong(String key, long defaultValue, long increaseWith) - { - final long newValue = getLong(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public float getFloat(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Float value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).floatValue(); - } - try - { - return Float.parseFloat((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Float value required, but found: " + val); - } - } - - @Override - public float getFloat(String key, float defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).floatValue(); - } - try - { - return Float.parseFloat((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Float value required, but found: " + val); - } - } - - public float increaseFloat(String key, float increaseWith) - { - final float newValue = getFloat(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public float increaseFloat(String key, float defaultValue, float increaseWith) - { - final float newValue = getFloat(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public double getDouble(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Double value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).doubleValue(); - } - try - { - return Double.parseDouble((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Double value required, but found: " + val); - } - } - - @Override - public double getDouble(String key, double defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).doubleValue(); - } - try - { - return Double.parseDouble((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Double value required, but found: " + val); - } - } - - public double increaseDouble(String key, double increaseWith) - { - final double newValue = getDouble(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public double increaseDouble(String key, double defaultValue, double increaseWith) - { - final double newValue = getDouble(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public String getString(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("String value required, but not specified"); - } - return String.valueOf(val); - } - - @Override - public String getString(String key, String defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - return String.valueOf(val); - } - - @Override - public Duration getDuration(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("String value required, but not specified"); - } - return TimeUtil.parseDuration(String.valueOf(val)); - } - - @Override - public Duration getDuration(String key, Duration defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - return TimeUtil.parseDuration(String.valueOf(val)); - } - - @Override - @SuppressWarnings("unchecked") - public > T getEnum(String key, Class enumClass) - { - Objects.requireNonNull(key); - Objects.requireNonNull(enumClass); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but not specified"); - } - if (enumClass.isInstance(val)) - { - return (T) val; - } - try - { - return Enum.valueOf(enumClass, String.valueOf(val)); - } - catch (Exception e) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); - } - } - - @Override - @SuppressWarnings("unchecked") - public > T getEnum(String key, Class enumClass, T defaultValue) - { - Objects.requireNonNull(key); - Objects.requireNonNull(enumClass); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (enumClass.isInstance(val)) - { - return (T) val; - } - try - { - return Enum.valueOf(enumClass, String.valueOf(val)); - } - catch (Exception e) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); - } - } - - @SuppressWarnings("unchecked") - public A getObject(String name, Class type) - { - Objects.requireNonNull(name); - Objects.requireNonNull(type); - final Object obj = _set.get(name); - if ((obj == null) || !type.isAssignableFrom(obj.getClass())) - { - return null; - } - - return (A) obj; - } - - @SuppressWarnings("unchecked") - public A getObject(String name, Class type, A defaultValue) - { - Objects.requireNonNull(name); - Objects.requireNonNull(type); - final Object obj = _set.get(name); - if ((obj == null) || !type.isAssignableFrom(obj.getClass())) - { - return defaultValue; - } - - return (A) obj; - } - - public SkillHolder getSkillHolder(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof SkillHolder)) - { - return null; - } - - return (SkillHolder) obj; - } - - public Location getLocation(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof Location)) - { - return null; - } - return (Location) obj; - } - - @SuppressWarnings("unchecked") - public List getMinionList(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return Collections.emptyList(); - } - - return (List) obj; - } - - @SuppressWarnings("unchecked") - public List getList(String key, Class clazz) - { - Objects.requireNonNull(key); - Objects.requireNonNull(clazz); - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return null; - } - - final List originalList = (List) obj; - if (!originalList.isEmpty() && !originalList.stream().allMatch(clazz::isInstance)) - { - if (clazz.getSuperclass() == Enum.class) - { - throw new IllegalAccessError("Please use getEnumList if you want to get list of Enums!"); - } - - // Attempt to convert the list - final List convertedList = convertList(originalList, clazz); - if (convertedList == null) - { - LOGGER.log(Level.WARNING, "getList(\"" + key + "\", " + clazz.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); - return null; - } - - // Overwrite the existing list with proper generic type - _set.put(key, convertedList); - return convertedList; - } - return (List) obj; - } - - public List getList(String key, Class clazz, List defaultValue) - { - final List list = getList(key, clazz); - return list == null ? defaultValue : list; - } - - @SuppressWarnings("unchecked") - public > List getEnumList(String key, Class clazz) - { - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return null; - } - - final List originalList = (List) obj; - if (!originalList.isEmpty() && (obj.getClass().getGenericInterfaces()[0] != clazz) && originalList.stream().allMatch(name -> Util.isEnum(name.toString(), clazz))) - { - final List convertedList = originalList.stream().map(Object::toString).map(name -> Enum.valueOf(clazz, name)).map(clazz::cast).collect(Collectors.toList()); - - // Overwrite the existing list with proper generic type - _set.put(key, convertedList); - return convertedList; - } - return (List) obj; - } - - /** - * @param - * @param originalList - * @param clazz - * @return - */ - private List convertList(List originalList, Class clazz) - { - if (clazz == Integer.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isInteger)) - { - return originalList.stream().map(Object::toString).map(Integer::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - else if (clazz == Float.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isFloat)) - { - return originalList.stream().map(Object::toString).map(Float::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - else if (clazz == Double.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isDouble)) - { - return originalList.stream().map(Object::toString).map(Double::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - return null; - } - - @SuppressWarnings("unchecked") - public Map getMap(String key, Class keyClass, Class valueClass) - { - final Object obj = _set.get(key); - if (!(obj instanceof Map)) - { - return null; - } - - final Map originalList = (Map) obj; - if (!originalList.isEmpty() && ((!originalList.keySet().stream().allMatch(keyClass::isInstance)) || (!originalList.values().stream().allMatch(valueClass::isInstance)))) - { - LOGGER.log(Level.WARNING, "getMap(\"" + key + "\", " + keyClass.getSimpleName() + ", " + valueClass.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); - } - return (Map) obj; - } - - public StatsSet set(String name, Object value) - { - if (value == null) - { - return this; - } - _set.put(name, value); - return this; - } - - public StatsSet set(String key, boolean value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, byte value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, short value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, int value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, long value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, float value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, double value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, String value) - { - if (value == null) - { - return this; - } - _set.put(key, value); - return this; - } - - public StatsSet set(String key, Enum value) - { - if (value == null) - { - return this; - } - _set.put(key, value); - return this; - } - - public static StatsSet valueOf(String key, Object value) - { - final StatsSet set = new StatsSet(); - set.set(key, value); - return set; - } - - public void remove(String key) - { - _set.remove(key); - } - - public boolean contains(String name) - { - return _set.containsKey(name); - } - - @Override - public String toString() - { - return "StatsSet{_set=" + _set + '}'; - } -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Npc.java index 40f5f65ede..f74f986666 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -50,7 +50,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.MpRewardTask; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.FishermanInstance; @@ -149,7 +149,7 @@ public class Npc extends Creature private NpcStringId _titleString; private NpcStringId _nameString; - private StatsSet _params; + private StatSet _params; private RaidBossStatus _raidStatus; /** Contains information about local tax payments. */ @@ -1768,7 +1768,7 @@ public class Npc extends Creature /** * @return the parameters of the npc merged with the spawn parameters (if there are any) */ - public StatsSet getParameters() + public StatSet getParameters() { if (_params != null) { @@ -1780,10 +1780,10 @@ public class Npc extends Creature final NpcSpawnTemplate npcSpawnTemplate = _spawn.getNpcSpawnTemplate(); if ((npcSpawnTemplate != null) && (npcSpawnTemplate.getParameters() != null) && !npcSpawnTemplate.getParameters().isEmpty()) { - final StatsSet params = getTemplate().getParameters(); + final StatSet params = getTemplate().getParameters(); if ((params != null) && !params.getSet().isEmpty()) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.merge(params); set.merge(npcSpawnTemplate.getParameters()); _params = set; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index c8cbb989c0..a4d95ae3fc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -21,7 +21,7 @@ import java.util.EnumMap; import java.util.Map; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; @@ -49,12 +49,12 @@ public class CreatureTemplate extends ListenersContainer /** The creature's race. */ private Race _race; - public CreatureTemplate(StatsSet set) + public CreatureTemplate(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { // Base stats _baseValues.put(Stat.STAT_STR, set.getDouble("baseSTR", 0)); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java index 86441c678c..14f0e9cae8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.CubicInstance; @@ -46,7 +46,7 @@ public class CubicTemplate implements ICubicConditionHolder private final List _conditions = new ArrayList<>(); public List _skills = new ArrayList<>(); - public CubicTemplate(StatsSet set) + public CubicTemplate(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java index c40883ac75..410040bc86 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.templates; import org.l2jmobius.gameserver.enums.DoorOpenType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -57,7 +57,7 @@ public class DoorTemplate extends CreatureTemplate implements IIdentifiable private final boolean _stealth; private final boolean _isInverted; - public DoorTemplate(StatsSet set) + public DoorTemplate(StatSet set) { super(set); _doorId = set.getInt("id"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 14411761d5..285005f744 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.enums.MpRewardAffectType; import org.l2jmobius.gameserver.enums.MpRewardType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -64,7 +64,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private boolean _usingServerSideName; private String _title; private boolean _usingServerSideTitle; - private StatsSet _parameters; + private StatSet _parameters; private Sex _sex; private int _chestId; private int _rhandId; @@ -127,15 +127,15 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable /** * Constructor of Creature. - * @param set The StatsSet object to transfer data to the method + * @param set The StatSet object to transfer data to the method */ - public NpcTemplate(StatsSet set) + public NpcTemplate(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _id = set.getInt("id"); @@ -327,12 +327,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _usingServerSideTitle; } - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } - public void setParameters(StatsSet set) + public void setParameters(StatSet set) { _parameters = set; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 50292b8bc8..28458aa09e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -50,7 +50,7 @@ public class PlayerTemplate extends CreatureTemplate private final List _creationPoints; private final Map _baseSlotDef; - public PlayerTemplate(StatsSet set, List creationPoints) + public PlayerTemplate(StatSet set, List creationPoints) { super(set); _classId = ClassId.getClassId(set.getInt("classId")); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index aa28a0f648..260da48365 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -23,7 +23,7 @@ import java.util.Objects; import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import org.l2jmobius.gameserver.enums.InventoryBlockType; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -57,7 +57,7 @@ public class Transform implements IIdentifiable private TransformTemplate _maleTemplate; private TransformTemplate _femaleTemplate; - public Transform(StatsSet set) + public Transform(StatSet set) { _id = set.getInt("id"); _displayId = set.getInt("displayId", _id); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java index 5660852a01..729998503f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.actor.transform; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -31,7 +31,7 @@ public class TransformLevelData private final double _levelMod; private Map _stats; - public TransformLevelData(StatsSet set) + public TransformLevelData(StatSet set) { _level = set.getInt("val"); _levelMod = set.getDouble("levelMod"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 4de84b8bdc..7aca059f91 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -23,7 +23,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -49,7 +49,7 @@ public class TransformTemplate private ExBasicActionList _list; private final Map _data = new LinkedHashMap<>(100); - public TransformTemplate(StatsSet set) + public TransformTemplate(StatSet set) { _collisionRadius = set.contains("radius") ? set.getDouble("radius") : null; _collisionHeight = set.contains("height") ? set.getDouble("height") : null; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java index d808a6b8bf..02550d2818 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -36,7 +36,7 @@ public class AlchemyCraftData private ItemHolder _productionSuccess; private ItemHolder _productionFailure; - public AlchemyCraftData(StatsSet set) + public AlchemyCraftData(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java index 0bd061d3c4..79dd6c0207 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.beautyshop; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -32,7 +32,7 @@ public class BeautyItem private final int _beautyShopTicket; private final Map _colors = new HashMap<>(); - public BeautyItem(StatsSet set) + public BeautyItem(StatSet set) { _id = set.getInt("id"); _adena = set.getInt("adena", 0); @@ -60,7 +60,7 @@ public class BeautyItem return _beautyShopTicket; } - public void addColor(StatsSet set) + public void addColor(StatSet set) { final BeautyItem color = new BeautyItem(set); _colors.put(set.getInt("id"), color); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index e0d1486962..1c341e0c31 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party.MessageType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.appearance.PlayerAppearance; @@ -244,7 +244,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent player.teleToLocation(_instance.getEnterLocations().get(index++), 0, _instance); } - getTimers().addTimer("match_start_countdown", StatsSet.valueOf("time", 60), 100, null, null); + getTimers().addTimer("match_start_countdown", StatSet.valueOf("time", 60), 100, null, null); getTimers().addTimer("teleport_message1", 10000, null, null); getTimers().addTimer("teleport_message2", 14000, null, null); @@ -394,7 +394,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent } } getTimers().cancelTimer("update", null, null); - getTimers().addTimer("match_end_countdown", StatsSet.valueOf("time", 30), 30 * 1000, null, null); + getTimers().addTimer("match_end_countdown", StatSet.valueOf("time", 30), 30 * 1000, null, null); EventDispatcher.getInstance().notifyEvent(new OnCeremonyOfChaosMatchResult(winners, members)); } @@ -487,7 +487,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java index 39f9196d93..371f8dc459 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.conditions.ICubicCondition; @@ -38,7 +38,7 @@ public class CubicSkill extends SkillHolder implements ICubicConditionHolder private final List _conditions = new ArrayList<>(); private final boolean _targetDebuff; - public CubicSkill(StatsSet set) + public CubicSkill(StatSet set) { super(set.getInt("id"), set.getInt("level")); _triggerRate = set.getInt("triggerRate", 100); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/entity/ClanHall.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/entity/ClanHall.java index 8da77477fd..22af370709 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/entity/ClanHall.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/entity/ClanHall.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -75,7 +75,7 @@ public class ClanHall extends AbstractResidence private static final String LOAD_CLANHALL = "SELECT * FROM clanhall WHERE id=?"; private static final String UPDATE_CLANHALL = "UPDATE clanhall SET ownerId=?,paidUntil=? WHERE id=?"; - public ClanHall(StatsSet params) + public ClanHall(StatSet params) { super(params.getInt("id")); // Set static parameters diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/entity/Hero.java index ef005ff325..aee8b019ee 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/entity/Hero.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/entity/Hero.java @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.data.xml.impl.ClassListData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -74,13 +74,13 @@ public class Hero // delete hero items private static final String DELETE_ITEMS = "DELETE FROM items WHERE item_id IN (30392, 30393, 30394, 30395, 30396, 30397, 30398, 30399, 30400, 30401, 30402, 30403, 30404, 30405, 30372, 30373, 6842, 6611, 6612, 6613, 6614, 6615, 6616, 6617, 6618, 6619, 6620, 6621, 9388, 9389, 9390) AND owner_id NOT IN (SELECT charId FROM characters WHERE accesslevel > 0)"; - private static final Map HEROES = new ConcurrentHashMap<>(); - private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); + private static final Map HEROES = new ConcurrentHashMap<>(); + private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); - private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); - private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); + private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); + private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); - private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); + private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); private static final Map HERO_MESSAGE = new ConcurrentHashMap<>(); public static final String COUNT = "count"; @@ -118,7 +118,7 @@ public class Hero { while (rset.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset.getInt(Olympiad.CLASS_ID)); @@ -137,7 +137,7 @@ public class Hero while (rset2.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset2.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset2.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset2.getInt(Olympiad.CLASS_ID)); @@ -159,7 +159,7 @@ public class Hero LOGGER.info("Hero System: Loaded " + COMPLETE_HEROS.size() + " all time Heroes."); } - private void processHeros(PreparedStatement ps, int charId, StatsSet hero) throws SQLException + private void processHeros(PreparedStatement ps, int charId, StatSet hero) throws SQLException { ps.setInt(1, charId); try (ResultSet rs = ps.executeQuery()) @@ -224,7 +224,7 @@ public class Hero public void loadDiary(int charId) { - final List diary = new ArrayList<>(); + final List diary = new ArrayList<>(); int diaryentries = 0; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement("SELECT * FROM heroes_diary WHERE charId=? ORDER BY time ASC")) @@ -234,7 +234,7 @@ public class Hero { while (rset.next()) { - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final long time = rset.getLong("time"); final int action = rset.getInt("action"); @@ -279,8 +279,8 @@ public class Hero public void loadFights(int charId) { - final List fights = new ArrayList<>(); - final StatsSet heroCountData = new StatsSet(); + final List fights = new ArrayList<>(); + final StatSet heroCountData = new StatSet(); final Calendar data = Calendar.getInstance(); data.set(Calendar.DAY_OF_MONTH, 1); data.set(Calendar.HOUR_OF_DAY, 0); @@ -326,7 +326,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charTwoClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -362,7 +362,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charOneClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -410,14 +410,14 @@ public class Hero } } - public Map getHeroes() + public Map getHeroes() { return HEROES; } public int getHeroByClass(int classid) { - for (Entry e : HEROES.entrySet()) + for (Entry e : HEROES.entrySet()) { if (e.getValue().getInt(Olympiad.CLASS_ID) == classid) { @@ -438,7 +438,7 @@ public class Hero public void showHeroDiary(PlayerInstance player, int heroclass, int charid, int page) { final int perpage = 10; - final List mainList = HERO_DIARY.get(charid); + final List mainList = HERO_DIARY.get(charid); if (mainList != null) { final NpcHtmlMessage diaryReply = new NpcHtmlMessage(); @@ -453,7 +453,7 @@ public class Hero if (!mainList.isEmpty()) { - final List list = new ArrayList<>(mainList); + final List list = new ArrayList<>(mainList); Collections.reverse(list); boolean color = true; @@ -463,7 +463,7 @@ public class Hero for (int i = (page - 1) * perpage; i < list.size(); i++) { breakat = i; - final StatsSet diaryEntry = list.get(i); + final StatSet diaryEntry = list.get(i); fList.append(""); if (color) { @@ -524,7 +524,7 @@ public class Hero int loss = 0; int draw = 0; - final List heroFights = HERO_FIGHTS.get(charid); + final List heroFights = HERO_FIGHTS.get(charid); if (heroFights != null) { final NpcHtmlMessage fightReply = new NpcHtmlMessage(); @@ -536,7 +536,7 @@ public class Hero if (!heroFights.isEmpty()) { - final StatsSet heroCount = HERO_COUNTS.get(charid); + final StatSet heroCount = HERO_COUNTS.get(charid); if (heroCount != null) { win = heroCount.getInt("victory"); @@ -551,7 +551,7 @@ public class Hero for (int i = (page - 1) * perpage; i < heroFights.size(); i++) { breakat = i; - final StatsSet fight = heroFights.get(i); + final StatSet fight = heroFights.get(i); fList.append(""); if (color) { @@ -609,7 +609,7 @@ public class Hero } } - public synchronized void computeNewHeroes(List newHeroes) + public synchronized void computeNewHeroes(List newHeroes) { updateHeroes(true); @@ -659,13 +659,13 @@ public class Hero return; } - for (StatsSet hero : newHeroes) + for (StatSet hero : newHeroes) { final int charId = hero.getInt(Olympiad.CHAR_ID); if (COMPLETE_HEROS.containsKey(charId)) { - final StatsSet oldHero = COMPLETE_HEROS.get(charId); + final StatSet oldHero = COMPLETE_HEROS.get(charId); final int count = oldHero.getInt(COUNT); oldHero.set(COUNT, count + 1); oldHero.set(PLAYED, 1); @@ -674,7 +674,7 @@ public class Hero } else { - final StatsSet newHero = new StatsSet(); + final StatSet newHero = new StatSet(); newHero.set(Olympiad.CHAR_NAME, hero.getString(Olympiad.CHAR_NAME)); newHero.set(Olympiad.CLASS_ID, hero.getInt(Olympiad.CLASS_ID)); newHero.set(COUNT, 1); @@ -700,9 +700,9 @@ public class Hero } else { - StatsSet hero; + StatSet hero; int heroId; - for (Entry entry : HEROES.entrySet()) + for (Entry entry : HEROES.entrySet()) { hero = entry.getValue(); heroId = entry.getKey(); @@ -787,13 +787,13 @@ public class Hero setDiaryData(charId, ACTION_RAID_KILLED, npcId); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (template == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -806,13 +806,13 @@ public class Hero setDiaryData(charId, ACTION_CASTLE_TAKEN, castleId); final Castle castle = CastleManager.getInstance().getCastleById(castleId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (castle == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -922,10 +922,10 @@ public class Hero */ public void claimHero(PlayerInstance player) { - StatsSet hero = HEROES.get(player.getObjectId()); + StatSet hero = HEROES.get(player.getObjectId()); if (hero == null) { - hero = new StatsSet(); + hero = new StatSet(); HEROES.put(player.getObjectId(), hero); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java index f1263e8d44..c52f487402 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java @@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.atomic.AtomicReference; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.eventengine.drop.IEventDrop; import org.l2jmobius.gameserver.model.events.AbstractScript; @@ -42,7 +42,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout public abstract class AbstractEventManager>extends AbstractScript { private String _name; - private StatsSet _variables = StatsSet.EMPTY_STATSET; + private StatSet _variables = StatSet.EMPTY_STATSET; private Set _schedulers = Collections.emptySet(); private Set _conditionalSchedulers = Collections.emptySet(); private Map _rewards = Collections.emptyMap(); @@ -67,14 +67,14 @@ public abstract class AbstractEventManager>extends Ab /* ********************** */ - public StatsSet getVariables() + public StatSet getVariables() { return _variables; } - public void setVariables(StatsSet variables) + public void setVariables(StatSet variables) { - _variables = new StatsSet(Collections.unmodifiableMap(variables.getSet())); + _variables = new StatSet(Collections.unmodifiableMap(variables.getSet())); } /* ********************** */ diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java index 59c64b812c..e41af41d1a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.util.cron4j.PastPredictor; import org.l2jmobius.gameserver.util.cron4j.Predictor; @@ -45,7 +45,7 @@ public class EventScheduler private List _notifications; private ScheduledFuture _task; - public EventScheduler(AbstractEventManager manager, StatsSet set) + public EventScheduler(AbstractEventManager manager, StatSet set) { _eventManager = manager; _name = set.getString("name", ""); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 4fc2d3b8b0..819c3bf34d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -50,7 +50,7 @@ import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -181,12 +181,12 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime onTimerCancel(holder.getEvent(), holder.getParams(), holder.getNpc(), holder.getPlayer()); } - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { LOGGER.warning("[" + getClass().getSimpleName() + "]: Timer event arrived at non overriden onTimerEvent method event: " + event + " npc: " + npc + " player: " + player); } - public void onTimerCancel(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerCancel(String event, StatSet params, Npc npc, PlayerInstance player) { } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java index 400fb64b6e..861c4a9b31 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java @@ -24,7 +24,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.timers.IEventTimerCancel; @@ -69,7 +69,7 @@ public class TimerExecutor * @param eventTimer * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - public boolean addTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) + public boolean addTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) { return addTimer(new TimerHolder<>(event, params, time, npc, player, false, eventTimer, _cancelListener, this)); } @@ -95,7 +95,7 @@ public class TimerExecutor * @param player * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - public boolean addTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player) + public boolean addTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player) { return addTimer(event, params, time, npc, player, _eventListener); } @@ -123,7 +123,7 @@ public class TimerExecutor * @param eventTimer * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - private boolean addRepeatingTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) + private boolean addRepeatingTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) { return addTimer(new TimerHolder<>(event, params, time, npc, player, true, eventTimer, _cancelListener, this)); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java index ab8fa150ca..0fcafba759 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java @@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.gameserver.instancemanager.TimersManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.TimerExecutor; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.events.TimerExecutor; public class TimerHolder implements Runnable { private final T _event; - private final StatsSet _params; + private final StatSet _params; private final long _time; private final Npc _npc; private final PlayerInstance _player; @@ -44,7 +44,7 @@ public class TimerHolder implements Runnable private final TimerExecutor _postExecutor; private final ScheduledFuture _task; - public TimerHolder(T event, StatsSet params, long time, Npc npc, PlayerInstance player, boolean isRepeating, IEventTimerEvent eventScript, IEventTimerCancel cancelScript, TimerExecutor postExecutor) + public TimerHolder(T event, StatSet params, long time, Npc npc, PlayerInstance player, boolean isRepeating, IEventTimerEvent eventScript, IEventTimerCancel cancelScript, TimerExecutor postExecutor) { Objects.requireNonNull(event, getClass().getSimpleName() + ": \"event\" cannot be null!"); Objects.requireNonNull(eventScript, getClass().getSimpleName() + ": \"script\" cannot be null!"); @@ -73,7 +73,7 @@ public class TimerHolder implements Runnable /** * @return the parameters of this timer */ - public StatsSet getParams() + public StatSet getParams() { return _params; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index bcf2f14eec..38dfd26bba 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; @@ -37,7 +37,7 @@ public class AppearanceHolder private final AppearanceTargetType _targetType; private final long _bodyPart; - public AppearanceHolder(StatsSet set) + public AppearanceHolder(StatSet set) { _visualId = set.getInt("id", 0); _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java index 29740873cd..0f9488448d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Nik @@ -43,7 +43,7 @@ public class AttachSkillHolder extends SkillHolder return _requiredSkillLevel; } - public static AttachSkillHolder fromStatsSet(StatsSet set) + public static AttachSkillHolder fromStatSet(StatSet set) { return new AttachSkillHolder(set.getInt("skillId"), set.getInt("skillLevel", 1), set.getInt("requiredSkillId"), set.getInt("requiredSkillLevel", 1)); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java index cc41724532..57b6d47c40 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Set; import org.l2jmobius.gameserver.enums.SkillEnchantType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -36,7 +36,7 @@ public class EnchantSkillHolder private final Map _chance = new EnumMap<>(SkillEnchantType.class); private final Map> _requiredItems = new EnumMap<>(SkillEnchantType.class); - public EnchantSkillHolder(StatsSet set) + public EnchantSkillHolder(StatSet set) { _level = set.getInt("level"); _enchantFailLevel = set.getInt("enchantFailLevel"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java index e6706c8467..33d14e4345 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Map; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -36,7 +36,7 @@ public class ExtendDropDataHolder private final List _conditions; private final Map _systemMessages; - public ExtendDropDataHolder(StatsSet set) + public ExtendDropDataHolder(StatSet set) { _id = set.getInt("id"); _items = set.getList("items", ExtendDropItemHolder.class); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java index 16454d764a..d63d4eb775 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -52,7 +52,7 @@ public class FakePlayerHolder private final int _clanId; private final int _pledgeStatus; - public FakePlayerHolder(StatsSet set) + public FakePlayerHolder(StatSet set) { _classId = set.getInt("classId", 182); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java index a9c72776cd..86af0c1405 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -29,7 +29,7 @@ public class ItemHolder implements IIdentifiable private final int _id; private final long _count; - public ItemHolder(StatsSet set) + public ItemHolder(StatSet set) { _id = set.getInt("id"); _count = set.getLong("count"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java index 5b581c4cfe..a54dfa8300 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -25,7 +25,7 @@ public class ItemPointHolder extends ItemHolder { private final int _points; - public ItemPointHolder(StatsSet params) + public ItemPointHolder(StatSet params) { this(params.getInt("id"), params.getLong("count"), params.getInt("points")); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java index 22c6c327eb..0ba78224d3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.holders; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -34,7 +34,7 @@ public class LuckyGameDataHolder private int _minModifyRewardGame; private int _maxModifyRewardGame; - public LuckyGameDataHolder(StatsSet params) + public LuckyGameDataHolder(StatSet params) { _index = params.getInt("index"); _turningPoints = params.getInt("turning_point"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java index f77e380e8d..9fa8c99654 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.holders; import java.time.Duration; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -32,7 +32,7 @@ public class MinionHolder implements IIdentifiable private final long _respawnTime; private final int _weightPoint; - public MinionHolder(StatsSet set) + public MinionHolder(StatSet set) { _id = set.getInt("id"); _count = set.getInt("count", 1); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java index f4173594d1..36ac70176d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -52,7 +52,7 @@ public class MultisellListHolder implements IIdentifiable } @SuppressWarnings("unchecked") - public MultisellListHolder(StatsSet set) + public MultisellListHolder(StatSet set) { _listId = set.getInt("listId"); _isChanceMultisell = set.getBoolean("isChanceMultisell", false); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 3e3ea5d31b..c2f4ab4119 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -45,7 +45,7 @@ import org.l2jmobius.gameserver.enums.InstanceReenterType; import org.l2jmobius.gameserver.enums.InstanceTeleportType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -87,7 +87,7 @@ public class Instance implements IIdentifiable, INamable private final Set _players = ConcurrentHashMap.newKeySet(); // Players inside instance private final Set _npcs = ConcurrentHashMap.newKeySet(); // Spawned NPCs inside instance private final Map _doors = new HashMap<>(); // Spawned doors inside instance - private final StatsSet _parameters = new StatsSet(); + private final StatSet _parameters = new StatSet(); // Timers private final Map> _ejectDeadTasks = new ConcurrentHashMap<>(); private ScheduledFuture _cleanUpTask = null; @@ -171,7 +171,7 @@ public class Instance implements IIdentifiable, INamable * Get instance world parameters. * @return instance parameters */ - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } @@ -1020,7 +1020,7 @@ public class Instance implements IIdentifiable, INamable * Get parameters from instance template.
    * @return template parameters */ - public StatsSet getTemplateParameters() + public StatSet getTemplateParameters() { return _template.getParameters(); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 2a196f73ef..b53b0a819d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.AbstractPlayerGroup; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -71,7 +71,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl private float _spRate = Config.RATE_INSTANCE_SP; private float _expPartyRate = Config.RATE_INSTANCE_PARTY_XP; private float _spPartyRate = Config.RATE_INSTANCE_PARTY_SP; - private StatsSet _parameters = StatsSet.EMPTY_STATSET; + private StatSet _parameters = StatSet.EMPTY_STATSET; private final Map _doors = new HashMap<>(); private final List _spawns = new ArrayList<>(); // Locations @@ -92,7 +92,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl /** * @param set */ - public InstanceTemplate(StatsSet set) + public InstanceTemplate(StatSet set) { _templateId = set.getInt("id", 0); _name = set.getString("name", null); @@ -178,7 +178,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (!set.isEmpty()) { - _parameters = new StatsSet(Collections.unmodifiableMap(set)); + _parameters = new StatSet(Collections.unmodifiableMap(set)); } } @@ -469,7 +469,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl * Get instance template parameters. * @return parameters of template */ - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java index 3b67ff72f4..3627959662 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; import java.util.function.BiConsumer; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public abstract class Condition { private final InstanceTemplate _template; - private final StatsSet _parameters; + private final StatSet _parameters; private final boolean _leaderOnly; private final boolean _showMessageAndHtml; private SystemMessageId _systemMsg = null; @@ -46,7 +46,7 @@ public abstract class Condition * @param onlyLeader flag which means if only leader should be affected (leader means player who wants to enter not group leader!) * @param showMessageAndHtml if {@code true} and HTML message is defined then both are send, otherwise only HTML or message is send */ - public Condition(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public Condition(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { _template = template; _parameters = parameters; @@ -58,7 +58,7 @@ public abstract class Condition * Gets parameters of condition. * @return set of parameters */ - protected final StatsSet getParameters() + protected final StatSet getParameters() { return _parameters; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java index e379741b59..c27d92d662 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionCommandChannel extends Condition { - public ConditionCommandChannel(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionCommandChannel(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_CANNOT_ENTER_BECAUSE_YOU_ARE_NOT_ASSOCIATED_WITH_THE_CURRENT_COMMAND_CHANNEL); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java index ed434e3524..a828dcceae 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.model.AbstractPlayerGroup; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionCommandChannelLeader extends Condition { - public ConditionCommandChannelLeader(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionCommandChannelLeader(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java index d2a60816d0..423a37a94e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionDistance extends Condition { - public ConditionDistance(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionDistance(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); setSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED, (message, player) -> message.addString(player.getName())); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java index 3dc78a98c7..8aa68b7e08 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionGroupMax extends Condition { - public ConditionGroupMax(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionGroupMax(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_CANNOT_ENTER_DUE_TO_THE_PARTY_HAVING_EXCEEDED_THE_LIMIT); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java index 818803c844..70ea03c187 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionGroupMin extends Condition { - public ConditionGroupMin(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionGroupMin(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_MUST_HAVE_A_MINIMUM_OF_S1_PEOPLE_TO_ENTER_THIS_INSTANCE_ZONE, (msg, player) -> msg.addInt(getLimit())); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 3088d8ae64..53fee609aa 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.enums.ResidenceType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; */ public class ConditionHasResidence extends Condition { - public ConditionHasResidence(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionHasResidence(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); } @@ -43,7 +43,7 @@ public class ConditionHasResidence extends Condition return false; } - final StatsSet params = getParameters(); + final StatSet params = getParameters(); final int id = params.getInt("id"); boolean test = false; switch (params.getEnum("type", ResidenceType.class)) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java index 4e1c407325..eed350db38 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -32,7 +32,7 @@ public class ConditionItem extends Condition private final long _count; private final boolean _take; - public ConditionItem(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionItem(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Load params diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java index 7d509a20c7..b38f8c0e2c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -32,7 +32,7 @@ public class ConditionLevel extends Condition private final int _min; private final int _max; - public ConditionLevel(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionLevel(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Load params diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java index b91deeffdb..d71e6d0a39 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; */ public class ConditionNoParty extends Condition { - public ConditionNoParty(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionNoParty(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java index dd31bf3ca5..5bf768a03e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionParty extends Condition { - public ConditionParty(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionParty(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java index 524a59675a..0363715536 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionPartyLeader extends Condition { - public ConditionPartyLeader(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionPartyLeader(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java index 481cb251ce..48d7fc7981 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.instancemanager.QuestManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionQuest extends Condition { - public ConditionQuest(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionQuest(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Set message diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 899b17aff9..a073129734 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionReenter extends Condition { - public ConditionReenter(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionReenter(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); setSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET, (message, player) -> message.addString(player.getName())); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java index ec255025c3..fafafe5604 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.itemauction; import java.util.Calendar; import java.util.concurrent.TimeUnit; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Forsaiken @@ -40,7 +40,7 @@ public class AuctionDateGenerator private int _hour_of_day; private int _minute_of_hour; - public AuctionDateGenerator(StatsSet config) + public AuctionDateGenerator(StatSet config) { _calendar = Calendar.getInstance(); _interval = config.getInt(FIELD_INTERVAL, -1); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 64bf0a6ff1..cb554e4dce 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.itemauction; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.idfactory.IdFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,9 +34,9 @@ public class AuctionItem private final int _itemId; private final long _itemCount; @SuppressWarnings("unused") - private final StatsSet _itemExtra; + private final StatSet _itemExtra; - public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatsSet itemExtra) + public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatSet itemExtra) { _auctionItemId = auctionItemId; _auctionLength = auctionLength; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 6dff6e3a4d..dc3a7f6f6b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -44,7 +44,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -84,7 +84,7 @@ public class ItemAuctionInstance _items = new ArrayList<>(); final NamedNodeMap nanode = node.getAttributes(); - final StatsSet generatorConfig = new StatsSet(); + final StatSet generatorConfig = new StatSet(); for (int i = nanode.getLength(); i-- > 0;) { final Node n = nanode.item(i); @@ -115,7 +115,7 @@ public class ItemAuctionInstance throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } - final StatsSet itemExtra = new StatsSet(); + final StatSet itemExtra = new StatSet(); final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Armor.java index d4fd97ef10..bfc90d126d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Armor.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.type.ArmorType; /** @@ -28,15 +28,15 @@ public class Armor extends Item /** * Constructor for Armor. - * @param set the StatsSet designating the set of couples (key,value) characterizing the armor. + * @param set the StatSet designating the set of couples (key,value) characterizing the armor. */ - public Armor(StatsSet set) + public Armor(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/EtcItem.java index 86d7291595..a902860c0d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/EtcItem.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -38,15 +38,15 @@ public class EtcItem extends Item /** * Constructor for EtcItem. - * @param set StatsSet designating the set of couples (key,value) for description of the Etc + * @param set StatSet designating the set of couples (key,value) for description of the Etc */ - public EtcItem(StatsSet set) + public EtcItem(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Henna.java index 921fa10dfb..87cea36031 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; @@ -44,7 +44,7 @@ public class Henna private final List _skills; private final List _wear_class; - public Henna(StatsSet set) + public Henna(StatSet set) { _dyeId = set.getInt("dyeId"); _dyeItemId = set.getInt("dyeItemId"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Item.java index 8f8d49e9d8..4f2d125bdf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Item.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.enums.ItemGrade; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; @@ -178,14 +178,14 @@ public abstract class Item extends ListenersContainer implements IIdentifiable /** * Constructor of the Item that fill class variables.
    *
    - * @param set : StatsSet corresponding to a set of couples (key,value) for description of the item + * @param set : StatSet corresponding to a set of couples (key,value) for description of the item */ - protected Item(StatsSet set) + protected Item(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { _itemId = set.getInt("item_id"); _displayId = set.getInt("displayId", _itemId); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java index ab196007a8..3ca228cbe5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -29,7 +29,7 @@ public class PlayerItemTemplate extends ItemHolder /** * @param set the set containing the values for this object */ - public PlayerItemTemplate(StatsSet set) + public PlayerItemTemplate(StatSet set) { super(set.getInt("id"), set.getInt("count")); _equipped = set.getBoolean("equipped", false); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Weapon.java index 16f0c47287..5f9f8507bd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Weapon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.items; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ItemSkillType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -58,15 +58,15 @@ public class Weapon extends Item /** * Constructor for Weapon. - * @param set the StatsSet designating the set of couples (key,value) characterizing the weapon. + * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. */ - public Weapon(StatsSet set) + public Weapon(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java index 7bdd968d90..6d05c20ff3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java @@ -23,7 +23,7 @@ import java.util.List; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -54,7 +54,7 @@ public class AppearanceStone private List _racesNot; private List _allVisualIds; - public AppearanceStone(StatsSet set) + public AppearanceStone(StatSet set) { _id = set.getInt("id"); _visualId = set.getInt("visualId", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java index f3b53f1a67..a2897ba911 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.items.combination; import java.util.EnumMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -31,7 +31,7 @@ public class CombinationItem private final int _chance; private final Map _rewards = new EnumMap<>(CombinationItemType.class); - public CombinationItem(StatsSet set) + public CombinationItem(StatSet set) { _itemOne = set.getInt("one"); _itemTwo = set.getInt("two"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java index 1cde38a6d6..a7f1326bd8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.CrystalType; @@ -59,7 +59,7 @@ public abstract class AbstractEnchantItem private final int _maxEnchantLevel; private final double _bonusRate; - public AbstractEnchantItem(StatsSet set) + public AbstractEnchantItem(StatSet set) { _id = set.getInt("id"); if (getItem() == null) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java index b6b34cc667..7329d8728e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -40,7 +40,7 @@ public class EnchantScroll extends AbstractEnchantItem private final int _scrollGroupId; private Set _items; - public EnchantScroll(StatsSet set) + public EnchantScroll(StatSet set) { super(set); _scrollGroupId = set.getInt("scrollGroupId", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java index c02095428b..978e38d533 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items.enchant; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.items.type.ItemType; @@ -30,7 +30,7 @@ public class EnchantSupportItem extends AbstractEnchantItem private final boolean _isGiant; private final ItemType type; - public EnchantSupportItem(StatsSet set) + public EnchantSupportItem(StatSet set) { super(set); type = getItem().getItemType(); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index c965e15d4c..36efcc2103 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -45,7 +45,7 @@ import org.l2jmobius.gameserver.data.xml.impl.ClassListData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.ClassId; @@ -63,7 +63,7 @@ public class Olympiad extends ListenersContainer protected static final Logger LOGGER = Logger.getLogger(Olympiad.class.getName()); protected static final Logger LOGGER_OLYMPIAD = Logger.getLogger("olympiad"); - private static final Map NOBLES = new ConcurrentHashMap<>(); + private static final Map NOBLES = new ConcurrentHashMap<>(); private static final Map NOBLES_RANK = new HashMap<>(); public static final String OLYMPIAD_HTML_PATH = "data/html/olympiad/"; @@ -228,10 +228,10 @@ public class Olympiad extends ListenersContainer PreparedStatement statement = con.prepareStatement(OLYMPIAD_LOAD_NOBLES); ResultSet rset = statement.executeQuery()) { - StatsSet statData; + StatSet statData; while (rset.next()) { - statData = new StatsSet(); + statData = new StatSet(); statData.set(CLASS_ID, rset.getInt(CLASS_ID)); statData.set(CHAR_NAME, rset.getString(CHAR_NAME)); statData.set(POINTS, rset.getInt(POINTS)); @@ -454,7 +454,7 @@ public class Olympiad extends ListenersContainer saveNobleData(); _period = 1; - final List heroesToBe = sortHerosToBe(); + final List heroesToBe = sortHerosToBe(); Hero.getInstance().resetData(); Hero.getInstance().computeNewHeroes(heroesToBe); @@ -488,7 +488,7 @@ public class Olympiad extends ListenersContainer return NOBLES.size(); } - public static StatsSet getNobleStats(int playerId) + public static StatSet getNobleStats(int playerId) { return NOBLES.get(playerId); } @@ -787,7 +787,7 @@ public class Olympiad extends ListenersContainer } int currentPoints; - for (StatsSet nobleInfo : NOBLES.values()) + for (StatSet nobleInfo : NOBLES.values()) { currentPoints = nobleInfo.getInt(POINTS); currentPoints += WEEKLY_POINTS; @@ -805,7 +805,7 @@ public class Olympiad extends ListenersContainer return; } - for (StatsSet nobleInfo : NOBLES.values()) + for (StatSet nobleInfo : NOBLES.values()) { nobleInfo.set(COMP_DONE_WEEK, 0); } @@ -838,9 +838,9 @@ public class Olympiad extends ListenersContainer try (Connection con = DatabaseFactory.getConnection()) { - for (Entry entry : NOBLES.entrySet()) + for (Entry entry : NOBLES.entrySet()) { - final StatsSet nobleInfo = entry.getValue(); + final StatSet nobleInfo = entry.getValue(); if (nobleInfo == null) { @@ -953,7 +953,7 @@ public class Olympiad extends ListenersContainer } } - protected List sortHerosToBe() + protected List sortHerosToBe() { if (_period != 1) { @@ -961,8 +961,8 @@ public class Olympiad extends ListenersContainer } LOGGER_OLYMPIAD.info("Noble,charid,classid,compDone,points"); - StatsSet nobleInfo; - for (Entry entry : NOBLES.entrySet()) + StatSet nobleInfo; + for (Entry entry : NOBLES.entrySet()) { nobleInfo = entry.getValue(); if (nobleInfo == null) @@ -979,12 +979,12 @@ public class Olympiad extends ListenersContainer LOGGER_OLYMPIAD.info(charName + "," + charId + "," + classId + "," + compDone + "," + points); } - final List heroesToBe = new LinkedList<>(); + final List heroesToBe = new LinkedList<>(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(OLYMPIAD_GET_HEROS)) { - StatsSet hero; + StatSet hero; for (int element : HERO_IDS) { // Classic can have 2nd and 3rd class competitors, but only 1 hero @@ -996,7 +996,7 @@ public class Olympiad extends ListenersContainer { if (rset.next()) { - hero = new StatsSet(); + hero = new StatSet(); hero.set(CLASS_ID, element); // save the 3rd class title hero.set(CHAR_ID, rset.getInt(CHAR_ID)); hero.set(CHAR_NAME, rset.getString(CHAR_NAME)); @@ -1050,7 +1050,7 @@ public class Olympiad extends ListenersContainer return 0; } - final StatsSet noble = NOBLES.get(objectId); + final StatSet noble = NOBLES.get(objectId); if ((noble == null) || (noble.getInt(POINTS) == 0)) { return 0; @@ -1100,7 +1100,7 @@ public class Olympiad extends ListenersContainer { if (!NOBLES.containsKey(player.getObjectId())) { - final StatsSet statDat = new StatsSet(); + final StatSet statDat = new StatSet(); statDat.set(CLASS_ID, player.getBaseClass()); statDat.set(CHAR_NAME, player.getName()); statDat.set(POINTS, DEFAULT_POINTS); @@ -1207,7 +1207,7 @@ public class Olympiad extends ListenersContainer * @param data the stats set data to add. * @return the old stats set if the noble is already present, null otherwise. */ - public static StatsSet addNobleStats(int charId, StatsSet data) + public static StatSet addNobleStats(int charId, StatSet data) { return NOBLES.put(charId, data); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/Participant.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/Participant.java index 670066ac32..b6d879b902 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/Participant.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/Participant.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.olympiad; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class Participant private final int baseClass; private boolean disconnected = false; private boolean defaulted = false; - private final StatsSet stats; + private final StatSet stats; public String clanName; public int clanId; @@ -125,7 +125,7 @@ public class Participant /** * @return the stats */ - public StatsSet getStats() + public StatSet getStats() { return stats; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java index 4d5231ca5d..c1fb0f88f6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.primeshop; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -49,7 +49,7 @@ public class PrimeShopGroup private final int _availableCount; private final List _items; - public PrimeShopGroup(StatsSet set, List items) + public PrimeShopGroup(StatSet set, List items) { _brId = set.getInt("id"); _category = set.getInt("cat", 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java index d150ec98cd..88795e0721 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.residences; import java.time.Duration; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -33,7 +33,7 @@ public class ResidenceFunctionTemplate private final Duration _duration; private final double _value; - public ResidenceFunctionTemplate(StatsSet set) + public ResidenceFunctionTemplate(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java index 4f15efda0b..b19f8e59d5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; /** @@ -34,7 +34,7 @@ public class ShuttleDataHolder private final List _stops = new ArrayList<>(2); private final List _routes = new ArrayList<>(2); - public ShuttleDataHolder(StatsSet set) + public ShuttleDataHolder(StatSet set) { _id = set.getInt("id"); _loc = new Location(set); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/Skill.java index c44b45a781..0e97466a3a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.handler.IAffectScopeHandler; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.CubicInstance; @@ -210,7 +210,7 @@ public class Skill implements IIdentifiable private final SkillBuffType _buffType; private final boolean _displayInList; - public Skill(StatsSet set) + public Skill(StatSet set) { _id = set.getInt(".id"); _level = set.getInt(".level"); @@ -391,7 +391,7 @@ public class Skill implements IIdentifiable _toggleGroupId = set.getInt("toggleGroupId", -1); _attachToggleGroupId = set.getInt("attachToggleGroupId", -1); - _attachSkills = set.getList("attachSkillList", StatsSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatsSet).collect(Collectors.toList()); + _attachSkills = set.getList("attachSkillList", StatSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatSet).collect(Collectors.toList()); final String abnormalResist = set.getString("abnormalResists", null); if (abnormalResist != null) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java index bfc25bddde..39b738dbca 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.ChanceLocation; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory; /** * @author UnAfraid */ -public class NpcSpawnTemplate implements Cloneable, IParameterized +public class NpcSpawnTemplate implements Cloneable, IParameterized { private static final Logger LOGGER = Logger.getLogger(NpcSpawnTemplate.class.getName()); @@ -56,7 +56,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized private final Duration _respawnTimeRandom; private List _locations; private SpawnTerritory _zone; - private StatsSet _parameters; + private StatSet _parameters; private final boolean _spawnAnimation; private final boolean _saveInDB; private final String _dbName; @@ -82,7 +82,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized _minions = template._minions; } - public NpcSpawnTemplate(SpawnTemplate spawnTemplate, SpawnGroup group, StatsSet set) + public NpcSpawnTemplate(SpawnTemplate spawnTemplate, SpawnGroup group, StatSet set) { _spawnTemplate = spawnTemplate; _group = group; @@ -128,14 +128,14 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized mergeParameters(spawnTemplate, group); } - private StatsSet mergeParameters(SpawnTemplate spawnTemplate, SpawnGroup group) + private StatSet mergeParameters(SpawnTemplate spawnTemplate, SpawnGroup group) { if ((_parameters == null) && (spawnTemplate.getParameters() == null) && (group.getParameters() == null)) { return null; } - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); if (spawnTemplate.getParameters() != null) { set.merge(spawnTemplate.getParameters()); @@ -206,13 +206,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized } @Override - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } @Override - public void setParameters(StatsSet parameters) + public void setParameters(StatSet parameters) { if (_parameters == null) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java index 6723863c93..7ceb2d46af 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IParameterized; import org.l2jmobius.gameserver.model.interfaces.ITerritorized; @@ -31,16 +31,16 @@ import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory; /** * @author UnAfraid */ -public class SpawnGroup implements Cloneable, ITerritorized, IParameterized +public class SpawnGroup implements Cloneable, ITerritorized, IParameterized { private final String _name; private final boolean _spawnByDefault; private List _territories; private List _bannedTerritories; private final List _spawns = new ArrayList<>(); - private StatsSet _parameters; + private StatSet _parameters; - public SpawnGroup(StatsSet set) + public SpawnGroup(StatSet set) { this(set.getString("name", null), set.getBoolean("spawnByDefault", true)); } @@ -104,13 +104,13 @@ public class SpawnGroup implements Cloneable, ITerritorized, IParameterized +public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized { private final String _name; private final String _ai; @@ -45,9 +45,9 @@ public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized _territories; private List _bannedTerritories; private final List _groups = new ArrayList<>(); - private StatsSet _parameters; + private StatSet _parameters; - public SpawnTemplate(StatsSet set, File file) + public SpawnTemplate(StatSet set, File file) { this(set.getString("name", null), set.getString("ai", null), set.getBoolean("spawnByDefault", true), file); } @@ -128,13 +128,13 @@ public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized _castleId; - public TeleportLocation(int id, StatsSet set) + public TeleportLocation(int id, StatSet set) { super(set); _id = id; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java index 916ae0790c..33cf6ac3bc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.variables; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.IRestorable; import org.l2jmobius.gameserver.model.interfaces.IStorable; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.interfaces.IStorable; /** * @author UnAfraid */ -public abstract class AbstractVariables extends StatsSet implements IRestorable, IStorable, IDeletable +public abstract class AbstractVariables extends StatSet implements IRestorable, IStorable, IDeletable { private final AtomicBoolean _hasChanges = new AtomicBoolean(false); @@ -41,42 +41,42 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, */ @Override - public StatsSet set(String name, boolean value) + public StatSet set(String name, boolean value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, double value) + public StatSet set(String name, double value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, Enum value) + public StatSet set(String name, Enum value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, int value) + public StatSet set(String name, int value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, long value) + public StatSet set(String name, long value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, String value) + public StatSet set(String name, String value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); @@ -89,7 +89,7 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, * @param markAsChanged * @return */ - public StatsSet set(String name, String value, boolean markAsChanged) + public StatSet set(String name, String value, boolean markAsChanged) { if (markAsChanged) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index 5c03122a62..4d97f0017a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExHeroList implements IClientOutgoingPacket { - private final Map _heroList; + private final Map _heroList; public ExHeroList() { @@ -42,7 +42,7 @@ public class ExHeroList implements IClientOutgoingPacket OutgoingPackets.EX_HERO_LIST.writeId(packet); packet.writeD(_heroList.size()); - for (StatsSet hero : _heroList.values()) + for (StatSet hero : _heroList.values()) { packet.writeS(hero.getString(Olympiad.CHAR_NAME)); packet.writeD(hero.getInt(Olympiad.CLASS_ID)); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/BypassParser.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/BypassParser.java index 414125bdeb..a80323ba1f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/BypassParser.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/BypassParser.java @@ -20,12 +20,12 @@ import java.util.LinkedHashMap; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid */ -public class BypassParser extends StatsSet +public class BypassParser extends StatSet { private static final String ALLOWED_CHARS = "a-zA-Z0-9-_`!@#%^&*()\\[\\]|\\\\/"; private static final Pattern PATTERN = Pattern.compile(String.format("([%s]*)=('([%s ]*)'|[%s]*)", ALLOWED_CHARS, ALLOWED_CHARS, ALLOWED_CHARS)); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index b837d839d8..d12c29d422 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -138,7 +138,7 @@ public class Antharas extends AbstractNpcAI addAttackId(ANTHARAS, BOMBER, BEHEMOTH, TERASQUE); addKillId(ANTHARAS, TERASQUE, BEHEMOTH); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANTHARAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANTHARAS); final double curr_hp = info.getDouble("currentHP"); final double curr_mp = info.getDouble("currentMP"); final int loc_x = info.getInt("loc_x"); @@ -761,7 +761,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(PlayerInstance attacker, int damage) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Baium/Baium.java index a1e8eb99d5..2686236add 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -112,7 +112,7 @@ public class Baium extends AbstractNpcAI addSeeCreatureId(BAIUM); addSpellFinishedId(BAIUM); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(BAIUM); + final StatSet info = GrandBossManager.getInstance().getStatSet(BAIUM); switch (getStatus()) { @@ -666,7 +666,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Core/Core.java index bfa7212b8c..c1452bf9de 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; @@ -85,7 +85,7 @@ public class Core extends AbstractNpcAI registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR); _firstAttacked = false; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. @@ -205,9 +205,9 @@ public class Core extends AbstractNpcAI final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000; startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(CORE, info); + GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index 38eebefc7b..5e525a6caa 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -92,7 +92,7 @@ public class Orfen extends AbstractNpcAI registerMobs(mobs); _IsTeleported = false; ZONE = ZoneManager.getInstance().getZoneById(12013); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); final int status = GrandBossManager.getInstance().getBossStatus(ORFEN); if (status == DEAD) { @@ -327,9 +327,9 @@ public class Orfen extends AbstractNpcAI respawnTime *= 3600000; startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(ORFEN, info); + GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); startQuestTimer("despawn_minions", 20000, null, null); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index c2564917c7..b9fdddaaf7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; @@ -91,7 +91,7 @@ public class QueenAnt extends AbstractNpcAI addFactionCallId(NURSE); _zone = ZoneManager.getInstance().getZoneById(12012); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); final int status = GrandBossManager.getInstance().getBossStatus(QUEEN); if (status == DEAD) { @@ -367,9 +367,9 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("action", npc, null); cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(QUEEN, info); + GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); _larva.deleteMe(); _larva = null; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java index 0964b5fd44..a322a608f2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java @@ -18,7 +18,7 @@ package ai.bosses.Zaken; import org.l2jmobius.Config; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -48,7 +48,7 @@ public class Zaken extends AbstractNpcAI { addKillId(ZAKEN); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ZAKEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN); final int status = GrandBossManager.getInstance().getBossStatus(ZAKEN); if (status == DEAD) { @@ -96,9 +96,9 @@ public class Zaken extends AbstractNpcAI final long respawnTime = (Config.ZAKEN_SPAWN_INTERVAL + getRandom(-Config.ZAKEN_SPAWN_RANDOM, Config.ZAKEN_SPAWN_RANDOM)) * 3600000; startQuestTimer("zaken_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ZAKEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(ZAKEN, info); + GrandBossManager.getInstance().setStatSet(ZAKEN, info); return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java index 25a584bdf9..1feccc805a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -101,7 +101,7 @@ public class CastleTeleporter extends AbstractNpcAI if (st.hasMoreTokens()) { final int unknowInt = Integer.parseInt(st.nextToken()); - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); Location teleLoc = null; switch (unknowInt) { @@ -191,7 +191,7 @@ public class CastleTeleporter extends AbstractNpcAI return htmltext; } - private Location getTeleportLocation(StatsSet npcParams, String paramName1, String paramName2, String paramName3) + private Location getTeleportLocation(StatSet npcParams, String paramName1, String paramName2, String paramName3) { final Location loc; if (getRandom(100) < 33) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java index f19f5dea69..c817501830 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java @@ -17,7 +17,7 @@ package ai.others.Servitors; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -52,7 +52,7 @@ public class TreeOfLife extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (player != null) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index d459bd2538..4f36bd6b51 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.zone.type.NoRestartZone; @@ -305,7 +305,7 @@ public class AdminGrandBoss implements IAdminCommandHandler } } - final StatsSet info = GrandBossManager.getInstance().getStatsSet(grandBossId); + final StatSet info = GrandBossManager.getInstance().getStatSet(grandBossId); final String bossRespawn = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(info.getLong("respawn_time")); final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java index f1109bf0e7..9489d8e1bb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java @@ -19,7 +19,7 @@ package handlers.admincommandhandlers; import java.util.StringTokenizer; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -114,7 +114,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.isNoble()) { - final StatsSet statDat = getPlayerSet(player); + final StatSet statDat = getPlayerSet(player); final int oldpoints = Olympiad.getInstance().getNoblePoints(player); final int points = Math.max(oldpoints + val, 0); if (points > 1000) @@ -155,7 +155,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.isNoble()) { - final StatsSet playerStat = Olympiad.getNobleStats(player.getObjectId()); + final StatSet playerStat = Olympiad.getNobleStats(player.getObjectId()); if (playerStat == null) { BuilderUtil.sendSysMessage(activeChar, "This player hasn't played on Olympiad yet!"); @@ -197,7 +197,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.isNoble()) { - final StatsSet statDat = getPlayerSet(player); + final StatSet statDat = getPlayerSet(player); final int oldpoints = Olympiad.getInstance().getNoblePoints(player); final int points = oldpoints - val; if ((points < 1) && (points > 1000)) @@ -237,12 +237,12 @@ public class AdminOlympiad implements IAdminCommandHandler return Integer.decode(token); } - private StatsSet getPlayerSet(PlayerInstance player) + private StatSet getPlayerSet(PlayerInstance player) { - StatsSet statDat = Olympiad.getNobleStats(player.getObjectId()); + StatSet statDat = Olympiad.getNobleStats(player.getObjectId()); if (statDat == null) { - statDat = new StatsSet(); + statDat = new StatSet(); statDat.set(Olympiad.CLASS_ID, player.getBaseClass()); statDat.set(Olympiad.CHAR_NAME, player.getName()); statDat.set(Olympiad.POINTS, Olympiad.DEFAULT_POINTS); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java index d8a3d6e5ce..6382651e6c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java @@ -19,7 +19,7 @@ package handlers.conditions; import java.util.List; import org.l2jmobius.gameserver.enums.CategoryType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -31,7 +31,7 @@ public class CategoryTypeCondition implements ICondition { private final List _categoryTypes; - public CategoryTypeCondition(StatsSet params) + public CategoryTypeCondition(StatSet params) { _categoryTypes = params.getEnumList("category", CategoryType.class); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java index b24cfa0f14..9a14cb6fa2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java @@ -16,7 +16,7 @@ */ package handlers.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -29,7 +29,7 @@ public class NpcLevelCondition implements ICondition private final int _minLevel; private final int _maxLevel; - public NpcLevelCondition(StatsSet params) + public NpcLevelCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java index afffe7a0c5..9e3deaa8ce 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java @@ -16,7 +16,7 @@ */ package handlers.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -29,7 +29,7 @@ public class PlayerLevelCondition implements ICondition private final int _minLevel; private final int _maxLevel; - public PlayerLevelCondition(StatsSet params) + public PlayerLevelCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 09f609dc37..0e81066579 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -32,7 +32,7 @@ public class AbnormalShield extends AbstractEffect { private final int _times; - public AbnormalShield(StatsSet params) + public AbnormalShield(StatSet params) { _times = params.getInt("times", -1); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 0496c9068d..9c508c8c52 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Objects; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class AbnormalTimeChange extends AbstractEffect private final int _time; private final int _mode; - public AbnormalTimeChange(StatsSet params) + public AbnormalTimeChange(StatSet params) { final String abnormals = params.getString("slot", null); if ((abnormals != null) && !abnormals.isEmpty()) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 98f85c7b21..3f9132b8e3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -37,7 +37,7 @@ public class AbsorbDamage extends AbstractEffect private final double _damage; private static final Map _damageHolder = new ConcurrentHashMap<>(); - public AbsorbDamage(StatsSet params) + public AbsorbDamage(StatSet params) { _damage = params.getDouble("damage", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 26f51d5351..86fef7cf6d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; @@ -38,7 +38,7 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect private final int _hpPercent; private final Map _updates = new ConcurrentHashMap<>(); - protected AbstractConditionalHpEffect(StatsSet params, Stat stat) + protected AbstractConditionalHpEffect(StatSet params, Stat stat) { super(params, stat); _hpPercent = params.getInt("hpPercent", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java index 2e40124e39..f010f84271 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AbstractStatAddEffect extends AbstractEffect private final Stat _stat; protected final double _amount; - public AbstractStatAddEffect(StatsSet params, Stat stat) + public AbstractStatAddEffect(StatSet params, Stat stat) { _stat = stat; _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index da6a575c44..29e439684b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; @@ -42,12 +42,12 @@ public abstract class AbstractStatEffect extends AbstractEffect protected final StatModifierType _mode; protected final List _conditions = new ArrayList<>(); - public AbstractStatEffect(StatsSet params, Stat stat) + public AbstractStatEffect(StatSet params, Stat stat) { this(params, stat, stat); } - public AbstractStatEffect(StatsSet params, Stat mulStat, Stat addStat) + public AbstractStatEffect(StatSet params, Stat mulStat, Stat addStat) { _addStat = addStat; _mulStat = mulStat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java index 9811f395aa..33d08bff36 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AbstractStatPercentEffect extends AbstractEffect private final Stat _stat; protected final double _amount; - public AbstractStatPercentEffect(StatsSet params, Stat stat) + public AbstractStatPercentEffect(StatSet params, Stat stat) { _stat = stat; _amount = params.getDouble("amount", 1); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java index 539814ef2a..79c022a23c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class Accuracy extends AbstractStatEffect { - public Accuracy(StatsSet params) + public Accuracy(StatSet params) { super(params, Stat.ACCURACY_COMBAT); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index 0c1fcbd92b..48d69968c5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddHate extends AbstractEffect private final double _power; private final boolean _affectSummoner; - public AddHate(StatsSet params) + public AddHate(StatSet params) { _power = params.getDouble("power", 0); _affectSummoner = params.getBoolean("affectSummoner", false); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java index 274699d44b..486b330824 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class AddHuntingTime extends AbstractEffect private final int _zoneId; private final long _time; - public AddHuntingTime(StatsSet params) + public AddHuntingTime(StatSet params) { _zoneId = params.getInt("zoneId", 0); _time = params.getLong("time", 3600000); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java index e90d5cc7f3..324927947a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddSkillBySkill extends AbstractEffect private final int _existingSkillLevel; private final SkillHolder _addedSkill; - public AddSkillBySkill(StatsSet params) + public AddSkillBySkill(StatSet params) { _existingSkillId = params.getInt("existingSkillId"); _existingSkillLevel = params.getInt("existingSkillLevel"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index bdd8314dd7..205bc82200 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddTeleportBookmarkSlot extends AbstractEffect { private final int _amount; - public AddTeleportBookmarkSlot(StatsSet params) + public AddTeleportBookmarkSlot(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java index c26ec5442f..658931ecb2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionCp extends AbstractStatAddEffect { - public AdditionalPotionCp(StatsSet params) + public AdditionalPotionCp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_CP); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java index 6b68e40f32..57d54c7d3b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionHp extends AbstractStatAddEffect { - public AdditionalPotionHp(StatsSet params) + public AdditionalPotionHp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_HP); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java index c9e1cc237e..007547ebe7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionMp extends AbstractStatAddEffect { - public AdditionalPotionMp(StatsSet params) + public AdditionalPotionMp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_MP); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AgathionSlot.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AgathionSlot.java index 2d2a3cf6df..b8a91b683f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AgathionSlot.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AgathionSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AgathionSlot extends AbstractStatAddEffect { - public AgathionSlot(StatsSet params) + public AgathionSlot(StatSet params) { super(params, Stat.AGATHION_SLOTS); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java index f5cbb63465..9255ba1877 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AreaDamage extends AbstractStatAddEffect { - public AreaDamage(StatsSet params) + public AreaDamage(StatSet params) { super(params, Stat.DAMAGE_ZONE_VULN); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ArtifactSlot.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ArtifactSlot.java index 150e53d14e..0c146fc6a3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ArtifactSlot.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ArtifactSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ArtifactSlot extends AbstractStatAddEffect { - public ArtifactSlot(StatsSet params) + public ArtifactSlot(StatSet params) { super(params, Stat.ARTIFACT_SLOTS); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java index 2ded14e7ae..a5d56477f5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AttackAttribute extends AbstractEffect private final AttributeType _attribute; private final double _amount; - public AttackAttribute(StatsSet params) + public AttackAttribute(StatSet params) { _amount = params.getDouble("amount", 0); _attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java index ff58d09cc7..795366850d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class AttackAttributeAdd extends AbstractEffect { private final double _amount; - public AttackAttributeAdd(StatsSet params) + public AttackAttributeAdd(StatSet params) { _amount = params.getDouble("amount", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java index 37bfbf341a..fcd2b48c99 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class AttackBehind extends AbstractEffect { - public AttackBehind(StatsSet params) + public AttackBehind(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index 062c325a55..4136f5d530 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class AttackTrait extends AbstractEffect { private final Map _attackTraits = new EnumMap<>(TraitType.class); - public AttackTrait(StatsSet params) + public AttackTrait(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 02d6a8d78c..8ac42d45c3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -37,7 +37,7 @@ public class Backstab extends AbstractEffect private final double _criticalChance; private final boolean _overHit; - public Backstab(StatsSet params) + public Backstab(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Betray.java index 32e3c65c55..79e8bd3360 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Betray extends AbstractEffect { - public Betray(StatsSet params) + public Betray(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Blink.java index ba1caed6ac..56d3f628fd 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -52,7 +52,7 @@ public class Blink extends AbstractEffect private final int _flyDelay; private final int _animationSpeed; - public Blink(StatsSet params) + public Blink(StatSet params) { _flyCourse = params.getInt("angle", 0); _flyRadius = params.getInt("range", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 8677f72407..596d4b752f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; */ public class BlinkSwap extends AbstractEffect { - public BlinkSwap(StatsSet params) + public BlinkSwap(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 7bec602aef..cea12039d2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -20,7 +20,7 @@ import java.util.Arrays; import java.util.Set; import java.util.stream.Collectors; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class BlockAbnormalSlot extends AbstractEffect { private final Set _blockAbnormalSlots; - public BlockAbnormalSlot(StatsSet params) + public BlockAbnormalSlot(StatSet params) { _blockAbnormalSlots = Arrays.stream(params.getString("slot").split(";")).map(slot -> Enum.valueOf(AbnormalType.class, slot)).collect(Collectors.toSet()); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index b4839ab322..348881f970 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -21,7 +21,7 @@ import java.util.Set; import org.l2jmobius.gameserver.datatables.BotReportTable; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class BlockAction extends AbstractEffect { private final Set _blockedActions = new HashSet<>(); - public BlockAction(StatsSet params) + public BlockAction(StatSet params) { final String[] actions = params.getString("blockedActions").split(","); for (String action : actions) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index 68f6586e3e..635d2735f9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -22,7 +22,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class BlockActions extends AbstractEffect { private final Set _allowedSkills; - public BlockActions(StatsSet params) + public BlockActions(StatSet params) { final String[] allowedSkills = params.getString("allowedSkills", "").split(";"); _allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 99af987208..3502d140d0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockChat extends AbstractEffect { - public BlockChat(StatsSet params) + public BlockChat(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java index 6160114414..a2b084c918 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; */ public class BlockControl extends AbstractEffect { - public BlockControl(StatsSet params) + public BlockControl(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java index 3d96329b6d..69b390ae8f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BlockEscape extends AbstractEffect { - public BlockEscape(StatsSet params) + public BlockEscape(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index 8bbd7ac018..85d89180e7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockMove extends AbstractEffect { - public BlockMove(StatsSet params) + public BlockMove(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index 316f82f855..9e28fc403a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockParty extends AbstractEffect { - public BlockParty(StatsSet params) + public BlockParty(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java index ae2ac8b035..d3235fc34f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BlockResurrection extends AbstractEffect { - public BlockResurrection(StatsSet params) + public BlockResurrection(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index f7f119691f..f2cc65b782 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -35,7 +35,7 @@ public class BlockSkill extends AbstractEffect { private final int[] _magicTypes; - public BlockSkill(StatsSet params) + public BlockSkill(StatSet params) { _magicTypes = params.getIntArray("magicTypes", ";"); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index d9b3d3a34d..9f0b7143d2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockTarget extends AbstractEffect { - public BlockTarget(StatsSet params) + public BlockTarget(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index bc4cbd6320..bef60ad003 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class Bluff extends AbstractEffect { private final int _chance; - public Bluff(StatsSet params) + public Bluff(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java index 2ace40a596..69583d613b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusDropAmount extends AbstractStatPercentEffect { - public BonusDropAmount(StatsSet params) + public BonusDropAmount(StatSet params) { super(params, Stat.BONUS_DROP_AMOUNT); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java index b81560b040..e63c8f79f4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusDropRate extends AbstractStatPercentEffect { - public BonusDropRate(StatsSet params) + public BonusDropRate(StatSet params) { super(params, Stat.BONUS_DROP_RATE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java index b984404cb2..e0fb54b162 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusSpoilRate extends AbstractStatPercentEffect { - public BonusSpoilRate(StatsSet params) + public BonusSpoilRate(StatSet params) { super(params, Stat.BONUS_SPOIL_RATE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Breath.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Breath.java index 859f341f3c..4235319f22 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Breath.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Breath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class Breath extends AbstractStatEffect { - public Breath(StatsSet params) + public Breath(StatSet params) { super(params, Stat.BREATH); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java index a6d25f3c36..4102506e6c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BuffBlock extends AbstractEffect { - public BuffBlock(StatsSet params) + public BuffBlock(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index de7497f8bf..4f470b06c7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class CallLearnedSkill extends AbstractEffect { private final int _skillId; - public CallLearnedSkill(StatsSet params) + public CallLearnedSkill(StatSet params) { _skillId = params.getInt("skillId"); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index e6096be4be..b41daf073c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CallParty extends AbstractEffect { - public CallParty(StatsSet params) + public CallParty(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index f6e51392b7..f425c6030f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class CallPc extends AbstractEffect private final int _itemId; private final int _itemCount; - public CallPc(StatsSet params) + public CallPc(StatSet params) { _itemId = params.getInt("itemId", 0); _itemCount = params.getInt("itemCount", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index d6d5cb721d..0da3802665 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -35,7 +35,7 @@ public class CallRandomSkill extends AbstractEffect { private final List _skills = new ArrayList<>(); - public CallRandomSkill(StatsSet params) + public CallRandomSkill(StatSet params) { final String skills = params.getString("skills", null); if (skills != null) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index 99c1494223..f8e4b226c4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -35,7 +35,7 @@ public class CallSkill extends AbstractEffect private final SkillHolder _skill; private final int _skillLevelScaleTo; - public CallSkill(StatsSet params) + public CallSkill(StatSet params) { _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0)); _skillLevelScaleTo = params.getInt("skillLevelScaleTo", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index cec2706e81..4a18b31781 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.Collections; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ public class CallSkillOnActionTime extends AbstractEffect { private final SkillHolder _skill; - public CallSkillOnActionTime(StatsSet params) + public CallSkillOnActionTime(StatSet params) { _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0)); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index 6d5d7eacfc..3d2d03151f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CallTargetParty extends AbstractEffect { - public CallTargetParty(StatsSet params) + public CallTargetParty(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index ef01f4a8ed..d4331bf5b7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ public class ChameleonRest extends AbstractEffect { private final double _power; - public ChameleonRest(StatsSet params) + public ChameleonRest(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index e3b846674d..37054f2fd0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; @@ -35,9 +35,9 @@ public class ChangeBody extends AbstractEffect { private final Set _transformations = new HashSet<>(); - public ChangeBody(StatsSet params) + public ChangeBody(StatSet params) { - for (StatsSet item : params.getList("templates", StatsSet.class)) + for (StatSet item : params.getList("templates", StatSet.class)) { _transformations.add(new TemplateChanceHolder(item.getInt(".templateId"), item.getInt(".minChance"), item.getInt(".maxChance"))); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 76c6e03aa6..6b6386909e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeFace extends AbstractEffect { private final int _value; - public ChangeFace(StatsSet params) + public ChangeFace(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java index cee3ac1a6f..304afa821c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; /** @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; */ public class ChangeFishingMastery extends AbstractEffect { - public ChangeFishingMastery(StatsSet params) + public ChangeFishingMastery(StatSet params) { } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index 0c583cbc13..64ac49f5d5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeHairColor extends AbstractEffect { private final int _value; - public ChangeHairColor(StatsSet params) + public ChangeHairColor(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index ad2efbe6a0..ae7d6c6da1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeHairStyle extends AbstractEffect { private final int _value; - public ChangeHairStyle(StatsSet params) + public ChangeHairStyle(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java index 2d536029fd..4d7c380c75 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class CheapShot extends AbstractEffect { - public CheapShot(StatsSet params) + public CheapShot(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index 5fa3df1676..0215ff6a5b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.SubclassInfoType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class ClassChange extends AbstractEffect private final int _index; private static final int IDENTITY_CRISIS_SKILL_ID = 1570; - public ClassChange(StatsSet params) + public ClassChange(StatSet params) { _index = params.getInt("index", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index ccf7598eff..e184022afc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.stats.Formulas; */ public class Compelling extends AbstractEffect { - public Compelling(StatsSet params) + public Compelling(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index b6aa30f604..f164ac6f3f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class Confuse extends AbstractEffect { private final int _chance; - public Confuse(StatsSet params) + public Confuse(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 25e29532eb..78293c1b0f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ConsumeBody extends AbstractEffect { - public ConsumeBody(StatsSet params) + public ConsumeBody(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 0cf786c656..da47135afd 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class ConvertItem extends AbstractEffect { - public ConvertItem(StatsSet params) + public ConvertItem(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java index 9402fdb06d..857df659c0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CounterPhysicalSkill extends AbstractStatAddEffect { - public CounterPhysicalSkill(StatsSet params) + public CounterPhysicalSkill(StatSet params) { super(params, Stat.VENGEANCE_SKILL_PHYSICAL_DAMAGE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 67bca7fd1b..598682037b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Cp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Cp(StatsSet params) + public Cp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index e0cd52808e..37303b0e7a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class CpHeal extends AbstractEffect { private final double _power; - public CpHeal(StatsSet params) + public CpHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index e2e8ee3479..54de5adfc6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class CpHealOverTime extends AbstractEffect { private final double _power; - public CpHealOverTime(StatsSet params) + public CpHealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index 5665e937dc..b4a994d6df 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CpHealPercent extends AbstractEffect { private final double _power; - public CpHealPercent(StatsSet params) + public CpHealPercent(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java index 1cc851b2af..efb020bbd5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CpRegen extends AbstractStatEffect { - public CpRegen(StatsSet params) + public CpRegen(StatSet params) { super(params, Stat.REGENERATE_CP_RATE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java index 8983497026..0b93eef45e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CriticalDamage extends AbstractStatEffect { - public CriticalDamage(StatsSet params) + public CriticalDamage(StatSet params) { super(params, Stat.CRITICAL_DAMAGE, Stat.CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 7ef4f0ecb4..0630f087b7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.Position; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CriticalDamagePosition extends AbstractEffect private final double _amount; private final Position _position; - public CriticalDamagePosition(StatsSet params) + public CriticalDamagePosition(StatSet params) { _amount = params.getDouble("amount", 0); _position = params.getEnum("position", Position.class, Position.FRONT); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java index 01f49380eb..0d4bded60e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; public class CriticalRate extends AbstractConditionalHpEffect { - public CriticalRate(StatsSet params) + public CriticalRate(StatSet params) { super(params, Stat.CRITICAL_RATE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 863b385ca3..4d65fa84eb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.Position; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CriticalRatePositionBonus extends AbstractEffect private final double _amount; private final Position _position; - public CriticalRatePositionBonus(StatsSet params) + public CriticalRatePositionBonus(StatSet params) { _amount = params.getDouble("amount", 0); _position = params.getEnum("position", Position.class, Position.FRONT); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java index 94ff8e64e2..79ee5b994e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CubicMastery extends AbstractStatAddEffect { - public CubicMastery(StatsSet params) + public CubicMastery(StatSet params) { super(params, Stat.MAX_CUBIC); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index 36abf0accf..e6bb53fdea 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class DamOverTime extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTime(StatsSet params) + public DamOverTime(StatSet params) { _canKill = params.getBoolean("canKill", false); _power = params.getDouble("power"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 13e57099e0..b5f25db4d8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class DamOverTimePercent extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTimePercent(StatsSet params) + public DamOverTimePercent(StatSet params) { _canKill = params.getBoolean("canKill", false); _power = params.getDouble("power"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java index dc7a45198f..c9567ea034 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ public class DamageBlock extends AbstractEffect private final boolean _blockHp; private final boolean _blockMp; - public DamageBlock(StatsSet params) + public DamageBlock(StatSet params) { final String type = params.getString("type", null); _blockHp = type.equalsIgnoreCase("BLOCK_HP"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java index 5bc9b5fff8..3d8985d1d8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DamageByAttackType; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -38,7 +38,7 @@ public class DamageByAttack extends AbstractEffect private final double _value; private final DamageByAttackType _type; - public DamageByAttack(StatsSet params) + public DamageByAttack(StatSet params) { _value = params.getDouble("amount"); _type = params.getEnum("type", DamageByAttackType.class, DamageByAttackType.NONE); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java index 5a7629482a..e823a9824a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DamageShield extends AbstractStatAddEffect { - public DamageShield(StatsSet params) + public DamageShield(StatSet params) { super(params, Stat.REFLECT_DAMAGE_PERCENT); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java index db1abe264d..3029a3f0aa 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DamageShieldResist extends AbstractStatAddEffect { - public DamageShieldResist(StatsSet params) + public DamageShieldResist(StatSet params) { super(params, Stat.REFLECT_DAMAGE_PERCENT_DEFENSE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index 8561ff46b0..369bd5483d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class DeathLink extends AbstractEffect { private final double _power; - public DeathLink(StatsSet params) + public DeathLink(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java index b948fad1fc..54261c6229 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class DebuffBlock extends AbstractEffect { - public DebuffBlock(StatsSet params) + public DebuffBlock(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java index 217ef3dfaa..4bc08271fa 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class DefenceAttribute extends AbstractEffect private final AttributeType _attribute; private final double _amount; - public DefenceAttribute(StatsSet params) + public DefenceAttribute(StatSet params) { _amount = params.getDouble("amount", 0); _attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java index 0c0c2e8d6a..daff53d9e1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceCriticalDamage extends AbstractStatEffect { - public DefenceCriticalDamage(StatsSet params) + public DefenceCriticalDamage(StatSet params) { super(params, Stat.DEFENCE_CRITICAL_DAMAGE, Stat.DEFENCE_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java index 131eb500ea..74a729e38c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceCriticalRate extends AbstractStatEffect { - public DefenceCriticalRate(StatsSet params) + public DefenceCriticalRate(StatSet params) { super(params, Stat.DEFENCE_CRITICAL_RATE, Stat.DEFENCE_CRITICAL_RATE_ADD); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java index 1abee78e08..c664939977 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceMagicCriticalDamage extends AbstractStatEffect { - public DefenceMagicCriticalDamage(StatsSet params) + public DefenceMagicCriticalDamage(StatSet params) { super(params, Stat.DEFENCE_MAGIC_CRITICAL_DAMAGE, Stat.DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java index 2146b89551..6594dda2b3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceMagicCriticalRate extends AbstractStatEffect { - public DefenceMagicCriticalRate(StatsSet params) + public DefenceMagicCriticalRate(StatSet params) { super(params, Stat.DEFENCE_MAGIC_CRITICAL_RATE, Stat.DEFENCE_MAGIC_CRITICAL_RATE_ADD); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index bd80f690cd..134ed56979 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class DefenceTrait extends AbstractEffect { private final Map _defenceTraits = new EnumMap<>(TraitType.class); - public DefenceTrait(StatsSet params) + public DefenceTrait(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index bab5e1a762..7cee616006 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class DeleteHate extends AbstractEffect { private final int _chance; - public DeleteHate(StatsSet params) + public DeleteHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index 85985653b8..f10f189e68 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class DeleteHateOfMe extends AbstractEffect { private final int _chance; - public DeleteHateOfMe(StatsSet params) + public DeleteHateOfMe(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index d3664ad00f..82833ac79d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class DeleteTopAgro extends AbstractEffect { private final int _chance; - public DeleteTopAgro(StatsSet params) + public DeleteTopAgro(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index ae1f2a5942..ba6dad4698 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DoorOpenType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DetectHiddenObjects extends AbstractEffect { - public DetectHiddenObjects(StatsSet params) + public DetectHiddenObjects(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Detection.java index 078360ff35..a20cbcb348 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Detection extends AbstractEffect { - public Detection(StatsSet params) + public Detection(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 8567a94d12..32ee715df7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DisableTargeting extends AbstractEffect { - public DisableTargeting(StatsSet params) + public DisableTargeting(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index fa06ec7221..5a80971f51 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Disarm extends AbstractEffect { - public Disarm(StatsSet params) + public Disarm(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index 7cf0889b57..95d32dd083 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class Disarmor extends AbstractEffect private final Map _unequippedItems; // PlayerObjId, ItemObjId private final long _slot; - public Disarmor(StatsSet params) + public Disarmor(StatSet params) { _unequippedItems = new ConcurrentHashMap<>(); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 95de0300bb..a652a023f5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DispelAll extends AbstractEffect { - public DispelAll(StatsSet params) + public DispelAll(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 88d979a0d9..040271d2a7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.List; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -38,7 +38,7 @@ public class DispelByCategory extends AbstractEffect private final int _rate; private final int _max; - public DispelByCategory(StatsSet params) + public DispelByCategory(StatSet params) { _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); _rate = params.getInt("rate", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index a6e4c7cd19..ab79e046b2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.EnumMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -37,7 +37,7 @@ public class DispelBySlot extends AbstractEffect private final String _dispel; private final Map _dispelAbnormals; - public DispelBySlot(StatsSet params) + public DispelBySlot(StatSet params) { _dispel = params.getString("dispel"); if ((_dispel != null) && !_dispel.isEmpty()) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 1ba6612e23..d1341d10b9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class DispelBySlotMyself extends AbstractEffect { private final Set _dispelAbnormals; - public DispelBySlotMyself(StatsSet params) + public DispelBySlotMyself(StatSet params) { final String dispel = params.getString("dispel"); if ((dispel != null) && !dispel.isEmpty()) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 845980e59d..b58723058e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -37,7 +37,7 @@ public class DispelBySlotProbability extends AbstractEffect private final Set _dispelAbnormals; private final int _rate; - public DispelBySlotProbability(StatsSet params) + public DispelBySlotProbability(StatSet params) { final String[] dispelEffects = params.getString("dispel").split(";"); _rate = params.getInt("rate", 100); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index 7acd9c4a6c..688d77a703 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -45,7 +45,7 @@ public class DoubleCast extends AbstractEffect private final Map> _addedToggles; - public DoubleCast(StatsSet params) + public DoubleCast(StatSet params) { _addedToggles = new HashMap<>(); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java index d7f067a2a0..d1e21edeb0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DuelistFury extends AbstractEffect { - public DuelistFury(StatsSet params) + public DuelistFury(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ElementalSpiritAttack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ElementalSpiritAttack.java index b069c26601..347affa72f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ElementalSpiritAttack.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ElementalSpiritAttack.java @@ -17,14 +17,14 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ElementalType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author JoeAlisson */ public class ElementalSpiritAttack extends AbstractStatEffect { - public ElementalSpiritAttack(StatsSet params) + public ElementalSpiritAttack(StatSet params) { super(params, params.getEnum("type", ElementalType.class).getAttackStat()); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ElementalSpiritDefense.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ElementalSpiritDefense.java index 4d270b97a6..fe74e7a709 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ElementalSpiritDefense.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ElementalSpiritDefense.java @@ -17,14 +17,14 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ElementalType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author JoeAlisson */ public class ElementalSpiritDefense extends AbstractStatEffect { - public ElementalSpiritDefense(StatsSet params) + public ElementalSpiritDefense(StatSet params) { super(params, params.getEnum("type", ElementalType.class).getDefenseStat()); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index 409fed6a23..de397bb5ff 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class EnableCloak extends AbstractEffect { - public EnableCloak(StatsSet params) + public EnableCloak(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index e855c4ba1a..2fe2bef99f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -43,7 +43,7 @@ public class EnergyAttack extends AbstractEffect private final boolean _overHit; private final double _pDefMod; - public EnergyAttack(StatsSet params) + public EnergyAttack(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getInt("criticalChance", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index a8f108573f..ae463ef2a4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class EnlargeAbnormalSlot extends AbstractEffect { private final int _slots; - public EnlargeAbnormalSlot(StatsSet params) + public EnlargeAbnormalSlot(StatSet params) { _slots = params.getInt("slots", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java index c43ea04413..c4073b1a47 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StorageType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class EnlargeSlot extends AbstractEffect private final StorageType _type; private final double _amount; - public EnlargeSlot(StatsSet params) + public EnlargeSlot(StatSet params) { _amount = params.getDouble("amount", 0); _type = params.getEnum("type", StorageType.class, StorageType.INVENTORY_NORMAL); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Escape.java index 936f82d8ce..f3a07c9d15 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class Escape extends AbstractEffect { private final TeleportWhereType _escapeType; - public Escape(StatsSet params) + public Escape(StatSet params) { _escapeType = params.getEnum("escapeType", TeleportWhereType.class, null); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java index 76dbc8171c..eb68d24af8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ExpModify extends AbstractStatAddEffect { - public ExpModify(StatsSet params) + public ExpModify(StatSet params) { super(params, Stat.BONUS_EXP); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java index bf11db6e4b..1100ca25be 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Faceoff extends AbstractEffect { - public Faceoff(StatsSet params) + public Faceoff(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index e256209e39..79f7b43503 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -34,7 +34,7 @@ public class FakeDeath extends AbstractEffect { private final double _power; - public FakeDeath(StatsSet params) + public FakeDeath(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index a94c75d310..780d5cefba 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -44,7 +44,7 @@ public class FatalBlow extends AbstractEffect private final double _abnormalPower; private final boolean _overHit; - public FatalBlow(StatsSet params) + public FatalBlow(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java index c8ff8f7acb..6e7597e63d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class FatalBlowRate extends AbstractEffect private final double _amount; private final StatModifierType _mode; - public FatalBlowRate(StatsSet params) + public FatalBlowRate(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 9731e75e5d..ec2659ea2c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DefenderInstance; import org.l2jmobius.gameserver.model.actor.instance.FortCommanderInstance; @@ -40,7 +40,7 @@ public class Fear extends AbstractEffect { private static final int FEAR_RANGE = 500; - public Fear(StatsSet params) + public Fear(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 5e04e46d60..94d9912bdf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.MountType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ public class Feed extends AbstractEffect private final int _ride; private final int _wyvern; - public Feed(StatsSet params) + public Feed(StatSet params) { _normal = params.getInt("normal", 0); _ride = params.getInt("ride", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java index d61a1dd277..c2ed4e3af5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class FishingExpSpBonus extends AbstractStatPercentEffect { - public FishingExpSpBonus(StatsSet params) + public FishingExpSpBonus(StatSet params) { super(params, Stat.FISHING_EXP_SP_BONUS); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Flag.java index c1469eab19..2442cbdb35 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Flag extends AbstractEffect { - public Flag(StatsSet params) + public Flag(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index 0243f0f543..74a9754a95 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.BlockInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class FlipBlock extends AbstractEffect { - public FlipBlock(StatsSet params) + public FlipBlock(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 7fc7da5fe6..3412e4d36d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class FlyAway extends AbstractEffect { private final int _radius; - public FlyAway(StatsSet params) + public FlyAway(StatSet params) { _radius = params.getInt("radius"); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java index fd3216286d..590fbbcd44 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class FocusEnergy extends AbstractStatAddEffect { - public FocusEnergy(StatsSet params) + public FocusEnergy(StatSet params) { super(params, Stat.MAX_MOMENTUM); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index efbd93f304..19f0163e42 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class FocusMaxMomentum extends AbstractEffect { - public FocusMaxMomentum(StatsSet params) + public FocusMaxMomentum(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index 284d19ee5f..e8c18e9682 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -36,7 +36,7 @@ public class FocusMomentum extends AbstractEffect private final int _amount; private final int _maxCharges; - public FocusMomentum(StatsSet params) + public FocusMomentum(StatSet params) { _amount = params.getInt("amount", 1); _maxCharges = params.getInt("maxCharges", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 18a9864bbc..debd491cfe 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class FocusSouls extends AbstractEffect { private final int _charge; - public FocusSouls(StatsSet params) + public FocusSouls(StatSet params) { _charge = params.getInt("charge", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 8540ccd49c..23328db910 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Set; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class GetAgro extends AbstractEffect { - public GetAgro(StatsSet params) + public GetAgro(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java index 1ca8722709..e91002d04b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class GetDamageLimit extends AbstractStatAddEffect { - public GetDamageLimit(StatsSet params) + public GetDamageLimit(StatSet params) { super(params, Stat.DAMAGE_LIMIT); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 2dfd3bf8c4..439f3e8e3a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class GetMomentum extends AbstractEffect { private static int _ticks; - public GetMomentum(StatsSet params) + public GetMomentum(StatSet params) { _ticks = params.getInt("ticks", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index 7c1c0f3fa2..2c842101ed 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class GiveClanReputation extends AbstractEffect { private final int _reputation; - public GiveClanReputation(StatsSet params) + public GiveClanReputation(StatSet params) { _reputation = params.getInt("reputation", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index fd4d61fa73..9052c63154 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class GiveExpAndSp extends AbstractEffect private final int _xp; private final int _sp; - public GiveExpAndSp(StatsSet params) + public GiveExpAndSp(StatSet params) { _xp = params.getInt("xp", 0); _sp = params.getInt("sp", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index 3448e09797..9d41a4395b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ public class GiveFame extends AbstractEffect { private final int _fame; - public GiveFame(StatsSet params) + public GiveFame(StatSet params) { _fame = params.getInt("fame", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index c948fa0948..617a8ef88a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class GiveRecommendation extends AbstractEffect { private final int _amount; - public GiveRecommendation(StatsSet params) + public GiveRecommendation(StatSet params) { _amount = params.getInt("amount", 0); if (_amount == 0) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index 5fe06566c7..75a16fe828 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class GiveSp extends AbstractEffect { private final int _sp; - public GiveSp(StatsSet params) + public GiveSp(StatSet params) { _sp = params.getInt("sp", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index 5b1a04c165..ae7248c500 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class GiveXp extends AbstractEffect { private final int _xp; - public GiveXp(StatsSet params) + public GiveXp(StatSet params) { _xp = params.getInt("xp", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 17095c209a..5cf4994f32 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Grow extends AbstractEffect { - public Grow(StatsSet params) + public Grow(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index a2200e1a2f..350c8e659f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.UserInfoType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class HairAccessorySet extends AbstractEffect { - public HairAccessorySet(StatsSet params) + public HairAccessorySet(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index f881ed5027..1654fc650c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Harvesting extends AbstractEffect { - public Harvesting(StatsSet params) + public Harvesting(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java index ac1c9f49d8..097db6604a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HateAttack extends AbstractStatPercentEffect { - public HateAttack(StatsSet params) + public HateAttack(StatSet params) { super(params, Stat.HATE_ATTACK); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index 00f569eb17..9963ff1336 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlagInstance; @@ -34,7 +34,7 @@ public class HeadquarterCreate extends AbstractEffect private static final int HQ_NPC_ID = 35062; private final boolean _isAdvanced; - public HeadquarterCreate(StatsSet params) + public HeadquarterCreate(StatSet params) { _isAdvanced = params.getBoolean("isAdvanced", false); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Heal.java index de11d77e47..699942a5e8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -41,7 +41,7 @@ public class Heal extends AbstractEffect { private final double _power; - public Heal(StatsSet params) + public Heal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java index 5a7457d3df..a9f75ab036 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HealEffect extends AbstractStatEffect { - public HealEffect(StatsSet params) + public HealEffect(StatSet params) { super(params, Stat.HEAL_EFFECT, Stat.HEAL_EFFECT_ADD); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index d4722e5e4f..93c9a6f1a3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class HealOverTime extends AbstractEffect { private final double _power; - public HealOverTime(StatsSet params) + public HealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index 156f6959c3..69001ac255 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class HealPercent extends AbstractEffect { private final int _power; - public HealPercent(StatsSet params) + public HealPercent(StatSet params) { _power = params.getInt("power", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Hide.java index e431277964..d02898bac5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Hide extends AbstractEffect { - public Hide(StatsSet params) + public Hide(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index e7e5f3f91b..78fa1c9392 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.GameTimeController; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HitAtNight extends AbstractStatEffect { - public HitAtNight(StatsSet params) + public HitAtNight(StatSet params) { super(params, Stat.HIT_AT_NIGHT); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java index 1fd98e7aa9..f14b922308 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HitNumber extends AbstractStatEffect { - public HitNumber(StatsSet params) + public HitNumber(StatSet params) { super(params, Stat.ATTACK_COUNT_MAX); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 0e8d7406b7..f30972bfd9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -36,7 +36,7 @@ public class Hp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Hp(StatsSet params) + public Hp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index 3d125565fe..6244c76428 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class HpByLevel extends AbstractEffect { private final double _power; - public HpByLevel(StatsSet params) + public HpByLevel(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index f9d9d0beeb..af3726c17f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -40,7 +40,7 @@ public class HpCpHeal extends AbstractEffect { private final double _power; - public HpCpHeal(StatsSet params) + public HpCpHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java index 0394dab996..6f96c2dcb3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class HpCpHealCritical extends AbstractEffect { - public HpCpHealCritical(StatsSet params) + public HpCpHealCritical(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 554b1cec79..7cf47c3a65 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class HpDrain extends AbstractEffect private final double _power; private final double _percentage; - public HpDrain(StatsSet params) + public HpDrain(StatSet params) { _power = params.getDouble("power", 0); _percentage = params.getDouble("percentage", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java index cb1d2bc3a7..b170bc62ba 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HpRegen extends AbstractStatEffect { - public HpRegen(StatsSet params) + public HpRegen(StatSet params) { super(params, Stat.REGENERATE_HP_RATE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 235e89a79b..f346fbaad8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class HpToOwner extends AbstractEffect private final double _power; private final int _stealAmount; - public HpToOwner(StatsSet params) + public HpToOwner(StatSet params) { _power = params.getDouble("power"); _stealAmount = params.getInt("stealAmount"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java index 9829519da9..c659684ae8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class IgnoreDeath extends AbstractEffect { - public IgnoreDeath(StatsSet params) + public IgnoreDeath(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index f7c9baa155..44dceba10e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ImmobilePetBuff extends AbstractEffect { - public ImmobilePetBuff(StatsSet params) + public ImmobilePetBuff(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java index a60fc45d15..a03eff933a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ public class InstantKillResist extends AbstractEffect { private final int _amount; - public InstantKillResist(StatsSet params) + public InstantKillResist(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java index 7e1fc8abe4..265a9aab97 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class JewelSlot extends AbstractStatAddEffect { - public JewelSlot(StatsSet params) + public JewelSlot(StatSet params) { super(params, Stat.BROOCH_JEWELS); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 3d5ff2dda3..a34d7cc5b3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class KarmaCount extends AbstractEffect private final int _amount; private final int _mode; - public KarmaCount(StatsSet params) + public KarmaCount(StatSet params) { _amount = params.getInt("amount", 0); switch (params.getString("mode", "DIFF")) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index dd58d33685..3af09931f8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -45,7 +45,7 @@ public class KnockBack extends AbstractEffect private final boolean _knockDown; private final FlyType _type; - public KnockBack(StatsSet params) + public KnockBack(StatSet params) { _distance = params.getInt("distance", 50); _speed = params.getInt("speed", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index 7bfac989cf..1affb1b141 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -38,7 +38,7 @@ public class Lethal extends AbstractEffect private final double _fullLethal; private final double _halfLethal; - public Lethal(StatsSet params) + public Lethal(StatSet params) { _fullLethal = params.getDouble("fullLethal", 0); _halfLethal = params.getDouble("halfLethal", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java index aeb42458a6..43b17877ad 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitCp extends AbstractStatEffect { - public LimitCp(StatsSet params) + public LimitCp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_CP); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java index cf76ec482a..45d8f37355 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitHp extends AbstractStatEffect { - public LimitHp(StatsSet params) + public LimitHp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_HP); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java index f5eda36ba6..8d31633d0a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitMp extends AbstractStatEffect { - public LimitMp(StatsSet params) + public LimitMp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_MP); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Lucky.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Lucky.java index 3775d2361d..4ff5ea9a01 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Lucky.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Lucky.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Lucky extends AbstractEffect { - public Lucky(StatsSet params) + public Lucky(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MAtk.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MAtk.java index 5f9ad5f32b..38c2fc9067 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MAtk.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MAtk.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MAtk extends AbstractStatEffect { - public MAtk(StatsSet params) + public MAtk(StatSet params) { super(params, Stat.MAGIC_ATTACK); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MAtkByPAtk.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MAtkByPAtk.java index d17cdb9b91..87d75d096c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MAtkByPAtk.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MAtkByPAtk.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MAtkByPAtk extends AbstractStatPercentEffect { - public MAtkByPAtk(StatsSet params) + public MAtkByPAtk(StatSet params) { super(params, Stat.MAGIC_ATTACK_BY_PHYSICAL_ATTACK); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java index 2b9ae2e9e6..393d0d2d30 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicAccuracy extends AbstractStatEffect { - public MagicAccuracy(StatsSet params) + public MagicAccuracy(StatSet params) { super(params, Stat.ACCURACY_MAGIC); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java index 123706eb55..b9a58b09f3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicCriticalDamage extends AbstractStatEffect { - public MagicCriticalDamage(StatsSet params) + public MagicCriticalDamage(StatSet params) { super(params, Stat.MAGIC_CRITICAL_DAMAGE, Stat.MAGIC_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java index 0c10014e50..c9fa9a4240 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicCriticalRate extends AbstractStatEffect { - public MagicCriticalRate(StatsSet params) + public MagicCriticalRate(StatSet params) { super(params, Stat.MAGIC_CRITICAL_RATE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRateByCriticalRate.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRateByCriticalRate.java index 58e5f7d8ed..8be85daebc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRateByCriticalRate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRateByCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicCriticalRateByCriticalRate extends AbstractStatPercentEffect { - public MagicCriticalRateByCriticalRate(StatsSet params) + public MagicCriticalRateByCriticalRate(StatSet params) { super(params, Stat.MAGIC_CRITICAL_RATE_BY_CRITICAL_RATE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index e8b6f5e8bf..5281bf8445 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class MagicMpCost extends AbstractEffect private final int _magicType; private final double _amount; - public MagicMpCost(StatsSet params) + public MagicMpCost(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index ed4a3fca8b..283a99176c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class MagicalAbnormalDispelAttack extends AbstractEffect private final double _power; private final AbnormalType _abnormalType; - public MagicalAbnormalDispelAttack(StatsSet params) + public MagicalAbnormalDispelAttack(StatSet params) { _power = params.getDouble("power", 0); _abnormalType = AbnormalType.getAbnormalType(params.getString("abnormalType", null)); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java index 8234db1c43..be6403077c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAbnormalResist extends AbstractStatAddEffect { - public MagicalAbnormalResist(StatsSet params) + public MagicalAbnormalResist(StatSet params) { super(params, Stat.ABNORMAL_RESIST_MAGICAL); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index 4e938809f1..25c7d25954 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -37,7 +37,7 @@ public class MagicalAttack extends AbstractEffect private final boolean _overHit; private final double _debuffModifier; - public MagicalAttack(StatsSet params) + public MagicalAttack(StatSet params) { _power = params.getDouble("power", 0); _overHit = params.getBoolean("overHit", false); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 424480b76c..11c387780e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class MagicalAttackByAbnormal extends AbstractEffect { private final double _power; - public MagicalAttackByAbnormal(StatsSet params) + public MagicalAttackByAbnormal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9c3e263a05..348e904025 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -40,7 +40,7 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect private final double _power; private final Set _abnormals; - public MagicalAttackByAbnormalSlot(StatsSet params) + public MagicalAttackByAbnormalSlot(StatSet params) { _power = params.getDouble("power", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 49dd351046..de55dd0fcd 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -38,7 +38,7 @@ public class MagicalAttackMp extends AbstractEffect private final boolean _critical; private final double _criticalLimit; - public MagicalAttackMp(StatsSet params) + public MagicalAttackMp(StatSet params) { _power = params.getDouble("power"); _critical = params.getBoolean("critical"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 4414b36fa7..93ac560169 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class MagicalAttackRange extends AbstractEffect private final double _power; private final double _shieldDefPercent; - public MagicalAttackRange(StatsSet params) + public MagicalAttackRange(StatSet params) { _power = params.getDouble("power"); _shieldDefPercent = params.getDouble("shieldDefPercent", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java index 2e304e5f8b..1cf39ed501 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAttackSpeed extends AbstractStatEffect { - public MagicalAttackSpeed(StatsSet params) + public MagicalAttackSpeed(StatSet params) { super(params, Stat.MAGIC_ATTACK_SPEED); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 9a3a776e32..880d71f0c5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class MagicalDamOverTime extends AbstractEffect private final double _power; private final boolean _canKill; - public MagicalDamOverTime(StatsSet params) + public MagicalDamOverTime(StatSet params) { _power = params.getDouble("power", 0); _canKill = params.getBoolean("canKill", false); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java index 80fdf87050..9b4e6061aa 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalDefence extends AbstractStatEffect { - public MagicalDefence(StatsSet params) + public MagicalDefence(StatSet params) { super(params, Stat.MAGICAL_DEFENCE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java index c3c7c404f3..4e83b80e8b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalEvasion extends AbstractStatEffect { - public MagicalEvasion(StatsSet params) + public MagicalEvasion(StatSet params) { super(params, Stat.MAGIC_EVASION_RATE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java index 6253af7373..bf419a19f7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalSkillPower extends AbstractStatEffect { - public MagicalSkillPower(StatsSet params) + public MagicalSkillPower(StatSet params) { super(params, Stat.MAGICAL_SKILL_POWER, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index d0047fedef..f4388dc16f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class MagicalSoulAttack extends AbstractEffect { private final double _power; - public MagicalSoulAttack(StatsSet params) + public MagicalSoulAttack(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java index fcc143cd4b..688243d9e1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ManaCharge extends AbstractStatAddEffect { - public ManaCharge(StatsSet params) + public ManaCharge(StatSet params) { super(params, Stat.MANA_CHARGE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index 0c84b4ab61..b889e6e824 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class ManaDamOverTime extends AbstractEffect { private final double _power; - public ManaDamOverTime(StatsSet params) + public ManaDamOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index f48011c9a2..94286df1c8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -34,7 +34,7 @@ public class ManaHeal extends AbstractEffect { private final double _power; - public ManaHeal(StatsSet params) + public ManaHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index bfdfa54380..61f15449a0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -35,7 +35,7 @@ public class ManaHealByLevel extends AbstractEffect { private final double _power; - public ManaHealByLevel(StatsSet params) + public ManaHealByLevel(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 46937a8dd0..e505c9e7a2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class ManaHealOverTime extends AbstractEffect { private final double _power; - public ManaHealOverTime(StatsSet params) + public ManaHealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 101961d1c4..71085da549 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class ManaHealPercent extends AbstractEffect { private final double _power; - public ManaHealPercent(StatsSet params) + public ManaHealPercent(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 7c9c63e3ad..07d15d826c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxCp extends AbstractStatEffect { private final boolean _heal; - public MaxCp(StatsSet params) + public MaxCp(StatSet params) { super(params, Stat.MAX_CP); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 6d2c3449bd..85867bca96 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxHp extends AbstractStatEffect { private final boolean _heal; - public MaxHp(StatsSet params) + public MaxHp(StatSet params) { super(params, Stat.MAX_HP); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index e554c63055..9ca46fda8d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxMp extends AbstractStatEffect { private final boolean _heal; - public MaxMp(StatsSet params) + public MaxMp(StatSet params) { super(params, Stat.MAX_MP); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 39cf62a95b..c27284e5f6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -43,7 +43,7 @@ public class ModifyVital extends AbstractEffect private final int _mp; private final int _cp; - public ModifyVital(StatsSet params) + public ModifyVital(StatSet params) { _type = params.getEnum("type", ModifyType.class); if (_type != ModifyType.SET) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 29ee88f805..095d130f7f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Mp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Mp(StatsSet params) + public Mp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index 76d858ad8e..b13d7824d0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class MpConsumePerLevel extends AbstractEffect { private final double _power; - public MpConsumePerLevel(StatsSet params) + public MpConsumePerLevel(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java index 2051009805..ae7bf0c48c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpRegen extends AbstractStatEffect { - public MpRegen(StatsSet params) + public MpRegen(StatSet params) { super(params, Stat.REGENERATE_MP_RATE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MpShield.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MpShield.java index 82e307a562..a4eb3e663f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MpShield.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MpShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpShield extends AbstractStatAddEffect { - public MpShield(StatsSet params) + public MpShield(StatSet params) { super(params, Stat.MANA_SHIELD_PERCENT); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java index af2ce119cc..366e96b18f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpVampiricAttack extends AbstractStatAddEffect { - public MpVampiricAttack(StatsSet params) + public MpVampiricAttack(StatSet params) { super(params, Stat.ABSORB_MANA_DAMAGE_PERCENT); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Mute.java index a7f2f76e23..7e5b5a528f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Mute extends AbstractEffect { - public Mute(StatsSet params) + public Mute(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java index 3cc4cae96f..513dc46ec7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class NoblesseBless extends AbstractEffect { - public NoblesseBless(StatsSet params) + public NoblesseBless(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index bb0f02af5c..05f8c6a99b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpenChest extends AbstractEffect { - public OpenChest(StatsSet params) + public OpenChest(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 15cd9c2a64..de0414fd23 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.RecipeController; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpenCommonRecipeBook extends AbstractEffect { - public OpenCommonRecipeBook(StatsSet params) + public OpenCommonRecipeBook(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 21dd337982..7b5effc6b4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class OpenDoor extends AbstractEffect private final int _chance; private final boolean _isItem; - public OpenDoor(StatsSet params) + public OpenDoor(StatSet params) { _chance = params.getInt("chance", 0); _isItem = params.getBoolean("isItem", false); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index b99a8f9757..3526fa5fdc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.RecipeController; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpenDwarfRecipeBook extends AbstractEffect { - public OpenDwarfRecipeBook(StatsSet params) + public OpenDwarfRecipeBook(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PAtk.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PAtk.java index c353d03a00..7f10b9dcc7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PAtk.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PAtk.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PAtk extends AbstractConditionalHpEffect { - public PAtk(StatsSet params) + public PAtk(StatSet params) { super(params, Stat.PHYSICAL_ATTACK); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Passive.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Passive.java index cef680ca21..27ce15bb60 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Passive.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Passive.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Passive extends AbstractEffect { - public Passive(StatsSet params) + public Passive(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java index 05f55c7dac..1a9f29424f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAbnormalResist extends AbstractStatAddEffect { - public PhysicalAbnormalResist(StatsSet params) + public PhysicalAbnormalResist(StatSet params) { super(params, Stat.ABNORMAL_RESIST_PHYSICAL); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 098770705b..7e5fb14465 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -52,7 +52,7 @@ public class PhysicalAttack extends AbstractEffect private final Set _abnormals; private final double _abnormalPowerMod; - public PhysicalAttack(StatsSet params) + public PhysicalAttack(StatSet params) { _power = params.getDouble("power", 0); _pAtkMod = params.getDouble("pAtkMod", 1.0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index d325c3d5ed..f191867614 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -38,7 +38,7 @@ public class PhysicalAttackHpLink extends AbstractEffect private final double _criticalChance; private final boolean _overHit; - public PhysicalAttackHpLink(StatsSet params) + public PhysicalAttackHpLink(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index dc575c2c75..fe087a1bcc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class PhysicalAttackMute extends AbstractEffect { - public PhysicalAttackMute(StatsSet params) + public PhysicalAttackMute(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java index 112b41eb36..2093d45264 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAttackRange extends AbstractStatEffect { - public PhysicalAttackRange(StatsSet params) + public PhysicalAttackRange(StatSet params) { super(params, Stat.PHYSICAL_ATTACK_RANGE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index d3c2dcfaf2..5d66bd4c87 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ public class PhysicalAttackSaveHp extends AbstractEffect private final boolean _overHit; private final double _saveHp; - public PhysicalAttackSaveHp(StatsSet params) + public PhysicalAttackSaveHp(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java index 167b859572..cdf34eb6f6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAttackSpeed extends AbstractStatEffect { - public PhysicalAttackSpeed(StatsSet params) + public PhysicalAttackSpeed(StatSet params) { super(params, Stat.PHYSICAL_ATTACK_SPEED); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 61bed5561b..a1a6818a00 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class PhysicalAttackWeaponBonus extends AbstractEffect private final Map _weaponBonus = new EnumMap<>(WeaponType.class); - public PhysicalAttackWeaponBonus(StatsSet params) + public PhysicalAttackWeaponBonus(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java index fa3925e725..078c3673b9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalDefence extends AbstractConditionalHpEffect { - public PhysicalDefence(StatsSet params) + public PhysicalDefence(StatSet params) { super(params, Stat.PHYSICAL_DEFENCE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java index 812c641ac8..9714220e1b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalEvasion extends AbstractConditionalHpEffect { - public PhysicalEvasion(StatsSet params) + public PhysicalEvasion(StatSet params) { super(params, Stat.EVASION_RATE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index b337fed6cb..fe7cf853c8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class PhysicalMute extends AbstractEffect { - public PhysicalMute(StatsSet params) + public PhysicalMute(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java index 0fd835f4e3..1b843dda3d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class PhysicalShieldAngleAll extends AbstractEffect { - public PhysicalShieldAngleAll(StatsSet params) + public PhysicalShieldAngleAll(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java index 9d3f051659..507eb57326 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalSkillPower extends AbstractStatEffect { - public PhysicalSkillPower(StatsSet params) + public PhysicalSkillPower(StatSet params) { super(params, Stat.PHYSICAL_SKILL_POWER, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index a958116ff7..9ceccea4cc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -42,7 +42,7 @@ public class PhysicalSoulAttack extends AbstractEffect private final boolean _ignoreShieldDefence; private final boolean _overHit; - public PhysicalSoulAttack(StatsSet params) + public PhysicalSoulAttack(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index e95e09ab90..fd2b23a2ae 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class PkCount extends AbstractEffect { private final int _amount; - public PkCount(StatsSet params) + public PkCount(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index 2d64d05406..b51d6a7961 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class Plunder extends AbstractEffect { - public Plunder(StatsSet params) + public Plunder(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index fd61584af1..3e885274b3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PolearmSingleTarget extends AbstractEffect { - public PolearmSingleTarget(StatsSet params) + public PolearmSingleTarget(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java index 86f2e2cee8..b2fb920379 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class ProtectDeathPenalty extends AbstractEffect { - public ProtectDeathPenalty(StatsSet params) + public ProtectDeathPenalty(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java index 890b8980bd..6664b36bae 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ProtectionBlessing extends AbstractEffect { - public ProtectionBlessing(StatsSet params) + public ProtectionBlessing(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index 6de78c2c82..62c480716d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class PullBack extends AbstractEffect private final int _animationSpeed; private final FlyType _type; - public PullBack(StatsSet params) + public PullBack(StatSet params) { _speed = params.getInt("speed", 0); _delay = params.getInt("delay", _speed); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java index 1019c56778..84a72299f3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveMagicalSkillDamageBonus extends AbstractStatPercentEffect { - public PveMagicalSkillDamageBonus(StatsSet params) + public PveMagicalSkillDamageBonus(StatSet params) { super(params, Stat.PVE_MAGICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java index 8da698c746..70870aa45c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveMagicalSkillDefenceBonus(StatsSet params) + public PveMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java index c7a82d4ded..8f60ea025c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalAttackDamageBonus extends AbstractStatPercentEffect { - public PvePhysicalAttackDamageBonus(StatsSet params) + public PvePhysicalAttackDamageBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_ATTACK_DAMAGE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java index 0717fe525b..ea01a4e1d8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PvePhysicalAttackDefenceBonus(StatsSet params) + public PvePhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java index 878f942877..1e8b9e76c4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvePhysicalSkillDamageBonus(StatsSet params) + public PvePhysicalSkillDamageBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java index bdfa0dcc67..b1dbb0b217 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvePhysicalSkillDefenceBonus(StatsSet params) + public PvePhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java index 94fdc26015..fbe3119ba8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveRaidMagicalSkillDefenceBonus(StatsSet params) + public PveRaidMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java index f54d849752..83352e1b2f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidPhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PveRaidPhysicalAttackDefenceBonus(StatsSet params) + public PveRaidPhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java index 0a344f96de..be05bec159 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidPhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveRaidPhysicalSkillDefenceBonus(StatsSet params) + public PveRaidPhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java index 542c019420..2f0153189a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpMagicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvpMagicalSkillDamageBonus(StatsSet params) + public PvpMagicalSkillDamageBonus(StatSet params) { super(params, Stat.PVP_MAGICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java index bb006280fc..41ad3b7749 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvpMagicalSkillDefenceBonus(StatsSet params) + public PvpMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVP_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java index 483d7b02e4..23488ea000 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalAttackDamageBonus extends AbstractStatPercentEffect { - public PvpPhysicalAttackDamageBonus(StatsSet params) + public PvpPhysicalAttackDamageBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_ATTACK_DAMAGE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java index 40c3a22ea2..ff942b3d4d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PvpPhysicalAttackDefenceBonus(StatsSet params) + public PvpPhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java index 225c7c1e39..19a7c96003 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvpPhysicalSkillDamageBonus(StatsSet params) + public PvpPhysicalSkillDamageBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java index ea2d1fa126..211d14c5e3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvpPhysicalSkillDefenceBonus(StatsSet params) + public PvpPhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 8a01583374..e500b487af 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -36,7 +36,7 @@ public class RandomizeHate extends AbstractEffect { private final int _chance; - public RandomizeHate(StatsSet params) + public RandomizeHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index 1fdf1296cc..452588fb12 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class RealDamage extends AbstractEffect { private final double _power; - public RealDamage(StatsSet params) + public RealDamage(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java index 4372c15bcf..86738fae0f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class RearDamage extends AbstractStatPercentEffect { - public RearDamage(StatsSet params) + public RearDamage(StatSet params) { super(params, Stat.REAR_DAMAGE_RATE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 31c7a4e4b3..82ed18faa1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RebalanceHP extends AbstractEffect { - public RebalanceHP(StatsSet params) + public RebalanceHP(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index 09d307be02..979809b533 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RebalanceHPSummon extends AbstractEffect { - public RebalanceHPSummon(StatsSet params) + public RebalanceHPSummon(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 7599b691ac..e76328929a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class RecoverVitalityInPeaceZone extends AbstractEffect private final double _amount; private final int _ticks; - public RecoverVitalityInPeaceZone(StatsSet params) + public RecoverVitalityInPeaceZone(StatSet params) { _amount = params.getDouble("amount", 0); _ticks = params.getInt("ticks", 10); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java index 824044ae21..e52b5abafb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ReduceCancel extends AbstractStatEffect { - public ReduceCancel(StatsSet params) + public ReduceCancel(StatSet params) { super(params, Stat.ATTACK_CANCEL); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index ecc7a10d31..be9188f3b0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -33,7 +33,7 @@ public class ReduceDamage extends AbstractEffect { private final double _amount; - public ReduceDamage(StatsSet params) + public ReduceDamage(StatSet params) { _amount = params.getDouble("amount"); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java index 8534a94fc6..7b8862f608 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ReduceDropType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -32,7 +32,7 @@ public class ReduceDropPenalty extends AbstractEffect private final double _deathPenalty; private final ReduceDropType _type; - public ReduceDropPenalty(StatsSet params) + public ReduceDropPenalty(StatSet params) { _exp = params.getDouble("exp", 0); _deathPenalty = params.getDouble("deathPenalty", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java index c15f7301b9..6436b488e0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ReflectMagic extends AbstractStatAddEffect { - public ReflectMagic(StatsSet params) + public ReflectMagic(StatSet params) { super(params, Stat.VENGEANCE_SKILL_MAGIC_DAMAGE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java index bf1d555351..583191fd4c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.BasicProperty; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ReflectSkill extends AbstractEffect private final Stat _stat; private final double _amount; - public ReflectSkill(StatsSet params) + public ReflectSkill(StatSet params) { _stat = params.getEnum("type", BasicProperty.class, BasicProperty.PHYSICAL) == BasicProperty.PHYSICAL ? Stat.REFLECT_SKILL_PHYSIC : Stat.REFLECT_SKILL_MAGIC; _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index e850ea6be9..77b96e4205 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class RefuelAirship extends AbstractEffect { private final int _value; - public RefuelAirship(StatsSet params) + public RefuelAirship(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Relax.java index c8c61fe47e..e2ba4420db 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ public class Relax extends AbstractEffect { private final double _power; - public Relax(StatsSet params) + public Relax(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 9678dc1174..0613c17234 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class ResetInstanceEntry extends AbstractEffect { private final Set _instanceId; - public ResetInstanceEntry(StatsSet params) + public ResetInstanceEntry(StatSet params) { final String instanceIds = params.getString("instanceId", null); if ((instanceIds != null) && !instanceIds.isEmpty()) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java index 940c731208..f15ff56189 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ResistAbnormalByCategory extends AbstractEffect private final DispelSlotType _slot; private final double _amount; - public ResistAbnormalByCategory(StatsSet params) + public ResistAbnormalByCategory(StatSet params) { _amount = params.getDouble("amount", 0); _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.DEBUFF); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java index dae38e5246..2e29b5cc8e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ResistDDMagic extends AbstractStatPercentEffect { - public ResistDDMagic(StatsSet params) + public ResistDDMagic(StatSet params) { super(params, Stat.MAGIC_SUCCESS_RES); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java index af2b203aad..d08fcb262a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ResistDispelByCategory extends AbstractEffect private final DispelSlotType _slot; private final double _amount; - public ResistDispelByCategory(StatsSet params) + public ResistDispelByCategory(StatSet params) { _amount = params.getDouble("amount", 0); _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index af1e40bea8..cd03f1a74a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -34,7 +34,7 @@ public class ResistSkill extends AbstractEffect { private final List _skills = new ArrayList<>(); - public ResistSkill(StatsSet params) + public ResistSkill(StatSet params) { for (int i = 1;; i++) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index feb5885fb0..6f887a07cf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class Restoration extends AbstractEffect private final int _itemCount; private final int _itemEnchantmentLevel; - public Restoration(StatsSet params) + public Restoration(StatSet params) { _itemId = params.getInt("itemId", 0); _itemCount = params.getInt("itemCount", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 37cd974643..0baf0aaae6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -25,7 +25,7 @@ import java.util.Map.Entry; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.ExtractableProductItem; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,12 +47,12 @@ public class RestorationRandom extends AbstractEffect { private final List _products = new ArrayList<>(); - public RestorationRandom(StatsSet params) + public RestorationRandom(StatSet params) { - for (StatsSet group : params.getList("items", StatsSet.class)) + for (StatSet group : params.getList("items", StatSet.class)) { final List items = new ArrayList<>(); - for (StatsSet item : group.getList(".", StatsSet.class)) + for (StatSet item : group.getList(".", StatSet.class)) { items.add(new RestorationItemHolder(item.getInt(".id"), item.getInt(".count"), item.getInt(".minEnchant", 0), item.getInt(".maxEnchant", 0))); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index f9c10b7ff2..9b287dd419 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class Resurrection extends AbstractEffect { private final int _power; - public Resurrection(StatsSet params) + public Resurrection(StatSet params) { _power = params.getInt("power", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 18d8bdb0bd..6ef063ce91 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -39,7 +39,7 @@ public class ResurrectionSpecial extends AbstractEffect private final int _power; private final Set _instanceId; - public ResurrectionSpecial(StatsSet params) + public ResurrectionSpecial(StatSet params) { _power = params.getInt("power", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index e4d66b43d3..0e7391681b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class Reuse extends AbstractEffect private final int _magicType; private final double _amount; - public Reuse(StatsSet params) + public Reuse(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index 3716fc1922..e17cd7cc25 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ReuseSkillById extends AbstractEffect { private final int _skillId; - public ReuseSkillById(StatsSet params) + public ReuseSkillById(StatSet params) { _skillId = params.getInt("skillId", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Root.java index 1ca3492949..b6876e8e13 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Root extends AbstractEffect { - public Root(StatsSet params) + public Root(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index 66fc8d82c8..4c7ee53239 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class SacrificeSummon extends AbstractEffect { - public SacrificeSummon(StatsSet params) + public SacrificeSummon(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java index d00856c9bd..683f45bb55 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SafeFallHeight extends AbstractStatEffect { - public SafeFallHeight(StatsSet params) + public SafeFallHeight(StatSet params) { super(params, Stat.FALL); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 7f6bf69ee3..797aa95263 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -33,7 +33,7 @@ public class SendSystemMessageToClan extends AbstractEffect { private final SystemMessage _message; - public SendSystemMessageToClan(StatsSet params) + public SendSystemMessageToClan(StatSet params) { final int id = params.getInt("id", 0); _message = new SystemMessage(id); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java index 7acbf846df..a0508d73b1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class ServitorShare extends AbstractEffect { private final Map _sharedStats = new EnumMap<>(Stat.class); - public ServitorShare(StatsSet params) + public ServitorShare(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 01dfd87c71..6e8187feae 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SetHp extends AbstractEffect private final double _amount; private final StatModifierType _mode; - public SetHp(StatsSet params) + public SetHp(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index 805d18160b..fae21baa51 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SetSkill extends AbstractEffect private final int _skillId; private final int _skillLvl; - public SetSkill(StatsSet params) + public SetSkill(StatSet params) { _skillId = params.getInt("skillId", 0); _skillLvl = params.getInt("skillLvl", 1); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java index a93bb5f253..354cb42b55 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ShieldDefence extends AbstractStatEffect { - public ShieldDefence(StatsSet params) + public ShieldDefence(StatSet params) { super(params, Stat.SHIELD_DEFENCE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java index f28d0e4ad2..1fdee75f69 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ShieldDefenceRate extends AbstractStatEffect { - public ShieldDefenceRate(StatsSet params) + public ShieldDefenceRate(StatSet params) { super(params, Stat.SHIELD_DEFENCE_RATE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java index 1d649082dc..533b631f10 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class SilentMove extends AbstractEffect { - public SilentMove(StatsSet params) + public SilentMove(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java index 89dad85514..7c929a7fe8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class SkillCritical extends AbstractEffect { private final BaseStat _stat; - public SkillCritical(StatsSet params) + public SkillCritical(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java index 369bef11f5..8f054f973b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillCriticalDamage extends AbstractStatEffect { - public SkillCriticalDamage(StatsSet params) + public SkillCriticalDamage(StatSet params) { super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java index c91f2d6b49..88ecf69e77 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillCriticalProbability extends AbstractStatPercentEffect { - public SkillCriticalProbability(StatsSet params) + public SkillCriticalProbability(StatSet params) { super(params, Stat.SKILL_CRITICAL_PROBABILITY); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 7b98a9e180..1664ea1827 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class SkillEvasion extends AbstractEffect private final int _magicType; private final double _amount; - public SkillEvasion(StatsSet params) + public SkillEvasion(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java index 9cc62532b4..2880d0ccef 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillPowerAdd extends AbstractStatAddEffect { - public SkillPowerAdd(StatsSet params) + public SkillPowerAdd(StatSet params) { super(params, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 9578c88f91..7156fff2df 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SkillTurning extends AbstractEffect private final int _chance; private final boolean _staticChance; - public SkillTurning(StatsSet params) + public SkillTurning(StatSet params) { _chance = params.getInt("chance", 100); _staticChance = params.getBoolean("staticChance", false); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 45b02206a4..04691304ed 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SkillTurningOverTime extends AbstractEffect private final int _chance; private final boolean _staticChance; - public SkillTurningOverTime(StatsSet params) + public SkillTurningOverTime(StatSet params) { _chance = params.getInt("chance", 100); _staticChance = params.getBoolean("staticChance", false); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index c1dd92cedb..b919c7acac 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -36,7 +36,7 @@ public class SoulBlow extends AbstractEffect private final double _chanceBoost; private final boolean _overHit; - public SoulBlow(StatsSet params) + public SoulBlow(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 8471aa236c..4f63a84081 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; @@ -40,7 +40,7 @@ public class SoulEating extends AbstractEffect private final int _expNeeded; private final int _maxSouls; - public SoulEating(StatsSet params) + public SoulEating(StatSet params) { _expNeeded = params.getInt("expNeeded"); _maxSouls = params.getInt("maxSouls"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a7d5c2628a..ad261845eb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Seed; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Sow extends AbstractEffect { - public Sow(StatsSet params) + public Sow(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SpModify.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SpModify.java index 24d124ecce..c3bc6193e9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SpModify.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SpModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SpModify extends AbstractStatAddEffect { - public SpModify(StatsSet params) + public SpModify(StatSet params) { super(params, Stat.BONUS_SP); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 0718408ca2..890438d65f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.enums.SpeedType; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -36,7 +36,7 @@ public class Speed extends AbstractEffect private final StatModifierType _mode; private List _speedType; - public Speed(StatsSet params) + public Speed(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index 91b91ad05e..db247775f3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SphericBarrier extends AbstractStatAddEffect { - public SphericBarrier(StatsSet params) + public SphericBarrier(StatSet params) { super(params, Stat.SPHERIC_BARRIER_RANGE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SpiritExpModify.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SpiritExpModify.java index 11de35695a..6e3306fa0d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SpiritExpModify.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SpiritExpModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SpiritExpModify extends AbstractStatEffect { - public SpiritExpModify(StatsSet params) + public SpiritExpModify(StatSet params) { super(params, Stat.ELEMENTAL_SPIRIT_BONUS_EXP); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index d13eaf1c2e..385240377f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class Spoil extends AbstractEffect { - public Spoil(StatsSet params) + public Spoil(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index b63c24dc20..22c4132b63 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -36,7 +36,7 @@ public class StatBonusSkillCritical extends AbstractEffect private final BaseStat _stat; private final Condition _armorTypeCondition; - public StatBonusSkillCritical(StatsSet params) + public StatBonusSkillCritical(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.DEX); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index 41a20bfafe..49280eb774 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -36,7 +36,7 @@ public class StatBonusSpeed extends AbstractEffect private final BaseStat _stat; private final Condition _armorTypeCondition; - public StatBonusSpeed(StatsSet params) + public StatBonusSpeed(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.DEX); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index a007b118b2..bcf691e360 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class StatByMoveType extends AbstractEffect private final MoveType _type; private final double _value; - public StatByMoveType(StatsSet params) + public StatByMoveType(StatSet params) { _stat = params.getEnum("stat", Stat.class); _type = params.getEnum("type", MoveType.class); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StatUp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StatUp.java index b961ec8484..7abb1367af 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StatUp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StatUp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class StatUp extends AbstractEffect private final BaseStat _stat; private final double _amount; - public StatUp(StatsSet params) + public StatUp(StatSet params) { _amount = params.getDouble("amount", 0); _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index 0720057c19..23239887a7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.List; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -39,7 +39,7 @@ public class StealAbnormal extends AbstractEffect private final int _rate; private final int _max; - public StealAbnormal(StatsSet params) + public StealAbnormal(StatSet params) { _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); _rate = params.getInt("rate", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Summon.java index cd7bfabef8..62daa5ffdf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.ServitorInstance; @@ -43,7 +43,7 @@ public class Summon extends AbstractEffect private final int _lifeTime; private final int _consumeItemInterval; - public Summon(StatsSet params) + public Summon(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index 8929e1f2b0..50c025e572 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class SummonAgathion extends AbstractEffect { private final int _npcId; - public SummonAgathion(StatsSet params) + public SummonAgathion(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index 7716d58f16..49b816f272 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.CubicData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; @@ -42,7 +42,7 @@ public class SummonCubic extends AbstractEffect private final int _cubicId; private final int _cubicLvl; - public SummonCubic(StatsSet params) + public SummonCubic(StatSet params) { _cubicId = params.getInt("cubicId", -1); _cubicLvl = params.getInt("cubicLvl", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index d0a2a82738..13d5a2eac7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoppelgangerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ public class SummonHallucination extends AbstractEffect private final int _npcId; private final int _npcCount; - public SummonHallucination(StatsSet params) + public SummonHallucination(StatSet params) { _despawnDelay = params.getInt("despawnDelay", 20000); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index bcd050e084..d61a6e5c02 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.ServitorInstance; @@ -43,7 +43,7 @@ public class SummonMulti extends AbstractEffect private final int _consumeItemInterval; private final int _summonPoints; - public SummonMulti(StatsSet params) + public SummonMulti(StatSet params) { _npcId = params.getInt("npcId"); _expMultiplier = params.getFloat("expMultiplier", 1); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index 6f4090eef0..eaff214b7c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DecoyInstance; @@ -48,7 +48,7 @@ public class SummonNpc extends AbstractEffect private final boolean _isSummonSpawn; private final boolean _singleInstance; // Only one instance of this NPC is allowed. - public SummonNpc(StatsSet params) + public SummonNpc(StatSet params) { _despawnDelay = params.getInt("despawnDelay", 20000); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 5ef621819e..534a41ee16 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.data.xml.impl.PetDataTable; import org.l2jmobius.gameserver.model.PetData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PetItemList; */ public class SummonPet extends AbstractEffect { - public SummonPet(StatsSet params) + public SummonPet(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java index 7dd690587c..b1d5ec38cb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SummonPoints extends AbstractStatAddEffect { - public SummonPoints(StatsSet params) + public SummonPoints(StatSet params) { super(params, Stat.MAX_SUMMON_POINTS); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index d8a47b670f..ac1ddaa16a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; @@ -35,7 +35,7 @@ public class SummonTrap extends AbstractEffect private final int _despawnTime; private final int _npcId; - public SummonTrap(StatsSet params) + public SummonTrap(StatSet params) { _despawnTime = params.getInt("despawnTime", 0); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 84f6d070a8..3196bb949d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Collection; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Sweeper extends AbstractEffect { - public Sweeper(StatsSet params) + public Sweeper(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 559dfc6437..ec29554f2d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ public class Synergy extends AbstractEffect private final int _skillLevelScaleTo; private final int _minSlot; - public Synergy(StatsSet params) + public Synergy(StatSet params) { final String requiredSlots = params.getString("requiredSlots", null); if ((requiredSlots != null) && !requiredSlots.isEmpty()) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index e35516fef5..39ed981bbf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Castle; @@ -33,7 +33,7 @@ public class TakeCastle extends AbstractEffect { private final CastleSide _side; - public TakeCastle(StatsSet params) + public TakeCastle(StatSet params) { _side = params.getEnum("side", CastleSide.class); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 77fd9ec103..3be2bf5593 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Castle; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TakeCastleStart extends AbstractEffect { - public TakeCastleStart(StatsSet params) + public TakeCastleStart(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 70842191a7..18749c1aef 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Fort; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TakeFort extends AbstractEffect { - public TakeFort(StatsSet params) + public TakeFort(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 0eb23f6733..77355f9683 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TakeFortStart extends AbstractEffect { - public TakeFortStart(StatsSet params) + public TakeFortStart(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index cec32755ed..dd8e09278f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class TalismanSlot extends AbstractEffect { private final int _slots; - public TalismanSlot(StatsSet params) + public TalismanSlot(StatSet params) { _slots = params.getInt("slots", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 281b5322fd..32a126f499 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class TargetCancel extends AbstractEffect { private final int _chance; - public TargetCancel(StatsSet params) + public TargetCancel(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index b4463de391..86ff70c9ca 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMe extends AbstractEffect { - public TargetMe(StatsSet params) + public TargetMe(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index 11e581113e..e68a1e1faf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class TargetMeProbability extends AbstractEffect { private final int _chance; - public TargetMeProbability(StatsSet params) + public TargetMeProbability(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 6c30519678..9ca01faf50 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -32,7 +32,7 @@ public class Teleport extends AbstractEffect { private final Location _loc; - public Teleport(StatsSet params) + public Teleport(StatSet params) { _loc = new Location(params.getInt("x", 0), params.getInt("y", 0), params.getInt("z", 0)); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index e0e715818c..bdc53208d5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -38,7 +38,7 @@ public class TeleportToNpc extends AbstractEffect private final int _npcId; private final boolean _party; - public TeleportToNpc(StatsSet params) + public TeleportToNpc(StatSet params) { _npcId = params.getInt("npcId"); _party = params.getBoolean("party", false); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index 029897cdea..ef056d6bb1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TeleportToPlayer extends AbstractEffect { - public TeleportToPlayer(StatsSet params) + public TeleportToPlayer(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index 1c9af0f535..b2d6b663de 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class TeleportToSummon extends AbstractEffect { private final double _maxDistance; - public TeleportToSummon(StatsSet params) + public TeleportToSummon(StatSet params) { _maxDistance = params.getDouble("distance", -1); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index e550302b02..c4bf787a10 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class TeleportToTarget extends AbstractEffect { - public TeleportToTarget(StatsSet params) + public TeleportToTarget(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index ba1c55c615..ff63eea817 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class TransferDamageToPlayer extends AbstractStatAddEffect { - public TransferDamageToPlayer(StatsSet params) + public TransferDamageToPlayer(StatSet params) { super(params, Stat.TRANSFER_DAMAGE_TO_PLAYER); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java index b084bfc1cb..c87d5f0554 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class TransferDamageToSummon extends AbstractStatAddEffect { - public TransferDamageToSummon(StatsSet params) + public TransferDamageToSummon(StatSet params) { super(params, Stat.TRANSFER_DAMAGE_SUMMON_PERCENT); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index e9f0292113..48bc5e3a1c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -34,7 +34,7 @@ public class TransferHate extends AbstractEffect { private final int _chance; - public TransferHate(StatsSet params) + public TransferHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 2ddf95a4db..bf593eaed8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Transformation extends AbstractEffect { private final List _id; - public Transformation(StatsSet params) + public Transformation(StatSet params) { final String ids = params.getString("transformationId", null); if ((ids != null) && !ids.isEmpty()) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 103ccdf8ce..2b4af0a1d3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class TrapDetect extends AbstractEffect { private final int _power; - public TrapDetect(StatsSet params) + public TrapDetect(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index eb7b073b36..c4a6c6aed9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.TrapAction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class TrapRemove extends AbstractEffect { private final int _power; - public TrapRemove(StatsSet params) + public TrapRemove(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 6df3874ab1..8fb87050b1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -59,7 +59,7 @@ public class TriggerSkillByAttack extends AbstractEffect * @param params */ - public TriggerSkillByAttack(StatsSet params) + public TriggerSkillByAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index ae6a3bc89f..78366b8047 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillByAvoid extends AbstractEffect /** * @param params */ - public TriggerSkillByAvoid(StatsSet params) + public TriggerSkillByAvoid(StatSet params) { _chance = params.getInt("chance", 100); _skill = new SkillHolder(params.getInt("skillId", 0), params.getInt("skillLevel", 0)); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index c24fb95246..9fe53c0622 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -48,7 +48,7 @@ public class TriggerSkillByDamage extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillByDamage(StatsSet params) + public TriggerSkillByDamage(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c086507336..8b84350293 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillByDeathBlow extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillByDeathBlow(StatsSet params) + public TriggerSkillByDeathBlow(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index a9bfcc320c..11802645f2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -37,7 +37,7 @@ public class TriggerSkillByKill extends AbstractEffect private final int _chance; private final SkillHolder _skill; - public TriggerSkillByKill(StatsSet params) + public TriggerSkillByKill(StatSet params) { _chance = params.getInt("chance", 100); _skill = new SkillHolder(params.getInt("skillId", 0), params.getInt("skillLevel", 0)); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 2893d46f33..7f2d3f9fa7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -52,7 +52,7 @@ public class TriggerSkillByMagicType extends AbstractEffect * @param params */ - public TriggerSkillByMagicType(StatsSet params) + public TriggerSkillByMagicType(StatSet params) { _chance = params.getInt("chance", 100); _magicTypes = params.getIntArray("magicTypes", ";"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 1524e3d4f4..b77da803f5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillBySkill extends AbstractEffect private final int _skillLevelScaleTo; private final TargetType _targetType; - public TriggerSkillBySkill(StatsSet params) + public TriggerSkillBySkill(StatSet params) { _castSkillId = params.getInt("castSkillId"); _chance = params.getInt("chance", 100); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index ec2124c44e..7bb68baec9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -53,7 +53,7 @@ public class TriggerSkillBySkillAttack extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillBySkillAttack(StatsSet params) + public TriggerSkillBySkillAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 3f58619f0a..c209decfb3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -69,7 +69,7 @@ public class TwoHandedBluntBonus extends AbstractEffect private final double _speedAmount; private final StatModifierType _speedMode; - public TwoHandedBluntBonus(StatsSet params) + public TwoHandedBluntBonus(StatSet params) { _pAtkAmount = params.getDouble("pAtkAmount", 0); _pAtkMode = params.getEnum("pAtkMode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index b2c50c4b88..344456a925 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -69,7 +69,7 @@ public class TwoHandedSwordBonus extends AbstractEffect private final double _speedAmount; private final StatModifierType _speedMode; - public TwoHandedSwordBonus(StatsSet params) + public TwoHandedSwordBonus(StatSet params) { _pAtkAmount = params.getDouble("pAtkAmount", 0); _pAtkMode = params.getEnum("pAtkMode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 01ae8122ec..20b418c29b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ public class Unsummon extends AbstractEffect { private final int _chance; - public Unsummon(StatsSet params) + public Unsummon(StatSet params) { _chance = params.getInt("chance", -1); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 57eb89196d..f73f0f57f0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; */ public class UnsummonAgathion extends AbstractEffect { - public UnsummonAgathion(StatsSet params) + public UnsummonAgathion(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index a4fdc2c0aa..0779d018cc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class UnsummonServitors extends AbstractEffect { - public UnsummonServitors(StatsSet params) + public UnsummonServitors(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index dbb0c700b5..ac33fcba0d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Untargetable extends AbstractEffect { - public Untargetable(StatsSet params) + public Untargetable(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java index ac6cae3d05..1c85196fe0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class VampiricAttack extends AbstractEffect private final double _amount; private final double _sum; - public VampiricAttack(StatsSet params) + public VampiricAttack(StatSet params) { _amount = params.getDouble("amount"); _sum = _amount * params.getDouble("chance"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java index ab724714e1..571ca55bbe 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ public class VampiricDefence extends AbstractEffect { private final int _amount; - public VampiricDefence(StatsSet params) + public VampiricDefence(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java index f8b9d76f3a..caaa8d02b4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class VitalityExpRate extends AbstractStatPercentEffect { - public VitalityExpRate(StatsSet params) + public VitalityExpRate(StatSet params) { super(params, Stat.VITALITY_EXP_RATE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index cba2b14c35..385595e03d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class VitalityPointUp extends AbstractEffect { private final int _value; - public VitalityPointUp(StatsSet params) + public VitalityPointUp(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java index 86612955dd..72f78ec177 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class VitalityPointsRate extends AbstractStatPercentEffect { - public VitalityPointsRate(StatsSet params) + public VitalityPointsRate(StatSet params) { super(params, Stat.VITALITY_CONSUME_RATE); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java index 09500b3823..bf20bd5018 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WeightLimit extends AbstractStatEffect { - public WeightLimit(StatsSet params) + public WeightLimit(StatSet params) { super(params, Stat.WEIGHT_LIMIT); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java index f9be68f493..6020399f85 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WeightPenalty extends AbstractStatAddEffect { - public WeightPenalty(StatsSet params) + public WeightPenalty(StatSet params) { super(params, Stat.WEIGHT_PENALTY); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java index bdf9aca48d..81eb9a9688 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WorldChatPoints extends AbstractStatEffect { - public WorldChatPoints(StatsSet params) + public WorldChatPoints(StatSet params) { super(params, Stat.WORLD_CHAT_POINTS); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java index 5a3842921d..127dadf9d2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class BuildAdvanceBaseSkillCondition implements ISkillCondition { - public BuildAdvanceBaseSkillCondition(StatsSet params) + public BuildAdvanceBaseSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java index 9328638400..b479302f61 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class BuildCampSkillCondition implements ISkillCondition { - public BuildCampSkillCondition(StatsSet params) + public BuildCampSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java index c1220c828a..aca51bafbf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanAddMaxEntranceInzoneSkillCondition implements ISkillCondition { - public CanAddMaxEntranceInzoneSkillCondition(StatsSet params) + public CanAddMaxEntranceInzoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java index eddd45771c..6ac3c2e199 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ public class CanBookmarkAddSlotSkillCondition implements ISkillCondition { private final int _teleportBookmarkSlots; - public CanBookmarkAddSlotSkillCondition(StatsSet params) + public CanBookmarkAddSlotSkillCondition(StatSet params) { _teleportBookmarkSlots = params.getInt("teleportBookmarkSlots"); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java index 30fdb7f36f..ee1bf96e69 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanChangeVitalItemCountSkillCondition implements ISkillCondition { - public CanChangeVitalItemCountSkillCondition(StatsSet params) + public CanChangeVitalItemCountSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java index da553a6d9f..48e28e7af7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanEnchantAttributeSkillCondition implements ISkillCondition { - public CanEnchantAttributeSkillCondition(StatsSet params) + public CanEnchantAttributeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java index c14f1ffe64..2908994776 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanMountForEventSkillCondition implements ISkillCondition { - public CanMountForEventSkillCondition(StatsSet params) + public CanMountForEventSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java index d07aa9a622..9dc5f99592 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShipInstance; @@ -31,7 +31,7 @@ public class CanRefuelAirshipSkillCondition implements ISkillCondition { private final int _amount; - public CanRefuelAirshipSkillCondition(StatsSet params) + public CanRefuelAirshipSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java index d451f3c997..67206b47bd 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanRestoreVitalPointSkillCondition implements ISkillCondition { - public CanRestoreVitalPointSkillCondition(StatsSet params) + public CanRestoreVitalPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java index 7e519025b0..49232af88f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CanSummonCubicSkillCondition implements ISkillCondition { - public CanSummonCubicSkillCondition(StatsSet params) + public CanSummonCubicSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java index 8b550d164c..33541e82a8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class CanSummonMultiSkillCondition implements ISkillCondition { private final int _summonPoints; - public CanSummonMultiSkillCondition(StatsSet params) + public CanSummonMultiSkillCondition(StatSet params) { _summonPoints = params.getInt("summonPoints"); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java index aa9579e92a..b06ba00f32 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.CharSummonTable; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; */ public class CanSummonPetSkillCondition implements ISkillCondition { - public CanSummonPetSkillCondition(StatsSet params) + public CanSummonPetSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java index ea41a2e22e..3655e158cb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanSummonSiegeGolemSkillCondition implements ISkillCondition { - public CanSummonSiegeGolemSkillCondition(StatsSet params) + public CanSummonSiegeGolemSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java index 460d72a743..e07ce75c8f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanSummonSkillCondition implements ISkillCondition { - public CanSummonSkillCondition(StatsSet params) + public CanSummonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java index 309da529c9..bd8838d02f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanTransformInDominionSkillCondition implements ISkillCondition { - public CanTransformInDominionSkillCondition(StatsSet params) + public CanTransformInDominionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java index 81297944f1..2f4d780cab 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class CanTransformSkillCondition implements ISkillCondition // TODO: What to do with this? // private final int _transformId; - public CanTransformSkillCondition(StatsSet params) + public CanTransformSkillCondition(StatSet params) { // _transformId = params.getInt("transformId"); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java index 800d0375be..771873a553 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanUntransformSkillCondition implements ISkillCondition { - public CanUntransformSkillCondition(StatsSet params) + public CanUntransformSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java index e651b3b1d5..ffe2e4a026 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class CanUseInBattlefieldSkillCondition implements ISkillCondition { - public CanUseInBattlefieldSkillCondition(StatsSet params) + public CanUseInBattlefieldSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java index 5ff751abce..ba030b97a4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanUseInDragonLairSkillCondition implements ISkillCondition { - public CanUseInDragonLairSkillCondition(StatsSet params) + public CanUseInDragonLairSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java index 4d914c28fe..8a0cb18ac7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class CanUseSwoopCannonSkillCondition implements ISkillCondition { - public CanUseSwoopCannonSkillCondition(StatsSet params) + public CanUseSwoopCannonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java index 6a2d832a4c..e9996580fc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanUseVitalityConsumeItemSkillCondition implements ISkillCondition { - public CanUseVitalityConsumeItemSkillCondition(StatsSet params) + public CanUseVitalityConsumeItemSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java index f694956e7e..48dafb46c3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class CannotUseInTransformSkillCondition implements ISkillCondition { private final int _transformId; - public CannotUseInTransformSkillCondition(StatsSet params) + public CannotUseInTransformSkillCondition(StatSet params) { _transformId = params.getInt("transformId", -1); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java index 141c69322f..6591233504 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -32,7 +32,7 @@ public class CheckLevelSkillCondition implements ISkillCondition private final int _maxLevel; private final SkillConditionAffectType _affectType; - public CheckLevelSkillCondition(StatsSet params) + public CheckLevelSkillCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java index 15163a3373..d72f463c4e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class CheckSexSkillCondition implements ISkillCondition { private final boolean _isFemale; - public CheckSexSkillCondition(StatsSet params) + public CheckSexSkillCondition(StatSet params) { _isFemale = params.getBoolean("isFemale"); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java index 8dee11ef9c..12e49c23a7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConsumeBodySkillCondition implements ISkillCondition { - public ConsumeBodySkillCondition(StatsSet params) + public ConsumeBodySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java index c24da9ebcd..ba1b1cdd5f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class EnergySavedSkillCondition implements ISkillCondition { private final int _amount; - public EnergySavedSkillCondition(StatsSet params) + public EnergySavedSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 89d705e991..34f76973f0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -35,7 +35,7 @@ public class EquipArmorSkillCondition implements ISkillCondition { private int _armorTypesMask = 0; - public EquipArmorSkillCondition(StatsSet params) + public EquipArmorSkillCondition(StatSet params) { final List armorTypes = params.getEnumList("armorType", ArmorType.class); if (armorTypes != null) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index e5f22008fa..708b4dd1d4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class EquipShieldSkillCondition implements ISkillCondition { - public EquipShieldSkillCondition(StatsSet params) + public EquipShieldSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 4561945254..f733f81f62 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -33,7 +33,7 @@ public class EquipWeaponSkillCondition implements ISkillCondition { private int _weaponTypesMask = 0; - public EquipWeaponSkillCondition(StatsSet params) + public EquipWeaponSkillCondition(StatSet params) { final List weaponTypes = params.getEnumList("weaponType", WeaponType.class); if (weaponTypes != null) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java index 5f77215218..e36c06fa11 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class NotFearedSkillCondition implements ISkillCondition { - public NotFearedSkillCondition(StatsSet params) + public NotFearedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java index b9096cc1a9..b6e7bcd826 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class NotInUnderwaterSkillCondition implements ISkillCondition { - public NotInUnderwaterSkillCondition(StatsSet params) + public NotInUnderwaterSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index eee6ec73e9..18d8dc8a11 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -35,7 +35,7 @@ public class Op2hWeaponSkillCondition implements ISkillCondition { private final List _weaponTypes = new ArrayList<>(); - public Op2hWeaponSkillCondition(StatsSet params) + public Op2hWeaponSkillCondition(StatSet params) { final List weaponTypes = params.getList("weaponType", String.class); if (weaponTypes != null) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 3b91f36fe4..6223172dbc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; - public OpAffectedBySkillSkillCondition(StatsSet params) + public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java index 2eb561291e..3818df4736 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAgathionEnergySkillCondition implements ISkillCondition { - public OpAgathionEnergySkillCondition(StatsSet params) + public OpAgathionEnergySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java index 76a7ebc5a8..ee2b415021 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.enums.SkillConditionAlignment; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -32,7 +32,7 @@ public class OpAlignmentSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final SkillConditionAlignment _alignment; - public OpAlignmentSkillCondition(StatsSet params) + public OpAlignmentSkillCondition(StatSet params) { _affectType = params.getEnum("affectType", SkillConditionAffectType.class); _alignment = params.getEnum("alignment", SkillConditionAlignment.class); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index 1c83d18f4e..bcc6715bb2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -33,7 +33,7 @@ public class OpBlinkSkillCondition implements ISkillCondition private final int _angle; private final int _range; - public OpBlinkSkillCondition(StatsSet params) + public OpBlinkSkillCondition(StatSet params) { switch (params.getEnum("direction", Position.class)) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java index 5215f86ae6..fde0c7f0f8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpCallPcSkillCondition implements ISkillCondition { - public OpCallPcSkillCondition(StatsSet params) + public OpCallPcSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java index dddafec6f0..1de2a32550 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCanEscapeSkillCondition implements ISkillCondition { - public OpCanEscapeSkillCondition(StatsSet params) + public OpCanEscapeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java index 3f1685a1e0..a87fd8adb6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCanNotUseAirshipSkillCondition implements ISkillCondition { - public OpCanNotUseAirshipSkillCondition(StatsSet params) + public OpCanNotUseAirshipSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java index 8eec19a568..ac7a81c015 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCannotUseTargetWithPrivateStoreSkillCondition implements ISkillCondition { - public OpCannotUseTargetWithPrivateStoreSkillCondition(StatsSet params) + public OpCannotUseTargetWithPrivateStoreSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 91de0adc8c..4030b79d00 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Weapon; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpChangeWeaponSkillCondition implements ISkillCondition { - public OpChangeWeaponSkillCondition(StatsSet params) + public OpChangeWeaponSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java index c2de03de1e..3e304e7d9d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.AbnormalType; @@ -34,7 +34,7 @@ public class OpCheckAbnormalSkillCondition implements ISkillCondition private final boolean _hasAbnormal; private final SkillConditionAffectType _affectType; - public OpCheckAbnormalSkillCondition(StatsSet params) + public OpCheckAbnormalSkillCondition(StatSet params) { _type = params.getEnum("type", AbnormalType.class); _level = params.getInt("level"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java index 65084182b1..c70b58dc50 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCheckAccountTypeSkillCondition implements ISkillCondition { - public OpCheckAccountTypeSkillCondition(StatsSet params) + public OpCheckAccountTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java index 3d4f0a58a0..11eb804274 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpCheckCastRangeSkillCondition implements ISkillCondition { private final int _distance; - public OpCheckCastRangeSkillCondition(StatsSet params) + public OpCheckCastRangeSkillCondition(StatSet params) { _distance = params.getInt("distance"); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java index 7e2e391595..03af1ac63d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.ClassId; @@ -35,7 +35,7 @@ public class OpCheckClassListSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final boolean _isWithin; - public OpCheckClassListSkillCondition(StatsSet params) + public OpCheckClassListSkillCondition(StatSet params) { _classIds = params.getEnumList("classIds", ClassId.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java index 9f779f937a..9702804304 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.ClassId; @@ -33,7 +33,7 @@ public class OpCheckClassSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final boolean _isWithin; - public OpCheckClassSkillCondition(StatsSet params) + public OpCheckClassSkillCondition(StatSet params) { _classId = params.getEnum("classId", ClassId.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java index 3bf6b65dc8..ad997dced7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckCrtEffectSkillCondition implements ISkillCondition { - public OpCheckCrtEffectSkillCondition(StatsSet params) + public OpCheckCrtEffectSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java index 144dc95daa..1d5a3adff9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class OpCheckFlagSkillCondition implements ISkillCondition { - public OpCheckFlagSkillCondition(StatsSet params) + public OpCheckFlagSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java index 75af2ab89a..2e0c07d040 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckOnGoingEventCampaignSkillCondition implements ISkillCondition { - public OpCheckOnGoingEventCampaignSkillCondition(StatsSet params) + public OpCheckOnGoingEventCampaignSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java index c64f7c6722..f11569f43c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckPcbangPointSkillCondition implements ISkillCondition { - public OpCheckPcbangPointSkillCondition(StatsSet params) + public OpCheckPcbangPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java index 252519f7ff..997a4d0fec 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.data.xml.impl.ClanHallData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -35,7 +35,7 @@ public class OpCheckResidenceSkillCondition implements ISkillCondition private final List _residencesId; private final boolean _isWithin; - public OpCheckResidenceSkillCondition(StatsSet params) + public OpCheckResidenceSkillCondition(StatSet params) { _residencesId = params.getList("residencesId", Integer.class); _isWithin = params.getBoolean("isWithin"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java index 6abeed7d35..3a1bcf424c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -34,7 +34,7 @@ public class OpCheckSkillListSkillCondition implements ISkillCondition private final List _skillIds; private final SkillConditionAffectType _affectType; - public OpCheckSkillListSkillCondition(StatsSet params) + public OpCheckSkillListSkillCondition(StatSet params) { _skillIds = params.getList("skillIds", Integer.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java index 984338b2c0..af563d983f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpCheckSkillSkillCondition implements ISkillCondition private final int _skillId; private final SkillConditionAffectType _affectType; - public OpCheckSkillSkillCondition(StatsSet params) + public OpCheckSkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java index ea882c3635..5d85a2dbdb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionCompanionType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpCompanionSkillCondition implements ISkillCondition { private final SkillConditionCompanionType _type; - public OpCompanionSkillCondition(StatsSet params) + public OpCompanionSkillCondition(StatSet params) { _type = params.getEnum("type", SkillConditionCompanionType.class); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java index 069b9d1759..464853c00c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpEnchantRangeSkillCondition implements ISkillCondition { - public OpEnchantRangeSkillCondition(StatsSet params) + public OpEnchantRangeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java index 99f22bb16a..e12f3ae007 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class OpEncumberedSkillCondition implements ISkillCondition private final int _slotsPercent; private final int _weightPercent; - public OpEncumberedSkillCondition(StatsSet params) + public OpEncumberedSkillCondition(StatSet params) { _slotsPercent = params.getInt("slotsPercent"); _weightPercent = params.getInt("weightPercent"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java index 187dfba744..49cf8e2cb8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpEnergyMaxSkillCondition implements ISkillCondition { private final int _amount; - public OpEnergyMaxSkillCondition(StatsSet params) + public OpEnergyMaxSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 75bdf465e0..82eb70b770 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class OpEquipItemSkillCondition implements ISkillCondition private final int _itemId; private final SkillConditionAffectType _affectType; - public OpEquipItemSkillCondition(StatsSet params) + public OpEquipItemSkillCondition(StatSet params) { _itemId = params.getInt("itemId"); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java index 2c4576c2fa..fa6e82082b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ public class OpExistNpcSkillCondition implements ISkillCondition private final int _range; private final boolean _isAround; - public OpExistNpcSkillCondition(StatsSet params) + public OpExistNpcSkillCondition(StatSet params) { _npcIds = params.getList("npcIds", Integer.class); _range = params.getInt("range"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java index 27cc3e90a9..8299b40047 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingCastSkillCondition implements ISkillCondition { - public OpFishingCastSkillCondition(StatsSet params) + public OpFishingCastSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java index 84cc031a24..4b43eb834e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingPumpingSkillCondition implements ISkillCondition { - public OpFishingPumpingSkillCondition(StatsSet params) + public OpFishingPumpingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java index 86aa667bee..a6a400f96f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingReelingSkillCondition implements ISkillCondition { - public OpFishingReelingSkillCondition(StatsSet params) + public OpFishingReelingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java index d22733df7e..50e6dafb82 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpHaveSummonSkillCondition implements ISkillCondition { - public OpHaveSummonSkillCondition(StatsSet params) + public OpHaveSummonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 2e854ca2b8..cceb4e937b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { private final int _npcId; - public OpHaveSummonedNpcSkillCondition(StatsSet params) + public OpHaveSummonedNpcSkillCondition(StatSet params) { _npcId = params.getInt("npcId"); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java index 16932ce531..374a75bfab 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.impl.ClanHallData; import org.l2jmobius.gameserver.enums.ResidenceType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -34,7 +34,7 @@ public class OpHomeSkillCondition implements ISkillCondition { private final ResidenceType _type; - public OpHomeSkillCondition(StatsSet params) + public OpHomeSkillCondition(StatSet params) { _type = params.getEnum("type", ResidenceType.class); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java index 9482a0bf55..62ad48bdcc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpInSiegeTimeSkillCondition implements ISkillCondition { - public OpInSiegeTimeSkillCondition(StatsSet params) + public OpInSiegeTimeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java index 1bffdacd6c..f2fb298398 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -30,7 +30,7 @@ public class OpInstantzoneSkillCondition implements ISkillCondition { private final int _instanceId; - public OpInstantzoneSkillCondition(StatsSet params) + public OpInstantzoneSkillCondition(StatSet params) { _instanceId = params.getInt("instanceId"); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java index 76703cc53b..7418ef9b64 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpMainjobSkillCondition implements ISkillCondition { - public OpMainjobSkillCondition(StatsSet params) + public OpMainjobSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java index d4c9f1f331..3c81369bbb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNeedAgathionSkillCondition implements ISkillCondition { - public OpNeedAgathionSkillCondition(StatsSet params) + public OpNeedAgathionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java index 96f6774f25..e7a477b0ee 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; @@ -34,7 +34,7 @@ public class OpNeedSummonOrPetSkillCondition implements ISkillCondition { private final List _npcIds = new ArrayList<>(); - public OpNeedSummonOrPetSkillCondition(StatsSet params) + public OpNeedSummonOrPetSkillCondition(StatSet params) { final List npcIds = params.getList("npcIds", String.class); if (npcIds != null) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java index 9701002065..ae1edfd719 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotCursedSkillCondition implements ISkillCondition { - public OpNotCursedSkillCondition(StatsSet params) + public OpNotCursedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java index bf909425d8..1de79f388a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpNotInPeacezoneSkillCondition implements ISkillCondition { - public OpNotInPeacezoneSkillCondition(StatsSet params) + public OpNotInPeacezoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java index 0752ba4a6a..0d3e4cb4dd 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotInstantzoneSkillCondition implements ISkillCondition { - public OpNotInstantzoneSkillCondition(StatsSet params) + public OpNotInstantzoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java index 45891cd0ac..7ea02159ba 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotOlympiadSkillCondition implements ISkillCondition { - public OpNotOlympiadSkillCondition(StatsSet params) + public OpNotOlympiadSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java index 5c5d293ae8..2397a68e99 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpNotTerritorySkillCondition implements ISkillCondition { - public OpNotTerritorySkillCondition(StatsSet params) + public OpNotTerritorySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java index 874872bb2e..d9f8c1fa3b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpPeacezoneSkillCondition implements ISkillCondition { - public OpPeacezoneSkillCondition(StatsSet params) + public OpPeacezoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java index c20c4665bb..08d6bb095a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpPkcountSkillCondition implements ISkillCondition { private final SkillConditionAffectType _affectType; - public OpPkcountSkillCondition(StatsSet params) + public OpPkcountSkillCondition(StatSet params) { _affectType = params.getEnum("affectType", SkillConditionAffectType.class); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java index 879fc88c4c..d393c5ddc3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -30,7 +30,7 @@ public class OpPledgeSkillCondition implements ISkillCondition { private final int _level; - public OpPledgeSkillCondition(StatsSet params) + public OpPledgeSkillCondition(StatSet params) { _level = params.getInt("level"); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java index 9adc89b98d..adf16f8feb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpRestartPointSkillCondition implements ISkillCondition { - public OpRestartPointSkillCondition(StatsSet params) + public OpRestartPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java index bbd1d9d7d1..6874091ba2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class OpResurrectionSkillCondition implements ISkillCondition { - public OpResurrectionSkillCondition(StatsSet params) + public OpResurrectionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java index 8bbf796ad2..566f935a50 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpSiegeHammerSkillCondition implements ISkillCondition { - public OpSiegeHammerSkillCondition(StatsSet params) + public OpSiegeHammerSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java index be3ad18e05..cbfc1a25b2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition private final int _skillId; private final boolean _hasLearned; - public OpSkillAcquireSkillCondition(StatsSet params) + public OpSkillAcquireSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _hasLearned = params.getBoolean("hasLearned"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java index c8789d28e4..a8382b83b3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpSkillSkillCondition implements ISkillCondition private final int _skillLevel; private final boolean _hasLearned; - public OpSkillSkillCondition(StatsSet params) + public OpSkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _skillLevel = params.getInt("skillLevel"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java index 5127071683..a3d188f3eb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpSocialClassSkillCondition implements ISkillCondition { private final int _socialClass; - public OpSocialClassSkillCondition(StatsSet params) + public OpSocialClassSkillCondition(StatSet params) { _socialClass = params.getInt("socialClass"); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java index b9d37d18c0..c86984a218 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class OpSoulMaxSkillCondition implements ISkillCondition { - public OpSoulMaxSkillCondition(StatsSet params) + public OpSoulMaxSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java index 4780c13a58..0faa676bbe 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpSubjobSkillCondition implements ISkillCondition { - public OpSubjobSkillCondition(StatsSet params) + public OpSubjobSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java index 17a9a1a9e3..a14192847a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.concurrent.atomic.AtomicBoolean; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpSweeperSkillCondition implements ISkillCondition { - public OpSweeperSkillCondition(StatsSet params) + public OpSweeperSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java index b36585bf00..c4b3923e92 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTargetAllItemTypeSkillCondition implements ISkillCondition { - public OpTargetAllItemTypeSkillCondition(StatsSet params) + public OpTargetAllItemTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 6b85389d62..5492e96e1a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTargetArmorTypeSkillCondition implements ISkillCondition { - public OpTargetArmorTypeSkillCondition(StatsSet params) + public OpTargetArmorTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java index 0c0090fbc4..97e07a1822 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpTargetDoorSkillCondition implements ISkillCondition { private final List _doorIds; - public OpTargetDoorSkillCondition(StatsSet params) + public OpTargetDoorSkillCondition(StatSet params) { _doorIds = params.getList("doorIds", Integer.class); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java index 6fbc3cda10..eaabf4a73d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpTargetMyPledgeAcademySkillCondition implements ISkillCondition { - public OpTargetMyPledgeAcademySkillCondition(StatsSet params) + public OpTargetMyPledgeAcademySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java index d5820600dd..14a744613d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpTargetNpcSkillCondition implements ISkillCondition { private final List _npcId; - public OpTargetNpcSkillCondition(StatsSet params) + public OpTargetNpcSkillCondition(StatSet params) { _npcId = params.getList("npcIds", Integer.class); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java index 854225a75a..b0c5e50ae3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpTargetPcSkillCondition implements ISkillCondition { - public OpTargetPcSkillCondition(StatsSet params) + public OpTargetPcSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index 7faecb2ffd..62fd4b365f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Weapon; @@ -34,7 +34,7 @@ public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition { private final List _weaponTypes = new ArrayList<>(); - public OpTargetWeaponAttackTypeSkillCondition(StatsSet params) + public OpTargetWeaponAttackTypeSkillCondition(StatSet params) { final List weaponTypes = params.getList("weaponType", String.class); if (weaponTypes != null) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java index 8451365885..e114c03412 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTerritorySkillCondition implements ISkillCondition { - public OpTerritorySkillCondition(StatsSet params) + public OpTerritorySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java index 13f287687e..fde1293086 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpUnlockSkillCondition implements ISkillCondition { - public OpUnlockSkillCondition(StatsSet params) + public OpUnlockSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java index 8cc76a34bb..46dea5bbcb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpUseFirecrackerSkillCondition implements ISkillCondition { - public OpUseFirecrackerSkillCondition(StatsSet params) + public OpUseFirecrackerSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java index f3b54bbad7..651dade274 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpUsePraseedSkillCondition implements ISkillCondition { - public OpUsePraseedSkillCondition(StatsSet params) + public OpUsePraseedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java index 890b0fcd5f..dd57df0e13 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.MountType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpWyvernSkillCondition implements ISkillCondition { - public OpWyvernSkillCondition(StatsSet params) + public OpWyvernSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java index 49085b6674..8590262afc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class PossessHolythingSkillCondition implements ISkillCondition { - public PossessHolythingSkillCondition(StatsSet params) + public PossessHolythingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java index 8b0fb55554..38b5644fb1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class RemainCpPerSkillCondition implements ISkillCondition private final int _amount; private final SkillConditionPercentType _percentType; - public RemainCpPerSkillCondition(StatsSet params) + public RemainCpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java index 612367a233..1ad96100ad 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -33,7 +33,7 @@ public class RemainHpPerSkillCondition implements ISkillCondition private final SkillConditionPercentType _percentType; private final SkillConditionAffectType _affectType; - public RemainHpPerSkillCondition(StatsSet params) + public RemainHpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java index 5455c1587a..39085349d9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class RemainMpPerSkillCondition implements ISkillCondition private final int _amount; private final SkillConditionPercentType _percentType; - public RemainMpPerSkillCondition(StatsSet params) + public RemainMpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java index 7de47f103f..6e9e5ad821 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class SoulSavedSkillCondition implements ISkillCondition { private final int _amount; - public SoulSavedSkillCondition(StatsSet params) + public SoulSavedSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java index 0b75a5a623..f4bdbaaecb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class TargetItemCrystalTypeSkillCondition implements ISkillCondition { - public TargetItemCrystalTypeSkillCondition(StatsSet params) + public TargetItemCrystalTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java index 51502ff209..604a41f904 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.MentorManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMyMenteeSkillCondition implements ISkillCondition { - public TargetMyMenteeSkillCondition(StatsSet params) + public TargetMyMenteeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java index fc621365a9..4bfb496634 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class TargetMyPartySkillCondition implements ISkillCondition { private final boolean _includeMe; - public TargetMyPartySkillCondition(StatsSet params) + public TargetMyPartySkillCondition(StatSet params) { _includeMe = params.getBoolean("includeMe"); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java index 9ebec0e691..d44a1bc8a9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMyPledgeSkillCondition implements ISkillCondition { - public TargetMyPledgeSkillCondition(StatsSet params) + public TargetMyPledgeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java index f4da8d6079..5045aa3848 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class TargetRaceSkillCondition implements ISkillCondition { private final Race _race; - public TargetRaceSkillCondition(StatsSet params) + public TargetRaceSkillCondition(StatSet params) { _race = params.getEnum("race", Race.class); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java index b1d0ec8553..7e9236b634 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.ActionDataHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -57,7 +57,7 @@ public class ActionData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "action", actionNode -> { - final ActionDataHolder holder = new ActionDataHolder(new StatsSet(parseAttributes(actionNode))); + final ActionDataHolder holder = new ActionDataHolder(new StatSet(parseAttributes(actionNode))); _actionData.put(holder.getId(), holder); })); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java index 36002572b0..f7762ab07b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java @@ -32,7 +32,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.AdminCommandAccessRight; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -72,7 +72,7 @@ public class AdminData implements IXmlReader { NamedNodeMap attrs; Node attr; - StatsSet set; + StatSet set; AccessLevel level; AdminCommandAccessRight command; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -83,7 +83,7 @@ public class AdminData implements IXmlReader { if ("access".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -99,7 +99,7 @@ public class AdminData implements IXmlReader } else if ("admin".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index a5de47d07c..c31f2ea750 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; @@ -83,7 +83,7 @@ public class AppearanceItemData implements IXmlReader { if ("appearance_stone".equalsIgnoreCase(d.getNodeName())) { - final AppearanceStone stone = new AppearanceStone(new StatsSet(parseAttributes(d))); + final AppearanceStone stone = new AppearanceStone(new StatSet(parseAttributes(d))); for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) { switch (c.getNodeName()) @@ -120,7 +120,7 @@ public class AppearanceItemData implements IXmlReader } case "visual": { - stone.addVisualId(new AppearanceHolder(new StatsSet(parseAttributes(c)))); + stone.addVisualId(new AppearanceHolder(new StatSet(parseAttributes(c)))); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java index 6c96d3874a..6eac3240e7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -64,7 +64,7 @@ public class AttendanceRewardData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "item", rewardNode -> { - final StatsSet set = new StatsSet(parseAttributes(rewardNode)); + final StatSet set = new StatSet(parseAttributes(rewardNode)); final int itemId = set.getInt("id"); final int itemCount = set.getInt("count"); if (ItemTable.getInstance().getTemplate(itemId) == null) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java index 891d19fcf2..3054b0e7ef 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.beautyshop.BeautyData; import org.l2jmobius.gameserver.model.beautyshop.BeautyItem; @@ -56,7 +56,7 @@ public class BeautyShopData implements IXmlReader public void parseDocument(Document doc, File f) { NamedNodeMap attrs; - StatsSet set; + StatSet set; Node att; Race race = null; Sex sex = null; @@ -92,7 +92,7 @@ public class BeautyShopData implements IXmlReader if ("hair".equalsIgnoreCase(a.getNodeName())) { attrs = a.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -105,7 +105,7 @@ public class BeautyShopData implements IXmlReader if ("color".equalsIgnoreCase(g.getNodeName())) { attrs = g.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -119,7 +119,7 @@ public class BeautyShopData implements IXmlReader else if ("face".equalsIgnoreCase(a.getNodeName())) { attrs = a.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java index 37e977c51e..530a5d975a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java @@ -34,7 +34,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.entity.ClanHall; @@ -66,7 +66,7 @@ public class ClanHallData implements IXmlReader final List doors = new ArrayList<>(); final List npcs = new ArrayList<>(); final List teleports = new ArrayList<>(); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); for (Node listNode = doc.getFirstChild(); listNode != null; listNode = listNode.getNextSibling()) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java index ae608cefb6..f1a23734e0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.combination.CombinationItem; import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; @@ -57,7 +57,7 @@ public class CombinationItemsData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "item", itemNode -> { - final CombinationItem item = new CombinationItem(new StatsSet(parseAttributes(itemNode))); + final CombinationItem item = new CombinationItem(new StatSet(parseAttributes(itemNode))); forEach(itemNode, "reward", rewardNode -> { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java index 038738b138..4af039b48d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.CubicSkill; import org.l2jmobius.gameserver.model.cubic.ICubicConditionHolder; @@ -61,7 +61,7 @@ public class CubicData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - forEach(doc, "list", listNode -> forEach(listNode, "cubic", cubicNode -> parseTemplate(cubicNode, new CubicTemplate(new StatsSet(parseAttributes(cubicNode)))))); + forEach(doc, "list", listNode -> forEach(listNode, "cubic", cubicNode -> parseTemplate(cubicNode, new CubicTemplate(new StatSet(parseAttributes(cubicNode)))))); } /** @@ -137,7 +137,7 @@ public class CubicData implements IXmlReader { forEach(cubicNode, "skill", skillNode -> { - final CubicSkill skill = new CubicSkill(new StatsSet(parseAttributes(skillNode))); + final CubicSkill skill = new CubicSkill(new StatSet(parseAttributes(skillNode))); forEach(cubicNode, "conditions", conditionNode -> parseConditions(cubicNode, template, skill)); template.getSkills().add(skill); }); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java index 3d19bee079..ede9b72202 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -62,7 +62,7 @@ public class DailyMissionData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "reward", rewardNode -> { - final StatsSet set = new StatsSet(parseAttributes(rewardNode)); + final StatSet set = new StatSet(parseAttributes(rewardNode)); final List items = new ArrayList<>(1); forEach(rewardNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> @@ -80,14 +80,14 @@ public class DailyMissionData implements IXmlReader // Initial values in case handler doesn't exists set.set("handler", ""); - set.set("params", StatsSet.EMPTY_STATSET); + set.set("params", StatSet.EMPTY_STATSET); // Parse handler and parameters forEach(rewardNode, "handler", handlerNode -> { set.set("handler", parseString(handlerNode.getAttributes(), "name")); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); set.set("params", params); forEach(handlerNode, "param", paramNode -> params.set(parseString(paramNode.getAttributes(), "name"), paramNode.getTextContent())); }); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java index 835eab4fe9..53248de524 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java @@ -35,7 +35,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -51,7 +51,7 @@ public class DoorData implements IXmlReader // Info holders private final Map> _groups = new HashMap<>(); private final Map _doors = new HashMap<>(); - private final Map _templates = new HashMap<>(); + private final Map _templates = new HashMap<>(); private final Map> _regions = new HashMap<>(); protected DoorData() @@ -75,9 +75,9 @@ public class DoorData implements IXmlReader LOGGER.info(getClass().getSimpleName() + ": Loaded " + _doors.size() + " Door Templates for " + _regions.size() + " regions."); } - public StatsSet parseDoor(Node doorNode) + public StatSet parseDoor(Node doorNode) { - final StatsSet params = new StatsSet(parseAttributes(doorNode)); + final StatSet params = new StatSet(parseAttributes(doorNode)); params.set("baseHpMax", 1); // Avoid doors without HP value created dead due to default value 0 in CreatureTemplate forEach(doorNode, IXmlReader::isNode, innerDoorNode -> @@ -115,7 +115,7 @@ public class DoorData implements IXmlReader /** * @param set */ - private void applyCollisions(StatsSet set) + private void applyCollisions(StatSet set) { // Insert Collision data if (set.contains("nodeX_0") && set.contains("nodeY_0") && set.contains("nodeX_1") && set.contains("nodeY_1")) @@ -142,7 +142,7 @@ public class DoorData implements IXmlReader * @param set * @return */ - public DoorInstance spawnDoor(StatsSet set) + public DoorInstance spawnDoor(StatSet set) { // Create door template + door instance final DoorTemplate template = new DoorTemplate(set); @@ -183,7 +183,7 @@ public class DoorData implements IXmlReader return door; } - public StatsSet getDoorTemplate(int doorId) + public StatSet getDoorTemplate(int doorId) { return _templates.get(doorId); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java index eca42a9a34..637ef1e953 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -64,7 +64,7 @@ public class EnchantItemData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node att; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -76,7 +76,7 @@ public class EnchantItemData implements IXmlReader if ("enchant".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -107,7 +107,7 @@ public class EnchantItemData implements IXmlReader else if ("support".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java index 46701fd777..bb1e8026b7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.SkillEnchantType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.EnchantSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -69,10 +69,10 @@ public class EnchantSkillGroupsData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "enchant", enchantNode -> { - final EnchantSkillHolder enchantSkillHolder = new EnchantSkillHolder(new StatsSet(parseAttributes(enchantNode))); + final EnchantSkillHolder enchantSkillHolder = new EnchantSkillHolder(new StatSet(parseAttributes(enchantNode))); forEach(enchantNode, "sps", spsNode -> forEach(spsNode, "sp", spNode -> enchantSkillHolder.addSp(parseEnum(spNode.getAttributes(), SkillEnchantType.class, "type"), parseInteger(spNode.getAttributes(), "amount")))); forEach(enchantNode, "chances", chancesNode -> forEach(chancesNode, "chance", chanceNode -> enchantSkillHolder.addChance(parseEnum(chanceNode.getAttributes(), SkillEnchantType.class, "type"), parseInteger(chanceNode.getAttributes(), "value")))); - forEach(enchantNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> enchantSkillHolder.addRequiredItem(parseEnum(itemNode.getAttributes(), SkillEnchantType.class, "type"), new ItemHolder(new StatsSet(parseAttributes(itemNode)))))); + forEach(enchantNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> enchantSkillHolder.addRequiredItem(parseEnum(itemNode.getAttributes(), SkillEnchantType.class, "type"), new ItemHolder(new StatSet(parseAttributes(itemNode)))))); _enchantSkillHolders.put(parseInteger(enchantNode.getAttributes(), "level"), enchantSkillHolder); })); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/EquipmentUpgradeData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/EquipmentUpgradeData.java index 4700307bd0..c6745249f6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/EquipmentUpgradeData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/EquipmentUpgradeData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.EquipmentUpgradeHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -57,7 +57,7 @@ public class EquipmentUpgradeData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "upgrade", upgradeNode -> { - final StatsSet set = new StatsSet(parseAttributes(upgradeNode)); + final StatSet set = new StatSet(parseAttributes(upgradeNode)); final int id = set.getInt("id"); final String[] item = set.getString("item").split(","); final int requiredItemId = Integer.parseInt(item[0]); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java index a8bb0397ac..037af7e1ae 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java @@ -34,7 +34,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.eventengine.AbstractEventManager; import org.l2jmobius.gameserver.model.eventengine.EventMethodNotification; import org.l2jmobius.gameserver.model.eventengine.EventScheduler; @@ -156,7 +156,7 @@ public class EventEngineData implements IXmlReader */ private void parseVariables(AbstractEventManager eventManager, Node innerNode) { - final StatsSet variables = new StatsSet(LinkedHashMap::new); + final StatSet variables = new StatSet(LinkedHashMap::new); for (Node variableNode = innerNode.getFirstChild(); variableNode != null; variableNode = variableNode.getNextSibling()) { if ("variable".equals(variableNode.getNodeName())) @@ -188,7 +188,7 @@ public class EventEngineData implements IXmlReader { if ("schedule".equals(scheduleNode.getNodeName())) { - final StatsSet params = new StatsSet(LinkedHashMap::new); + final StatSet params = new StatSet(LinkedHashMap::new); final NamedNodeMap attrs = scheduleNode.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -235,7 +235,7 @@ public class EventEngineData implements IXmlReader } else if ("conditionalSchedule".equals(scheduleNode.getNodeName())) { - final StatsSet params = new StatsSet(LinkedHashMap::new); + final StatSet params = new StatSet(LinkedHashMap::new); final NamedNodeMap attrs = scheduleNode.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -346,7 +346,7 @@ public class EventEngineData implements IXmlReader * @param variableNode */ @SuppressWarnings("unchecked") - private void parseListVariables(AbstractEventManager eventManager, StatsSet variables, Node variableNode) + private void parseListVariables(AbstractEventManager eventManager, StatSet variables, Node variableNode) { final String name = parseString(variableNode.getAttributes(), "name"); final String type = parseString(variableNode.getAttributes(), "type"); @@ -419,7 +419,7 @@ public class EventEngineData implements IXmlReader * @param variableNode */ @SuppressWarnings("unchecked") - private void parseMapVariables(AbstractEventManager eventManager, StatsSet variables, Node variableNode) + private void parseMapVariables(AbstractEventManager eventManager, StatSet variables, Node variableNode) { final String name = parseString(variableNode.getAttributes(), "name"); final String keyType = parseString(variableNode.getAttributes(), "keyType"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java index db19c5fdff..0724877d9d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.ConditionHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.ICondition; import org.l2jmobius.gameserver.model.holders.ExtendDropDataHolder; import org.l2jmobius.gameserver.model.holders.ExtendDropItemHolder; @@ -62,7 +62,7 @@ public class ExtendDropData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "drop", dropNode -> { - final StatsSet set = new StatsSet(parseAttributes(dropNode)); + final StatSet set = new StatSet(parseAttributes(dropNode)); final List items = new ArrayList<>(1); forEach(dropNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> @@ -80,8 +80,8 @@ public class ExtendDropData implements IXmlReader forEach(dropNode, "conditions", conditionsNode -> forEach(conditionsNode, "condition", conditionNode -> { final String conditionName = parseString(conditionNode.getAttributes(), "name"); - final StatsSet params = (StatsSet) parseValue(conditionNode); - final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); + final StatSet params = (StatSet) parseValue(conditionNode); + final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); if (conditionFunction != null) { conditions.add(conditionFunction.apply(params)); @@ -109,7 +109,7 @@ public class ExtendDropData implements IXmlReader private Object parseValue(Node node) { - StatsSet statsSet = null; + StatSet statSet = null; List list = null; Object text = null; for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) @@ -145,12 +145,12 @@ public class ExtendDropData implements IXmlReader final Object value = parseValue(node); if (value != null) { - if (statsSet == null) + if (statSet == null) { - statsSet = new StatsSet(); + statSet = new StatSet(); } - statsSet.set(nodeName, value); + statSet.set(nodeName, value); } } } @@ -161,9 +161,9 @@ public class ExtendDropData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", list); + statSet.set(".", list); } else { @@ -176,16 +176,16 @@ public class ExtendDropData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", text); + statSet.set(".", text); } else { return text; } } - return statsSet; + return statSet; } public ExtendDropDataHolder getExtendDropById(int id) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java index 57a16d6390..608f4702b8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.FakePlayerHolder; @@ -72,7 +72,7 @@ public class FakePlayerData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayer", fakePlayerNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerNode)); final int npcId = set.getInt("npcId"); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); final String name = template.getName(); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java index 18cc499b71..a5ade27c03 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.FenceState; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldRegion; import org.l2jmobius.gameserver.model.actor.instance.FenceInstance; @@ -79,7 +79,7 @@ public class FenceData implements IXmlReader private void spawnFence(Node fenceNode) { - final StatsSet set = new StatsSet(parseAttributes(fenceNode)); + final StatSet set = new StatSet(parseAttributes(fenceNode)); spawnFence(set.getInt("x"), set.getInt("y"), set.getInt("z"), set.getString("name"), set.getInt("width"), set.getInt("length"), set.getInt("height"), 0, set.getEnum("state", FenceState.class, FenceState.CLOSED)); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java index 67dd4e396b..02efb756f2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.Henna; import org.l2jmobius.gameserver.model.skills.Skill; @@ -86,7 +86,7 @@ public class HennaData implements IXmlReader */ private void parseHenna(Node d) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final List wearClassIds = new ArrayList<>(); final List skills = new ArrayList<>(); NamedNodeMap attrs = d.getAttributes(); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java index 03ad8ab79e..d81e85948d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; @@ -93,7 +93,7 @@ public class InitialEquipmentData implements IXmlReader { if ("item".equalsIgnoreCase(c.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java index 72080aa4ac..54b1909d60 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemPointHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; @@ -55,17 +55,17 @@ public class LuckyGameData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "luckygame", rewardNode -> { - final LuckyGameDataHolder holder = new LuckyGameDataHolder(new StatsSet(parseAttributes(rewardNode))); + final LuckyGameDataHolder holder = new LuckyGameDataHolder(new StatSet(parseAttributes(rewardNode))); forEach(rewardNode, "common_reward", commonRewardNode -> forEach(commonRewardNode, "item", itemNode -> { - final StatsSet stats = new StatsSet(parseAttributes(itemNode)); + final StatSet stats = new StatSet(parseAttributes(itemNode)); holder.addCommonReward(new ItemChanceHolder(stats.getInt("id"), stats.getDouble("chance"), stats.getLong("count"))); })); forEach(rewardNode, "unique_reward", uniqueRewardNode -> forEach(uniqueRewardNode, "item", itemNode -> { - holder.addUniqueReward(new ItemPointHolder(new StatsSet(parseAttributes(itemNode)))); + holder.addUniqueReward(new ItemPointHolder(new StatSet(parseAttributes(itemNode)))); })); forEach(rewardNode, "modify_reward", uniqueRewardNode -> @@ -74,7 +74,7 @@ public class LuckyGameData implements IXmlReader holder.setMaxModifyRewardGame(parseInteger(uniqueRewardNode.getAttributes(), "max_game")); forEach(uniqueRewardNode, "item", itemNode -> { - final StatsSet stats = new StatsSet(parseAttributes(itemNode)); + final StatSet stats = new StatSet(parseAttributes(itemNode)); holder.addModifyReward(new ItemChanceHolder(stats.getInt("id"), stats.getDouble("chance"), stats.getLong("count"))); }); }); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java index 75bb48ed37..190653cdec 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java @@ -35,7 +35,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.SpecialItemType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; @@ -90,7 +90,7 @@ public class MultisellData implements IXmlReader { forEach(doc, "list", listNode -> { - final StatsSet set = new StatsSet(parseAttributes(listNode)); + final StatSet set = new StatSet(parseAttributes(listNode)); final int listId = Integer.parseInt(f.getName().substring(0, f.getName().length() - 4)); final List entries = new ArrayList<>(listNode.getChildNodes().getLength()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java index e6c9fd6758..4ce4d1f496 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java @@ -45,7 +45,7 @@ import org.l2jmobius.gameserver.enums.DropType; import org.l2jmobius.gameserver.enums.ElementalType; import org.l2jmobius.gameserver.enums.MpRewardAffectType; import org.l2jmobius.gameserver.enums.MpRewardType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.DropHolder; @@ -96,7 +96,7 @@ public class NpcData implements IXmlReader if ("npc".equalsIgnoreCase(listNode.getNodeName())) { NamedNodeMap attrs = listNode.getAttributes(); - final StatsSet set = new StatsSet(new HashMap<>()); + final StatSet set = new StatSet(new HashMap<>()); final int npcId = parseInteger(attrs, "id"); Map parameters = null; Map skills = null; @@ -517,11 +517,11 @@ public class NpcData implements IXmlReader if (parameters != null) { // Using unmodifiable map parameters of template are not meant to be changed at runtime. - template.setParameters(new StatsSet(Collections.unmodifiableMap(parameters))); + template.setParameters(new StatSet(Collections.unmodifiableMap(parameters))); } else { - template.setParameters(StatsSet.EMPTY_STATSET); + template.setParameters(StatSet.EMPTY_STATSET); } if (skills != null) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java index 3712cca6af..373f87ecfc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -79,7 +79,7 @@ public class NpcNameLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); NPC_NAME_LOCALISATIONS.get(_lang).put(set.getInt("id"), new String[] { set.getString("name"), diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 55dcd539aa..36c5897ecd 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.EffectHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; @@ -71,7 +71,7 @@ public class OptionData implements IXmlReader forEach(innerNode, "effect", effectNode -> { final String name = parseString(effectNode.getAttributes(), "name"); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); forEach(effectNode, IXmlReader::isNode, paramNode -> params.set(paramNode.getNodeName(), SkillData.getInstance().parseValue(paramNode, true, false, Collections.emptyMap()))); option.addEffect(EffectHandler.getInstance().getHandlerFactory(name).apply(params)); }); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java index b1bb74baf6..c893725bc3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.PetLevelData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * This class parse and hold all pet parameters.
    @@ -116,7 +116,7 @@ public class PetDataTable implements IXmlReader if (s.getNodeName().equals("stat")) { final int level = Integer.parseInt(s.getAttributes().getNamedItem("level").getNodeValue()); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (Node bean = s.getFirstChild(); bean != null; bean = bean.getNextSibling()) { if (bean.getNodeName().equals("set")) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java index ab1cb3b257..b646782547 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.base.ClassId; @@ -83,7 +83,7 @@ public class PlayerTemplateData implements IXmlReader } else if ("staticData".equalsIgnoreCase(d.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.set("classId", classId); final List creationPoints = new ArrayList<>(); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java index 34a04edd9b..35b879e73f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; @@ -83,7 +83,7 @@ public class PrimeShopData implements IXmlReader { NamedNodeMap attrs = d.getAttributes(); Node att; - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java index b7ed4c8fba..43e5d84784 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.RecipeInstance; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.RecipeStatInstance; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; /** @@ -82,7 +82,7 @@ public class RecipeData implements IXmlReader Node att; int id = -1; boolean haveRare = false; - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); att = attrs.getNamedItem("id"); if (att == null) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java index 796f5ae085..9a8397e085 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java @@ -29,7 +29,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate; /** @@ -60,7 +60,7 @@ public class ResidenceFunctionsData implements IXmlReader forEach(doc, "list", list -> forEach(list, "function", func -> { final NamedNodeMap attrs = func.getAttributes(); - final StatsSet set = new StatsSet(HashMap::new); + final StatSet set = new StatSet(HashMap::new); for (int i = 0; i < attrs.getLength(); i++) { final Node node = attrs.item(i); @@ -69,7 +69,7 @@ public class ResidenceFunctionsData implements IXmlReader forEach(func, "function", levelNode -> { final NamedNodeMap levelAttrs = levelNode.getAttributes(); - final StatsSet levelSet = new StatsSet(HashMap::new); + final StatSet levelSet = new StatSet(HashMap::new); levelSet.merge(set); for (int i = 0; i < levelAttrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java index 053d9089ce..d6b28a5962 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; /** @@ -82,7 +82,7 @@ public class SendMessageLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); SEND_MESSAGE_LOCALISATIONS.get(_lang).put(set.getString("message").split(SPLIT_STRING), set.getString("translation").split(SPLIT_STRING)); })); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java index e473030c56..c3eda1f3b8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.actor.instance.ShuttleInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; @@ -72,7 +72,7 @@ public class ShuttleData implements IXmlReader public void parseDocument(Document doc, File f) { NamedNodeMap attrs; - StatsSet set; + StatSet set; Node att; ShuttleDataHolder data; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -84,7 +84,7 @@ public class ShuttleData implements IXmlReader if ("shuttle".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -164,7 +164,7 @@ public class ShuttleData implements IXmlReader { for (ShuttleDataHolder data : _shuttles.values()) { - final ShuttleInstance shuttle = new ShuttleInstance(new CreatureTemplate(new StatsSet())); + final ShuttleInstance shuttle = new ShuttleInstance(new CreatureTemplate(new StatSet())); shuttle.setData(data); shuttle.setHeading(data.getLocation().getHeading()); shuttle.setLocationInvisible(data.getLocation()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java index 9db0b5f64b..ba000649f2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.SiegeScheduleDate; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.util.Util; /** @@ -54,7 +54,7 @@ public class SiegeScheduleData implements IXmlReader LOGGER.info(getClass().getSimpleName() + ": Loaded " + _scheduleData.size() + " siege schedulers."); if (_scheduleData.isEmpty()) { - _scheduleData.add(new SiegeScheduleDate(new StatsSet())); + _scheduleData.add(new SiegeScheduleDate(new StatSet())); LOGGER.info(getClass().getSimpleName() + ": Emergency loaded " + _scheduleData.size() + " default siege schedulers."); } } @@ -72,7 +72,7 @@ public class SiegeScheduleData implements IXmlReader { case "schedule": { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final NamedNodeMap attrs = cd.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java index cc019c4dbb..2592b3ed97 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java @@ -40,7 +40,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.EffectHandler; import org.l2jmobius.gameserver.handler.SkillConditionHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.EffectScope; @@ -67,9 +67,9 @@ public class SkillData implements IXmlReader private final Integer _toLevel; private final Integer _fromSubLevel; private final Integer _toSubLevel; - private final Map> _info; + private final Map> _info; - public NamedParamInfo(String name, Integer fromLevel, Integer toLevel, Integer fromSubLevel, Integer toSubLevel, Map> info) + public NamedParamInfo(String name, Integer fromLevel, Integer toLevel, Integer fromSubLevel, Integer toSubLevel, Map> info) { _name = name; _fromLevel = fromLevel; @@ -104,7 +104,7 @@ public class SkillData implements IXmlReader return _toSubLevel; } - public Map> getInfo() + public Map> getInfo() { return _info; } @@ -241,8 +241,8 @@ public class SkillData implements IXmlReader { NamedNodeMap attributes = listNode.getAttributes(); final Map> levels = new HashMap<>(); - final Map> skillInfo = new HashMap<>(); - final StatsSet generalSkillInfo = skillInfo.computeIfAbsent(-1, k -> new HashMap<>()).computeIfAbsent(-1, k -> new StatsSet()); + final Map> skillInfo = new HashMap<>(); + final StatSet generalSkillInfo = skillInfo.computeIfAbsent(-1, k -> new HashMap<>()).computeIfAbsent(-1, k -> new StatSet()); parseAttributes(attributes, "", generalSkillInfo); @@ -321,7 +321,7 @@ public class SkillData implements IXmlReader { return; } - subLevelMap.forEach((subLevel, statsSet) -> + subLevelMap.forEach((subLevel, statSet) -> { if (subLevel == -1) { @@ -339,7 +339,7 @@ public class SkillData implements IXmlReader { return; } - subLevelMap.forEach((subLevel, statsSet) -> + subLevelMap.forEach((subLevel, statSet) -> { if (subLevel == -1) { @@ -371,31 +371,31 @@ public class SkillData implements IXmlReader levels.forEach((level, subLevels) -> subLevels.forEach(subLevel -> { - final StatsSet statsSet = Optional.ofNullable(skillInfo.getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatsSet::new); - skillInfo.getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(statsSet.getSet()::putIfAbsent); - skillInfo.getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(statsSet.getSet()::putIfAbsent); - statsSet.set(".level", level); - statsSet.set(".subLevel", subLevel); - final Skill skill = new Skill(statsSet); + final StatSet statSet = Optional.ofNullable(skillInfo.getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatSet::new); + skillInfo.getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(statSet.getSet()::putIfAbsent); + skillInfo.getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(statSet.getSet()::putIfAbsent); + statSet.set(".level", level); + statSet.set(".subLevel", subLevel); + final Skill skill = new Skill(statSet); forEachNamedParamInfoParam(effectParamInfo, level, subLevel, ((effectScope, params) -> { final String effectName = params.getString(".name"); params.remove(".name"); try { - final Function effectFunction = EffectHandler.getInstance().getHandlerFactory(effectName); + final Function effectFunction = EffectHandler.getInstance().getHandlerFactory(effectName); if (effectFunction != null) { skill.addEffect(effectScope, effectFunction.apply(params)); } else { - LOGGER.warning(getClass().getSimpleName() + ": Missing effect for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]"); + LOGGER.warning(getClass().getSimpleName() + ": Missing effect for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]"); } } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading effect for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading effect for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]", e); } })); @@ -405,19 +405,19 @@ public class SkillData implements IXmlReader params.remove(".name"); try { - final Function conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName); + final Function conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName); if (conditionFunction != null) { skill.addCondition(skillConditionScope, conditionFunction.apply(params)); } else { - LOGGER.warning(getClass().getSimpleName() + ": Missing condition for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + skillConditionScope + "] Effect Name[" + conditionName + "]"); + LOGGER.warning(getClass().getSimpleName() + ": Missing condition for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + skillConditionScope + "] Effect Name[" + conditionName + "]"); } } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading condition for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Condition Scope[" + skillConditionScope + "] Condition Name[" + conditionName + "]", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading condition for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Condition Scope[" + skillConditionScope + "] Condition Name[" + conditionName + "]", e); } })); @@ -434,16 +434,16 @@ public class SkillData implements IXmlReader } } - private void forEachNamedParamInfoParam(Map> paramInfo, int level, int subLevel, BiConsumer consumer) + private void forEachNamedParamInfoParam(Map> paramInfo, int level, int subLevel, BiConsumer consumer) { paramInfo.forEach((scope, namedParamInfos) -> namedParamInfos.forEach(namedParamInfo -> { if ((((namedParamInfo.getFromLevel() == null) && (namedParamInfo.getToLevel() == null)) || ((namedParamInfo.getFromLevel() <= level) && (namedParamInfo.getToLevel() >= level))) // && (((namedParamInfo.getFromSubLevel() == null) && (namedParamInfo.getToSubLevel() == null)) || ((namedParamInfo.getFromSubLevel() <= subLevel) && (namedParamInfo.getToSubLevel() >= subLevel)))) { - final StatsSet params = Optional.ofNullable(namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatsSet::new); - namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); - namedParamInfo.getInfo().getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); + final StatSet params = Optional.ofNullable(namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatSet::new); + namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); + namedParamInfo.getInfo().getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); params.set(".name", namedParamInfo.getName()); consumer.accept(scope, params); } @@ -460,7 +460,7 @@ public class SkillData implements IXmlReader final Integer subLevel = parseInteger(attributes, "subLevel"); final Integer fromSubLevel = parseInteger(attributes, "fromSubLevel", subLevel); final Integer toSubLevel = parseInteger(attributes, "toSubLevel", subLevel); - final Map> info = new HashMap<>(); + final Map> info = new HashMap<>(); for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) { if (!node.getNodeName().equals("#text")) @@ -471,7 +471,7 @@ public class SkillData implements IXmlReader return new NamedParamInfo(name, fromLevel, toLevel, fromSubLevel, toSubLevel, info); } - private void parseInfo(Node node, Map>> variableValues, Map> info) + private void parseInfo(Node node, Map>> variableValues, Map> info) { Map> values = parseValues(node); final Object generalValue = values.getOrDefault(-1, Collections.emptyMap()).get(-1); @@ -492,7 +492,7 @@ public class SkillData implements IXmlReader } } - values.forEach((level, subLevelMap) -> subLevelMap.forEach((subLevel, value) -> info.computeIfAbsent(level, k -> new HashMap<>()).computeIfAbsent(subLevel, k -> new StatsSet()).set(node.getNodeName(), value))); + values.forEach((level, subLevelMap) -> subLevelMap.forEach((subLevel, value) -> info.computeIfAbsent(level, k -> new HashMap<>()).computeIfAbsent(subLevel, k -> new StatSet()).set(node.getNodeName(), value))); } private Map> parseValues(Node node) @@ -535,7 +535,7 @@ public class SkillData implements IXmlReader variables.put("index", (i - fromLevel) + 1d); variables.put("subIndex", (j - fromSubLevel) + 1d); final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1); - if ((base != null) && !(base instanceof StatsSet)) + if ((base != null) && !(base instanceof StatSet)) { variables.put("base", Double.parseDouble(String.valueOf(base))); } @@ -555,13 +555,13 @@ public class SkillData implements IXmlReader Object parseValue(Node node, boolean blockValue, boolean parseAttributes, Map variables) { - StatsSet statsSet = null; + StatSet statSet = null; List list = null; Object text = null; if (parseAttributes && (!node.getNodeName().equals("value") || !blockValue) && (node.getAttributes().getLength() > 0)) { - statsSet = new StatsSet(); - parseAttributes(node.getAttributes(), "", statsSet, variables); + statSet = new StatSet(); + parseAttributes(node.getAttributes(), "", statSet, variables); } for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) { @@ -604,12 +604,12 @@ public class SkillData implements IXmlReader final Object value = parseValue(node, false, true, variables); if (value != null) { - if (statsSet == null) + if (statSet == null) { - statsSet = new StatsSet(); + statSet = new StatSet(); } - statsSet.set(nodeName, value); + statSet.set(nodeName, value); } } } @@ -620,9 +620,9 @@ public class SkillData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", list); + statSet.set(".", list); } else { @@ -635,30 +635,30 @@ public class SkillData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", text); + statSet.set(".", text); } else { return text; } } - return statsSet; + return statSet; } - private void parseAttributes(NamedNodeMap attributes, String prefix, StatsSet statsSet, Map variables) + private void parseAttributes(NamedNodeMap attributes, String prefix, StatSet statSet, Map variables) { for (int i = 0; i < attributes.getLength(); i++) { final Node attributeNode = attributes.item(i); - statsSet.set(prefix + "." + attributeNode.getNodeName(), parseNodeValue(attributeNode.getNodeValue(), variables)); + statSet.set(prefix + "." + attributeNode.getNodeName(), parseNodeValue(attributeNode.getNodeValue(), variables)); } } - private void parseAttributes(NamedNodeMap attributes, String prefix, StatsSet statsSet) + private void parseAttributes(NamedNodeMap attributes, String prefix, StatSet statSet) { - parseAttributes(attributes, prefix, statsSet, Collections.emptyMap()); + parseAttributes(attributes, prefix, statSet, Collections.emptyMap()); } private Object parseNodeValue(String value, Map variables) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java index 7fab3401b8..4609f8c7bb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java @@ -43,7 +43,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.SubclassType; import org.l2jmobius.gameserver.model.SkillLearn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.base.ClassId; @@ -228,7 +228,7 @@ public class SkillTreesData implements IXmlReader { if ("skill".equalsIgnoreCase(c.getNodeName())) { - final StatsSet learnSkillSet = new StatsSet(); + final StatSet learnSkillSet = new StatSet(); attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java index 87915d89eb..78c22d1e7d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java @@ -36,7 +36,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.ChanceLocation; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.MinionHolder; import org.l2jmobius.gameserver.model.interfaces.IParameterized; @@ -169,7 +169,7 @@ public class SpawnsData implements IXmlReader public void parseSpawn(Node spawnsNode, File file, Collection spawns) { - final SpawnTemplate spawnTemplate = new SpawnTemplate(new StatsSet(parseAttributes(spawnsNode)), file); + final SpawnTemplate spawnTemplate = new SpawnTemplate(new StatSet(parseAttributes(spawnsNode)), file); SpawnGroup defaultGroup = null; for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling()) { @@ -185,7 +185,7 @@ public class SpawnsData implements IXmlReader { if (defaultGroup == null) { - defaultGroup = new SpawnGroup(StatsSet.EMPTY_STATSET); + defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET); } parseNpc(innerNode, spawnTemplate, defaultGroup); } @@ -244,7 +244,7 @@ public class SpawnsData implements IXmlReader private void parseGroup(Node n, SpawnTemplate spawnTemplate) { - final SpawnGroup group = new SpawnGroup(new StatsSet(parseAttributes(n))); + final SpawnGroup group = new SpawnGroup(new StatSet(parseAttributes(n))); forEach(n, IXmlReader::isNode, npcNode -> { switch (npcNode.getNodeName()) @@ -271,7 +271,7 @@ public class SpawnsData implements IXmlReader */ private void parseNpc(Node n, SpawnTemplate spawnTemplate, SpawnGroup group) { - final NpcSpawnTemplate npcTemplate = new NpcSpawnTemplate(spawnTemplate, group, new StatsSet(parseAttributes(n))); + final NpcSpawnTemplate npcTemplate = new NpcSpawnTemplate(spawnTemplate, group, new StatSet(parseAttributes(n))); final NpcTemplate template = NpcData.getInstance().getTemplate(npcTemplate.getId()); if (template == null) { @@ -332,10 +332,10 @@ public class SpawnsData implements IXmlReader * @param n * @param npcTemplate */ - private void parseParameters(Node n, IParameterized npcTemplate) + private void parseParameters(Node n, IParameterized npcTemplate) { final Map params = parseParameters(n); - npcTemplate.setParameters(!params.isEmpty() ? new StatsSet(Collections.unmodifiableMap(params)) : StatsSet.EMPTY_STATSET); + npcTemplate.setParameters(!params.isEmpty() ? new StatSet(Collections.unmodifiableMap(params)) : StatSet.EMPTY_STATSET); } /** @@ -344,7 +344,7 @@ public class SpawnsData implements IXmlReader */ private void parseMinions(Node n, NpcSpawnTemplate npcTemplate) { - forEach(n, "minion", minionNode -> npcTemplate.addMinion(new MinionHolder(new StatsSet(parseAttributes(minionNode))))); + forEach(n, "minion", minionNode -> npcTemplate.addMinion(new MinionHolder(new StatSet(parseAttributes(minionNode))))); } /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java index 98d333446c..ef93935404 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; @@ -69,7 +69,7 @@ public class StaticObjectData implements IXmlReader if ("object".equalsIgnoreCase(d.getNodeName())) { final NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -86,9 +86,9 @@ public class StaticObjectData implements IXmlReader * Initialize an static object based on the stats set and add it to the map. * @param set the stats set to add. */ - private void addObject(StatsSet set) + private void addObject(StatSet set) { - final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatsSet()), set.getInt("id")); + final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatSet()), set.getInt("id")); obj.setType(set.getInt("type", 0)); obj.setName(set.getString("name")); obj.setMap(set.getString("texture", "none"), set.getInt("map_x", 0), set.getInt("map_y", 0)); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/TeleportListData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/TeleportListData.java index 53510c1f1b..698188a3fc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/TeleportListData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/TeleportListData.java @@ -24,7 +24,7 @@ import java.util.logging.Logger; import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.TeleportListHolder; /** @@ -55,7 +55,7 @@ public class TeleportListData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "teleport", teleportNode -> { - final StatsSet set = new StatsSet(parseAttributes(teleportNode)); + final StatSet set = new StatSet(parseAttributes(teleportNode)); final int tpId = set.getInt("id"); final int x = set.getInt("x"); final int y = set.getInt("y"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java index 7c8c9a538d..487bae9dea 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.TeleportType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.teleporter.TeleportHolder; /** @@ -74,7 +74,7 @@ public class TeleportersData implements IXmlReader final String name = parseString(nodeAttrs, "name", type.name()); // Parse locations final TeleportHolder holder = new TeleportHolder(name, type); - forEach(node, "location", location -> holder.registerLocation(new StatsSet(parseAttributes(location)))); + forEach(node, "location", location -> holder.registerLocation(new StatSet(parseAttributes(location)))); // Register holder if (teleList.putIfAbsent(name, holder) != null) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java index b6b3bf2e90..c2f5f94adb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java @@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.transform.Transform; import org.l2jmobius.gameserver.model.actor.transform.TransformLevelData; import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate; @@ -70,7 +70,7 @@ public class TransformData implements IXmlReader if ("transform".equalsIgnoreCase(d.getNodeName())) { NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -192,7 +192,7 @@ public class TransformData implements IXmlReader transform.setTemplate(isMale, templateData); } - final StatsSet levelsSet = new StatsSet(); + final StatSet levelsSet = new StatSet(); for (Node s = z.getFirstChild(); s != null; s = s.getNextSibling()) { if ("level".equals(s.getNodeName())) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/engines/DocumentBase.java index 376aeccaa5..126f472492 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/engines/DocumentBase.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/engines/DocumentBase.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.PlayerState; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionCategoryType; @@ -177,7 +177,7 @@ public abstract class DocumentBase protected abstract void parseDocument(Document doc); - protected abstract StatsSet getStatsSet(); + protected abstract StatSet getStatSet(); protected abstract String getTableValue(String name); @@ -1238,7 +1238,7 @@ public abstract class DocumentBase setTable(name, array.toArray(new String[array.size()])); } - protected void parseBeanSet(Node n, StatsSet set, Integer level) + protected void parseBeanSet(Node n, StatSet set, Integer level) { final String name = n.getAttributes().getNamedItem("name").getNodeValue().trim(); final String value = n.getAttributes().getNamedItem("val").getNodeValue().trim(); @@ -1253,7 +1253,7 @@ public abstract class DocumentBase } } - protected void setExtractableSkillData(StatsSet set, String value) + protected void setExtractableSkillData(StatSet set, String value) { set.set("capsuled_items_skill", value); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java index e8c77b206e..46f8f9be1f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java @@ -21,7 +21,7 @@ import java.io.File; import org.w3c.dom.Document; import org.w3c.dom.Node; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; /** @@ -41,7 +41,7 @@ public class DocumentBaseGeneral extends DocumentBase } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return null; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java index 3ea7f41bb6..419552cf68 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.engines.DocumentBase; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -57,7 +57,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return _currentItem.set; } @@ -111,7 +111,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader _currentItem.id = itemId; _currentItem.name = itemName; _currentItem.type = className; - _currentItem.set = new StatsSet(); + _currentItem.set = new StatSet(); _currentItem.set.set("item_id", itemId); _currentItem.set.set("name", itemName); _currentItem.set.set("additionalName", additionalName); @@ -218,7 +218,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatsSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (Item) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java index 56e5b21a9f..967c1fc34d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.engines.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; public class ItemDataHolder @@ -24,7 +24,7 @@ public class ItemDataHolder int id; String type; String name; - StatsSet set; + StatSet set; int currentLevel; Item item; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/ConditionHandler.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/ConditionHandler.java index 47f24d690d..b53f170fb3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/ConditionHandler.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/ConditionHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.ICondition; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class ConditionHandler { - private final Map> _conditionHandlerFactories = new HashMap<>(); + private final Map> _conditionHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _conditionHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _conditionHandlerFactories.get(name); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/EffectHandler.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/EffectHandler.java index a58de8efb4..328265d9db 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/EffectHandler.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/EffectHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class EffectHandler { - private final Map> _effectHandlerFactories = new HashMap<>(); + private final Map> _effectHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _effectHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _effectHandlerFactories.get(name); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java index a6e2275d04..32438040e0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class SkillConditionHandler { - private final Map> _skillConditionHandlerFactories = new HashMap<>(); + private final Map> _skillConditionHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _skillConditionHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _skillConditionHandlerFactories.get(name); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java index 6992dd5366..65a8c52d7e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.model.AirShipTeleportList; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShipInstance; @@ -45,13 +45,13 @@ public class AirShipManager private static final String UPDATE_DB = "UPDATE airships SET fuel=? WHERE owner_id=?"; private CreatureTemplate _airShipTemplate = null; - private final Map _airShipsInfo = new HashMap<>(); + private final Map _airShipsInfo = new HashMap<>(); private final Map _airShips = new HashMap<>(); private final Map _teleports = new HashMap<>(); protected AirShipManager() { - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", 9); npcDat.set("level", 0); npcDat.set("jClass", "boat"); @@ -113,7 +113,7 @@ public class AirShipManager public AirShipInstance getNewAirShip(int x, int y, int z, int heading, int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return null; @@ -147,7 +147,7 @@ public class AirShipManager if (ship.getOwnerId() != 0) { storeInDb(ship.getOwnerId()); - final StatsSet info = _airShipsInfo.get(ship.getOwnerId()); + final StatSet info = _airShipsInfo.get(ship.getOwnerId()); if (info != null) { info.set("fuel", ship.getFuel()); @@ -164,7 +164,7 @@ public class AirShipManager { if (!_airShipsInfo.containsKey(ownerId)) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("fuel", 600); _airShipsInfo.put(ownerId, info); @@ -264,10 +264,10 @@ public class AirShipManager Statement s = con.createStatement(); ResultSet rs = s.executeQuery(LOAD_DB)) { - StatsSet info; + StatSet info; while (rs.next()) { - info = new StatsSet(); + info = new StatSet(); info.set("fuel", rs.getInt("fuel")); _airShipsInfo.put(rs.getInt("owner_id"), info); } @@ -285,7 +285,7 @@ public class AirShipManager private void storeInDb(int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java index 2db10dd045..e5c610b3f2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.BoatInstance; @@ -57,7 +57,7 @@ public class BoatManager return null; } - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", boatId); npcDat.set("level", 0); npcDat.set("jClass", "boat"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 99a9678ece..56f08422cd 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.enums.ManorMode; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; import org.l2jmobius.gameserver.model.SeedProduction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.entity.Castle; @@ -126,7 +126,7 @@ public class CastleManorManager implements IXmlReader, IStorable @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; NamedNodeMap attrs; Node att; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -142,7 +142,7 @@ public class CastleManorManager implements IXmlReader, IStorable { if ("crop".equalsIgnoreCase(c.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); set.set("castleId", castleId); attrs = c.getAttributes(); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java index 62c7dd2d5c..839a5af512 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java @@ -26,7 +26,7 @@ import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.CeremonyOfChaosState; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -180,7 +180,7 @@ public class CeremonyOfChaosManager extends AbstractEventManager _npcs = new ConcurrentHashMap<>(); protected final Map _spawns = new ConcurrentHashMap<>(); - protected final Map _storedInfo = new ConcurrentHashMap<>(); + protected final Map _storedInfo = new ConcurrentHashMap<>(); protected final Map> _schedules = new ConcurrentHashMap<>(); /** @@ -161,7 +161,7 @@ public class DBSpawnManager { npc.setDBStatus(RaidBossStatus.ALIVE); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getCurrentHp()); info.set("currentMP", npc.getCurrentMp()); info.set("respawnTime", 0); @@ -181,7 +181,7 @@ public class DBSpawnManager */ public void updateStatus(Npc npc, boolean isNpcDead) { - final StatsSet info = _storedInfo.get(npc.getId()); + final StatSet info = _storedInfo.get(npc.getId()); if (info == null) { return; @@ -254,7 +254,7 @@ public class DBSpawnManager _npcs.put(npcId, npc); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", currentHP); info.set("currentMP", currentMP); info.set("respawnTime", 0); @@ -316,7 +316,7 @@ public class DBSpawnManager } npc.setDBStatus(RaidBossStatus.ALIVE); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", 0); @@ -401,7 +401,7 @@ public class DBSpawnManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("UPDATE npc_respawns SET respawnTime = ?, currentHP = ?, currentMP = ? WHERE id = ?")) { - for (Entry entry : _storedInfo.entrySet()) + for (Entry entry : _storedInfo.entrySet()) { final Integer npcId = entry.getKey(); if (npcId == null) @@ -420,7 +420,7 @@ public class DBSpawnManager updateStatus(npc, false); } - final StatsSet info = entry.getValue(); + final StatSet info = entry.getValue(); if (info == null) { continue; @@ -529,7 +529,7 @@ public class DBSpawnManager */ public void notifySpawnNightNpc(Npc npc) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getCurrentHp()); info.set("currentMP", npc.getCurrentMp()); info.set("respawnTime", 0); @@ -572,7 +572,7 @@ public class DBSpawnManager * Gets the stored info. * @return the stored info */ - public Map getStoredInfo() + public Map getStoredInfo() { return _storedInfo; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index 3dd4e3f652..767bed6954 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.datatables.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.FakePlayerChatHolder; @@ -73,7 +73,7 @@ public class FakePlayerChatManager implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayerChat", fakePlayerChatNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerChatNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerChatNode)); MESSAGES.add(new FakePlayerChatHolder(set.getString("fpcName"), set.getString("searchMethod"), set.getString("searchText"), set.getString("answers"))); })); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java index 07c111065e..52bab09349 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java @@ -33,7 +33,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.tasks.GrandBossManagerStoreTask; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; import org.l2jmobius.gameserver.model.interfaces.IStorable; @@ -51,7 +51,7 @@ public class GrandBossManager implements IStorable protected static Map _bosses = new ConcurrentHashMap<>(); - protected static Map _storedInfo = new HashMap<>(); + protected static Map _storedInfo = new HashMap<>(); private final Map _bossStatus = new HashMap<>(); @@ -72,7 +72,7 @@ public class GrandBossManager implements IStorable final int bossId = rs.getInt("boss_id"); if (NpcData.getInstance().getTemplate(bossId) != null) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("loc_x", rs.getInt("loc_x")); info.set("loc_y", rs.getInt("loc_y")); info.set("loc_z", rs.getInt("loc_z")); @@ -140,12 +140,12 @@ public class GrandBossManager implements IStorable return _bosses.get(bossId); } - public StatsSet getStatsSet(int bossId) + public StatSet getStatSet(int bossId) { return _storedInfo.get(bossId); } - public void setStatsSet(int bossId, StatsSet info) + public void setStatSet(int bossId, StatSet info) { _storedInfo.put(bossId, info); updateDb(bossId, false); @@ -156,10 +156,10 @@ public class GrandBossManager implements IStorable { try (Connection con = DatabaseFactory.getConnection()) { - for (Entry e : _storedInfo.entrySet()) + for (Entry e : _storedInfo.entrySet()) { final GrandBossInstance boss = _bosses.get(e.getKey()); - final StatsSet info = e.getValue(); + final StatSet info = e.getValue(); if ((boss == null) || (info == null)) { try (PreparedStatement update = con.prepareStatement(UPDATE_GRAND_BOSS_DATA2)) @@ -209,7 +209,7 @@ public class GrandBossManager implements IStorable try (Connection con = DatabaseFactory.getConnection()) { final GrandBossInstance boss = _bosses.get(bossId); - final StatsSet info = _storedInfo.get(bossId); + final StatSet info = _storedInfo.get(bossId); if (statusOnly || (boss == null) || (info == null)) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index d77642378f..29e517b0cd 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.enums.InstanceReenterType; import org.l2jmobius.gameserver.enums.InstanceRemoveBuffType; import org.l2jmobius.gameserver.enums.InstanceTeleportType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.holders.InstanceReenterTimeHolder; @@ -151,7 +151,7 @@ public class InstanceManager implements IXmlReader return; } - final InstanceTemplate template = new InstanceTemplate(new StatsSet(parseAttributes(instanceNode))); + final InstanceTemplate template = new InstanceTemplate(new StatSet(parseAttributes(instanceNode))); // Update name if wasn't provided if (template.getName() == null) @@ -241,10 +241,10 @@ public class InstanceManager implements IXmlReader { if (doorNode.getNodeName().equals("door")) { - final StatsSet parsedSet = DoorData.getInstance().parseDoor(doorNode); - final StatsSet mergedSet = new StatsSet(); + final StatSet parsedSet = DoorData.getInstance().parseDoor(doorNode); + final StatSet mergedSet = new StatSet(); final int doorId = parsedSet.getInt("id"); - final StatsSet templateSet = DoorData.getInstance().getDoorTemplate(doorId); + final StatSet templateSet = DoorData.getInstance().getDoorTemplate(doorId); if (templateSet != null) { mergedSet.merge(templateSet); @@ -324,14 +324,14 @@ public class InstanceManager implements IXmlReader final boolean onlyLeader = parseBoolean(attrs, "onlyLeader", false); final boolean showMessageAndHtml = parseBoolean(attrs, "showMessageAndHtml", false); // Load parameters - StatsSet params = null; + StatSet params = null; for (Node f = conditionNode.getFirstChild(); f != null; f = f.getNextSibling()) { if (f.getNodeName().equals("param")) { if (params == null) { - params = new StatsSet(); + params = new StatSet(); } params.set(parseString(f.getAttributes(), "name"), parseString(f.getAttributes(), "value")); @@ -341,14 +341,14 @@ public class InstanceManager implements IXmlReader // If none parameters found then set empty StatSet if (params == null) { - params = StatsSet.EMPTY_STATSET; + params = StatSet.EMPTY_STATSET; } // Now when everything is loaded register condition to template try { final Class clazz = Class.forName("org.l2jmobius.gameserver.model.instancezone.conditions.Condition" + type); - final Constructor constructor = clazz.getConstructor(InstanceTemplate.class, StatsSet.class, boolean.class, boolean.class); + final Constructor constructor = clazz.getConstructor(InstanceTemplate.class, StatSet.class, boolean.class, boolean.class); conditions.add((Condition) constructor.newInstance(template, params, onlyLeader, showMessageAndHtml)); } catch (Exception ex) @@ -378,7 +378,7 @@ public class InstanceManager implements IXmlReader */ public Instance createInstance() { - return new Instance(getNewInstanceId(), new InstanceTemplate(StatsSet.EMPTY_STATSET), null); + return new Instance(getNewInstanceId(), new InstanceTemplate(StatSet.EMPTY_STATSET), null); } /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/RankManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/RankManager.java index bb6afac13c..11023da661 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/RankManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/RankManager.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.sql.impl.ClanTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.entity.Hero; @@ -47,10 +47,10 @@ public class RankManager private static final String GET_CURRENT_CYCLE_DATA = "SELECT characters.char_name, characters.level, characters.base_class, characters.clanid, olympiad_nobles.charId, olympiad_nobles.olympiad_points, olympiad_nobles.competitions_won, olympiad_nobles.competitions_lost FROM characters, olympiad_nobles WHERE characters.charId = olympiad_nobles.charId ORDER BY olympiad_nobles.olympiad_points DESC LIMIT " + PLAYER_LIMIT; private static final String GET_CHARACTERS_BY_CLASS = "SELECT characters.charId, olympiad_nobles.olympiad_points FROM characters, olympiad_nobles WHERE olympiad_nobles.charId = characters.charId AND characters.base_class = ? ORDER BY olympiad_nobles.olympiad_points DESC LIMIT " + PLAYER_LIMIT; - private final Map _mainList = new ConcurrentHashMap<>(); - private Map _snapshotList = new ConcurrentHashMap<>(); - private final Map _mainOlyList = new ConcurrentHashMap<>(); - private Map _snapshotOlyList = new ConcurrentHashMap<>(); + private final Map _mainList = new ConcurrentHashMap<>(); + private Map _snapshotList = new ConcurrentHashMap<>(); + private final Map _mainOlyList = new ConcurrentHashMap<>(); + private Map _snapshotOlyList = new ConcurrentHashMap<>(); protected RankManager() { @@ -73,7 +73,7 @@ public class RankManager int i = 1; while (rset.next()) { - final StatsSet player = new StatsSet(); + final StatSet player = new StatSet(); final int charId = rset.getInt("charId"); player.set("charId", charId); player.set("name", rset.getString("char_name")); @@ -112,7 +112,7 @@ public class RankManager int i = 1; while (rset.next()) { - final StatsSet player = new StatsSet(); + final StatSet player = new StatSet(); final int charId = rset.getInt("charId"); player.set("charId", charId); player.set("name", rset.getString("char_name")); @@ -142,7 +142,7 @@ public class RankManager if (Hero.getInstance().getCompleteHeroes().containsKey(charId)) { - final StatsSet hero = Hero.getInstance().getCompleteHeroes().get(charId); + final StatSet hero = Hero.getInstance().getCompleteHeroes().get(charId); player.set("count", hero.getInt("count")); player.set("legend_count", hero.getInt("legend_count")); } @@ -165,7 +165,7 @@ public class RankManager } } - private void loadClassRank(int charId, int classId, StatsSet player) + private void loadClassRank(int charId, int classId, StatSet player) { try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(GET_CHARACTERS_BY_CLASS)) @@ -194,7 +194,7 @@ public class RankManager } } - private void loadRaceRank(int charId, int race, StatsSet player) + private void loadRaceRank(int charId, int race, StatSet player) { try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(SELECT_CHARACTERS_BY_RACE)) @@ -223,22 +223,22 @@ public class RankManager } } - public Map getRankList() + public Map getRankList() { return _mainList; } - public Map getSnapshotList() + public Map getSnapshotList() { return _snapshotList; } - public Map getOlyRankList() + public Map getOlyRankList() { return _mainOlyList; } - public Map getSnapshotOlyList() + public Map getSnapshotOlyList() { return _snapshotOlyList; } @@ -246,9 +246,9 @@ public class RankManager public int getPlayerGlobalRank(PlayerInstance player) { final int playerOid = player.getObjectId(); - for (Entry entry : _mainList.entrySet()) + for (Entry entry : _mainList.entrySet()) { - final StatsSet stats = entry.getValue(); + final StatSet stats = entry.getValue(); if (stats.getInt("charId") != playerOid) { continue; @@ -261,7 +261,7 @@ public class RankManager public int getPlayerRaceRank(PlayerInstance player) { final int playerOid = player.getObjectId(); - for (StatsSet stats : _mainList.values()) + for (StatSet stats : _mainList.values()) { if (stats.getInt("charId") != playerOid) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/AccessLevel.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/AccessLevel.java index 772c1fe77e..72b77905e1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/AccessLevel.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/AccessLevel.java @@ -52,7 +52,7 @@ public class AccessLevel /** Flag to gain exp in party */ private boolean _gainExp = false; - public AccessLevel(StatsSet set) + public AccessLevel(StatSet set) { _accessLevel = set.getInt("level"); _name = set.getString("name"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ActionDataHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ActionDataHolder.java index 4887bedba8..ca6d9ee685 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ActionDataHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ActionDataHolder.java @@ -25,7 +25,7 @@ public class ActionDataHolder private final String _handler; private final int _optionId; - public ActionDataHolder(StatsSet set) + public ActionDataHolder(StatSet set) { _id = set.getInt("id"); _handler = set.getString("handler"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java index 656119098e..3f88e455d7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java @@ -27,7 +27,7 @@ public class AdminCommandAccessRight private final int _accessLevel; private final boolean _requireConfirm; - public AdminCommandAccessRight(StatsSet set) + public AdminCommandAccessRight(StatSet set) { _adminCommand = set.getString("command"); _requireConfirm = set.getBoolean("confirmDlg", false); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index efc53c7e48..6102d39d06 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -36,7 +36,7 @@ public class DailyMissionDataHolder private final List _rewardsItems; private final List _classRestriction; private final int _requiredCompletions; - private final StatsSet _params; + private final StatSet _params; private final boolean _dailyReset; private final boolean _isOneTime; private final boolean _isMainClassOnly; @@ -44,7 +44,7 @@ public class DailyMissionDataHolder private final boolean _isDisplayedWhenNotAvailable; private final AbstractDailyMissionHandler _handler; - public DailyMissionDataHolder(StatsSet set) + public DailyMissionDataHolder(StatSet set) { final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); @@ -53,7 +53,7 @@ public class DailyMissionDataHolder _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); - _params = set.getObject("params", StatsSet.class); + _params = set.getObject("params", StatSet.class); _dailyReset = set.getBoolean("dailyReset", true); _isOneTime = set.getBoolean("isOneTime", true); _isMainClassOnly = set.getBoolean("isMainClassOnly", true); @@ -87,7 +87,7 @@ public class DailyMissionDataHolder return _requiredCompletions; } - public StatsSet getParams() + public StatSet getParams() { return _params; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Location.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Location.java index 1c61740e4d..024c71075f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Location.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Location.java @@ -49,7 +49,7 @@ public class Location implements IPositionable this(obj.getX(), obj.getY(), obj.getZ(), obj.getHeading()); } - public Location(StatsSet set) + public Location(StatSet set) { _x = set.getInt("x"); _y = set.getInt("y"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/PetLevelData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/PetLevelData.java index e46b215b5f..7cad1a225a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/PetLevelData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/PetLevelData.java @@ -46,7 +46,7 @@ public class PetLevelData private final double _slowFlySpeedOnRide; private final double _fastFlySpeedOnRide; - public PetLevelData(StatsSet set) + public PetLevelData(StatSet set) { _ownerExpTaken = set.getInt("get_exp_type"); _petMaxExp = set.getLong("exp"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/RecipeList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/RecipeList.java index 9e4a3b2387..a81bbb1802 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/RecipeList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/RecipeList.java @@ -68,7 +68,7 @@ public class RecipeList * @param set * @param haveRare */ - public RecipeList(StatsSet set, boolean haveRare) + public RecipeList(StatSet set, boolean haveRare) { _recipes = new RecipeInstance[0]; _statUse = new RecipeStatInstance[0]; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Seed.java index 6d31ffc60f..54ef8acd9f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Seed.java @@ -35,7 +35,7 @@ public class Seed private final int _seedReferencePrice; private final int _cropReferencePrice; - public Seed(StatsSet set) + public Seed(StatSet set) { _cropId = set.getInt("id"); _seedId = set.getInt("seedId"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java index 78897cf4f1..4de77df228 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java @@ -27,7 +27,7 @@ public class SiegeScheduleDate private final int _hour; private final int _maxConcurrent; - public SiegeScheduleDate(StatsSet set) + public SiegeScheduleDate(StatSet set) { _day = set.getInt("day", Calendar.SUNDAY); _hour = set.getInt("hour", 16); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/SkillLearn.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/SkillLearn.java index e2ccdd6331..00f53c0cb9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/SkillLearn.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/SkillLearn.java @@ -58,7 +58,7 @@ public class SkillLearn * Constructor for SkillLearn. * @param set the set with the SkillLearn data. */ - public SkillLearn(StatsSet set) + public SkillLearn(StatSet set) { _skillName = set.getString("skillName"); _skillId = set.getInt("skillId"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/StatSet.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/StatSet.java new file mode 100644 index 0000000000..3c824d9fa4 --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/StatSet.java @@ -0,0 +1,968 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Supplier; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.stream.Collectors; + +import org.l2jmobius.commons.util.TimeUtil; +import org.l2jmobius.gameserver.model.holders.MinionHolder; +import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.interfaces.IParserAdvUtils; +import org.l2jmobius.gameserver.util.Util; + +/** + * This class is meant to hold a set of (key,value) pairs.
    + * They are stored as object but can be retrieved in any type wanted. As long as cast is available.
    + * @author mkizub + */ +public class StatSet implements IParserAdvUtils +{ + private static final Logger LOGGER = Logger.getLogger(StatSet.class.getName()); + /** Static empty immutable map, used to avoid multiple null checks over the source. */ + public static final StatSet EMPTY_STATSET = new StatSet(Collections.emptyMap()); + + private final Map _set; + + public StatSet() + { + this(ConcurrentHashMap::new); + } + + public StatSet(Supplier> mapFactory) + { + this(mapFactory.get()); + } + + public StatSet(Map map) + { + _set = map; + } + + /** + * Returns the set of values + * @return HashMap + */ + public Map getSet() + { + return _set; + } + + /** + * Add a set of couple values in the current set + * @param newSet : StatSet pointing out the list of couples to add in the current set + */ + public void merge(StatSet newSet) + { + _set.putAll(newSet.getSet()); + } + + /** + * Verifies if the stat set is empty. + * @return {@code true} if the stat set is empty, {@code false} otherwise + */ + public boolean isEmpty() + { + return _set.isEmpty(); + } + + /** + * Return the boolean value associated with key. + * @param key : String designating the key in the set + * @return boolean : value associated to the key + * @throws IllegalArgumentException : If value is not set or value is not boolean + */ + @Override + public boolean getBoolean(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Boolean value required, but not specified"); + } + if (val instanceof Boolean) + { + return ((Boolean) val).booleanValue(); + } + try + { + return Boolean.parseBoolean((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Boolean value required, but found: " + val); + } + } + + /** + * Return the boolean value associated with key.
    + * If no value is associated with key, or type of value is wrong, returns defaultValue. + * @param key : String designating the key in the entry set + * @return boolean : value associated to the key + */ + @Override + public boolean getBoolean(String key, boolean defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Boolean) + { + return ((Boolean) val).booleanValue(); + } + try + { + return Boolean.parseBoolean((String) val); + } + catch (Exception e) + { + return defaultValue; + } + } + + @Override + public byte getByte(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Byte value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).byteValue(); + } + try + { + return Byte.parseByte((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + + @Override + public byte getByte(String key, byte defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).byteValue(); + } + try + { + return Byte.parseByte((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + + public short increaseByte(String key, byte increaseWith) + { + final byte newValue = (byte) (getByte(key) + increaseWith); + set(key, newValue); + return newValue; + } + + public short increaseByte(String key, byte defaultValue, byte increaseWith) + { + final byte newValue = (byte) (getByte(key, defaultValue) + increaseWith); + set(key, newValue); + return newValue; + } + + public byte[] getByteArray(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Byte value required, but not specified"); + } + if (val instanceof Number) + { + return new byte[] + { + ((Number) val).byteValue() + }; + } + int c = 0; + final String[] vals = ((String) val).split(splitOn); + final byte[] result = new byte[vals.length]; + for (String v : vals) + { + try + { + result[c++] = Byte.parseByte(v); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + return result; + } + + public List getByteList(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final List result = new ArrayList<>(); + for (Byte i : getByteArray(key, splitOn)) + { + result.add(i); + } + return result; + } + + @Override + public short getShort(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Short value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).shortValue(); + } + try + { + return Short.parseShort((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Short value required, but found: " + val); + } + } + + @Override + public short getShort(String key, short defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).shortValue(); + } + try + { + return Short.parseShort((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Short value required, but found: " + val); + } + } + + public short increaseShort(String key, short increaseWith) + { + final short newValue = (short) (getShort(key) + increaseWith); + set(key, newValue); + return newValue; + } + + public short increaseShort(String key, short defaultValue, short increaseWith) + { + final short newValue = (short) (getShort(key, defaultValue) + increaseWith); + set(key, newValue); + return newValue; + } + + @Override + public int getInt(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Integer value required, but not specified: " + key + "!"); + } + + if (val instanceof Number) + { + return ((Number) val).intValue(); + } + + try + { + return Integer.parseInt((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val + "!"); + } + } + + @Override + public int getInt(String key, int defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).intValue(); + } + try + { + return Integer.parseInt((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val); + } + } + + public int increaseInt(String key, int increaseWith) + { + final int newValue = getInt(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public int increaseInt(String key, int defaultValue, int increaseWith) + { + final int newValue = getInt(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + public int[] getIntArray(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Integer value required, but not specified"); + } + if (val instanceof Number) + { + return new int[] + { + ((Number) val).intValue() + }; + } + int c = 0; + final String[] vals = ((String) val).split(splitOn); + final int[] result = new int[vals.length]; + for (String v : vals) + { + try + { + result[c++] = Integer.parseInt(v); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val); + } + } + return result; + } + + public List getIntegerList(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final List result = new ArrayList<>(); + for (int i : getIntArray(key, splitOn)) + { + result.add(i); + } + return result; + } + + @Override + public long getLong(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Long value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).longValue(); + } + try + { + return Long.parseLong((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Long value required, but found: " + val); + } + } + + @Override + public long getLong(String key, long defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).longValue(); + } + try + { + return Long.parseLong((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Long value required, but found: " + val); + } + } + + public long increaseLong(String key, long increaseWith) + { + final long newValue = getLong(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public long increaseLong(String key, long defaultValue, long increaseWith) + { + final long newValue = getLong(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public float getFloat(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Float value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).floatValue(); + } + try + { + return Float.parseFloat((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Float value required, but found: " + val); + } + } + + @Override + public float getFloat(String key, float defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).floatValue(); + } + try + { + return Float.parseFloat((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Float value required, but found: " + val); + } + } + + public float increaseFloat(String key, float increaseWith) + { + final float newValue = getFloat(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public float increaseFloat(String key, float defaultValue, float increaseWith) + { + final float newValue = getFloat(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public double getDouble(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Double value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).doubleValue(); + } + try + { + return Double.parseDouble((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Double value required, but found: " + val); + } + } + + @Override + public double getDouble(String key, double defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).doubleValue(); + } + try + { + return Double.parseDouble((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Double value required, but found: " + val); + } + } + + public double increaseDouble(String key, double increaseWith) + { + final double newValue = getDouble(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public double increaseDouble(String key, double defaultValue, double increaseWith) + { + final double newValue = getDouble(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public String getString(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("String value required, but not specified"); + } + return String.valueOf(val); + } + + @Override + public String getString(String key, String defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + return String.valueOf(val); + } + + @Override + public Duration getDuration(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("String value required, but not specified"); + } + return TimeUtil.parseDuration(String.valueOf(val)); + } + + @Override + public Duration getDuration(String key, Duration defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + return TimeUtil.parseDuration(String.valueOf(val)); + } + + @Override + @SuppressWarnings("unchecked") + public > T getEnum(String key, Class enumClass) + { + Objects.requireNonNull(key); + Objects.requireNonNull(enumClass); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but not specified"); + } + if (enumClass.isInstance(val)) + { + return (T) val; + } + try + { + return Enum.valueOf(enumClass, String.valueOf(val)); + } + catch (Exception e) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); + } + } + + @Override + @SuppressWarnings("unchecked") + public > T getEnum(String key, Class enumClass, T defaultValue) + { + Objects.requireNonNull(key); + Objects.requireNonNull(enumClass); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (enumClass.isInstance(val)) + { + return (T) val; + } + try + { + return Enum.valueOf(enumClass, String.valueOf(val)); + } + catch (Exception e) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); + } + } + + @SuppressWarnings("unchecked") + public A getObject(String name, Class type) + { + Objects.requireNonNull(name); + Objects.requireNonNull(type); + final Object obj = _set.get(name); + if ((obj == null) || !type.isAssignableFrom(obj.getClass())) + { + return null; + } + + return (A) obj; + } + + @SuppressWarnings("unchecked") + public A getObject(String name, Class type, A defaultValue) + { + Objects.requireNonNull(name); + Objects.requireNonNull(type); + final Object obj = _set.get(name); + if ((obj == null) || !type.isAssignableFrom(obj.getClass())) + { + return defaultValue; + } + + return (A) obj; + } + + public SkillHolder getSkillHolder(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof SkillHolder)) + { + return null; + } + + return (SkillHolder) obj; + } + + public Location getLocation(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof Location)) + { + return null; + } + return (Location) obj; + } + + @SuppressWarnings("unchecked") + public List getMinionList(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return Collections.emptyList(); + } + + return (List) obj; + } + + @SuppressWarnings("unchecked") + public List getList(String key, Class clazz) + { + Objects.requireNonNull(key); + Objects.requireNonNull(clazz); + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return null; + } + + final List originalList = (List) obj; + if (!originalList.isEmpty() && !originalList.stream().allMatch(clazz::isInstance)) + { + if (clazz.getSuperclass() == Enum.class) + { + throw new IllegalAccessError("Please use getEnumList if you want to get list of Enums!"); + } + + // Attempt to convert the list + final List convertedList = convertList(originalList, clazz); + if (convertedList == null) + { + LOGGER.log(Level.WARNING, "getList(\"" + key + "\", " + clazz.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); + return null; + } + + // Overwrite the existing list with proper generic type + _set.put(key, convertedList); + return convertedList; + } + return (List) obj; + } + + public List getList(String key, Class clazz, List defaultValue) + { + final List list = getList(key, clazz); + return list == null ? defaultValue : list; + } + + @SuppressWarnings("unchecked") + public > List getEnumList(String key, Class clazz) + { + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return null; + } + + final List originalList = (List) obj; + if (!originalList.isEmpty() && (obj.getClass().getGenericInterfaces()[0] != clazz) && originalList.stream().allMatch(name -> Util.isEnum(name.toString(), clazz))) + { + final List convertedList = originalList.stream().map(Object::toString).map(name -> Enum.valueOf(clazz, name)).map(clazz::cast).collect(Collectors.toList()); + + // Overwrite the existing list with proper generic type + _set.put(key, convertedList); + return convertedList; + } + return (List) obj; + } + + /** + * @param + * @param originalList + * @param clazz + * @return + */ + private List convertList(List originalList, Class clazz) + { + if (clazz == Integer.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isInteger)) + { + return originalList.stream().map(Object::toString).map(Integer::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + else if (clazz == Float.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isFloat)) + { + return originalList.stream().map(Object::toString).map(Float::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + else if (clazz == Double.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isDouble)) + { + return originalList.stream().map(Object::toString).map(Double::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + return null; + } + + @SuppressWarnings("unchecked") + public Map getMap(String key, Class keyClass, Class valueClass) + { + final Object obj = _set.get(key); + if (!(obj instanceof Map)) + { + return null; + } + + final Map originalList = (Map) obj; + if (!originalList.isEmpty() && ((!originalList.keySet().stream().allMatch(keyClass::isInstance)) || (!originalList.values().stream().allMatch(valueClass::isInstance)))) + { + LOGGER.log(Level.WARNING, "getMap(\"" + key + "\", " + keyClass.getSimpleName() + ", " + valueClass.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); + } + return (Map) obj; + } + + public StatSet set(String name, Object value) + { + if (value == null) + { + return this; + } + _set.put(name, value); + return this; + } + + public StatSet set(String key, boolean value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, byte value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, short value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, int value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, long value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, float value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, double value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, String value) + { + if (value == null) + { + return this; + } + _set.put(key, value); + return this; + } + + public StatSet set(String key, Enum value) + { + if (value == null) + { + return this; + } + _set.put(key, value); + return this; + } + + public static StatSet valueOf(String key, Object value) + { + final StatSet set = new StatSet(); + set.set(key, value); + return set; + } + + public void remove(String key) + { + _set.remove(key); + } + + public boolean contains(String name) + { + return _set.containsKey(name); + } + + @Override + public String toString() + { + return "StatSet{_set=" + _set + '}'; + } +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/StatsSet.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/StatsSet.java deleted file mode 100644 index 5ce013ebd2..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/StatsSet.java +++ /dev/null @@ -1,968 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.ConcurrentHashMap; -import java.util.function.Supplier; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.stream.Collectors; - -import org.l2jmobius.commons.util.TimeUtil; -import org.l2jmobius.gameserver.model.holders.MinionHolder; -import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.interfaces.IParserAdvUtils; -import org.l2jmobius.gameserver.util.Util; - -/** - * This class is meant to hold a set of (key,value) pairs.
    - * They are stored as object but can be retrieved in any type wanted. As long as cast is available.
    - * @author mkizub - */ -public class StatsSet implements IParserAdvUtils -{ - private static final Logger LOGGER = Logger.getLogger(StatsSet.class.getName()); - /** Static empty immutable map, used to avoid multiple null checks over the source. */ - public static final StatsSet EMPTY_STATSET = new StatsSet(Collections.emptyMap()); - - private final Map _set; - - public StatsSet() - { - this(ConcurrentHashMap::new); - } - - public StatsSet(Supplier> mapFactory) - { - this(mapFactory.get()); - } - - public StatsSet(Map map) - { - _set = map; - } - - /** - * Returns the set of values - * @return HashMap - */ - public Map getSet() - { - return _set; - } - - /** - * Add a set of couple values in the current set - * @param newSet : StatsSet pointing out the list of couples to add in the current set - */ - public void merge(StatsSet newSet) - { - _set.putAll(newSet.getSet()); - } - - /** - * Verifies if the stat set is empty. - * @return {@code true} if the stat set is empty, {@code false} otherwise - */ - public boolean isEmpty() - { - return _set.isEmpty(); - } - - /** - * Return the boolean value associated with key. - * @param key : String designating the key in the set - * @return boolean : value associated to the key - * @throws IllegalArgumentException : If value is not set or value is not boolean - */ - @Override - public boolean getBoolean(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Boolean value required, but not specified"); - } - if (val instanceof Boolean) - { - return ((Boolean) val).booleanValue(); - } - try - { - return Boolean.parseBoolean((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Boolean value required, but found: " + val); - } - } - - /** - * Return the boolean value associated with key.
    - * If no value is associated with key, or type of value is wrong, returns defaultValue. - * @param key : String designating the key in the entry set - * @return boolean : value associated to the key - */ - @Override - public boolean getBoolean(String key, boolean defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Boolean) - { - return ((Boolean) val).booleanValue(); - } - try - { - return Boolean.parseBoolean((String) val); - } - catch (Exception e) - { - return defaultValue; - } - } - - @Override - public byte getByte(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Byte value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).byteValue(); - } - try - { - return Byte.parseByte((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - - @Override - public byte getByte(String key, byte defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).byteValue(); - } - try - { - return Byte.parseByte((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - - public short increaseByte(String key, byte increaseWith) - { - final byte newValue = (byte) (getByte(key) + increaseWith); - set(key, newValue); - return newValue; - } - - public short increaseByte(String key, byte defaultValue, byte increaseWith) - { - final byte newValue = (byte) (getByte(key, defaultValue) + increaseWith); - set(key, newValue); - return newValue; - } - - public byte[] getByteArray(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Byte value required, but not specified"); - } - if (val instanceof Number) - { - return new byte[] - { - ((Number) val).byteValue() - }; - } - int c = 0; - final String[] vals = ((String) val).split(splitOn); - final byte[] result = new byte[vals.length]; - for (String v : vals) - { - try - { - result[c++] = Byte.parseByte(v); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - return result; - } - - public List getByteList(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final List result = new ArrayList<>(); - for (Byte i : getByteArray(key, splitOn)) - { - result.add(i); - } - return result; - } - - @Override - public short getShort(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Short value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).shortValue(); - } - try - { - return Short.parseShort((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Short value required, but found: " + val); - } - } - - @Override - public short getShort(String key, short defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).shortValue(); - } - try - { - return Short.parseShort((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Short value required, but found: " + val); - } - } - - public short increaseShort(String key, short increaseWith) - { - final short newValue = (short) (getShort(key) + increaseWith); - set(key, newValue); - return newValue; - } - - public short increaseShort(String key, short defaultValue, short increaseWith) - { - final short newValue = (short) (getShort(key, defaultValue) + increaseWith); - set(key, newValue); - return newValue; - } - - @Override - public int getInt(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Integer value required, but not specified: " + key + "!"); - } - - if (val instanceof Number) - { - return ((Number) val).intValue(); - } - - try - { - return Integer.parseInt((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val + "!"); - } - } - - @Override - public int getInt(String key, int defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).intValue(); - } - try - { - return Integer.parseInt((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val); - } - } - - public int increaseInt(String key, int increaseWith) - { - final int newValue = getInt(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public int increaseInt(String key, int defaultValue, int increaseWith) - { - final int newValue = getInt(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - public int[] getIntArray(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Integer value required, but not specified"); - } - if (val instanceof Number) - { - return new int[] - { - ((Number) val).intValue() - }; - } - int c = 0; - final String[] vals = ((String) val).split(splitOn); - final int[] result = new int[vals.length]; - for (String v : vals) - { - try - { - result[c++] = Integer.parseInt(v); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val); - } - } - return result; - } - - public List getIntegerList(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final List result = new ArrayList<>(); - for (int i : getIntArray(key, splitOn)) - { - result.add(i); - } - return result; - } - - @Override - public long getLong(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Long value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).longValue(); - } - try - { - return Long.parseLong((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Long value required, but found: " + val); - } - } - - @Override - public long getLong(String key, long defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).longValue(); - } - try - { - return Long.parseLong((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Long value required, but found: " + val); - } - } - - public long increaseLong(String key, long increaseWith) - { - final long newValue = getLong(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public long increaseLong(String key, long defaultValue, long increaseWith) - { - final long newValue = getLong(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public float getFloat(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Float value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).floatValue(); - } - try - { - return Float.parseFloat((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Float value required, but found: " + val); - } - } - - @Override - public float getFloat(String key, float defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).floatValue(); - } - try - { - return Float.parseFloat((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Float value required, but found: " + val); - } - } - - public float increaseFloat(String key, float increaseWith) - { - final float newValue = getFloat(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public float increaseFloat(String key, float defaultValue, float increaseWith) - { - final float newValue = getFloat(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public double getDouble(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Double value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).doubleValue(); - } - try - { - return Double.parseDouble((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Double value required, but found: " + val); - } - } - - @Override - public double getDouble(String key, double defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).doubleValue(); - } - try - { - return Double.parseDouble((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Double value required, but found: " + val); - } - } - - public double increaseDouble(String key, double increaseWith) - { - final double newValue = getDouble(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public double increaseDouble(String key, double defaultValue, double increaseWith) - { - final double newValue = getDouble(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public String getString(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("String value required, but not specified"); - } - return String.valueOf(val); - } - - @Override - public String getString(String key, String defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - return String.valueOf(val); - } - - @Override - public Duration getDuration(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("String value required, but not specified"); - } - return TimeUtil.parseDuration(String.valueOf(val)); - } - - @Override - public Duration getDuration(String key, Duration defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - return TimeUtil.parseDuration(String.valueOf(val)); - } - - @Override - @SuppressWarnings("unchecked") - public > T getEnum(String key, Class enumClass) - { - Objects.requireNonNull(key); - Objects.requireNonNull(enumClass); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but not specified"); - } - if (enumClass.isInstance(val)) - { - return (T) val; - } - try - { - return Enum.valueOf(enumClass, String.valueOf(val)); - } - catch (Exception e) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); - } - } - - @Override - @SuppressWarnings("unchecked") - public > T getEnum(String key, Class enumClass, T defaultValue) - { - Objects.requireNonNull(key); - Objects.requireNonNull(enumClass); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (enumClass.isInstance(val)) - { - return (T) val; - } - try - { - return Enum.valueOf(enumClass, String.valueOf(val)); - } - catch (Exception e) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); - } - } - - @SuppressWarnings("unchecked") - public A getObject(String name, Class type) - { - Objects.requireNonNull(name); - Objects.requireNonNull(type); - final Object obj = _set.get(name); - if ((obj == null) || !type.isAssignableFrom(obj.getClass())) - { - return null; - } - - return (A) obj; - } - - @SuppressWarnings("unchecked") - public A getObject(String name, Class type, A defaultValue) - { - Objects.requireNonNull(name); - Objects.requireNonNull(type); - final Object obj = _set.get(name); - if ((obj == null) || !type.isAssignableFrom(obj.getClass())) - { - return defaultValue; - } - - return (A) obj; - } - - public SkillHolder getSkillHolder(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof SkillHolder)) - { - return null; - } - - return (SkillHolder) obj; - } - - public Location getLocation(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof Location)) - { - return null; - } - return (Location) obj; - } - - @SuppressWarnings("unchecked") - public List getMinionList(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return Collections.emptyList(); - } - - return (List) obj; - } - - @SuppressWarnings("unchecked") - public List getList(String key, Class clazz) - { - Objects.requireNonNull(key); - Objects.requireNonNull(clazz); - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return null; - } - - final List originalList = (List) obj; - if (!originalList.isEmpty() && !originalList.stream().allMatch(clazz::isInstance)) - { - if (clazz.getSuperclass() == Enum.class) - { - throw new IllegalAccessError("Please use getEnumList if you want to get list of Enums!"); - } - - // Attempt to convert the list - final List convertedList = convertList(originalList, clazz); - if (convertedList == null) - { - LOGGER.log(Level.WARNING, "getList(\"" + key + "\", " + clazz.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); - return null; - } - - // Overwrite the existing list with proper generic type - _set.put(key, convertedList); - return convertedList; - } - return (List) obj; - } - - public List getList(String key, Class clazz, List defaultValue) - { - final List list = getList(key, clazz); - return list == null ? defaultValue : list; - } - - @SuppressWarnings("unchecked") - public > List getEnumList(String key, Class clazz) - { - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return null; - } - - final List originalList = (List) obj; - if (!originalList.isEmpty() && (obj.getClass().getGenericInterfaces()[0] != clazz) && originalList.stream().allMatch(name -> Util.isEnum(name.toString(), clazz))) - { - final List convertedList = originalList.stream().map(Object::toString).map(name -> Enum.valueOf(clazz, name)).map(clazz::cast).collect(Collectors.toList()); - - // Overwrite the existing list with proper generic type - _set.put(key, convertedList); - return convertedList; - } - return (List) obj; - } - - /** - * @param - * @param originalList - * @param clazz - * @return - */ - private List convertList(List originalList, Class clazz) - { - if (clazz == Integer.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isInteger)) - { - return originalList.stream().map(Object::toString).map(Integer::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - else if (clazz == Float.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isFloat)) - { - return originalList.stream().map(Object::toString).map(Float::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - else if (clazz == Double.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isDouble)) - { - return originalList.stream().map(Object::toString).map(Double::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - return null; - } - - @SuppressWarnings("unchecked") - public Map getMap(String key, Class keyClass, Class valueClass) - { - final Object obj = _set.get(key); - if (!(obj instanceof Map)) - { - return null; - } - - final Map originalList = (Map) obj; - if (!originalList.isEmpty() && ((!originalList.keySet().stream().allMatch(keyClass::isInstance)) || (!originalList.values().stream().allMatch(valueClass::isInstance)))) - { - LOGGER.log(Level.WARNING, "getMap(\"" + key + "\", " + keyClass.getSimpleName() + ", " + valueClass.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); - } - return (Map) obj; - } - - public StatsSet set(String name, Object value) - { - if (value == null) - { - return this; - } - _set.put(name, value); - return this; - } - - public StatsSet set(String key, boolean value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, byte value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, short value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, int value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, long value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, float value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, double value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, String value) - { - if (value == null) - { - return this; - } - _set.put(key, value); - return this; - } - - public StatsSet set(String key, Enum value) - { - if (value == null) - { - return this; - } - _set.put(key, value); - return this; - } - - public static StatsSet valueOf(String key, Object value) - { - final StatsSet set = new StatsSet(); - set.set(key, value); - return set; - } - - public void remove(String key) - { - _set.remove(key); - } - - public boolean contains(String name) - { - return _set.containsKey(name); - } - - @Override - public String toString() - { - return "StatsSet{_set=" + _set + '}'; - } -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Npc.java index 40f5f65ede..f74f986666 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -50,7 +50,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.MpRewardTask; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.FishermanInstance; @@ -149,7 +149,7 @@ public class Npc extends Creature private NpcStringId _titleString; private NpcStringId _nameString; - private StatsSet _params; + private StatSet _params; private RaidBossStatus _raidStatus; /** Contains information about local tax payments. */ @@ -1768,7 +1768,7 @@ public class Npc extends Creature /** * @return the parameters of the npc merged with the spawn parameters (if there are any) */ - public StatsSet getParameters() + public StatSet getParameters() { if (_params != null) { @@ -1780,10 +1780,10 @@ public class Npc extends Creature final NpcSpawnTemplate npcSpawnTemplate = _spawn.getNpcSpawnTemplate(); if ((npcSpawnTemplate != null) && (npcSpawnTemplate.getParameters() != null) && !npcSpawnTemplate.getParameters().isEmpty()) { - final StatsSet params = getTemplate().getParameters(); + final StatSet params = getTemplate().getParameters(); if ((params != null) && !params.getSet().isEmpty()) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.merge(params); set.merge(npcSpawnTemplate.getParameters()); _params = set; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index c8cbb989c0..a4d95ae3fc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -21,7 +21,7 @@ import java.util.EnumMap; import java.util.Map; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; @@ -49,12 +49,12 @@ public class CreatureTemplate extends ListenersContainer /** The creature's race. */ private Race _race; - public CreatureTemplate(StatsSet set) + public CreatureTemplate(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { // Base stats _baseValues.put(Stat.STAT_STR, set.getDouble("baseSTR", 0)); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java index 86441c678c..14f0e9cae8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.CubicInstance; @@ -46,7 +46,7 @@ public class CubicTemplate implements ICubicConditionHolder private final List _conditions = new ArrayList<>(); public List _skills = new ArrayList<>(); - public CubicTemplate(StatsSet set) + public CubicTemplate(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java index c40883ac75..410040bc86 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.templates; import org.l2jmobius.gameserver.enums.DoorOpenType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -57,7 +57,7 @@ public class DoorTemplate extends CreatureTemplate implements IIdentifiable private final boolean _stealth; private final boolean _isInverted; - public DoorTemplate(StatsSet set) + public DoorTemplate(StatSet set) { super(set); _doorId = set.getInt("id"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 14411761d5..285005f744 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.enums.MpRewardAffectType; import org.l2jmobius.gameserver.enums.MpRewardType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -64,7 +64,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private boolean _usingServerSideName; private String _title; private boolean _usingServerSideTitle; - private StatsSet _parameters; + private StatSet _parameters; private Sex _sex; private int _chestId; private int _rhandId; @@ -127,15 +127,15 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable /** * Constructor of Creature. - * @param set The StatsSet object to transfer data to the method + * @param set The StatSet object to transfer data to the method */ - public NpcTemplate(StatsSet set) + public NpcTemplate(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _id = set.getInt("id"); @@ -327,12 +327,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _usingServerSideTitle; } - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } - public void setParameters(StatsSet set) + public void setParameters(StatSet set) { _parameters = set; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 50292b8bc8..28458aa09e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -50,7 +50,7 @@ public class PlayerTemplate extends CreatureTemplate private final List _creationPoints; private final Map _baseSlotDef; - public PlayerTemplate(StatsSet set, List creationPoints) + public PlayerTemplate(StatSet set, List creationPoints) { super(set); _classId = ClassId.getClassId(set.getInt("classId")); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index aa28a0f648..260da48365 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -23,7 +23,7 @@ import java.util.Objects; import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import org.l2jmobius.gameserver.enums.InventoryBlockType; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -57,7 +57,7 @@ public class Transform implements IIdentifiable private TransformTemplate _maleTemplate; private TransformTemplate _femaleTemplate; - public Transform(StatsSet set) + public Transform(StatSet set) { _id = set.getInt("id"); _displayId = set.getInt("displayId", _id); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java index 5660852a01..729998503f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.actor.transform; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -31,7 +31,7 @@ public class TransformLevelData private final double _levelMod; private Map _stats; - public TransformLevelData(StatsSet set) + public TransformLevelData(StatSet set) { _level = set.getInt("val"); _levelMod = set.getDouble("levelMod"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 4de84b8bdc..7aca059f91 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -23,7 +23,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -49,7 +49,7 @@ public class TransformTemplate private ExBasicActionList _list; private final Map _data = new LinkedHashMap<>(100); - public TransformTemplate(StatsSet set) + public TransformTemplate(StatSet set) { _collisionRadius = set.contains("radius") ? set.getDouble("radius") : null; _collisionHeight = set.contains("height") ? set.getDouble("height") : null; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java index d808a6b8bf..02550d2818 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -36,7 +36,7 @@ public class AlchemyCraftData private ItemHolder _productionSuccess; private ItemHolder _productionFailure; - public AlchemyCraftData(StatsSet set) + public AlchemyCraftData(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java index 0bd061d3c4..79dd6c0207 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.beautyshop; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -32,7 +32,7 @@ public class BeautyItem private final int _beautyShopTicket; private final Map _colors = new HashMap<>(); - public BeautyItem(StatsSet set) + public BeautyItem(StatSet set) { _id = set.getInt("id"); _adena = set.getInt("adena", 0); @@ -60,7 +60,7 @@ public class BeautyItem return _beautyShopTicket; } - public void addColor(StatsSet set) + public void addColor(StatSet set) { final BeautyItem color = new BeautyItem(set); _colors.put(set.getInt("id"), color); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index e0d1486962..1c341e0c31 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party.MessageType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.appearance.PlayerAppearance; @@ -244,7 +244,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent player.teleToLocation(_instance.getEnterLocations().get(index++), 0, _instance); } - getTimers().addTimer("match_start_countdown", StatsSet.valueOf("time", 60), 100, null, null); + getTimers().addTimer("match_start_countdown", StatSet.valueOf("time", 60), 100, null, null); getTimers().addTimer("teleport_message1", 10000, null, null); getTimers().addTimer("teleport_message2", 14000, null, null); @@ -394,7 +394,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent } } getTimers().cancelTimer("update", null, null); - getTimers().addTimer("match_end_countdown", StatsSet.valueOf("time", 30), 30 * 1000, null, null); + getTimers().addTimer("match_end_countdown", StatSet.valueOf("time", 30), 30 * 1000, null, null); EventDispatcher.getInstance().notifyEvent(new OnCeremonyOfChaosMatchResult(winners, members)); } @@ -487,7 +487,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java index 39f9196d93..371f8dc459 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.conditions.ICubicCondition; @@ -38,7 +38,7 @@ public class CubicSkill extends SkillHolder implements ICubicConditionHolder private final List _conditions = new ArrayList<>(); private final boolean _targetDebuff; - public CubicSkill(StatsSet set) + public CubicSkill(StatSet set) { super(set.getInt("id"), set.getInt("level")); _triggerRate = set.getInt("triggerRate", 100); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/entity/ClanHall.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/entity/ClanHall.java index 8da77477fd..22af370709 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/entity/ClanHall.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/entity/ClanHall.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -75,7 +75,7 @@ public class ClanHall extends AbstractResidence private static final String LOAD_CLANHALL = "SELECT * FROM clanhall WHERE id=?"; private static final String UPDATE_CLANHALL = "UPDATE clanhall SET ownerId=?,paidUntil=? WHERE id=?"; - public ClanHall(StatsSet params) + public ClanHall(StatSet params) { super(params.getInt("id")); // Set static parameters diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/entity/Hero.java index c7ffd29b6c..49e8061204 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/entity/Hero.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/entity/Hero.java @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.data.xml.impl.ClassListData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -74,13 +74,13 @@ public class Hero // delete hero items private static final String DELETE_ITEMS = "DELETE FROM items WHERE item_id IN (30392, 30393, 30394, 30395, 30396, 30397, 30398, 30399, 30400, 30401, 30402, 30403, 30404, 30405, 30372, 30373, 6842, 6611, 6612, 6613, 6614, 6615, 6616, 6617, 6618, 6619, 6620, 6621, 9388, 9389, 9390) AND owner_id NOT IN (SELECT charId FROM characters WHERE accesslevel > 0)"; - private static final Map HEROES = new ConcurrentHashMap<>(); - private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); + private static final Map HEROES = new ConcurrentHashMap<>(); + private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); - private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); - private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); + private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); + private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); - private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); + private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); private static final Map HERO_MESSAGE = new ConcurrentHashMap<>(); public static final String COUNT = "count"; @@ -119,7 +119,7 @@ public class Hero { while (rset.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset.getInt(Olympiad.CLASS_ID)); @@ -139,7 +139,7 @@ public class Hero while (rset2.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset2.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset2.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset2.getInt(Olympiad.CLASS_ID)); @@ -162,7 +162,7 @@ public class Hero LOGGER.info("Hero System: Loaded " + COMPLETE_HEROS.size() + " all time Heroes."); } - private void processHeros(PreparedStatement ps, int charId, StatsSet hero) throws SQLException + private void processHeros(PreparedStatement ps, int charId, StatSet hero) throws SQLException { ps.setInt(1, charId); try (ResultSet rs = ps.executeQuery()) @@ -227,7 +227,7 @@ public class Hero public void loadDiary(int charId) { - final List diary = new ArrayList<>(); + final List diary = new ArrayList<>(); int diaryentries = 0; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement("SELECT * FROM heroes_diary WHERE charId=? ORDER BY time ASC")) @@ -237,7 +237,7 @@ public class Hero { while (rset.next()) { - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final long time = rset.getLong("time"); final int action = rset.getInt("action"); @@ -282,8 +282,8 @@ public class Hero public void loadFights(int charId) { - final List fights = new ArrayList<>(); - final StatsSet heroCountData = new StatsSet(); + final List fights = new ArrayList<>(); + final StatSet heroCountData = new StatSet(); final Calendar data = Calendar.getInstance(); data.set(Calendar.DAY_OF_MONTH, 1); data.set(Calendar.HOUR_OF_DAY, 0); @@ -329,7 +329,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charTwoClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -365,7 +365,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charOneClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -413,19 +413,19 @@ public class Hero } } - public Map getHeroes() + public Map getHeroes() { return HEROES; } - public Map getCompleteHeroes() + public Map getCompleteHeroes() { return COMPLETE_HEROS; } public int getHeroByClass(int classid) { - for (Entry e : HEROES.entrySet()) + for (Entry e : HEROES.entrySet()) { if (e.getValue().getInt(Olympiad.CLASS_ID) == classid) { @@ -446,7 +446,7 @@ public class Hero public void showHeroDiary(PlayerInstance player, int heroclass, int charid, int page) { final int perpage = 10; - final List mainList = HERO_DIARY.get(charid); + final List mainList = HERO_DIARY.get(charid); if (mainList != null) { final NpcHtmlMessage diaryReply = new NpcHtmlMessage(); @@ -461,7 +461,7 @@ public class Hero if (!mainList.isEmpty()) { - final List list = new ArrayList<>(mainList); + final List list = new ArrayList<>(mainList); Collections.reverse(list); boolean color = true; @@ -471,7 +471,7 @@ public class Hero for (int i = (page - 1) * perpage; i < list.size(); i++) { breakat = i; - final StatsSet diaryEntry = list.get(i); + final StatSet diaryEntry = list.get(i); fList.append(""); if (color) { @@ -532,7 +532,7 @@ public class Hero int loss = 0; int draw = 0; - final List heroFights = HERO_FIGHTS.get(charid); + final List heroFights = HERO_FIGHTS.get(charid); if (heroFights != null) { final NpcHtmlMessage fightReply = new NpcHtmlMessage(); @@ -544,7 +544,7 @@ public class Hero if (!heroFights.isEmpty()) { - final StatsSet heroCount = HERO_COUNTS.get(charid); + final StatSet heroCount = HERO_COUNTS.get(charid); if (heroCount != null) { win = heroCount.getInt("victory"); @@ -559,7 +559,7 @@ public class Hero for (int i = (page - 1) * perpage; i < heroFights.size(); i++) { breakat = i; - final StatsSet fight = heroFights.get(i); + final StatSet fight = heroFights.get(i); fList.append(""); if (color) { @@ -617,7 +617,7 @@ public class Hero } } - public synchronized void computeNewHeroes(List newHeroes) + public synchronized void computeNewHeroes(List newHeroes) { updateHeroes(true); @@ -667,13 +667,13 @@ public class Hero return; } - for (StatsSet hero : newHeroes) + for (StatSet hero : newHeroes) { final int charId = hero.getInt(Olympiad.CHAR_ID); if (COMPLETE_HEROS.containsKey(charId)) { - final StatsSet oldHero = COMPLETE_HEROS.get(charId); + final StatSet oldHero = COMPLETE_HEROS.get(charId); if (hero.getInt(LEGEND_COUNT) == 1) { final int count = oldHero.getInt(LEGEND_COUNT); @@ -690,7 +690,7 @@ public class Hero } else { - final StatsSet newHero = new StatsSet(); + final StatSet newHero = new StatSet(); newHero.set(Olympiad.CHAR_NAME, hero.getString(Olympiad.CHAR_NAME)); newHero.set(Olympiad.CLASS_ID, hero.getInt(Olympiad.CLASS_ID)); if (hero.getInt(LEGEND_COUNT) == 1) @@ -723,9 +723,9 @@ public class Hero } else { - StatsSet hero; + StatSet hero; int heroId; - for (Entry entry : HEROES.entrySet()) + for (Entry entry : HEROES.entrySet()) { hero = entry.getValue(); heroId = entry.getKey(); @@ -812,13 +812,13 @@ public class Hero setDiaryData(charId, ACTION_RAID_KILLED, npcId); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (template == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -831,13 +831,13 @@ public class Hero setDiaryData(charId, ACTION_CASTLE_TAKEN, castleId); final Castle castle = CastleManager.getInstance().getCastleById(castleId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (castle == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -947,10 +947,10 @@ public class Hero */ public void claimHero(PlayerInstance player) { - StatsSet hero = HEROES.get(player.getObjectId()); + StatSet hero = HEROES.get(player.getObjectId()); if (hero == null) { - hero = new StatsSet(); + hero = new StatSet(); HEROES.put(player.getObjectId(), hero); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java index f1263e8d44..c52f487402 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java @@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.atomic.AtomicReference; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.eventengine.drop.IEventDrop; import org.l2jmobius.gameserver.model.events.AbstractScript; @@ -42,7 +42,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout public abstract class AbstractEventManager>extends AbstractScript { private String _name; - private StatsSet _variables = StatsSet.EMPTY_STATSET; + private StatSet _variables = StatSet.EMPTY_STATSET; private Set _schedulers = Collections.emptySet(); private Set _conditionalSchedulers = Collections.emptySet(); private Map _rewards = Collections.emptyMap(); @@ -67,14 +67,14 @@ public abstract class AbstractEventManager>extends Ab /* ********************** */ - public StatsSet getVariables() + public StatSet getVariables() { return _variables; } - public void setVariables(StatsSet variables) + public void setVariables(StatSet variables) { - _variables = new StatsSet(Collections.unmodifiableMap(variables.getSet())); + _variables = new StatSet(Collections.unmodifiableMap(variables.getSet())); } /* ********************** */ diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java index 59c64b812c..e41af41d1a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.util.cron4j.PastPredictor; import org.l2jmobius.gameserver.util.cron4j.Predictor; @@ -45,7 +45,7 @@ public class EventScheduler private List _notifications; private ScheduledFuture _task; - public EventScheduler(AbstractEventManager manager, StatsSet set) + public EventScheduler(AbstractEventManager manager, StatSet set) { _eventManager = manager; _name = set.getString("name", ""); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 4fc2d3b8b0..819c3bf34d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -50,7 +50,7 @@ import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -181,12 +181,12 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime onTimerCancel(holder.getEvent(), holder.getParams(), holder.getNpc(), holder.getPlayer()); } - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { LOGGER.warning("[" + getClass().getSimpleName() + "]: Timer event arrived at non overriden onTimerEvent method event: " + event + " npc: " + npc + " player: " + player); } - public void onTimerCancel(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerCancel(String event, StatSet params, Npc npc, PlayerInstance player) { } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java index 400fb64b6e..861c4a9b31 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java @@ -24,7 +24,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.timers.IEventTimerCancel; @@ -69,7 +69,7 @@ public class TimerExecutor * @param eventTimer * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - public boolean addTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) + public boolean addTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) { return addTimer(new TimerHolder<>(event, params, time, npc, player, false, eventTimer, _cancelListener, this)); } @@ -95,7 +95,7 @@ public class TimerExecutor * @param player * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - public boolean addTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player) + public boolean addTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player) { return addTimer(event, params, time, npc, player, _eventListener); } @@ -123,7 +123,7 @@ public class TimerExecutor * @param eventTimer * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - private boolean addRepeatingTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) + private boolean addRepeatingTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) { return addTimer(new TimerHolder<>(event, params, time, npc, player, true, eventTimer, _cancelListener, this)); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java index ab8fa150ca..0fcafba759 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java @@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.gameserver.instancemanager.TimersManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.TimerExecutor; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.events.TimerExecutor; public class TimerHolder implements Runnable { private final T _event; - private final StatsSet _params; + private final StatSet _params; private final long _time; private final Npc _npc; private final PlayerInstance _player; @@ -44,7 +44,7 @@ public class TimerHolder implements Runnable private final TimerExecutor _postExecutor; private final ScheduledFuture _task; - public TimerHolder(T event, StatsSet params, long time, Npc npc, PlayerInstance player, boolean isRepeating, IEventTimerEvent eventScript, IEventTimerCancel cancelScript, TimerExecutor postExecutor) + public TimerHolder(T event, StatSet params, long time, Npc npc, PlayerInstance player, boolean isRepeating, IEventTimerEvent eventScript, IEventTimerCancel cancelScript, TimerExecutor postExecutor) { Objects.requireNonNull(event, getClass().getSimpleName() + ": \"event\" cannot be null!"); Objects.requireNonNull(eventScript, getClass().getSimpleName() + ": \"script\" cannot be null!"); @@ -73,7 +73,7 @@ public class TimerHolder implements Runnable /** * @return the parameters of this timer */ - public StatsSet getParams() + public StatSet getParams() { return _params; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index bcf2f14eec..38dfd26bba 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; @@ -37,7 +37,7 @@ public class AppearanceHolder private final AppearanceTargetType _targetType; private final long _bodyPart; - public AppearanceHolder(StatsSet set) + public AppearanceHolder(StatSet set) { _visualId = set.getInt("id", 0); _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java index 29740873cd..0f9488448d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Nik @@ -43,7 +43,7 @@ public class AttachSkillHolder extends SkillHolder return _requiredSkillLevel; } - public static AttachSkillHolder fromStatsSet(StatsSet set) + public static AttachSkillHolder fromStatSet(StatSet set) { return new AttachSkillHolder(set.getInt("skillId"), set.getInt("skillLevel", 1), set.getInt("requiredSkillId"), set.getInt("requiredSkillLevel", 1)); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java index cc41724532..57b6d47c40 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Set; import org.l2jmobius.gameserver.enums.SkillEnchantType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -36,7 +36,7 @@ public class EnchantSkillHolder private final Map _chance = new EnumMap<>(SkillEnchantType.class); private final Map> _requiredItems = new EnumMap<>(SkillEnchantType.class); - public EnchantSkillHolder(StatsSet set) + public EnchantSkillHolder(StatSet set) { _level = set.getInt("level"); _enchantFailLevel = set.getInt("enchantFailLevel"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java index e6706c8467..33d14e4345 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Map; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -36,7 +36,7 @@ public class ExtendDropDataHolder private final List _conditions; private final Map _systemMessages; - public ExtendDropDataHolder(StatsSet set) + public ExtendDropDataHolder(StatSet set) { _id = set.getInt("id"); _items = set.getList("items", ExtendDropItemHolder.class); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java index 16454d764a..d63d4eb775 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -52,7 +52,7 @@ public class FakePlayerHolder private final int _clanId; private final int _pledgeStatus; - public FakePlayerHolder(StatsSet set) + public FakePlayerHolder(StatSet set) { _classId = set.getInt("classId", 182); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java index a9c72776cd..86af0c1405 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -29,7 +29,7 @@ public class ItemHolder implements IIdentifiable private final int _id; private final long _count; - public ItemHolder(StatsSet set) + public ItemHolder(StatSet set) { _id = set.getInt("id"); _count = set.getLong("count"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java index 5b581c4cfe..a54dfa8300 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -25,7 +25,7 @@ public class ItemPointHolder extends ItemHolder { private final int _points; - public ItemPointHolder(StatsSet params) + public ItemPointHolder(StatSet params) { this(params.getInt("id"), params.getLong("count"), params.getInt("points")); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java index 22c6c327eb..0ba78224d3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.holders; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -34,7 +34,7 @@ public class LuckyGameDataHolder private int _minModifyRewardGame; private int _maxModifyRewardGame; - public LuckyGameDataHolder(StatsSet params) + public LuckyGameDataHolder(StatSet params) { _index = params.getInt("index"); _turningPoints = params.getInt("turning_point"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java index f77e380e8d..9fa8c99654 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.holders; import java.time.Duration; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -32,7 +32,7 @@ public class MinionHolder implements IIdentifiable private final long _respawnTime; private final int _weightPoint; - public MinionHolder(StatsSet set) + public MinionHolder(StatSet set) { _id = set.getInt("id"); _count = set.getInt("count", 1); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java index f4173594d1..36ac70176d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -52,7 +52,7 @@ public class MultisellListHolder implements IIdentifiable } @SuppressWarnings("unchecked") - public MultisellListHolder(StatsSet set) + public MultisellListHolder(StatSet set) { _listId = set.getInt("listId"); _isChanceMultisell = set.getBoolean("isChanceMultisell", false); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 3e3ea5d31b..c2f4ab4119 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -45,7 +45,7 @@ import org.l2jmobius.gameserver.enums.InstanceReenterType; import org.l2jmobius.gameserver.enums.InstanceTeleportType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -87,7 +87,7 @@ public class Instance implements IIdentifiable, INamable private final Set _players = ConcurrentHashMap.newKeySet(); // Players inside instance private final Set _npcs = ConcurrentHashMap.newKeySet(); // Spawned NPCs inside instance private final Map _doors = new HashMap<>(); // Spawned doors inside instance - private final StatsSet _parameters = new StatsSet(); + private final StatSet _parameters = new StatSet(); // Timers private final Map> _ejectDeadTasks = new ConcurrentHashMap<>(); private ScheduledFuture _cleanUpTask = null; @@ -171,7 +171,7 @@ public class Instance implements IIdentifiable, INamable * Get instance world parameters. * @return instance parameters */ - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } @@ -1020,7 +1020,7 @@ public class Instance implements IIdentifiable, INamable * Get parameters from instance template.
    * @return template parameters */ - public StatsSet getTemplateParameters() + public StatSet getTemplateParameters() { return _template.getParameters(); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 2a196f73ef..b53b0a819d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.AbstractPlayerGroup; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -71,7 +71,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl private float _spRate = Config.RATE_INSTANCE_SP; private float _expPartyRate = Config.RATE_INSTANCE_PARTY_XP; private float _spPartyRate = Config.RATE_INSTANCE_PARTY_SP; - private StatsSet _parameters = StatsSet.EMPTY_STATSET; + private StatSet _parameters = StatSet.EMPTY_STATSET; private final Map _doors = new HashMap<>(); private final List _spawns = new ArrayList<>(); // Locations @@ -92,7 +92,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl /** * @param set */ - public InstanceTemplate(StatsSet set) + public InstanceTemplate(StatSet set) { _templateId = set.getInt("id", 0); _name = set.getString("name", null); @@ -178,7 +178,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (!set.isEmpty()) { - _parameters = new StatsSet(Collections.unmodifiableMap(set)); + _parameters = new StatSet(Collections.unmodifiableMap(set)); } } @@ -469,7 +469,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl * Get instance template parameters. * @return parameters of template */ - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java index 3b67ff72f4..3627959662 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; import java.util.function.BiConsumer; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public abstract class Condition { private final InstanceTemplate _template; - private final StatsSet _parameters; + private final StatSet _parameters; private final boolean _leaderOnly; private final boolean _showMessageAndHtml; private SystemMessageId _systemMsg = null; @@ -46,7 +46,7 @@ public abstract class Condition * @param onlyLeader flag which means if only leader should be affected (leader means player who wants to enter not group leader!) * @param showMessageAndHtml if {@code true} and HTML message is defined then both are send, otherwise only HTML or message is send */ - public Condition(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public Condition(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { _template = template; _parameters = parameters; @@ -58,7 +58,7 @@ public abstract class Condition * Gets parameters of condition. * @return set of parameters */ - protected final StatsSet getParameters() + protected final StatSet getParameters() { return _parameters; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java index e379741b59..c27d92d662 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionCommandChannel extends Condition { - public ConditionCommandChannel(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionCommandChannel(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_CANNOT_ENTER_BECAUSE_YOU_ARE_NOT_ASSOCIATED_WITH_THE_CURRENT_COMMAND_CHANNEL); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java index ed434e3524..a828dcceae 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.model.AbstractPlayerGroup; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionCommandChannelLeader extends Condition { - public ConditionCommandChannelLeader(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionCommandChannelLeader(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java index d2a60816d0..423a37a94e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionDistance extends Condition { - public ConditionDistance(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionDistance(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); setSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED, (message, player) -> message.addString(player.getName())); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java index 3dc78a98c7..8aa68b7e08 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionGroupMax extends Condition { - public ConditionGroupMax(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionGroupMax(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_CANNOT_ENTER_DUE_TO_THE_PARTY_HAVING_EXCEEDED_THE_LIMIT); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java index 818803c844..70ea03c187 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionGroupMin extends Condition { - public ConditionGroupMin(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionGroupMin(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_MUST_HAVE_A_MINIMUM_OF_S1_PEOPLE_TO_ENTER_THIS_INSTANCE_ZONE, (msg, player) -> msg.addInt(getLimit())); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 3088d8ae64..53fee609aa 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.enums.ResidenceType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; */ public class ConditionHasResidence extends Condition { - public ConditionHasResidence(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionHasResidence(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); } @@ -43,7 +43,7 @@ public class ConditionHasResidence extends Condition return false; } - final StatsSet params = getParameters(); + final StatSet params = getParameters(); final int id = params.getInt("id"); boolean test = false; switch (params.getEnum("type", ResidenceType.class)) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java index 4e1c407325..eed350db38 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -32,7 +32,7 @@ public class ConditionItem extends Condition private final long _count; private final boolean _take; - public ConditionItem(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionItem(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Load params diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java index 7d509a20c7..b38f8c0e2c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -32,7 +32,7 @@ public class ConditionLevel extends Condition private final int _min; private final int _max; - public ConditionLevel(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionLevel(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Load params diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java index b91deeffdb..d71e6d0a39 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; */ public class ConditionNoParty extends Condition { - public ConditionNoParty(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionNoParty(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java index dd31bf3ca5..5bf768a03e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionParty extends Condition { - public ConditionParty(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionParty(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java index 524a59675a..0363715536 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionPartyLeader extends Condition { - public ConditionPartyLeader(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionPartyLeader(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java index 481cb251ce..48d7fc7981 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.instancemanager.QuestManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionQuest extends Condition { - public ConditionQuest(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionQuest(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Set message diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 899b17aff9..a073129734 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionReenter extends Condition { - public ConditionReenter(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionReenter(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); setSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET, (message, player) -> message.addString(player.getName())); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java index ec255025c3..fafafe5604 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.itemauction; import java.util.Calendar; import java.util.concurrent.TimeUnit; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Forsaiken @@ -40,7 +40,7 @@ public class AuctionDateGenerator private int _hour_of_day; private int _minute_of_hour; - public AuctionDateGenerator(StatsSet config) + public AuctionDateGenerator(StatSet config) { _calendar = Calendar.getInstance(); _interval = config.getInt(FIELD_INTERVAL, -1); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 64bf0a6ff1..cb554e4dce 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.itemauction; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.idfactory.IdFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,9 +34,9 @@ public class AuctionItem private final int _itemId; private final long _itemCount; @SuppressWarnings("unused") - private final StatsSet _itemExtra; + private final StatSet _itemExtra; - public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatsSet itemExtra) + public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatSet itemExtra) { _auctionItemId = auctionItemId; _auctionLength = auctionLength; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 6dff6e3a4d..dc3a7f6f6b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -44,7 +44,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -84,7 +84,7 @@ public class ItemAuctionInstance _items = new ArrayList<>(); final NamedNodeMap nanode = node.getAttributes(); - final StatsSet generatorConfig = new StatsSet(); + final StatSet generatorConfig = new StatSet(); for (int i = nanode.getLength(); i-- > 0;) { final Node n = nanode.item(i); @@ -115,7 +115,7 @@ public class ItemAuctionInstance throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } - final StatsSet itemExtra = new StatsSet(); + final StatSet itemExtra = new StatSet(); final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Armor.java index d4fd97ef10..bfc90d126d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Armor.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.type.ArmorType; /** @@ -28,15 +28,15 @@ public class Armor extends Item /** * Constructor for Armor. - * @param set the StatsSet designating the set of couples (key,value) characterizing the armor. + * @param set the StatSet designating the set of couples (key,value) characterizing the armor. */ - public Armor(StatsSet set) + public Armor(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/EtcItem.java index 86d7291595..a902860c0d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/EtcItem.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -38,15 +38,15 @@ public class EtcItem extends Item /** * Constructor for EtcItem. - * @param set StatsSet designating the set of couples (key,value) for description of the Etc + * @param set StatSet designating the set of couples (key,value) for description of the Etc */ - public EtcItem(StatsSet set) + public EtcItem(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Henna.java index 921fa10dfb..87cea36031 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; @@ -44,7 +44,7 @@ public class Henna private final List _skills; private final List _wear_class; - public Henna(StatsSet set) + public Henna(StatSet set) { _dyeId = set.getInt("dyeId"); _dyeItemId = set.getInt("dyeItemId"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Item.java index 8f8d49e9d8..4f2d125bdf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Item.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.enums.ItemGrade; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; @@ -178,14 +178,14 @@ public abstract class Item extends ListenersContainer implements IIdentifiable /** * Constructor of the Item that fill class variables.
    *
    - * @param set : StatsSet corresponding to a set of couples (key,value) for description of the item + * @param set : StatSet corresponding to a set of couples (key,value) for description of the item */ - protected Item(StatsSet set) + protected Item(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { _itemId = set.getInt("item_id"); _displayId = set.getInt("displayId", _itemId); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java index ab196007a8..3ca228cbe5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -29,7 +29,7 @@ public class PlayerItemTemplate extends ItemHolder /** * @param set the set containing the values for this object */ - public PlayerItemTemplate(StatsSet set) + public PlayerItemTemplate(StatSet set) { super(set.getInt("id"), set.getInt("count")); _equipped = set.getBoolean("equipped", false); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Weapon.java index 16f0c47287..5f9f8507bd 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Weapon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.items; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ItemSkillType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -58,15 +58,15 @@ public class Weapon extends Item /** * Constructor for Weapon. - * @param set the StatsSet designating the set of couples (key,value) characterizing the weapon. + * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. */ - public Weapon(StatsSet set) + public Weapon(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java index 7bdd968d90..6d05c20ff3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java @@ -23,7 +23,7 @@ import java.util.List; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -54,7 +54,7 @@ public class AppearanceStone private List _racesNot; private List _allVisualIds; - public AppearanceStone(StatsSet set) + public AppearanceStone(StatSet set) { _id = set.getInt("id"); _visualId = set.getInt("visualId", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java index f3b53f1a67..a2897ba911 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.items.combination; import java.util.EnumMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -31,7 +31,7 @@ public class CombinationItem private final int _chance; private final Map _rewards = new EnumMap<>(CombinationItemType.class); - public CombinationItem(StatsSet set) + public CombinationItem(StatSet set) { _itemOne = set.getInt("one"); _itemTwo = set.getInt("two"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java index 1cde38a6d6..a7f1326bd8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.CrystalType; @@ -59,7 +59,7 @@ public abstract class AbstractEnchantItem private final int _maxEnchantLevel; private final double _bonusRate; - public AbstractEnchantItem(StatsSet set) + public AbstractEnchantItem(StatSet set) { _id = set.getInt("id"); if (getItem() == null) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java index b6b34cc667..7329d8728e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -40,7 +40,7 @@ public class EnchantScroll extends AbstractEnchantItem private final int _scrollGroupId; private Set _items; - public EnchantScroll(StatsSet set) + public EnchantScroll(StatSet set) { super(set); _scrollGroupId = set.getInt("scrollGroupId", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java index c02095428b..978e38d533 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items.enchant; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.items.type.ItemType; @@ -30,7 +30,7 @@ public class EnchantSupportItem extends AbstractEnchantItem private final boolean _isGiant; private final ItemType type; - public EnchantSupportItem(StatsSet set) + public EnchantSupportItem(StatSet set) { super(set); type = getItem().getItemType(); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 0ed171d83c..64a2203ce0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -45,7 +45,7 @@ import org.l2jmobius.gameserver.data.xml.impl.ClassListData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.ClassId; @@ -63,7 +63,7 @@ public class Olympiad extends ListenersContainer protected static final Logger LOGGER = Logger.getLogger(Olympiad.class.getName()); protected static final Logger LOGGER_OLYMPIAD = Logger.getLogger("olympiad"); - private static final Map NOBLES = new ConcurrentHashMap<>(); + private static final Map NOBLES = new ConcurrentHashMap<>(); private static final Map NOBLES_RANK = new HashMap<>(); public static final String OLYMPIAD_HTML_PATH = "data/html/olympiad/"; @@ -229,10 +229,10 @@ public class Olympiad extends ListenersContainer PreparedStatement statement = con.prepareStatement(OLYMPIAD_LOAD_NOBLES); ResultSet rset = statement.executeQuery()) { - StatsSet statData; + StatSet statData; while (rset.next()) { - statData = new StatsSet(); + statData = new StatSet(); statData.set(CLASS_ID, rset.getInt(CLASS_ID)); statData.set(CHAR_NAME, rset.getString(CHAR_NAME)); statData.set(POINTS, rset.getInt(POINTS)); @@ -455,7 +455,7 @@ public class Olympiad extends ListenersContainer saveNobleData(); _period = 1; - final List heroesToBe = sortHerosToBe(); + final List heroesToBe = sortHerosToBe(); Hero.getInstance().resetData(); Hero.getInstance().computeNewHeroes(heroesToBe); @@ -489,7 +489,7 @@ public class Olympiad extends ListenersContainer return NOBLES.size(); } - public static StatsSet getNobleStats(int playerId) + public static StatSet getNobleStats(int playerId) { return NOBLES.get(playerId); } @@ -788,7 +788,7 @@ public class Olympiad extends ListenersContainer } int currentPoints; - for (StatsSet nobleInfo : NOBLES.values()) + for (StatSet nobleInfo : NOBLES.values()) { currentPoints = nobleInfo.getInt(POINTS); currentPoints += WEEKLY_POINTS; @@ -806,7 +806,7 @@ public class Olympiad extends ListenersContainer return; } - for (StatsSet nobleInfo : NOBLES.values()) + for (StatSet nobleInfo : NOBLES.values()) { nobleInfo.set(COMP_DONE_WEEK, 0); } @@ -839,9 +839,9 @@ public class Olympiad extends ListenersContainer try (Connection con = DatabaseFactory.getConnection()) { - for (Entry entry : NOBLES.entrySet()) + for (Entry entry : NOBLES.entrySet()) { - final StatsSet nobleInfo = entry.getValue(); + final StatSet nobleInfo = entry.getValue(); if (nobleInfo == null) { @@ -954,7 +954,7 @@ public class Olympiad extends ListenersContainer } } - protected List sortHerosToBe() + protected List sortHerosToBe() { if (_period != 1) { @@ -962,8 +962,8 @@ public class Olympiad extends ListenersContainer } LOGGER_OLYMPIAD.info("Noble,charid,classid,compDone,points"); - StatsSet nobleInfo; - for (Entry entry : NOBLES.entrySet()) + StatSet nobleInfo; + for (Entry entry : NOBLES.entrySet()) { nobleInfo = entry.getValue(); if (nobleInfo == null) @@ -980,7 +980,7 @@ public class Olympiad extends ListenersContainer LOGGER_OLYMPIAD.info(charName + "," + charId + "," + classId + "," + compDone + "," + points); } - final List heroesToBe = new LinkedList<>(); + final List heroesToBe = new LinkedList<>(); int legendId = 0; try (Connection con = DatabaseFactory.getConnection(); @@ -999,7 +999,7 @@ public class Olympiad extends ListenersContainer try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(OLYMPIAD_GET_HEROS)) { - StatsSet hero; + StatSet hero; for (int element : HERO_IDS) { // Classic can have 2nd and 3rd class competitors, but only 1 hero @@ -1011,7 +1011,7 @@ public class Olympiad extends ListenersContainer { if (rset.next()) { - hero = new StatsSet(); + hero = new StatSet(); final int charId = rset.getInt(CHAR_ID); hero.set(CLASS_ID, element); // save the 3rd class title hero.set(CHAR_ID, charId); @@ -1067,7 +1067,7 @@ public class Olympiad extends ListenersContainer return 0; } - final StatsSet noble = NOBLES.get(objectId); + final StatSet noble = NOBLES.get(objectId); if ((noble == null) || (noble.getInt(POINTS) == 0)) { return 0; @@ -1117,7 +1117,7 @@ public class Olympiad extends ListenersContainer { if (!NOBLES.containsKey(player.getObjectId())) { - final StatsSet statDat = new StatsSet(); + final StatSet statDat = new StatSet(); statDat.set(CLASS_ID, player.getBaseClass()); statDat.set(CHAR_NAME, player.getName()); statDat.set(POINTS, DEFAULT_POINTS); @@ -1224,7 +1224,7 @@ public class Olympiad extends ListenersContainer * @param data the stats set data to add. * @return the old stats set if the noble is already present, null otherwise. */ - public static StatsSet addNobleStats(int charId, StatsSet data) + public static StatSet addNobleStats(int charId, StatSet data) { return NOBLES.put(charId, data); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/Participant.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/Participant.java index 670066ac32..b6d879b902 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/Participant.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/Participant.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.olympiad; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class Participant private final int baseClass; private boolean disconnected = false; private boolean defaulted = false; - private final StatsSet stats; + private final StatSet stats; public String clanName; public int clanId; @@ -125,7 +125,7 @@ public class Participant /** * @return the stats */ - public StatsSet getStats() + public StatSet getStats() { return stats; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java index 4d5231ca5d..c1fb0f88f6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.primeshop; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -49,7 +49,7 @@ public class PrimeShopGroup private final int _availableCount; private final List _items; - public PrimeShopGroup(StatsSet set, List items) + public PrimeShopGroup(StatSet set, List items) { _brId = set.getInt("id"); _category = set.getInt("cat", 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java index d150ec98cd..88795e0721 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.residences; import java.time.Duration; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -33,7 +33,7 @@ public class ResidenceFunctionTemplate private final Duration _duration; private final double _value; - public ResidenceFunctionTemplate(StatsSet set) + public ResidenceFunctionTemplate(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java index 4f15efda0b..b19f8e59d5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; /** @@ -34,7 +34,7 @@ public class ShuttleDataHolder private final List _stops = new ArrayList<>(2); private final List _routes = new ArrayList<>(2); - public ShuttleDataHolder(StatsSet set) + public ShuttleDataHolder(StatSet set) { _id = set.getInt("id"); _loc = new Location(set); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/Skill.java index c44b45a781..0e97466a3a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.handler.IAffectScopeHandler; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.CubicInstance; @@ -210,7 +210,7 @@ public class Skill implements IIdentifiable private final SkillBuffType _buffType; private final boolean _displayInList; - public Skill(StatsSet set) + public Skill(StatSet set) { _id = set.getInt(".id"); _level = set.getInt(".level"); @@ -391,7 +391,7 @@ public class Skill implements IIdentifiable _toggleGroupId = set.getInt("toggleGroupId", -1); _attachToggleGroupId = set.getInt("attachToggleGroupId", -1); - _attachSkills = set.getList("attachSkillList", StatsSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatsSet).collect(Collectors.toList()); + _attachSkills = set.getList("attachSkillList", StatSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatSet).collect(Collectors.toList()); final String abnormalResist = set.getString("abnormalResists", null); if (abnormalResist != null) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java index bfc25bddde..39b738dbca 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.ChanceLocation; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory; /** * @author UnAfraid */ -public class NpcSpawnTemplate implements Cloneable, IParameterized +public class NpcSpawnTemplate implements Cloneable, IParameterized { private static final Logger LOGGER = Logger.getLogger(NpcSpawnTemplate.class.getName()); @@ -56,7 +56,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized private final Duration _respawnTimeRandom; private List _locations; private SpawnTerritory _zone; - private StatsSet _parameters; + private StatSet _parameters; private final boolean _spawnAnimation; private final boolean _saveInDB; private final String _dbName; @@ -82,7 +82,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized _minions = template._minions; } - public NpcSpawnTemplate(SpawnTemplate spawnTemplate, SpawnGroup group, StatsSet set) + public NpcSpawnTemplate(SpawnTemplate spawnTemplate, SpawnGroup group, StatSet set) { _spawnTemplate = spawnTemplate; _group = group; @@ -128,14 +128,14 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized mergeParameters(spawnTemplate, group); } - private StatsSet mergeParameters(SpawnTemplate spawnTemplate, SpawnGroup group) + private StatSet mergeParameters(SpawnTemplate spawnTemplate, SpawnGroup group) { if ((_parameters == null) && (spawnTemplate.getParameters() == null) && (group.getParameters() == null)) { return null; } - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); if (spawnTemplate.getParameters() != null) { set.merge(spawnTemplate.getParameters()); @@ -206,13 +206,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized } @Override - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } @Override - public void setParameters(StatsSet parameters) + public void setParameters(StatSet parameters) { if (_parameters == null) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java index 6723863c93..7ceb2d46af 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IParameterized; import org.l2jmobius.gameserver.model.interfaces.ITerritorized; @@ -31,16 +31,16 @@ import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory; /** * @author UnAfraid */ -public class SpawnGroup implements Cloneable, ITerritorized, IParameterized +public class SpawnGroup implements Cloneable, ITerritorized, IParameterized { private final String _name; private final boolean _spawnByDefault; private List _territories; private List _bannedTerritories; private final List _spawns = new ArrayList<>(); - private StatsSet _parameters; + private StatSet _parameters; - public SpawnGroup(StatsSet set) + public SpawnGroup(StatSet set) { this(set.getString("name", null), set.getBoolean("spawnByDefault", true)); } @@ -104,13 +104,13 @@ public class SpawnGroup implements Cloneable, ITerritorized, IParameterized +public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized { private final String _name; private final String _ai; @@ -45,9 +45,9 @@ public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized _territories; private List _bannedTerritories; private final List _groups = new ArrayList<>(); - private StatsSet _parameters; + private StatSet _parameters; - public SpawnTemplate(StatsSet set, File file) + public SpawnTemplate(StatSet set, File file) { this(set.getString("name", null), set.getString("ai", null), set.getBoolean("spawnByDefault", true), file); } @@ -128,13 +128,13 @@ public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized _castleId; - public TeleportLocation(int id, StatsSet set) + public TeleportLocation(int id, StatSet set) { super(set); _id = id; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java index 916ae0790c..33cf6ac3bc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.variables; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.IRestorable; import org.l2jmobius.gameserver.model.interfaces.IStorable; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.interfaces.IStorable; /** * @author UnAfraid */ -public abstract class AbstractVariables extends StatsSet implements IRestorable, IStorable, IDeletable +public abstract class AbstractVariables extends StatSet implements IRestorable, IStorable, IDeletable { private final AtomicBoolean _hasChanges = new AtomicBoolean(false); @@ -41,42 +41,42 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, */ @Override - public StatsSet set(String name, boolean value) + public StatSet set(String name, boolean value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, double value) + public StatSet set(String name, double value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, Enum value) + public StatSet set(String name, Enum value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, int value) + public StatSet set(String name, int value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, long value) + public StatSet set(String name, long value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, String value) + public StatSet set(String name, String value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); @@ -89,7 +89,7 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, * @param markAsChanged * @return */ - public StatsSet set(String name, String value, boolean markAsChanged) + public StatSet set(String name, String value, boolean markAsChanged) { if (markAsChanged) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index 5c03122a62..4d97f0017a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExHeroList implements IClientOutgoingPacket { - private final Map _heroList; + private final Map _heroList; public ExHeroList() { @@ -42,7 +42,7 @@ public class ExHeroList implements IClientOutgoingPacket OutgoingPackets.EX_HERO_LIST.writeId(packet); packet.writeD(_heroList.size()); - for (StatsSet hero : _heroList.values()) + for (StatSet hero : _heroList.values()) { packet.writeS(hero.getString(Olympiad.CHAR_NAME)); packet.writeD(hero.getInt(Olympiad.CLASS_ID)); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java index 85eb7fea54..8565c13852 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java @@ -27,7 +27,7 @@ import java.util.GregorianCalendar; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.RankManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; @@ -135,7 +135,7 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket int legendCount = 0; if (Hero.getInstance().getCompleteHeroes().containsKey(_player.getObjectId())) { - final StatsSet hero = Hero.getInstance().getCompleteHeroes().get(_player.getObjectId()); + final StatSet hero = Hero.getInstance().getCompleteHeroes().get(_player.getObjectId()); heroCount = hero.getInt("count"); legendCount = hero.getInt("legend_count"); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java index 67ba9685bb..b399513c62 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.RankManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -39,8 +39,8 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket private final int _unk; private final int _classId; private final int _serverId; - private final Map _playerList; - private final Map _snapshotList; + private final Map _playerList; + private final Map _snapshotList; public ExOlympiadRankingInfo(PlayerInstance player, int tabId, int rankingType, int unk, int classId, int serverId) { @@ -78,7 +78,7 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket for (Integer id : _playerList.keySet()) { - final StatsSet player = _playerList.get(id); + final StatSet player = _playerList.get(id); packet.writeString(player.getString("name")); // name packet.writeString(player.getString("clanName")); // clan name @@ -88,7 +88,7 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket { for (Integer id2 : _snapshotList.keySet()) { - final StatsSet snapshot = _snapshotList.get(id2); + final StatSet snapshot = _snapshotList.get(id2); if (player.getInt("charId") == snapshot.getInt("charId")) { @@ -117,7 +117,7 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket boolean found = false; for (Integer id : _playerList.keySet()) { - final StatsSet player = _playerList.get(id); + final StatSet player = _playerList.get(id); if (player.getInt("charId") == _player.getObjectId()) { @@ -136,7 +136,7 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket for (int id2 = first; id2 <= last; id2++) { - final StatsSet plr = _playerList.get(id2); + final StatSet plr = _playerList.get(id2); packet.writeString(plr.getString("name")); packet.writeString(plr.getString("clanName")); @@ -145,7 +145,7 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket { for (Integer id3 : _snapshotList.keySet()) { - final StatsSet snapshot = _snapshotList.get(id3); + final StatSet snapshot = _snapshotList.get(id3); if (player.getInt("charId") == snapshot.getInt("charId")) { packet.writeD(id3); // class rank snapshot @@ -184,7 +184,7 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket for (int i = 1; i <= _playerList.size(); i++) { - final StatsSet player = _playerList.get(i); + final StatSet player = _playerList.get(i); if (_classId == player.getInt("classId")) { count++; @@ -195,7 +195,7 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket int i = 1; for (Integer id : _playerList.keySet()) { - final StatsSet player = _playerList.get(id); + final StatSet player = _playerList.get(id); if (_classId == player.getInt("classId")) { @@ -204,11 +204,11 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket packet.writeD(i); // class rank if (_snapshotList.size() > 0) { - final Map snapshotRaceList = new ConcurrentHashMap<>(); + final Map snapshotRaceList = new ConcurrentHashMap<>(); int j = 1; for (Integer id2 : _snapshotList.keySet()) { - final StatsSet snapshot = _snapshotList.get(id2); + final StatSet snapshot = _snapshotList.get(id2); if (_classId == snapshot.getInt("classId")) { @@ -218,7 +218,7 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket } for (Integer id2 : snapshotRaceList.keySet()) { - final StatsSet snapshot = snapshotRaceList.get(id2); + final StatSet snapshot = snapshotRaceList.get(id2); if (player.getInt("charId") == snapshot.getInt("charId")) { @@ -247,11 +247,11 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket else { boolean found = false; - final Map classList = new ConcurrentHashMap<>(); + final Map classList = new ConcurrentHashMap<>(); int i = 1; for (Integer id : _playerList.keySet()) { - final StatsSet set = _playerList.get(id); + final StatSet set = _playerList.get(id); if (_player.getBaseClass() == set.getInt("classId")) { @@ -262,7 +262,7 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket for (Integer id : classList.keySet()) { - final StatsSet player = classList.get(id); + final StatSet player = classList.get(id); if (player.getInt("charId") == _player.getObjectId()) { @@ -279,7 +279,7 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket } for (int id2 = first; id2 <= last; id2++) { - final StatsSet plr = classList.get(id2); + final StatSet plr = classList.get(id2); packet.writeString(plr.getString("name")); packet.writeString(plr.getString("clanName")); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java index c99698db80..16c1874d0c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java @@ -20,7 +20,7 @@ import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.RankManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -33,8 +33,8 @@ public class ExRankingCharInfo implements IClientOutgoingPacket @SuppressWarnings("unused") private final short _unk; private final PlayerInstance _player; - private final Map _playerList; - private final Map _snapshotList; + private final Map _playerList; + private final Map _snapshotList; public ExRankingCharInfo(PlayerInstance player, short unk) { @@ -53,7 +53,7 @@ public class ExRankingCharInfo implements IClientOutgoingPacket { for (Integer id : _playerList.keySet()) { - final StatsSet player = _playerList.get(id); + final StatSet player = _playerList.get(id); if (player.getInt("charId") == _player.getObjectId()) { packet.writeD(id); // server rank @@ -61,7 +61,7 @@ public class ExRankingCharInfo implements IClientOutgoingPacket for (Integer id2 : _snapshotList.keySet()) { - final StatsSet snapshot = _snapshotList.get(id2); + final StatSet snapshot = _snapshotList.get(id2); if (player.getInt("charId") == snapshot.getInt("charId")) { packet.writeD(id2); // server rank snapshot diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java index 361f967526..5f37ce51f9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.RankManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -38,8 +38,8 @@ public class ExRankingCharRankers implements IClientOutgoingPacket private final int _group; private final int _scope; - private final Map _playerList; - private final Map _snapshotList; + private final Map _playerList; + private final Map _snapshotList; public ExRankingCharRankers(PlayerInstance player, int group, int scope, int race) { @@ -76,7 +76,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket for (Integer id : _playerList.keySet()) { - final StatsSet player = _playerList.get(id); + final StatSet player = _playerList.get(id); packet.writeString(player.getString("name")); packet.writeString(player.getString("clanName")); @@ -88,7 +88,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket { for (Integer id2 : _snapshotList.keySet()) { - final StatsSet snapshot = _snapshotList.get(id2); + final StatSet snapshot = _snapshotList.get(id2); if (player.getInt("charId") == snapshot.getInt("charId")) { @@ -109,7 +109,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket boolean found = false; for (Integer id : _playerList.keySet()) { - final StatsSet player = _playerList.get(id); + final StatSet player = _playerList.get(id); if (player.getInt("charId") == _player.getObjectId()) { @@ -126,7 +126,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket } for (int id2 = first; id2 <= last; id2++) { - final StatsSet plr = _playerList.get(id2); + final StatSet plr = _playerList.get(id2); packet.writeString(plr.getString("name")); packet.writeString(plr.getString("clanName")); @@ -139,7 +139,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket { for (Integer id3 : _snapshotList.keySet()) { - final StatsSet snapshot = _snapshotList.get(id3); + final StatSet snapshot = _snapshotList.get(id3); if (player.getInt("charId") == snapshot.getInt("charId")) { packet.writeD(id3); // server rank snapshot @@ -165,7 +165,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket for (int i = 1; i <= _playerList.size(); i++) { - final StatsSet player = _playerList.get(i); + final StatSet player = _playerList.get(i); if (_race == player.getInt("race")) { count++; @@ -176,7 +176,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket int i = 1; for (Integer id : _playerList.keySet()) { - final StatsSet player = _playerList.get(id); + final StatSet player = _playerList.get(id); if (_race == player.getInt("race")) { @@ -188,11 +188,11 @@ public class ExRankingCharRankers implements IClientOutgoingPacket packet.writeD(i); // server rank if (_snapshotList.size() > 0) { - final Map snapshotRaceList = new ConcurrentHashMap<>(); + final Map snapshotRaceList = new ConcurrentHashMap<>(); int j = 1; for (Integer id2 : _snapshotList.keySet()) { - final StatsSet snapshot = _snapshotList.get(id2); + final StatSet snapshot = _snapshotList.get(id2); if (_race == snapshot.getInt("race")) { @@ -202,7 +202,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket } for (Integer id2 : snapshotRaceList.keySet()) { - final StatsSet snapshot = snapshotRaceList.get(id2); + final StatSet snapshot = snapshotRaceList.get(id2); if (player.getInt("charId") == snapshot.getInt("charId")) { @@ -224,11 +224,11 @@ public class ExRankingCharRankers implements IClientOutgoingPacket { boolean found = false; - final Map raceList = new ConcurrentHashMap<>(); + final Map raceList = new ConcurrentHashMap<>(); int i = 1; for (Integer id : _playerList.keySet()) { - final StatsSet set = _playerList.get(id); + final StatSet set = _playerList.get(id); if (_player.getRace().ordinal() == set.getInt("race")) { @@ -239,7 +239,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket for (Integer id : raceList.keySet()) { - final StatsSet player = raceList.get(id); + final StatSet player = raceList.get(id); if (player.getInt("charId") == _player.getObjectId()) { @@ -256,7 +256,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket } for (int id2 = first; id2 <= last; id2++) { - final StatsSet plr = raceList.get(id2); + final StatSet plr = raceList.get(id2); packet.writeString(plr.getString("name")); packet.writeString(plr.getString("clanName")); @@ -280,11 +280,11 @@ public class ExRankingCharRankers implements IClientOutgoingPacket { if (_player.getClan() != null) { - final Map clanList = new ConcurrentHashMap<>(); + final Map clanList = new ConcurrentHashMap<>(); int i = 1; for (Integer id : _playerList.keySet()) { - final StatsSet set = _playerList.get(id); + final StatSet set = _playerList.get(id); if (_player.getClan().getName() == set.getString("clanName")) { @@ -297,7 +297,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket for (Integer id : clanList.keySet()) { - final StatsSet player = clanList.get(id); + final StatSet player = clanList.get(id); packet.writeString(player.getString("name")); packet.writeString(player.getString("clanName")); @@ -309,7 +309,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket { for (Integer id2 : _snapshotList.keySet()) { - final StatsSet snapshot = _snapshotList.get(id2); + final StatSet snapshot = _snapshotList.get(id2); if (player.getInt("charId") == snapshot.getInt("charId")) { @@ -342,7 +342,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket { for (Integer id2 : _playerList.keySet()) { - final StatsSet temp = _playerList.get(id2); + final StatSet temp = _playerList.get(id2); if (temp.getInt("charId") == id) { friendList.add(temp.getInt("charId")); @@ -356,7 +356,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket for (int id : _playerList.keySet()) { - final StatsSet player = _playerList.get(id); + final StatSet player = _playerList.get(id); if (friendList.contains(player.getInt("charId"))) { packet.writeString(player.getString("name")); @@ -369,7 +369,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket { for (Integer id2 : _snapshotList.keySet()) { - final StatsSet snapshot = _snapshotList.get(id2); + final StatSet snapshot = _snapshotList.get(id2); if (player.getInt("charId") == snapshot.getInt("charId")) { @@ -407,7 +407,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket { for (Integer id : _snapshotList.keySet()) { - final StatsSet snapshot = _snapshotList.get(id); + final StatSet snapshot = _snapshotList.get(id); if (_player.getObjectId() == snapshot.getInt("charId")) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/BypassParser.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/BypassParser.java index 414125bdeb..a80323ba1f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/BypassParser.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/BypassParser.java @@ -20,12 +20,12 @@ import java.util.LinkedHashMap; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid */ -public class BypassParser extends StatsSet +public class BypassParser extends StatSet { private static final String ALLOWED_CHARS = "a-zA-Z0-9-_`!@#%^&*()\\[\\]|\\\\/"; private static final Pattern PATTERN = Pattern.compile(String.format("([%s]*)=('([%s ]*)'|[%s]*)", ALLOWED_CHARS, ALLOWED_CHARS, ALLOWED_CHARS)); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java index 2eb76b90b3..dadebef7fd 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java @@ -18,7 +18,7 @@ package ai.areas.BeastFarm; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -133,7 +133,7 @@ public class ImprovedBabyPets extends AbstractNpcAI private boolean castBuff(Summon summon, int stepNumber, int buffNumber) { final PlayerInstance owner = summon.getOwner(); - final StatsSet parameters = summon.getTemplate().getParameters(); + final StatSet parameters = summon.getTemplate().getParameters(); final SkillHolder skill = parameters.getObject("step" + stepNumber + "_buff0" + buffNumber, SkillHolder.class); if ((skill != null) && (owner != null)) @@ -177,7 +177,7 @@ public class ImprovedBabyPets extends AbstractNpcAI { final boolean previousFollowStatus = summon.getFollowStatus(); final PlayerInstance owner = summon.getOwner(); - final StatsSet parameters = summon.getTemplate().getParameters(); + final StatSet parameters = summon.getTemplate().getParameters(); final SkillHolder skill = parameters.getObject("step" + stepNumber + "_heal0" + healNumber, SkillHolder.class); final int targetType = parameters.getInt("step" + stepNumber + "_heal_target0" + healNumber, 0); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index b837d839d8..d12c29d422 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -138,7 +138,7 @@ public class Antharas extends AbstractNpcAI addAttackId(ANTHARAS, BOMBER, BEHEMOTH, TERASQUE); addKillId(ANTHARAS, TERASQUE, BEHEMOTH); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANTHARAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(ANTHARAS); final double curr_hp = info.getDouble("currentHP"); final double curr_mp = info.getDouble("currentMP"); final int loc_x = info.getInt("loc_x"); @@ -761,7 +761,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(PlayerInstance attacker, int damage) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Baium/Baium.java index a1e8eb99d5..2686236add 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -112,7 +112,7 @@ public class Baium extends AbstractNpcAI addSeeCreatureId(BAIUM); addSpellFinishedId(BAIUM); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(BAIUM); + final StatSet info = GrandBossManager.getInstance().getStatSet(BAIUM); switch (getStatus()) { @@ -666,7 +666,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Core/Core.java index bfa7212b8c..c1452bf9de 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; @@ -85,7 +85,7 @@ public class Core extends AbstractNpcAI registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR); _firstAttacked = false; - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. @@ -205,9 +205,9 @@ public class Core extends AbstractNpcAI final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000; startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); + final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(CORE, info); + GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java index 6f155887fe..a5c30f4c9c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; @@ -63,7 +63,7 @@ public class DrChaos extends AbstractNpcAI addKillId(CHAOS_GOLEM); // Message + despawn. addAttackId(CHAOS_GOLEM); // Random messages when he attacks. - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CHAOS_GOLEM); + final StatSet info = GrandBossManager.getInstance().getStatSet(CHAOS_GOLEM); final int status = GrandBossManager.getInstance().getBossStatus(CHAOS_GOLEM); // Load the reset date and time for Dr. Chaos from DB. @@ -257,9 +257,9 @@ public class DrChaos extends AbstractNpcAI startQuestTimer("reset_drchaos", respawnTime, null, null, false); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(CHAOS_GOLEM); + final StatSet info = GrandBossManager.getInstance().getStatSet(CHAOS_GOLEM); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(CHAOS_GOLEM, info); + GrandBossManager.getInstance().setStatSet(CHAOS_GOLEM, info); return null; } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index 38eebefc7b..5e525a6caa 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -92,7 +92,7 @@ public class Orfen extends AbstractNpcAI registerMobs(mobs); _IsTeleported = false; ZONE = ZoneManager.getInstance().getZoneById(12013); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); final int status = GrandBossManager.getInstance().getBossStatus(ORFEN); if (status == DEAD) { @@ -327,9 +327,9 @@ public class Orfen extends AbstractNpcAI respawnTime *= 3600000; startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(ORFEN, info); + GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); startQuestTimer("despawn_minions", 20000, null, null); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index c2564917c7..b9fdddaaf7 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; @@ -91,7 +91,7 @@ public class QueenAnt extends AbstractNpcAI addFactionCallId(NURSE); _zone = ZoneManager.getInstance().getZoneById(12012); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); final int status = GrandBossManager.getInstance().getBossStatus(QUEEN); if (status == DEAD) { @@ -367,9 +367,9 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("action", npc, null); cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(QUEEN, info); + GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); _larva.deleteMe(); _larva = null; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java index 302d45a5dc..14aa2d6171 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; @@ -123,7 +123,7 @@ public class Valakas extends AbstractNpcAI registerMobs(VALAKAS); ZONE = ZoneManager.getInstance().getZoneById(12010); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(VALAKAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); final int status = GrandBossManager.getInstance().getBossStatus(VALAKAS); if (status == DEAD) @@ -446,9 +446,9 @@ public class Valakas extends AbstractNpcAI final long respawnTime = (Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM)) * 3600000; startQuestTimer("valakas_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(VALAKAS); + final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(VALAKAS, info); + GrandBossManager.getInstance().setStatSet(VALAKAS, info); return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java index 0964b5fd44..a322a608f2 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java @@ -18,7 +18,7 @@ package ai.bosses.Zaken; import org.l2jmobius.Config; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -48,7 +48,7 @@ public class Zaken extends AbstractNpcAI { addKillId(ZAKEN); - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ZAKEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN); final int status = GrandBossManager.getInstance().getBossStatus(ZAKEN); if (status == DEAD) { @@ -96,9 +96,9 @@ public class Zaken extends AbstractNpcAI final long respawnTime = (Config.ZAKEN_SPAWN_INTERVAL + getRandom(-Config.ZAKEN_SPAWN_RANDOM, Config.ZAKEN_SPAWN_RANDOM)) * 3600000; startQuestTimer("zaken_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots - final StatsSet info = GrandBossManager.getInstance().getStatsSet(ZAKEN); + final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN); info.set("respawn_time", System.currentTimeMillis() + respawnTime); - GrandBossManager.getInstance().setStatsSet(ZAKEN, info); + GrandBossManager.getInstance().setStatSet(ZAKEN, info); return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java index 25a584bdf9..1feccc805a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -101,7 +101,7 @@ public class CastleTeleporter extends AbstractNpcAI if (st.hasMoreTokens()) { final int unknowInt = Integer.parseInt(st.nextToken()); - final StatsSet npcParams = npc.getParameters(); + final StatSet npcParams = npc.getParameters(); Location teleLoc = null; switch (unknowInt) { @@ -191,7 +191,7 @@ public class CastleTeleporter extends AbstractNpcAI return htmltext; } - private Location getTeleportLocation(StatsSet npcParams, String paramName1, String paramName2, String paramName3) + private Location getTeleportLocation(StatSet npcParams, String paramName1, String paramName2, String paramName3) { final Location loc; if (getRandom(100) < 33) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java index f19f5dea69..c817501830 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/Servitors/TreeOfLife.java @@ -17,7 +17,7 @@ package ai.others.Servitors; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -52,7 +52,7 @@ public class TreeOfLife extends AbstractNpcAI } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { if (player != null) { diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index d459bd2538..4f36bd6b51 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.zone.type.NoRestartZone; @@ -305,7 +305,7 @@ public class AdminGrandBoss implements IAdminCommandHandler } } - final StatsSet info = GrandBossManager.getInstance().getStatsSet(grandBossId); + final StatSet info = GrandBossManager.getInstance().getStatSet(grandBossId); final String bossRespawn = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(info.getLong("respawn_time")); final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java index f1109bf0e7..9489d8e1bb 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java @@ -19,7 +19,7 @@ package handlers.admincommandhandlers; import java.util.StringTokenizer; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -114,7 +114,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.isNoble()) { - final StatsSet statDat = getPlayerSet(player); + final StatSet statDat = getPlayerSet(player); final int oldpoints = Olympiad.getInstance().getNoblePoints(player); final int points = Math.max(oldpoints + val, 0); if (points > 1000) @@ -155,7 +155,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.isNoble()) { - final StatsSet playerStat = Olympiad.getNobleStats(player.getObjectId()); + final StatSet playerStat = Olympiad.getNobleStats(player.getObjectId()); if (playerStat == null) { BuilderUtil.sendSysMessage(activeChar, "This player hasn't played on Olympiad yet!"); @@ -197,7 +197,7 @@ public class AdminOlympiad implements IAdminCommandHandler if (player.isNoble()) { - final StatsSet statDat = getPlayerSet(player); + final StatSet statDat = getPlayerSet(player); final int oldpoints = Olympiad.getInstance().getNoblePoints(player); final int points = oldpoints - val; if ((points < 1) && (points > 1000)) @@ -237,12 +237,12 @@ public class AdminOlympiad implements IAdminCommandHandler return Integer.decode(token); } - private StatsSet getPlayerSet(PlayerInstance player) + private StatSet getPlayerSet(PlayerInstance player) { - StatsSet statDat = Olympiad.getNobleStats(player.getObjectId()); + StatSet statDat = Olympiad.getNobleStats(player.getObjectId()); if (statDat == null) { - statDat = new StatsSet(); + statDat = new StatSet(); statDat.set(Olympiad.CLASS_ID, player.getBaseClass()); statDat.set(Olympiad.CHAR_NAME, player.getName()); statDat.set(Olympiad.POINTS, Olympiad.DEFAULT_POINTS); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java index d8a3d6e5ce..6382651e6c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java @@ -19,7 +19,7 @@ package handlers.conditions; import java.util.List; import org.l2jmobius.gameserver.enums.CategoryType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -31,7 +31,7 @@ public class CategoryTypeCondition implements ICondition { private final List _categoryTypes; - public CategoryTypeCondition(StatsSet params) + public CategoryTypeCondition(StatSet params) { _categoryTypes = params.getEnumList("category", CategoryType.class); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java index b24cfa0f14..9a14cb6fa2 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/conditions/NpcLevelCondition.java @@ -16,7 +16,7 @@ */ package handlers.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -29,7 +29,7 @@ public class NpcLevelCondition implements ICondition private final int _minLevel; private final int _maxLevel; - public NpcLevelCondition(StatsSet params) + public NpcLevelCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java index afffe7a0c5..9e3deaa8ce 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/conditions/PlayerLevelCondition.java @@ -16,7 +16,7 @@ */ package handlers.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -29,7 +29,7 @@ public class PlayerLevelCondition implements ICondition private final int _minLevel; private final int _maxLevel; - public PlayerLevelCondition(StatsSet params) + public PlayerLevelCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 09f609dc37..0e81066579 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -32,7 +32,7 @@ public class AbnormalShield extends AbstractEffect { private final int _times; - public AbnormalShield(StatsSet params) + public AbnormalShield(StatSet params) { _times = params.getInt("times", -1); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 0496c9068d..9c508c8c52 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Objects; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class AbnormalTimeChange extends AbstractEffect private final int _time; private final int _mode; - public AbnormalTimeChange(StatsSet params) + public AbnormalTimeChange(StatSet params) { final String abnormals = params.getString("slot", null); if ((abnormals != null) && !abnormals.isEmpty()) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 98f85c7b21..3f9132b8e3 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -37,7 +37,7 @@ public class AbsorbDamage extends AbstractEffect private final double _damage; private static final Map _damageHolder = new ConcurrentHashMap<>(); - public AbsorbDamage(StatsSet params) + public AbsorbDamage(StatSet params) { _damage = params.getDouble("damage", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 26f51d5351..86fef7cf6d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; @@ -38,7 +38,7 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect private final int _hpPercent; private final Map _updates = new ConcurrentHashMap<>(); - protected AbstractConditionalHpEffect(StatsSet params, Stat stat) + protected AbstractConditionalHpEffect(StatSet params, Stat stat) { super(params, stat); _hpPercent = params.getInt("hpPercent", 0); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java index 2e40124e39..f010f84271 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbstractStatAddEffect.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AbstractStatAddEffect extends AbstractEffect private final Stat _stat; protected final double _amount; - public AbstractStatAddEffect(StatsSet params, Stat stat) + public AbstractStatAddEffect(StatSet params, Stat stat) { _stat = stat; _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index da6a575c44..29e439684b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; @@ -42,12 +42,12 @@ public abstract class AbstractStatEffect extends AbstractEffect protected final StatModifierType _mode; protected final List _conditions = new ArrayList<>(); - public AbstractStatEffect(StatsSet params, Stat stat) + public AbstractStatEffect(StatSet params, Stat stat) { this(params, stat, stat); } - public AbstractStatEffect(StatsSet params, Stat mulStat, Stat addStat) + public AbstractStatEffect(StatSet params, Stat mulStat, Stat addStat) { _addStat = addStat; _mulStat = mulStat; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java index 9811f395aa..33d08bff36 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbstractStatPercentEffect.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AbstractStatPercentEffect extends AbstractEffect private final Stat _stat; protected final double _amount; - public AbstractStatPercentEffect(StatsSet params, Stat stat) + public AbstractStatPercentEffect(StatSet params, Stat stat) { _stat = stat; _amount = params.getDouble("amount", 1); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java index 539814ef2a..79c022a23c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Accuracy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class Accuracy extends AbstractStatEffect { - public Accuracy(StatsSet params) + public Accuracy(StatSet params) { super(params, Stat.ACCURACY_COMBAT); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index 0c1fcbd92b..48d69968c5 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddHate extends AbstractEffect private final double _power; private final boolean _affectSummoner; - public AddHate(StatsSet params) + public AddHate(StatSet params) { _power = params.getDouble("power", 0); _affectSummoner = params.getBoolean("affectSummoner", false); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java index e90d5cc7f3..324927947a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddSkillBySkill extends AbstractEffect private final int _existingSkillLevel; private final SkillHolder _addedSkill; - public AddSkillBySkill(StatsSet params) + public AddSkillBySkill(StatSet params) { _existingSkillId = params.getInt("existingSkillId"); _existingSkillLevel = params.getInt("existingSkillLevel"); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index bdd8314dd7..205bc82200 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class AddTeleportBookmarkSlot extends AbstractEffect { private final int _amount; - public AddTeleportBookmarkSlot(StatsSet params) + public AddTeleportBookmarkSlot(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java index c26ec5442f..658931ecb2 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionCp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionCp extends AbstractStatAddEffect { - public AdditionalPotionCp(StatsSet params) + public AdditionalPotionCp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_CP); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java index 6b68e40f32..57d54c7d3b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionHp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionHp extends AbstractStatAddEffect { - public AdditionalPotionHp(StatsSet params) + public AdditionalPotionHp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_HP); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java index c9e1cc237e..007547ebe7 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AdditionalPotionMp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AdditionalPotionMp extends AbstractStatAddEffect { - public AdditionalPotionMp(StatsSet params) + public AdditionalPotionMp(StatSet params) { super(params, Stat.ADDITIONAL_POTION_MP); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index 959abe1167..81a13dae35 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -72,7 +72,7 @@ public class AirBind extends AbstractEffect _chainedAirSkills.put(ClassId.AEORE_SHILLIEN_SAINT, 11999); // Heavy Hit } - public AirBind(StatsSet params) + public AirBind(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java index f5cbb63465..9255ba1877 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AreaDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class AreaDamage extends AbstractStatAddEffect { - public AreaDamage(StatsSet params) + public AreaDamage(StatSet params) { super(params, Stat.DAMAGE_ZONE_VULN); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java index 2ded14e7ae..a5d56477f5 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class AttackAttribute extends AbstractEffect private final AttributeType _attribute; private final double _amount; - public AttackAttribute(StatsSet params) + public AttackAttribute(StatSet params) { _amount = params.getDouble("amount", 0); _attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java index ff58d09cc7..795366850d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class AttackAttributeAdd extends AbstractEffect { private final double _amount; - public AttackAttributeAdd(StatsSet params) + public AttackAttributeAdd(StatSet params) { _amount = params.getDouble("amount", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java index 37bfbf341a..fcd2b48c99 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AttackBehind.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class AttackBehind extends AbstractEffect { - public AttackBehind(StatsSet params) + public AttackBehind(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index 062c325a55..4136f5d530 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class AttackTrait extends AbstractEffect { private final Map _attackTraits = new EnumMap<>(TraitType.class); - public AttackTrait(StatsSet params) + public AttackTrait(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 02d6a8d78c..8ac42d45c3 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -37,7 +37,7 @@ public class Backstab extends AbstractEffect private final double _criticalChance; private final boolean _overHit; - public Backstab(StatsSet params) + public Backstab(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Betray.java index 32e3c65c55..79e8bd3360 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Betray extends AbstractEffect { - public Betray(StatsSet params) + public Betray(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Blink.java index ba1caed6ac..56d3f628fd 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -52,7 +52,7 @@ public class Blink extends AbstractEffect private final int _flyDelay; private final int _animationSpeed; - public Blink(StatsSet params) + public Blink(StatSet params) { _flyCourse = params.getInt("angle", 0); _flyRadius = params.getInt("range", 0); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 8677f72407..596d4b752f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; */ public class BlinkSwap extends AbstractEffect { - public BlinkSwap(StatsSet params) + public BlinkSwap(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 7bec602aef..cea12039d2 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -20,7 +20,7 @@ import java.util.Arrays; import java.util.Set; import java.util.stream.Collectors; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class BlockAbnormalSlot extends AbstractEffect { private final Set _blockAbnormalSlots; - public BlockAbnormalSlot(StatsSet params) + public BlockAbnormalSlot(StatSet params) { _blockAbnormalSlots = Arrays.stream(params.getString("slot").split(";")).map(slot -> Enum.valueOf(AbnormalType.class, slot)).collect(Collectors.toSet()); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index b4839ab322..348881f970 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -21,7 +21,7 @@ import java.util.Set; import org.l2jmobius.gameserver.datatables.BotReportTable; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class BlockAction extends AbstractEffect { private final Set _blockedActions = new HashSet<>(); - public BlockAction(StatsSet params) + public BlockAction(StatSet params) { final String[] actions = params.getString("blockedActions").split(","); for (String action : actions) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index 68f6586e3e..635d2735f9 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -22,7 +22,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class BlockActions extends AbstractEffect { private final Set _allowedSkills; - public BlockActions(StatsSet params) + public BlockActions(StatSet params) { final String[] allowedSkills = params.getString("allowedSkills", "").split(";"); _allowedSkills = Arrays.stream(allowedSkills).filter(s -> !s.isEmpty()).map(Integer::parseInt).collect(Collectors.toSet()); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 99af987208..3502d140d0 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockChat extends AbstractEffect { - public BlockChat(StatsSet params) + public BlockChat(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java index 6160114414..a2b084c918 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockControl.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; */ public class BlockControl extends AbstractEffect { - public BlockControl(StatsSet params) + public BlockControl(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java index 3d96329b6d..69b390ae8f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockEscape.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BlockEscape extends AbstractEffect { - public BlockEscape(StatsSet params) + public BlockEscape(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index 8bbd7ac018..85d89180e7 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockMove extends AbstractEffect { - public BlockMove(StatsSet params) + public BlockMove(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index 316f82f855..9e28fc403a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockParty extends AbstractEffect { - public BlockParty(StatsSet params) + public BlockParty(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java index ae2ac8b035..d3235fc34f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BlockResurrection extends AbstractEffect { - public BlockResurrection(StatsSet params) + public BlockResurrection(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index f7f119691f..f2cc65b782 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -35,7 +35,7 @@ public class BlockSkill extends AbstractEffect { private final int[] _magicTypes; - public BlockSkill(StatsSet params) + public BlockSkill(StatSet params) { _magicTypes = params.getIntArray("magicTypes", ";"); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index d9b3d3a34d..9f0b7143d2 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class BlockTarget extends AbstractEffect { - public BlockTarget(StatsSet params) + public BlockTarget(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index bc4cbd6320..bef60ad003 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class Bluff extends AbstractEffect { private final int _chance; - public Bluff(StatsSet params) + public Bluff(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java index 2ace40a596..69583d613b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BonusDropAmount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusDropAmount extends AbstractStatPercentEffect { - public BonusDropAmount(StatsSet params) + public BonusDropAmount(StatSet params) { super(params, Stat.BONUS_DROP_AMOUNT); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java index b81560b040..e63c8f79f4 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BonusDropRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusDropRate extends AbstractStatPercentEffect { - public BonusDropRate(StatsSet params) + public BonusDropRate(StatSet params) { super(params, Stat.BONUS_DROP_RATE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java index b984404cb2..e0fb54b162 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BonusSpoilRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class BonusSpoilRate extends AbstractStatPercentEffect { - public BonusSpoilRate(StatsSet params) + public BonusSpoilRate(StatSet params) { super(params, Stat.BONUS_SPOIL_RATE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Breath.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Breath.java index 859f341f3c..4235319f22 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Breath.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Breath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class Breath extends AbstractStatEffect { - public Breath(StatsSet params) + public Breath(StatSet params) { super(params, Stat.BREATH); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java index a6d25f3c36..4102506e6c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BuffBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class BuffBlock extends AbstractEffect { - public BuffBlock(StatsSet params) + public BuffBlock(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index de7497f8bf..4f470b06c7 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class CallLearnedSkill extends AbstractEffect { private final int _skillId; - public CallLearnedSkill(StatsSet params) + public CallLearnedSkill(StatSet params) { _skillId = params.getInt("skillId"); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index e6096be4be..b41daf073c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CallParty extends AbstractEffect { - public CallParty(StatsSet params) + public CallParty(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index 0760fb675e..eb4bdf2349 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class CallPc extends AbstractEffect private final int _itemId; private final int _itemCount; - public CallPc(StatsSet params) + public CallPc(StatSet params) { _itemId = params.getInt("itemId", 0); _itemCount = params.getInt("itemCount", 0); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index d6d5cb721d..0da3802665 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -35,7 +35,7 @@ public class CallRandomSkill extends AbstractEffect { private final List _skills = new ArrayList<>(); - public CallRandomSkill(StatsSet params) + public CallRandomSkill(StatSet params) { final String skills = params.getString("skills", null); if (skills != null) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index 99c1494223..f8e4b226c4 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -35,7 +35,7 @@ public class CallSkill extends AbstractEffect private final SkillHolder _skill; private final int _skillLevelScaleTo; - public CallSkill(StatsSet params) + public CallSkill(StatSet params) { _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0)); _skillLevelScaleTo = params.getInt("skillLevelScaleTo", 0); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index cec2706e81..4a18b31781 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.Collections; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ public class CallSkillOnActionTime extends AbstractEffect { private final SkillHolder _skill; - public CallSkillOnActionTime(StatsSet params) + public CallSkillOnActionTime(StatSet params) { _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1), params.getInt("skillSubLevel", 0)); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index d48eb90fb3..32753a71a0 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CallTargetParty extends AbstractEffect { - public CallTargetParty(StatsSet params) + public CallTargetParty(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index ef01f4a8ed..d4331bf5b7 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ public class ChameleonRest extends AbstractEffect { private final double _power; - public ChameleonRest(StatsSet params) + public ChameleonRest(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index e3b846674d..37054f2fd0 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; @@ -35,9 +35,9 @@ public class ChangeBody extends AbstractEffect { private final Set _transformations = new HashSet<>(); - public ChangeBody(StatsSet params) + public ChangeBody(StatSet params) { - for (StatsSet item : params.getList("templates", StatsSet.class)) + for (StatSet item : params.getList("templates", StatSet.class)) { _transformations.add(new TemplateChanceHolder(item.getInt(".templateId"), item.getInt(".minChance"), item.getInt(".maxChance"))); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 76c6e03aa6..6b6386909e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeFace extends AbstractEffect { private final int _value; - public ChangeFace(StatsSet params) + public ChangeFace(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java index cee3ac1a6f..304afa821c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeFishingMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; /** @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; */ public class ChangeFishingMastery extends AbstractEffect { - public ChangeFishingMastery(StatsSet params) + public ChangeFishingMastery(StatSet params) { } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index 0c583cbc13..64ac49f5d5 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeHairColor extends AbstractEffect { private final int _value; - public ChangeHairColor(StatsSet params) + public ChangeHairColor(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index ad2efbe6a0..ae7d6c6da1 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ChangeHairStyle extends AbstractEffect { private final int _value; - public ChangeHairStyle(StatsSet params) + public ChangeHairStyle(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java index 2d536029fd..4d7c380c75 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CheapShot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class CheapShot extends AbstractEffect { - public CheapShot(StatsSet params) + public CheapShot(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index 5fa3df1676..0215ff6a5b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.SubclassInfoType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class ClassChange extends AbstractEffect private final int _index; private static final int IDENTITY_CRISIS_SKILL_ID = 1570; - public ClassChange(StatsSet params) + public ClassChange(StatSet params) { _index = params.getInt("index", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index ccf7598eff..e184022afc 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.stats.Formulas; */ public class Compelling extends AbstractEffect { - public Compelling(StatsSet params) + public Compelling(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index b6aa30f604..f164ac6f3f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class Confuse extends AbstractEffect { private final int _chance; - public Confuse(StatsSet params) + public Confuse(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 25e29532eb..78293c1b0f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ConsumeBody extends AbstractEffect { - public ConsumeBody(StatsSet params) + public ConsumeBody(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index e915eb0391..6ddd0d72eb 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class ConvertItem extends AbstractEffect { - public ConvertItem(StatsSet params) + public ConvertItem(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java index 9402fdb06d..857df659c0 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CounterPhysicalSkill.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CounterPhysicalSkill extends AbstractStatAddEffect { - public CounterPhysicalSkill(StatsSet params) + public CounterPhysicalSkill(StatSet params) { super(params, Stat.VENGEANCE_SKILL_PHYSICAL_DAMAGE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 67bca7fd1b..598682037b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Cp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Cp(StatsSet params) + public Cp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index e0cd52808e..37303b0e7a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class CpHeal extends AbstractEffect { private final double _power; - public CpHeal(StatsSet params) + public CpHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index e2e8ee3479..54de5adfc6 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class CpHealOverTime extends AbstractEffect { private final double _power; - public CpHealOverTime(StatsSet params) + public CpHealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index 5665e937dc..b4a994d6df 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CpHealPercent extends AbstractEffect { private final double _power; - public CpHealPercent(StatsSet params) + public CpHealPercent(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java index 1cc851b2af..efb020bbd5 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CpRegen extends AbstractStatEffect { - public CpRegen(StatsSet params) + public CpRegen(StatSet params) { super(params, Stat.REGENERATE_CP_RATE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java index 8983497026..0b93eef45e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CriticalDamage extends AbstractStatEffect { - public CriticalDamage(StatsSet params) + public CriticalDamage(StatSet params) { super(params, Stat.CRITICAL_DAMAGE, Stat.CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 7ef4f0ecb4..0630f087b7 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.Position; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CriticalDamagePosition extends AbstractEffect private final double _amount; private final Position _position; - public CriticalDamagePosition(StatsSet params) + public CriticalDamagePosition(StatSet params) { _amount = params.getDouble("amount", 0); _position = params.getEnum("position", Position.class, Position.FRONT); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java index 01f49380eb..0d4bded60e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; public class CriticalRate extends AbstractConditionalHpEffect { - public CriticalRate(StatsSet params) + public CriticalRate(StatSet params) { super(params, Stat.CRITICAL_RATE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 863b385ca3..4d65fa84eb 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.Position; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class CriticalRatePositionBonus extends AbstractEffect private final double _amount; private final Position _position; - public CriticalRatePositionBonus(StatsSet params) + public CriticalRatePositionBonus(StatSet params) { _amount = params.getDouble("amount", 0); _position = params.getEnum("position", Position.class, Position.FRONT); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index 2e8ec38347..9d04575ae2 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class CrystalGradeModify extends AbstractEffect { private final int _grade; - public CrystalGradeModify(StatsSet params) + public CrystalGradeModify(StatSet params) { _grade = params.getInt("grade", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java index 94ff8e64e2..79ee5b994e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CubicMastery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class CubicMastery extends AbstractStatAddEffect { - public CubicMastery(StatsSet params) + public CubicMastery(StatSet params) { super(params, Stat.MAX_CUBIC); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index 36abf0accf..e6bb53fdea 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class DamOverTime extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTime(StatsSet params) + public DamOverTime(StatSet params) { _canKill = params.getBoolean("canKill", false); _power = params.getDouble("power"); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 13e57099e0..b5f25db4d8 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class DamOverTimePercent extends AbstractEffect private final boolean _canKill; private final double _power; - public DamOverTimePercent(StatsSet params) + public DamOverTimePercent(StatSet params) { _canKill = params.getBoolean("canKill", false); _power = params.getDouble("power"); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java index dc7a45198f..c9567ea034 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamageBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ public class DamageBlock extends AbstractEffect private final boolean _blockHp; private final boolean _blockMp; - public DamageBlock(StatsSet params) + public DamageBlock(StatSet params) { final String type = params.getString("type", null); _blockHp = type.equalsIgnoreCase("BLOCK_HP"); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java index bfa716eacc..9eb0b4e233 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamageByAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DamageByAttackType; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -38,7 +38,7 @@ public class DamageByAttack extends AbstractEffect private final double _value; private final DamageByAttackType _type; - public DamageByAttack(StatsSet params) + public DamageByAttack(StatSet params) { _value = params.getDouble("amount"); _type = params.getEnum("type", DamageByAttackType.class, DamageByAttackType.NONE); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java index 5a7629482a..e823a9824a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamageShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DamageShield extends AbstractStatAddEffect { - public DamageShield(StatsSet params) + public DamageShield(StatSet params) { super(params, Stat.REFLECT_DAMAGE_PERCENT); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java index db1abe264d..3029a3f0aa 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamageShieldResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DamageShieldResist extends AbstractStatAddEffect { - public DamageShieldResist(StatsSet params) + public DamageShieldResist(StatSet params) { super(params, Stat.REFLECT_DAMAGE_PERCENT_DEFENSE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index 8561ff46b0..369bd5483d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class DeathLink extends AbstractEffect { private final double _power; - public DeathLink(StatsSet params) + public DeathLink(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java index b948fad1fc..54261c6229 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DebuffBlock.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class DebuffBlock extends AbstractEffect { - public DebuffBlock(StatsSet params) + public DebuffBlock(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java index 217ef3dfaa..4bc08271fa 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class DefenceAttribute extends AbstractEffect private final AttributeType _attribute; private final double _amount; - public DefenceAttribute(StatsSet params) + public DefenceAttribute(StatSet params) { _amount = params.getDouble("amount", 0); _attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java index 0c0c2e8d6a..daff53d9e1 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceCriticalDamage extends AbstractStatEffect { - public DefenceCriticalDamage(StatsSet params) + public DefenceCriticalDamage(StatSet params) { super(params, Stat.DEFENCE_CRITICAL_DAMAGE, Stat.DEFENCE_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java index 131eb500ea..74a729e38c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceCriticalRate extends AbstractStatEffect { - public DefenceCriticalRate(StatsSet params) + public DefenceCriticalRate(StatSet params) { super(params, Stat.DEFENCE_CRITICAL_RATE, Stat.DEFENCE_CRITICAL_RATE_ADD); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java index 1abee78e08..c664939977 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceMagicCriticalDamage extends AbstractStatEffect { - public DefenceMagicCriticalDamage(StatsSet params) + public DefenceMagicCriticalDamage(StatSet params) { super(params, Stat.DEFENCE_MAGIC_CRITICAL_DAMAGE, Stat.DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java index 2146b89551..6594dda2b3 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceMagicCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class DefenceMagicCriticalRate extends AbstractStatEffect { - public DefenceMagicCriticalRate(StatsSet params) + public DefenceMagicCriticalRate(StatSet params) { super(params, Stat.DEFENCE_MAGIC_CRITICAL_RATE, Stat.DEFENCE_MAGIC_CRITICAL_RATE_ADD); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index bd80f690cd..134ed56979 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class DefenceTrait extends AbstractEffect { private final Map _defenceTraits = new EnumMap<>(TraitType.class); - public DefenceTrait(StatsSet params) + public DefenceTrait(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index bab5e1a762..7cee616006 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class DeleteHate extends AbstractEffect { private final int _chance; - public DeleteHate(StatsSet params) + public DeleteHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index 85985653b8..f10f189e68 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class DeleteHateOfMe extends AbstractEffect { private final int _chance; - public DeleteHateOfMe(StatsSet params) + public DeleteHateOfMe(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index d3664ad00f..82833ac79d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class DeleteTopAgro extends AbstractEffect { private final int _chance; - public DeleteTopAgro(StatsSet params) + public DeleteTopAgro(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index ae1f2a5942..ba6dad4698 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DoorOpenType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DetectHiddenObjects extends AbstractEffect { - public DetectHiddenObjects(StatsSet params) + public DetectHiddenObjects(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Detection.java index 078360ff35..a20cbcb348 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Detection extends AbstractEffect { - public Detection(StatsSet params) + public Detection(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java index d679c71919..5227885bb5 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class DisableSkill extends AbstractEffect private final Set disableSkills; private Skill knownSKill; - public DisableSkill(StatsSet params) + public DisableSkill(StatSet params) { final String disable = params.getString("disable"); if ((disable != null) && !disable.isEmpty()) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 8567a94d12..32ee715df7 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DisableTargeting extends AbstractEffect { - public DisableTargeting(StatsSet params) + public DisableTargeting(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index fa06ec7221..5a80971f51 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Disarm extends AbstractEffect { - public Disarm(StatsSet params) + public Disarm(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index 0133906661..8b06598d83 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -40,7 +40,7 @@ public class Disarmor extends AbstractEffect private final Map _unequippedItems; // PlayerObjId, ItemObjId private final int _slot; - public Disarmor(StatsSet params) + public Disarmor(StatSet params) { _unequippedItems = new ConcurrentHashMap<>(); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 95de0300bb..a652a023f5 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DispelAll extends AbstractEffect { - public DispelAll(StatsSet params) + public DispelAll(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 88d979a0d9..040271d2a7 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.List; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -38,7 +38,7 @@ public class DispelByCategory extends AbstractEffect private final int _rate; private final int _max; - public DispelByCategory(StatsSet params) + public DispelByCategory(StatSet params) { _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); _rate = params.getInt("rate", 0); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index a6e4c7cd19..ab79e046b2 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.EnumMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -37,7 +37,7 @@ public class DispelBySlot extends AbstractEffect private final String _dispel; private final Map _dispelAbnormals; - public DispelBySlot(StatsSet params) + public DispelBySlot(StatSet params) { _dispel = params.getString("dispel"); if ((_dispel != null) && !_dispel.isEmpty()) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 1ba6612e23..d1341d10b9 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class DispelBySlotMyself extends AbstractEffect { private final Set _dispelAbnormals; - public DispelBySlotMyself(StatsSet params) + public DispelBySlotMyself(StatSet params) { final String dispel = params.getString("dispel"); if ((dispel != null) && !dispel.isEmpty()) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 845980e59d..b58723058e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -37,7 +37,7 @@ public class DispelBySlotProbability extends AbstractEffect private final Set _dispelAbnormals; private final int _rate; - public DispelBySlotProbability(StatsSet params) + public DispelBySlotProbability(StatSet params) { final String[] dispelEffects = params.getString("dispel").split(";"); _rate = params.getInt("rate", 100); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index 7acd9c4a6c..688d77a703 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -45,7 +45,7 @@ public class DoubleCast extends AbstractEffect private final Map> _addedToggles; - public DoubleCast(StatsSet params) + public DoubleCast(StatSet params) { _addedToggles = new HashMap<>(); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java index d7f067a2a0..d1e21edeb0 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DuelistFury.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class DuelistFury extends AbstractEffect { - public DuelistFury(StatsSet params) + public DuelistFury(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index 409fed6a23..de397bb5ff 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class EnableCloak extends AbstractEffect { - public EnableCloak(StatsSet params) + public EnableCloak(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index e855c4ba1a..2fe2bef99f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -43,7 +43,7 @@ public class EnergyAttack extends AbstractEffect private final boolean _overHit; private final double _pDefMod; - public EnergyAttack(StatsSet params) + public EnergyAttack(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getInt("criticalChance", 0); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index a8f108573f..ae463ef2a4 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class EnlargeAbnormalSlot extends AbstractEffect { private final int _slots; - public EnlargeAbnormalSlot(StatsSet params) + public EnlargeAbnormalSlot(StatSet params) { _slots = params.getInt("slots", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java index c43ea04413..c4073b1a47 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/EnlargeSlot.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StorageType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class EnlargeSlot extends AbstractEffect private final StorageType _type; private final double _amount; - public EnlargeSlot(StatsSet params) + public EnlargeSlot(StatSet params) { _amount = params.getDouble("amount", 0); _type = params.getEnum("type", StorageType.class, StorageType.INVENTORY_NORMAL); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Escape.java index 936f82d8ce..f3a07c9d15 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class Escape extends AbstractEffect { private final TeleportWhereType _escapeType; - public Escape(StatsSet params) + public Escape(StatSet params) { _escapeType = params.getEnum("escapeType", TeleportWhereType.class, null); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java index 76dbc8171c..eb68d24af8 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ExpModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ExpModify extends AbstractStatAddEffect { - public ExpModify(StatsSet params) + public ExpModify(StatSet params) { super(params, Stat.BONUS_EXP); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java index bf11db6e4b..1100ca25be 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Faceoff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Faceoff extends AbstractEffect { - public Faceoff(StatsSet params) + public Faceoff(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index e256209e39..79f7b43503 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -34,7 +34,7 @@ public class FakeDeath extends AbstractEffect { private final double _power; - public FakeDeath(StatsSet params) + public FakeDeath(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index a94c75d310..780d5cefba 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -44,7 +44,7 @@ public class FatalBlow extends AbstractEffect private final double _abnormalPower; private final boolean _overHit; - public FatalBlow(StatsSet params) + public FatalBlow(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java index c8ff8f7acb..6e7597e63d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class FatalBlowRate extends AbstractEffect private final double _amount; private final StatModifierType _mode; - public FatalBlowRate(StatsSet params) + public FatalBlowRate(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 9731e75e5d..ec2659ea2c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DefenderInstance; import org.l2jmobius.gameserver.model.actor.instance.FortCommanderInstance; @@ -40,7 +40,7 @@ public class Fear extends AbstractEffect { private static final int FEAR_RANGE = 500; - public Fear(StatsSet params) + public Fear(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 5e04e46d60..94d9912bdf 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.MountType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ public class Feed extends AbstractEffect private final int _ride; private final int _wyvern; - public Feed(StatsSet params) + public Feed(StatSet params) { _normal = params.getInt("normal", 0); _ride = params.getInt("ride", 0); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java index 0b22a4d4c9..146e3b73e6 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FishingExpSpBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class FishingExpSpBonus extends AbstractStatPercentEffect { - public FishingExpSpBonus(StatsSet params) + public FishingExpSpBonus(StatSet params) { super(params, Stat.FISHING_EXP_SP_BONUS); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Flag.java index c1469eab19..2442cbdb35 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Flag extends AbstractEffect { - public Flag(StatsSet params) + public Flag(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index 0243f0f543..74a9754a95 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.BlockInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class FlipBlock extends AbstractEffect { - public FlipBlock(StatsSet params) + public FlipBlock(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 7fc7da5fe6..3412e4d36d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class FlyAway extends AbstractEffect { private final int _radius; - public FlyAway(StatsSet params) + public FlyAway(StatSet params) { _radius = params.getInt("radius"); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java index fd3216286d..590fbbcd44 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FocusEnergy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class FocusEnergy extends AbstractStatAddEffect { - public FocusEnergy(StatsSet params) + public FocusEnergy(StatSet params) { super(params, Stat.MAX_MOMENTUM); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index efbd93f304..19f0163e42 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class FocusMaxMomentum extends AbstractEffect { - public FocusMaxMomentum(StatsSet params) + public FocusMaxMomentum(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index 284d19ee5f..e8c18e9682 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -36,7 +36,7 @@ public class FocusMomentum extends AbstractEffect private final int _amount; private final int _maxCharges; - public FocusMomentum(StatsSet params) + public FocusMomentum(StatSet params) { _amount = params.getInt("amount", 1); _maxCharges = params.getInt("maxCharges", 0); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 18a9864bbc..debd491cfe 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class FocusSouls extends AbstractEffect { private final int _charge; - public FocusSouls(StatsSet params) + public FocusSouls(StatSet params) { _charge = params.getInt("charge", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 8540ccd49c..23328db910 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Set; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class GetAgro extends AbstractEffect { - public GetAgro(StatsSet params) + public GetAgro(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java index 1ca8722709..e91002d04b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GetDamageLimit.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class GetDamageLimit extends AbstractStatAddEffect { - public GetDamageLimit(StatsSet params) + public GetDamageLimit(StatSet params) { super(params, Stat.DAMAGE_LIMIT); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 2dfd3bf8c4..439f3e8e3a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class GetMomentum extends AbstractEffect { private static int _ticks; - public GetMomentum(StatsSet params) + public GetMomentum(StatSet params) { _ticks = params.getInt("ticks", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index 7c1c0f3fa2..2c842101ed 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ public class GiveClanReputation extends AbstractEffect { private final int _reputation; - public GiveClanReputation(StatsSet params) + public GiveClanReputation(StatSet params) { _reputation = params.getInt("reputation", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index fd4d61fa73..9052c63154 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -33,7 +33,7 @@ public class GiveExpAndSp extends AbstractEffect private final int _xp; private final int _sp; - public GiveExpAndSp(StatsSet params) + public GiveExpAndSp(StatSet params) { _xp = params.getInt("xp", 0); _sp = params.getInt("sp", 0); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index 3448e09797..9d41a4395b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ public class GiveFame extends AbstractEffect { private final int _fame; - public GiveFame(StatsSet params) + public GiveFame(StatSet params) { _fame = params.getInt("fame", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index c948fa0948..617a8ef88a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class GiveRecommendation extends AbstractEffect { private final int _amount; - public GiveRecommendation(StatsSet params) + public GiveRecommendation(StatSet params) { _amount = params.getInt("amount", 0); if (_amount == 0) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index 5fe06566c7..75a16fe828 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class GiveSp extends AbstractEffect { private final int _sp; - public GiveSp(StatsSet params) + public GiveSp(StatSet params) { _sp = params.getInt("sp", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index e32735f4e9..7779c6f413 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class GiveXp extends AbstractEffect { private final long _xp; - public GiveXp(StatsSet params) + public GiveXp(StatSet params) { _xp = params.getLong("xp", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 17095c209a..5cf4994f32 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Grow extends AbstractEffect { - public Grow(StatsSet params) + public Grow(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index a2200e1a2f..350c8e659f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.UserInfoType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class HairAccessorySet extends AbstractEffect { - public HairAccessorySet(StatsSet params) + public HairAccessorySet(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index f881ed5027..1654fc650c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Harvesting extends AbstractEffect { - public Harvesting(StatsSet params) + public Harvesting(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java index ac1c9f49d8..097db6604a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HateAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HateAttack extends AbstractStatPercentEffect { - public HateAttack(StatsSet params) + public HateAttack(StatSet params) { super(params, Stat.HATE_ATTACK); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index 00f569eb17..9963ff1336 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlagInstance; @@ -34,7 +34,7 @@ public class HeadquarterCreate extends AbstractEffect private static final int HQ_NPC_ID = 35062; private final boolean _isAdvanced; - public HeadquarterCreate(StatsSet params) + public HeadquarterCreate(StatSet params) { _isAdvanced = params.getBoolean("isAdvanced", false); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 4c2218df9b..d2848a6242 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -40,7 +40,7 @@ public class Heal extends AbstractEffect { private final double _power; - public Heal(StatsSet params) + public Heal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java index 5a7457d3df..a9f75ab036 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HealEffect.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HealEffect extends AbstractStatEffect { - public HealEffect(StatsSet params) + public HealEffect(StatSet params) { super(params, Stat.HEAL_EFFECT, Stat.HEAL_EFFECT_ADD); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 86e28dc8b4..da76f33058 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class HealOverTime extends AbstractEffect { private final double _power; - public HealOverTime(StatsSet params) + public HealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index 6c9c8986bb..8b1c821a0a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class HealPercent extends AbstractEffect { private final int _power; - public HealPercent(StatsSet params) + public HealPercent(StatSet params) { _power = params.getInt("power", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Hide.java index e431277964..d02898bac5 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Hide extends AbstractEffect { - public Hide(StatsSet params) + public Hide(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index e7e5f3f91b..78fa1c9392 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.GameTimeController; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HitAtNight extends AbstractStatEffect { - public HitAtNight(StatsSet params) + public HitAtNight(StatSet params) { super(params, Stat.HIT_AT_NIGHT); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java index 1fd98e7aa9..f14b922308 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HitNumber.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HitNumber extends AbstractStatEffect { - public HitNumber(StatsSet params) + public HitNumber(StatSet params) { super(params, Stat.ATTACK_COUNT_MAX); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 3611fd7d74..c2426f8d11 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Hp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Hp(StatsSet params) + public Hp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index 3d125565fe..6244c76428 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class HpByLevel extends AbstractEffect { private final double _power; - public HpByLevel(StatsSet params) + public HpByLevel(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index f9d9d0beeb..af3726c17f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -40,7 +40,7 @@ public class HpCpHeal extends AbstractEffect { private final double _power; - public HpCpHeal(StatsSet params) + public HpCpHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java index 0394dab996..6f96c2dcb3 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpCpHealCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class HpCpHealCritical extends AbstractEffect { - public HpCpHealCritical(StatsSet params) + public HpCpHealCritical(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 554b1cec79..7cf47c3a65 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class HpDrain extends AbstractEffect private final double _power; private final double _percentage; - public HpDrain(StatsSet params) + public HpDrain(StatSet params) { _power = params.getDouble("power", 0); _percentage = params.getDouble("percentage", 0); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java index cb1d2bc3a7..b170bc62ba 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class HpRegen extends AbstractStatEffect { - public HpRegen(StatsSet params) + public HpRegen(StatSet params) { super(params, Stat.REGENERATE_HP_RATE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 235e89a79b..f346fbaad8 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -33,7 +33,7 @@ public class HpToOwner extends AbstractEffect private final double _power; private final int _stealAmount; - public HpToOwner(StatsSet params) + public HpToOwner(StatSet params) { _power = params.getDouble("power"); _stealAmount = params.getInt("stealAmount"); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java index 9829519da9..c659684ae8 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/IgnoreDeath.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class IgnoreDeath extends AbstractEffect { - public IgnoreDeath(StatsSet params) + public IgnoreDeath(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index f7c9baa155..44dceba10e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ImmobilePetBuff extends AbstractEffect { - public ImmobilePetBuff(StatsSet params) + public ImmobilePetBuff(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java index a60fc45d15..a03eff933a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/InstantKillResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ public class InstantKillResist extends AbstractEffect { private final int _amount; - public InstantKillResist(StatsSet params) + public InstantKillResist(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java index 7e1fc8abe4..265a9aab97 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/JewelSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class JewelSlot extends AbstractStatAddEffect { - public JewelSlot(StatsSet params) + public JewelSlot(StatSet params) { super(params, Stat.BROOCH_JEWELS); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 3d5ff2dda3..a34d7cc5b3 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class KarmaCount extends AbstractEffect private final int _amount; private final int _mode; - public KarmaCount(StatsSet params) + public KarmaCount(StatSet params) { _amount = params.getInt("amount", 0); switch (params.getString("mode", "DIFF")) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index dd58d33685..3af09931f8 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -45,7 +45,7 @@ public class KnockBack extends AbstractEffect private final boolean _knockDown; private final FlyType _type; - public KnockBack(StatsSet params) + public KnockBack(StatSet params) { _distance = params.getInt("distance", 50); _speed = params.getInt("speed", 0); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index 7bfac989cf..1affb1b141 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -38,7 +38,7 @@ public class Lethal extends AbstractEffect private final double _fullLethal; private final double _halfLethal; - public Lethal(StatsSet params) + public Lethal(StatSet params) { _fullLethal = params.getDouble("fullLethal", 0); _halfLethal = params.getDouble("halfLethal", 0); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java index aeb42458a6..43b17877ad 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/LimitCp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitCp extends AbstractStatEffect { - public LimitCp(StatsSet params) + public LimitCp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_CP); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java index cf76ec482a..45d8f37355 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/LimitHp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitHp extends AbstractStatEffect { - public LimitHp(StatsSet params) + public LimitHp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_HP); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java index f5eda36ba6..8d31633d0a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/LimitMp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class LimitMp extends AbstractStatEffect { - public LimitMp(StatsSet params) + public LimitMp(StatSet params) { super(params, Stat.MAX_RECOVERABLE_MP); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Lucky.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Lucky.java index 3775d2361d..4ff5ea9a01 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Lucky.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Lucky.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Lucky extends AbstractEffect { - public Lucky(StatsSet params) + public Lucky(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MAtk.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MAtk.java index 5f9ad5f32b..38c2fc9067 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MAtk.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MAtk.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MAtk extends AbstractStatEffect { - public MAtk(StatsSet params) + public MAtk(StatSet params) { super(params, Stat.MAGIC_ATTACK); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java index 2b9ae2e9e6..393d0d2d30 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicAccuracy.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicAccuracy extends AbstractStatEffect { - public MagicAccuracy(StatsSet params) + public MagicAccuracy(StatSet params) { super(params, Stat.ACCURACY_MAGIC); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java index 123706eb55..b9a58b09f3 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicCriticalDamage extends AbstractStatEffect { - public MagicCriticalDamage(StatsSet params) + public MagicCriticalDamage(StatSet params) { super(params, Stat.MAGIC_CRITICAL_DAMAGE, Stat.MAGIC_CRITICAL_DAMAGE_ADD); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java index 0c10014e50..c9fa9a4240 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicCriticalRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicCriticalRate extends AbstractStatEffect { - public MagicCriticalRate(StatsSet params) + public MagicCriticalRate(StatSet params) { super(params, Stat.MAGIC_CRITICAL_RATE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index e8b6f5e8bf..5281bf8445 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class MagicMpCost extends AbstractEffect private final int _magicType; private final double _amount; - public MagicMpCost(StatsSet params) + public MagicMpCost(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index ed4a3fca8b..283a99176c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class MagicalAbnormalDispelAttack extends AbstractEffect private final double _power; private final AbnormalType _abnormalType; - public MagicalAbnormalDispelAttack(StatsSet params) + public MagicalAbnormalDispelAttack(StatSet params) { _power = params.getDouble("power", 0); _abnormalType = AbnormalType.getAbnormalType(params.getString("abnormalType", null)); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java index 8234db1c43..be6403077c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAbnormalResist extends AbstractStatAddEffect { - public MagicalAbnormalResist(StatsSet params) + public MagicalAbnormalResist(StatSet params) { super(params, Stat.ABNORMAL_RESIST_MAGICAL); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index 4e938809f1..25c7d25954 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -37,7 +37,7 @@ public class MagicalAttack extends AbstractEffect private final boolean _overHit; private final double _debuffModifier; - public MagicalAttack(StatsSet params) + public MagicalAttack(StatSet params) { _power = params.getDouble("power", 0); _overHit = params.getBoolean("overHit", false); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 424480b76c..11c387780e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class MagicalAttackByAbnormal extends AbstractEffect { private final double _power; - public MagicalAttackByAbnormal(StatsSet params) + public MagicalAttackByAbnormal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9c3e263a05..348e904025 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -40,7 +40,7 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect private final double _power; private final Set _abnormals; - public MagicalAttackByAbnormalSlot(StatsSet params) + public MagicalAttackByAbnormalSlot(StatSet params) { _power = params.getDouble("power", 0); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 49dd351046..de55dd0fcd 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -38,7 +38,7 @@ public class MagicalAttackMp extends AbstractEffect private final boolean _critical; private final double _criticalLimit; - public MagicalAttackMp(StatsSet params) + public MagicalAttackMp(StatSet params) { _power = params.getDouble("power"); _critical = params.getBoolean("critical"); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 4414b36fa7..93ac560169 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -35,7 +35,7 @@ public class MagicalAttackRange extends AbstractEffect private final double _power; private final double _shieldDefPercent; - public MagicalAttackRange(StatsSet params) + public MagicalAttackRange(StatSet params) { _power = params.getDouble("power"); _shieldDefPercent = params.getDouble("shieldDefPercent", 0); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java index 2e304e5f8b..1cf39ed501 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackSpeed.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalAttackSpeed extends AbstractStatEffect { - public MagicalAttackSpeed(StatsSet params) + public MagicalAttackSpeed(StatSet params) { super(params, Stat.MAGIC_ATTACK_SPEED); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 9a3a776e32..880d71f0c5 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class MagicalDamOverTime extends AbstractEffect private final double _power; private final boolean _canKill; - public MagicalDamOverTime(StatsSet params) + public MagicalDamOverTime(StatSet params) { _power = params.getDouble("power", 0); _canKill = params.getBoolean("canKill", false); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java index 80fdf87050..9b4e6061aa 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalDefence extends AbstractStatEffect { - public MagicalDefence(StatsSet params) + public MagicalDefence(StatSet params) { super(params, Stat.MAGICAL_DEFENCE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java index c3c7c404f3..4e83b80e8b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalEvasion extends AbstractStatEffect { - public MagicalEvasion(StatsSet params) + public MagicalEvasion(StatSet params) { super(params, Stat.MAGIC_EVASION_RATE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java index 6253af7373..bf419a19f7 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalSkillPower.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MagicalSkillPower extends AbstractStatEffect { - public MagicalSkillPower(StatsSet params) + public MagicalSkillPower(StatSet params) { super(params, Stat.MAGICAL_SKILL_POWER, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index d0047fedef..f4388dc16f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ public class MagicalSoulAttack extends AbstractEffect { private final double _power; - public MagicalSoulAttack(StatsSet params) + public MagicalSoulAttack(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java index fcc143cd4b..688243d9e1 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaCharge.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ManaCharge extends AbstractStatAddEffect { - public ManaCharge(StatsSet params) + public ManaCharge(StatSet params) { super(params, Stat.MANA_CHARGE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index 0c84b4ab61..b889e6e824 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class ManaDamOverTime extends AbstractEffect { private final double _power; - public ManaDamOverTime(StatsSet params) + public ManaDamOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index f48011c9a2..94286df1c8 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -34,7 +34,7 @@ public class ManaHeal extends AbstractEffect { private final double _power; - public ManaHeal(StatsSet params) + public ManaHeal(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index bfdfa54380..61f15449a0 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -35,7 +35,7 @@ public class ManaHealByLevel extends AbstractEffect { private final double _power; - public ManaHealByLevel(StatsSet params) + public ManaHealByLevel(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 46937a8dd0..e505c9e7a2 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class ManaHealOverTime extends AbstractEffect { private final double _power; - public ManaHealOverTime(StatsSet params) + public ManaHealOverTime(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 101961d1c4..71085da549 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -34,7 +34,7 @@ public class ManaHealPercent extends AbstractEffect { private final double _power; - public ManaHealPercent(StatsSet params) + public ManaHealPercent(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 7c9c63e3ad..07d15d826c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxCp extends AbstractStatEffect { private final boolean _heal; - public MaxCp(StatsSet params) + public MaxCp(StatSet params) { super(params, Stat.MAX_CP); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 6d2c3449bd..85867bca96 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxHp extends AbstractStatEffect { private final boolean _heal; - public MaxHp(StatsSet params) + public MaxHp(StatSet params) { super(params, Stat.MAX_HP); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index e554c63055..9ca46fda8d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class MaxMp extends AbstractStatEffect { private final boolean _heal; - public MaxMp(StatsSet params) + public MaxMp(StatSet params) { super(params, Stat.MAX_MP); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 39cf62a95b..c27284e5f6 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -43,7 +43,7 @@ public class ModifyVital extends AbstractEffect private final int _mp; private final int _cp; - public ModifyVital(StatsSet params) + public ModifyVital(StatSet params) { _type = params.getEnum("type", ModifyType.class); if (_type != ModifyType.SET) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 29ee88f805..095d130f7f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Mp extends AbstractEffect private final int _amount; private final StatModifierType _mode; - public Mp(StatsSet params) + public Mp(StatSet params) { _amount = params.getInt("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index 76d858ad8e..b13d7824d0 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class MpConsumePerLevel extends AbstractEffect { private final double _power; - public MpConsumePerLevel(StatsSet params) + public MpConsumePerLevel(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java index 2051009805..ae7bf0c48c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MpRegen.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpRegen extends AbstractStatEffect { - public MpRegen(StatsSet params) + public MpRegen(StatSet params) { super(params, Stat.REGENERATE_MP_RATE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MpShield.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MpShield.java index 82e307a562..a4eb3e663f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MpShield.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MpShield.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpShield extends AbstractStatAddEffect { - public MpShield(StatsSet params) + public MpShield(StatSet params) { super(params, Stat.MANA_SHIELD_PERCENT); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java index af2ce119cc..366e96b18f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MpVampiricAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class MpVampiricAttack extends AbstractStatAddEffect { - public MpVampiricAttack(StatsSet params) + public MpVampiricAttack(StatSet params) { super(params, Stat.ABSORB_MANA_DAMAGE_PERCENT); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Mute.java index a7f2f76e23..7e5b5a528f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Mute extends AbstractEffect { - public Mute(StatsSet params) + public Mute(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java index 3cc4cae96f..513dc46ec7 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/NoblesseBless.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class NoblesseBless extends AbstractEffect { - public NoblesseBless(StatsSet params) + public NoblesseBless(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index bb0f02af5c..05f8c6a99b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpenChest extends AbstractEffect { - public OpenChest(StatsSet params) + public OpenChest(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 15cd9c2a64..de0414fd23 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.RecipeController; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpenCommonRecipeBook extends AbstractEffect { - public OpenCommonRecipeBook(StatsSet params) + public OpenCommonRecipeBook(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 21dd337982..7b5effc6b4 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class OpenDoor extends AbstractEffect private final int _chance; private final boolean _isItem; - public OpenDoor(StatsSet params) + public OpenDoor(StatSet params) { _chance = params.getInt("chance", 0); _isItem = params.getBoolean("isItem", false); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index b99a8f9757..3526fa5fdc 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.RecipeController; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpenDwarfRecipeBook extends AbstractEffect { - public OpenDwarfRecipeBook(StatsSet params) + public OpenDwarfRecipeBook(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PAtk.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PAtk.java index c353d03a00..7f10b9dcc7 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PAtk.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PAtk.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PAtk extends AbstractConditionalHpEffect { - public PAtk(StatsSet params) + public PAtk(StatSet params) { super(params, Stat.PHYSICAL_ATTACK); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Passive.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Passive.java index cef680ca21..27ce15bb60 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Passive.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Passive.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Passive extends AbstractEffect { - public Passive(StatsSet params) + public Passive(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java index 05f55c7dac..1a9f29424f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAbnormalResist.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAbnormalResist extends AbstractStatAddEffect { - public PhysicalAbnormalResist(StatsSet params) + public PhysicalAbnormalResist(StatSet params) { super(params, Stat.ABNORMAL_RESIST_PHYSICAL); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 098770705b..7e5fb14465 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -52,7 +52,7 @@ public class PhysicalAttack extends AbstractEffect private final Set _abnormals; private final double _abnormalPowerMod; - public PhysicalAttack(StatsSet params) + public PhysicalAttack(StatSet params) { _power = params.getDouble("power", 0); _pAtkMod = params.getDouble("pAtkMod", 1.0); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index d325c3d5ed..f191867614 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -38,7 +38,7 @@ public class PhysicalAttackHpLink extends AbstractEffect private final double _criticalChance; private final boolean _overHit; - public PhysicalAttackHpLink(StatsSet params) + public PhysicalAttackHpLink(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index dc575c2c75..fe087a1bcc 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class PhysicalAttackMute extends AbstractEffect { - public PhysicalAttackMute(StatsSet params) + public PhysicalAttackMute(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java index 112b41eb36..2093d45264 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackRange.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAttackRange extends AbstractStatEffect { - public PhysicalAttackRange(StatsSet params) + public PhysicalAttackRange(StatSet params) { super(params, Stat.PHYSICAL_ATTACK_RANGE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index d3c2dcfaf2..5d66bd4c87 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ public class PhysicalAttackSaveHp extends AbstractEffect private final boolean _overHit; private final double _saveHp; - public PhysicalAttackSaveHp(StatsSet params) + public PhysicalAttackSaveHp(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java index 167b859572..cdf34eb6f6 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSpeed.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalAttackSpeed extends AbstractStatEffect { - public PhysicalAttackSpeed(StatsSet params) + public PhysicalAttackSpeed(StatSet params) { super(params, Stat.PHYSICAL_ATTACK_SPEED); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 61bed5561b..a1a6818a00 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class PhysicalAttackWeaponBonus extends AbstractEffect private final Map _weaponBonus = new EnumMap<>(WeaponType.class); - public PhysicalAttackWeaponBonus(StatsSet params) + public PhysicalAttackWeaponBonus(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java index fa3925e725..078c3673b9 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalDefence extends AbstractConditionalHpEffect { - public PhysicalDefence(StatsSet params) + public PhysicalDefence(StatSet params) { super(params, Stat.PHYSICAL_DEFENCE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java index 812c641ac8..9714220e1b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalEvasion extends AbstractConditionalHpEffect { - public PhysicalEvasion(StatsSet params) + public PhysicalEvasion(StatSet params) { super(params, Stat.EVASION_RATE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index b337fed6cb..fe7cf853c8 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class PhysicalMute extends AbstractEffect { - public PhysicalMute(StatsSet params) + public PhysicalMute(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java index 0fd835f4e3..1b843dda3d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalShieldAngleAll.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class PhysicalShieldAngleAll extends AbstractEffect { - public PhysicalShieldAngleAll(StatsSet params) + public PhysicalShieldAngleAll(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java index 9d3f051659..507eb57326 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalSkillPower.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PhysicalSkillPower extends AbstractStatEffect { - public PhysicalSkillPower(StatsSet params) + public PhysicalSkillPower(StatSet params) { super(params, Stat.PHYSICAL_SKILL_POWER, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index a958116ff7..9ceccea4cc 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -42,7 +42,7 @@ public class PhysicalSoulAttack extends AbstractEffect private final boolean _ignoreShieldDefence; private final boolean _overHit; - public PhysicalSoulAttack(StatsSet params) + public PhysicalSoulAttack(StatSet params) { _power = params.getDouble("power", 0); _criticalChance = params.getDouble("criticalChance", 0); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index e95e09ab90..fd2b23a2ae 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class PkCount extends AbstractEffect { private final int _amount; - public PkCount(StatsSet params) + public PkCount(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index 2d64d05406..b51d6a7961 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class Plunder extends AbstractEffect { - public Plunder(StatsSet params) + public Plunder(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index fd61584af1..3e885274b3 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PolearmSingleTarget extends AbstractEffect { - public PolearmSingleTarget(StatsSet params) + public PolearmSingleTarget(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java index 86f2e2cee8..b2fb920379 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ProtectDeathPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class ProtectDeathPenalty extends AbstractEffect { - public ProtectDeathPenalty(StatsSet params) + public ProtectDeathPenalty(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java index 890b8980bd..6664b36bae 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class ProtectionBlessing extends AbstractEffect { - public ProtectionBlessing(StatsSet params) + public ProtectionBlessing(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index 6de78c2c82..62c480716d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -38,7 +38,7 @@ public class PullBack extends AbstractEffect private final int _animationSpeed; private final FlyType _type; - public PullBack(StatsSet params) + public PullBack(StatSet params) { _speed = params.getInt("speed", 0); _delay = params.getInt("delay", _speed); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java index 1019c56778..84a72299f3 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveMagicalSkillDamageBonus extends AbstractStatPercentEffect { - public PveMagicalSkillDamageBonus(StatsSet params) + public PveMagicalSkillDamageBonus(StatSet params) { super(params, Stat.PVE_MAGICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java index 8da698c746..70870aa45c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PveMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveMagicalSkillDefenceBonus(StatsSet params) + public PveMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java index c7a82d4ded..8f60ea025c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalAttackDamageBonus extends AbstractStatPercentEffect { - public PvePhysicalAttackDamageBonus(StatsSet params) + public PvePhysicalAttackDamageBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_ATTACK_DAMAGE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java index 0717fe525b..ea01a4e1d8 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PvePhysicalAttackDefenceBonus(StatsSet params) + public PvePhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java index 878f942877..1e8b9e76c4 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvePhysicalSkillDamageBonus(StatsSet params) + public PvePhysicalSkillDamageBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java index bdfa0dcc67..b1dbb0b217 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvePhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvePhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvePhysicalSkillDefenceBonus(StatsSet params) + public PvePhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java index 94fdc26015..fbe3119ba8 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PveRaidMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveRaidMagicalSkillDefenceBonus(StatsSet params) + public PveRaidMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java index f54d849752..83352e1b2f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidPhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PveRaidPhysicalAttackDefenceBonus(StatsSet params) + public PveRaidPhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java index 0a344f96de..be05bec159 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PveRaidPhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PveRaidPhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PveRaidPhysicalSkillDefenceBonus(StatsSet params) + public PveRaidPhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVE_RAID_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java index 542c019420..2f0153189a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpMagicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvpMagicalSkillDamageBonus(StatsSet params) + public PvpMagicalSkillDamageBonus(StatSet params) { super(params, Stat.PVP_MAGICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java index bb006280fc..41ad3b7749 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvpMagicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpMagicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvpMagicalSkillDefenceBonus(StatsSet params) + public PvpMagicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVP_MAGICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java index 483d7b02e4..23488ea000 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalAttackDamageBonus extends AbstractStatPercentEffect { - public PvpPhysicalAttackDamageBonus(StatsSet params) + public PvpPhysicalAttackDamageBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_ATTACK_DAMAGE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java index 40c3a22ea2..ff942b3d4d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalAttackDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalAttackDefenceBonus extends AbstractStatPercentEffect { - public PvpPhysicalAttackDefenceBonus(StatsSet params) + public PvpPhysicalAttackDefenceBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_ATTACK_DEFENCE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java index 225c7c1e39..19a7c96003 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDamageBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalSkillDamageBonus extends AbstractStatPercentEffect { - public PvpPhysicalSkillDamageBonus(StatsSet params) + public PvpPhysicalSkillDamageBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_SKILL_DAMAGE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java index ea2d1fa126..211d14c5e3 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PvpPhysicalSkillDefenceBonus.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class PvpPhysicalSkillDefenceBonus extends AbstractStatPercentEffect { - public PvpPhysicalSkillDefenceBonus(StatsSet params) + public PvpPhysicalSkillDefenceBonus(StatSet params) { super(params, Stat.PVP_PHYSICAL_SKILL_DEFENCE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 8a01583374..e500b487af 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -36,7 +36,7 @@ public class RandomizeHate extends AbstractEffect { private final int _chance; - public RandomizeHate(StatsSet params) + public RandomizeHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index 8b2801ee6c..18b07bd2d7 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class RealDamage extends AbstractEffect { private final double _power; - public RealDamage(StatsSet params) + public RealDamage(StatSet params) { _power = params.getDouble("power", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java index 4372c15bcf..86738fae0f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RearDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class RearDamage extends AbstractStatPercentEffect { - public RearDamage(StatsSet params) + public RearDamage(StatSet params) { super(params, Stat.REAR_DAMAGE_RATE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 31c7a4e4b3..82ed18faa1 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RebalanceHP extends AbstractEffect { - public RebalanceHP(StatsSet params) + public RebalanceHP(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index 09d307be02..979809b533 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RebalanceHPSummon extends AbstractEffect { - public RebalanceHPSummon(StatsSet params) + public RebalanceHPSummon(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 7599b691ac..e76328929a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class RecoverVitalityInPeaceZone extends AbstractEffect private final double _amount; private final int _ticks; - public RecoverVitalityInPeaceZone(StatsSet params) + public RecoverVitalityInPeaceZone(StatSet params) { _amount = params.getDouble("amount", 0); _ticks = params.getInt("ticks", 10); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Recovery.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Recovery.java index 52f573fc95..87353b5d12 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Recovery.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Recovery.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Recovery extends AbstractEffect { - public Recovery(StatsSet params) + public Recovery(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java index 824044ae21..e52b5abafb 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ReduceCancel.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ReduceCancel extends AbstractStatEffect { - public ReduceCancel(StatsSet params) + public ReduceCancel(StatSet params) { super(params, Stat.ATTACK_CANCEL); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index ecc7a10d31..be9188f3b0 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -33,7 +33,7 @@ public class ReduceDamage extends AbstractEffect { private final double _amount; - public ReduceDamage(StatsSet params) + public ReduceDamage(StatSet params) { _amount = params.getDouble("amount"); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java index 8534a94fc6..7b8862f608 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ReduceDropPenalty.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ReduceDropType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -32,7 +32,7 @@ public class ReduceDropPenalty extends AbstractEffect private final double _deathPenalty; private final ReduceDropType _type; - public ReduceDropPenalty(StatsSet params) + public ReduceDropPenalty(StatSet params) { _exp = params.getDouble("exp", 0); _deathPenalty = params.getDouble("deathPenalty", 0); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java index c15f7301b9..6436b488e0 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ReflectMagic.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ReflectMagic extends AbstractStatAddEffect { - public ReflectMagic(StatsSet params) + public ReflectMagic(StatSet params) { super(params, Stat.VENGEANCE_SKILL_MAGIC_DAMAGE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java index bf1d555351..583191fd4c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ReflectSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.BasicProperty; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ReflectSkill extends AbstractEffect private final Stat _stat; private final double _amount; - public ReflectSkill(StatsSet params) + public ReflectSkill(StatSet params) { _stat = params.getEnum("type", BasicProperty.class, BasicProperty.PHYSICAL) == BasicProperty.PHYSICAL ? Stat.REFLECT_SKILL_PHYSIC : Stat.REFLECT_SKILL_MAGIC; _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index e850ea6be9..77b96e4205 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ public class RefuelAirship extends AbstractEffect { private final int _value; - public RefuelAirship(StatsSet params) + public RefuelAirship(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Relax.java index c8c61fe47e..e2ba4420db 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -33,7 +33,7 @@ public class Relax extends AbstractEffect { private final double _power; - public Relax(StatsSet params) + public Relax(StatSet params) { _power = params.getDouble("power", 0); setTicks(params.getInt("ticks")); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 9678dc1174..0613c17234 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class ResetInstanceEntry extends AbstractEffect { private final Set _instanceId; - public ResetInstanceEntry(StatsSet params) + public ResetInstanceEntry(StatSet params) { final String instanceIds = params.getString("instanceId", null); if ((instanceIds != null) && !instanceIds.isEmpty()) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java index 940c731208..f15ff56189 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResistAbnormalByCategory.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ResistAbnormalByCategory extends AbstractEffect private final DispelSlotType _slot; private final double _amount; - public ResistAbnormalByCategory(StatsSet params) + public ResistAbnormalByCategory(StatSet params) { _amount = params.getDouble("amount", 0); _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.DEBUFF); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java index dae38e5246..2e29b5cc8e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResistDDMagic.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ResistDDMagic extends AbstractStatPercentEffect { - public ResistDDMagic(StatsSet params) + public ResistDDMagic(StatSet params) { super(params, Stat.MAGIC_SUCCESS_RES); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java index af2b203aad..d08fcb262a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResistDispelByCategory.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class ResistDispelByCategory extends AbstractEffect private final DispelSlotType _slot; private final double _amount; - public ResistDispelByCategory(StatsSet params) + public ResistDispelByCategory(StatSet params) { _amount = params.getDouble("amount", 0); _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index af1e40bea8..cd03f1a74a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -34,7 +34,7 @@ public class ResistSkill extends AbstractEffect { private final List _skills = new ArrayList<>(); - public ResistSkill(StatsSet params) + public ResistSkill(StatSet params) { for (int i = 1;; i++) { diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index 2ff700a507..5258883634 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -39,7 +39,7 @@ public class Restoration extends AbstractEffect private final int _itemCount; private final int _itemEnchantmentLevel; - public Restoration(StatsSet params) + public Restoration(StatSet params) { _itemId = params.getInt("itemId", 0); _itemCount = params.getInt("itemCount", 0); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 9adaae9769..4ba694a32e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -26,7 +26,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.model.ExtractableProductItem; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -50,12 +50,12 @@ public class RestorationRandom extends AbstractEffect { private final List _products = new ArrayList<>(); - public RestorationRandom(StatsSet params) + public RestorationRandom(StatSet params) { - for (StatsSet group : params.getList("items", StatsSet.class)) + for (StatSet group : params.getList("items", StatSet.class)) { final List items = new ArrayList<>(); - for (StatsSet item : group.getList(".", StatsSet.class)) + for (StatSet item : group.getList(".", StatSet.class)) { items.add(new RestorationItemHolder(item.getInt(".id"), item.getInt(".count"), item.getInt(".minEnchant", 0), item.getInt(".maxEnchant", 0))); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index f9c10b7ff2..9b287dd419 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class Resurrection extends AbstractEffect { private final int _power; - public Resurrection(StatsSet params) + public Resurrection(StatSet params) { _power = params.getInt("power", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 18d8bdb0bd..6ef063ce91 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -39,7 +39,7 @@ public class ResurrectionSpecial extends AbstractEffect private final int _power; private final Set _instanceId; - public ResurrectionSpecial(StatsSet params) + public ResurrectionSpecial(StatSet params) { _power = params.getInt("power", 0); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index e4d66b43d3..0e7391681b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class Reuse extends AbstractEffect private final int _magicType; private final double _amount; - public Reuse(StatsSet params) + public Reuse(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index 3716fc1922..e17cd7cc25 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class ReuseSkillById extends AbstractEffect { private final int _skillId; - public ReuseSkillById(StatsSet params) + public ReuseSkillById(StatSet params) { _skillId = params.getInt("skillId", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Root.java index 1ca3492949..b6876e8e13 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Root extends AbstractEffect { - public Root(StatsSet params) + public Root(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index 66fc8d82c8..4c7ee53239 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class SacrificeSummon extends AbstractEffect { - public SacrificeSummon(StatsSet params) + public SacrificeSummon(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java index d00856c9bd..683f45bb55 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SafeFallHeight.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SafeFallHeight extends AbstractStatEffect { - public SafeFallHeight(StatsSet params) + public SafeFallHeight(StatSet params) { super(params, Stat.FALL); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 7f6bf69ee3..797aa95263 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -33,7 +33,7 @@ public class SendSystemMessageToClan extends AbstractEffect { private final SystemMessage _message; - public SendSystemMessageToClan(StatsSet params) + public SendSystemMessageToClan(StatSet params) { final int id = params.getInt("id", 0); _message = new SystemMessage(id); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java index 7acbf846df..a0508d73b1 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java @@ -20,7 +20,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class ServitorShare extends AbstractEffect { private final Map _sharedStats = new EnumMap<>(Stat.class); - public ServitorShare(StatsSet params) + public ServitorShare(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 01dfd87c71..6e8187feae 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SetHp extends AbstractEffect private final double _amount; private final StatModifierType _mode; - public SetHp(StatsSet params) + public SetHp(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index 805d18160b..fae21baa51 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.SkillData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SetSkill extends AbstractEffect private final int _skillId; private final int _skillLvl; - public SetSkill(StatsSet params) + public SetSkill(StatSet params) { _skillId = params.getInt("skillId", 0); _skillLvl = params.getInt("skillLvl", 1); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java index a93bb5f253..354cb42b55 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ShieldDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ShieldDefence extends AbstractStatEffect { - public ShieldDefence(StatsSet params) + public ShieldDefence(StatSet params) { super(params, Stat.SHIELD_DEFENCE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java index f28d0e4ad2..1fdee75f69 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ShieldDefenceRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class ShieldDefenceRate extends AbstractStatEffect { - public ShieldDefenceRate(StatsSet params) + public ShieldDefenceRate(StatSet params) { super(params, Stat.SHIELD_DEFENCE_RATE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java index 1d649082dc..533b631f10 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; */ public class SilentMove extends AbstractEffect { - public SilentMove(StatsSet params) + public SilentMove(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java index 89dad85514..7c929a7fe8 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillCritical.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class SkillCritical extends AbstractEffect { private final BaseStat _stat; - public SkillCritical(StatsSet params) + public SkillCritical(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java index 369bef11f5..8f054f973b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalDamage.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillCriticalDamage extends AbstractStatEffect { - public SkillCriticalDamage(StatsSet params) + public SkillCriticalDamage(StatSet params) { super(params, Stat.CRITICAL_DAMAGE_SKILL, Stat.CRITICAL_DAMAGE_SKILL_ADD); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java index c91f2d6b49..88ecf69e77 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillCriticalProbability.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillCriticalProbability extends AbstractStatPercentEffect { - public SkillCriticalProbability(StatsSet params) + public SkillCriticalProbability(StatSet params) { super(params, Stat.SKILL_CRITICAL_PROBABILITY); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 7b98a9e180..1664ea1827 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class SkillEvasion extends AbstractEffect private final int _magicType; private final double _amount; - public SkillEvasion(StatsSet params) + public SkillEvasion(StatSet params) { _magicType = params.getInt("magicType", 0); _amount = params.getDouble("amount", 0); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java index 9cc62532b4..2880d0ccef 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SkillPowerAdd extends AbstractStatAddEffect { - public SkillPowerAdd(StatsSet params) + public SkillPowerAdd(StatSet params) { super(params, Stat.SKILL_POWER_ADD); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 9578c88f91..7156fff2df 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SkillTurning extends AbstractEffect private final int _chance; private final boolean _staticChance; - public SkillTurning(StatsSet params) + public SkillTurning(StatSet params) { _chance = params.getInt("chance", 100); _staticChance = params.getBoolean("staticChance", false); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 45b02206a4..04691304ed 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class SkillTurningOverTime extends AbstractEffect private final int _chance; private final boolean _staticChance; - public SkillTurningOverTime(StatsSet params) + public SkillTurningOverTime(StatSet params) { _chance = params.getInt("chance", 100); _staticChance = params.getBoolean("staticChance", false); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index c1dd92cedb..b919c7acac 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.ShotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -36,7 +36,7 @@ public class SoulBlow extends AbstractEffect private final double _chanceBoost; private final boolean _overHit; - public SoulBlow(StatsSet params) + public SoulBlow(StatSet params) { _power = params.getDouble("power"); _chanceBoost = params.getDouble("chanceBoost"); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 8471aa236c..4f63a84081 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; @@ -40,7 +40,7 @@ public class SoulEating extends AbstractEffect private final int _expNeeded; private final int _maxSouls; - public SoulEating(StatsSet params) + public SoulEating(StatSet params) { _expNeeded = params.getInt("expNeeded"); _maxSouls = params.getInt("maxSouls"); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a7d5c2628a..ad261845eb 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Seed; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Sow extends AbstractEffect { - public Sow(StatsSet params) + public Sow(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SpModify.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SpModify.java index 24d124ecce..c3bc6193e9 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SpModify.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SpModify.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SpModify extends AbstractStatAddEffect { - public SpModify(StatsSet params) + public SpModify(StatSet params) { super(params, Stat.BONUS_SP); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 0718408ca2..890438d65f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.enums.SpeedType; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -36,7 +36,7 @@ public class Speed extends AbstractEffect private final StatModifierType _mode; private List _speedType; - public Speed(StatsSet params) + public Speed(StatSet params) { _amount = params.getDouble("amount", 0); _mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index 91b91ad05e..db247775f3 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SphericBarrier extends AbstractStatAddEffect { - public SphericBarrier(StatsSet params) + public SphericBarrier(StatSet params) { super(params, Stat.SPHERIC_BARRIER_RANGE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index d13eaf1c2e..385240377f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlEvent; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class Spoil extends AbstractEffect { - public Spoil(StatsSet params) + public Spoil(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index b63c24dc20..22c4132b63 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -36,7 +36,7 @@ public class StatBonusSkillCritical extends AbstractEffect private final BaseStat _stat; private final Condition _armorTypeCondition; - public StatBonusSkillCritical(StatsSet params) + public StatBonusSkillCritical(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.DEX); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index 41a20bfafe..49280eb774 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -36,7 +36,7 @@ public class StatBonusSpeed extends AbstractEffect private final BaseStat _stat; private final Condition _armorTypeCondition; - public StatBonusSpeed(StatsSet params) + public StatBonusSpeed(StatSet params) { _stat = params.getEnum("stat", BaseStat.class, BaseStat.DEX); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index a007b118b2..bcf691e360 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,7 +34,7 @@ public class StatByMoveType extends AbstractEffect private final MoveType _type; private final double _value; - public StatByMoveType(StatsSet params) + public StatByMoveType(StatSet params) { _stat = params.getEnum("stat", Stat.class); _type = params.getEnum("type", MoveType.class); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StatUp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StatUp.java index b961ec8484..7abb1367af 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StatUp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StatUp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -31,7 +31,7 @@ public class StatUp extends AbstractEffect private final BaseStat _stat; private final double _amount; - public StatUp(StatsSet params) + public StatUp(StatSet params) { _amount = params.getDouble("amount", 0); _stat = params.getEnum("stat", BaseStat.class, BaseStat.STR); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index 0720057c19..23239887a7 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.List; import org.l2jmobius.gameserver.enums.DispelSlotType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -39,7 +39,7 @@ public class StealAbnormal extends AbstractEffect private final int _rate; private final int _max; - public StealAbnormal(StatsSet params) + public StealAbnormal(StatSet params) { _slot = params.getEnum("slot", DispelSlotType.class, DispelSlotType.BUFF); _rate = params.getInt("rate", 0); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Summon.java index cd7bfabef8..62daa5ffdf 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.ServitorInstance; @@ -43,7 +43,7 @@ public class Summon extends AbstractEffect private final int _lifeTime; private final int _consumeItemInterval; - public Summon(StatsSet params) + public Summon(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index 8929e1f2b0..50c025e572 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ public class SummonAgathion extends AbstractEffect { private final int _npcId; - public SummonAgathion(StatsSet params) + public SummonAgathion(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index 7716d58f16..49b816f272 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.CubicData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; @@ -42,7 +42,7 @@ public class SummonCubic extends AbstractEffect private final int _cubicId; private final int _cubicLvl; - public SummonCubic(StatsSet params) + public SummonCubic(StatSet params) { _cubicId = params.getInt("cubicId", -1); _cubicLvl = params.getInt("cubicLvl", 0); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index d0a2a82738..13d5a2eac7 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.DoppelgangerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ public class SummonHallucination extends AbstractEffect private final int _npcId; private final int _npcCount; - public SummonHallucination(StatsSet params) + public SummonHallucination(StatSet params) { _despawnDelay = params.getInt("despawnDelay", 20000); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index bcd050e084..d61a6e5c02 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.ServitorInstance; @@ -43,7 +43,7 @@ public class SummonMulti extends AbstractEffect private final int _consumeItemInterval; private final int _summonPoints; - public SummonMulti(StatsSet params) + public SummonMulti(StatSet params) { _npcId = params.getInt("npcId"); _expMultiplier = params.getFloat("expMultiplier", 1); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index 6f4090eef0..eaff214b7c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DecoyInstance; @@ -48,7 +48,7 @@ public class SummonNpc extends AbstractEffect private final boolean _isSummonSpawn; private final boolean _singleInstance; // Only one instance of this NPC is allowed. - public SummonNpc(StatsSet params) + public SummonNpc(StatSet params) { _despawnDelay = params.getInt("despawnDelay", 20000); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 5ef621819e..534a41ee16 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.data.xml.impl.PetDataTable; import org.l2jmobius.gameserver.model.PetData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PetItemList; */ public class SummonPet extends AbstractEffect { - public SummonPet(StatsSet params) + public SummonPet(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java index 7dd690587c..b1d5ec38cb 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonPoints.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class SummonPoints extends AbstractStatAddEffect { - public SummonPoints(StatsSet params) + public SummonPoints(StatSet params) { super(params, Stat.MAX_SUMMON_POINTS); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index d8a47b670f..ac1ddaa16a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.data.xml.impl.NpcData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; @@ -35,7 +35,7 @@ public class SummonTrap extends AbstractEffect private final int _despawnTime; private final int _npcId; - public SummonTrap(StatsSet params) + public SummonTrap(StatSet params) { _despawnTime = params.getInt("despawnTime", 0); _npcId = params.getInt("npcId", 0); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 84f6d070a8..3196bb949d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import java.util.Collection; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Sweeper extends AbstractEffect { - public Sweeper(StatsSet params) + public Sweeper(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 559dfc6437..ec29554f2d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -41,7 +41,7 @@ public class Synergy extends AbstractEffect private final int _skillLevelScaleTo; private final int _minSlot; - public Synergy(StatsSet params) + public Synergy(StatSet params) { final String requiredSlots = params.getString("requiredSlots", null); if ((requiredSlots != null) && !requiredSlots.isEmpty()) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index e35516fef5..39ed981bbf 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Castle; @@ -33,7 +33,7 @@ public class TakeCastle extends AbstractEffect { private final CastleSide _side; - public TakeCastle(StatsSet params) + public TakeCastle(StatSet params) { _side = params.getEnum("side", CastleSide.class); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 77fd9ec103..3be2bf5593 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Castle; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TakeCastleStart extends AbstractEffect { - public TakeCastleStart(StatsSet params) + public TakeCastleStart(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 70842191a7..18749c1aef 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.entity.Fort; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TakeFort extends AbstractEffect { - public TakeFort(StatsSet params) + public TakeFort(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 0eb23f6733..77355f9683 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TakeFortStart extends AbstractEffect { - public TakeFortStart(StatsSet params) + public TakeFortStart(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index cec32755ed..dd8e09278f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -30,7 +30,7 @@ public class TalismanSlot extends AbstractEffect { private final int _slots; - public TalismanSlot(StatsSet params) + public TalismanSlot(StatSet params) { _slots = params.getInt("slots", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index 281b5322fd..32a126f499 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class TargetCancel extends AbstractEffect { private final int _chance; - public TargetCancel(StatsSet params) + public TargetCancel(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index b4463de391..86ff70c9ca 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMe extends AbstractEffect { - public TargetMe(StatsSet params) + public TargetMe(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index 11e581113e..e68a1e1faf 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class TargetMeProbability extends AbstractEffect { private final int _chance; - public TargetMeProbability(StatsSet params) + public TargetMeProbability(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 6c30519678..9ca01faf50 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -32,7 +32,7 @@ public class Teleport extends AbstractEffect { private final Location _loc; - public Teleport(StatsSet params) + public Teleport(StatSet params) { _loc = new Location(params.getInt("x", 0), params.getInt("y", 0), params.getInt("z", 0)); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index e0e715818c..bdc53208d5 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -38,7 +38,7 @@ public class TeleportToNpc extends AbstractEffect private final int _npcId; private final boolean _party; - public TeleportToNpc(StatsSet params) + public TeleportToNpc(StatSet params) { _npcId = params.getInt("npcId"); _party = params.getBoolean("party", false); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index c84c559322..4f4275fd41 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class TeleportToPlayer extends AbstractEffect { - public TeleportToPlayer(StatsSet params) + public TeleportToPlayer(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index 1c9af0f535..b2d6b663de 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -39,7 +39,7 @@ public class TeleportToSummon extends AbstractEffect { private final double _maxDistance; - public TeleportToSummon(StatsSet params) + public TeleportToSummon(StatSet params) { _maxDistance = params.getDouble("distance", -1); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index e550302b02..c4bf787a10 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class TeleportToTarget extends AbstractEffect { - public TeleportToTarget(StatsSet params) + public TeleportToTarget(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index ba1c55c615..ff63eea817 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class TransferDamageToPlayer extends AbstractStatAddEffect { - public TransferDamageToPlayer(StatsSet params) + public TransferDamageToPlayer(StatSet params) { super(params, Stat.TRANSFER_DAMAGE_TO_PLAYER); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java index b084bfc1cb..c87d5f0554 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToSummon.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class TransferDamageToSummon extends AbstractStatAddEffect { - public TransferDamageToSummon(StatsSet params) + public TransferDamageToSummon(StatSet params) { super(params, Stat.TRANSFER_DAMAGE_SUMMON_PERCENT); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index e9f0292113..48bc5e3a1c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -34,7 +34,7 @@ public class TransferHate extends AbstractEffect { private final int _chance; - public TransferHate(StatsSet params) + public TransferHate(StatSet params) { _chance = params.getInt("chance", 100); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 2ddf95a4db..bf593eaed8 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -35,7 +35,7 @@ public class Transformation extends AbstractEffect { private final List _id; - public Transformation(StatsSet params) + public Transformation(StatSet params) { final String ids = params.getString("transformationId", null); if ((ids != null) && !ids.isEmpty()) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 103ccdf8ce..2b4af0a1d3 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -31,7 +31,7 @@ public class TrapDetect extends AbstractEffect { private final int _power; - public TrapDetect(StatsSet params) + public TrapDetect(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index eb7b073b36..c4a6c6aed9 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.TrapAction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -35,7 +35,7 @@ public class TrapRemove extends AbstractEffect { private final int _power; - public TrapRemove(StatsSet params) + public TrapRemove(StatSet params) { if (params.isEmpty()) { diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 6df3874ab1..8fb87050b1 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -59,7 +59,7 @@ public class TriggerSkillByAttack extends AbstractEffect * @param params */ - public TriggerSkillByAttack(StatsSet params) + public TriggerSkillByAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index ae6a3bc89f..78366b8047 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillByAvoid extends AbstractEffect /** * @param params */ - public TriggerSkillByAvoid(StatsSet params) + public TriggerSkillByAvoid(StatSet params) { _chance = params.getInt("chance", 100); _skill = new SkillHolder(params.getInt("skillId", 0), params.getInt("skillLevel", 0)); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index c24fb95246..9fe53c0622 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -48,7 +48,7 @@ public class TriggerSkillByDamage extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillByDamage(StatsSet params) + public TriggerSkillByDamage(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c086507336..8b84350293 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillByDeathBlow extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillByDeathBlow(StatsSet params) + public TriggerSkillByDeathBlow(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index a9bfcc320c..11802645f2 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; @@ -37,7 +37,7 @@ public class TriggerSkillByKill extends AbstractEffect private final int _chance; private final SkillHolder _skill; - public TriggerSkillByKill(StatsSet params) + public TriggerSkillByKill(StatSet params) { _chance = params.getInt("chance", 100); _skill = new SkillHolder(params.getInt("skillId", 0), params.getInt("skillLevel", 0)); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 2893d46f33..7f2d3f9fa7 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -52,7 +52,7 @@ public class TriggerSkillByMagicType extends AbstractEffect * @param params */ - public TriggerSkillByMagicType(StatsSet params) + public TriggerSkillByMagicType(StatSet params) { _chance = params.getInt("chance", 100); _magicTypes = params.getIntArray("magicTypes", ";"); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 1524e3d4f4..b77da803f5 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -47,7 +47,7 @@ public class TriggerSkillBySkill extends AbstractEffect private final int _skillLevelScaleTo; private final TargetType _targetType; - public TriggerSkillBySkill(StatsSet params) + public TriggerSkillBySkill(StatSet params) { _castSkillId = params.getInt("castSkillId"); _chance = params.getInt("chance", 100); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index ec2124c44e..7bb68baec9 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -53,7 +53,7 @@ public class TriggerSkillBySkillAttack extends AbstractEffect private final TargetType _targetType; private final InstanceType _attackerType; - public TriggerSkillBySkillAttack(StatsSet params) + public TriggerSkillBySkillAttack(StatSet params) { _minAttackerLevel = params.getInt("minAttackerLevel", 1); _maxAttackerLevel = params.getInt("maxAttackerLevel", 127); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 3f58619f0a..c209decfb3 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -69,7 +69,7 @@ public class TwoHandedBluntBonus extends AbstractEffect private final double _speedAmount; private final StatModifierType _speedMode; - public TwoHandedBluntBonus(StatsSet params) + public TwoHandedBluntBonus(StatSet params) { _pAtkAmount = params.getDouble("pAtkAmount", 0); _pAtkMode = params.getEnum("pAtkMode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index b2c50c4b88..344456a925 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.enums.StatModifierType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; @@ -69,7 +69,7 @@ public class TwoHandedSwordBonus extends AbstractEffect private final double _speedAmount; private final StatModifierType _speedMode; - public TwoHandedSwordBonus(StatsSet params) + public TwoHandedSwordBonus(StatSet params) { _pAtkAmount = params.getDouble("pAtkAmount", 0); _pAtkMode = params.getEnum("pAtkMode", StatModifierType.class, StatModifierType.DIFF); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 01ae8122ec..20b418c29b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -17,7 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,7 +35,7 @@ public class Unsummon extends AbstractEffect { private final int _chance; - public Unsummon(StatsSet params) + public Unsummon(StatSet params) { _chance = params.getInt("chance", -1); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 57eb89196d..f73f0f57f0 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; */ public class UnsummonAgathion extends AbstractEffect { - public UnsummonAgathion(StatsSet params) + public UnsummonAgathion(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index a4fdc2c0aa..0779d018cc 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class UnsummonServitors extends AbstractEffect { - public UnsummonServitors(StatsSet params) + public UnsummonServitors(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index dbb0c700b5..ac33fcba0d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class Untargetable extends AbstractEffect { - public Untargetable(StatsSet params) + public Untargetable(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java index ac6cae3d05..1c85196fe0 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/VampiricAttack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +30,7 @@ public class VampiricAttack extends AbstractEffect private final double _amount; private final double _sum; - public VampiricAttack(StatsSet params) + public VampiricAttack(StatSet params) { _amount = params.getDouble("amount"); _sum = _amount * params.getDouble("chance"); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java index ab724714e1..571ca55bbe 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/VampiricDefence.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.Skill; @@ -29,7 +29,7 @@ public class VampiricDefence extends AbstractEffect { private final int _amount; - public VampiricDefence(StatsSet params) + public VampiricDefence(StatSet params) { _amount = params.getInt("amount", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java index f8b9d76f3a..caaa8d02b4 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/VitalityExpRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class VitalityExpRate extends AbstractStatPercentEffect { - public VitalityExpRate(StatsSet params) + public VitalityExpRate(StatSet params) { super(params, Stat.VITALITY_EXP_RATE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index cba2b14c35..385595e03d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -31,7 +31,7 @@ public class VitalityPointUp extends AbstractEffect { private final int _value; - public VitalityPointUp(StatsSet params) + public VitalityPointUp(StatSet params) { _value = params.getInt("value", 0); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java index 86612955dd..72f78ec177 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/VitalityPointsRate.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class VitalityPointsRate extends AbstractStatPercentEffect { - public VitalityPointsRate(StatsSet params) + public VitalityPointsRate(StatSet params) { super(params, Stat.VITALITY_CONSUME_RATE); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java index 09500b3823..bf20bd5018 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/WeightLimit.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WeightLimit extends AbstractStatEffect { - public WeightLimit(StatsSet params) + public WeightLimit(StatSet params) { super(params, Stat.WEIGHT_LIMIT); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java index f9be68f493..6020399f85 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/WeightPenalty.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WeightPenalty extends AbstractStatAddEffect { - public WeightPenalty(StatsSet params) + public WeightPenalty(StatSet params) { super(params, Stat.WEIGHT_PENALTY); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java index bdf9aca48d..81eb9a9688 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/WorldChatPoints.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class WorldChatPoints extends AbstractStatEffect { - public WorldChatPoints(StatsSet params) + public WorldChatPoints(StatSet params) { super(params, Stat.WORLD_CHAT_POINTS); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java index 5a3842921d..127dadf9d2 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/BuildAdvanceBaseSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class BuildAdvanceBaseSkillCondition implements ISkillCondition { - public BuildAdvanceBaseSkillCondition(StatsSet params) + public BuildAdvanceBaseSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java index 9328638400..b479302f61 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class BuildCampSkillCondition implements ISkillCondition { - public BuildCampSkillCondition(StatsSet params) + public BuildCampSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java index c1220c828a..aca51bafbf 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanAddMaxEntranceInzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanAddMaxEntranceInzoneSkillCondition implements ISkillCondition { - public CanAddMaxEntranceInzoneSkillCondition(StatsSet params) + public CanAddMaxEntranceInzoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java index eddd45771c..6ac3c2e199 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanBookmarkAddSlotSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,7 +31,7 @@ public class CanBookmarkAddSlotSkillCondition implements ISkillCondition { private final int _teleportBookmarkSlots; - public CanBookmarkAddSlotSkillCondition(StatsSet params) + public CanBookmarkAddSlotSkillCondition(StatSet params) { _teleportBookmarkSlots = params.getInt("teleportBookmarkSlots"); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java index 30fdb7f36f..ee1bf96e69 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanChangeVitalItemCountSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanChangeVitalItemCountSkillCondition implements ISkillCondition { - public CanChangeVitalItemCountSkillCondition(StatsSet params) + public CanChangeVitalItemCountSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java index da553a6d9f..48e28e7af7 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanEnchantAttributeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanEnchantAttributeSkillCondition implements ISkillCondition { - public CanEnchantAttributeSkillCondition(StatsSet params) + public CanEnchantAttributeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java index c14f1ffe64..2908994776 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanMountForEventSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanMountForEventSkillCondition implements ISkillCondition { - public CanMountForEventSkillCondition(StatsSet params) + public CanMountForEventSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java index d07aa9a622..9dc5f99592 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanRefuelAirshipSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShipInstance; @@ -31,7 +31,7 @@ public class CanRefuelAirshipSkillCondition implements ISkillCondition { private final int _amount; - public CanRefuelAirshipSkillCondition(StatsSet params) + public CanRefuelAirshipSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java index d451f3c997..67206b47bd 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanRestoreVitalPointSkillCondition implements ISkillCondition { - public CanRestoreVitalPointSkillCondition(StatsSet params) + public CanRestoreVitalPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java index 7e519025b0..49232af88f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonCubicSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class CanSummonCubicSkillCondition implements ISkillCondition { - public CanSummonCubicSkillCondition(StatsSet params) + public CanSummonCubicSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java index 8b550d164c..33541e82a8 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonMultiSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class CanSummonMultiSkillCondition implements ISkillCondition { private final int _summonPoints; - public CanSummonMultiSkillCondition(StatsSet params) + public CanSummonMultiSkillCondition(StatSet params) { _summonPoints = params.getInt("summonPoints"); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java index aa9579e92a..b06ba00f32 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonPetSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.impl.CharSummonTable; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; */ public class CanSummonPetSkillCondition implements ISkillCondition { - public CanSummonPetSkillCondition(StatsSet params) + public CanSummonPetSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java index ea41a2e22e..3655e158cb 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanSummonSiegeGolemSkillCondition implements ISkillCondition { - public CanSummonSiegeGolemSkillCondition(StatsSet params) + public CanSummonSiegeGolemSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java index 460d72a743..e07ce75c8f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanSummonSkillCondition implements ISkillCondition { - public CanSummonSkillCondition(StatsSet params) + public CanSummonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java index 309da529c9..bd8838d02f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformInDominionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanTransformInDominionSkillCondition implements ISkillCondition { - public CanTransformInDominionSkillCondition(StatsSet params) + public CanTransformInDominionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java index 81297944f1..2f4d780cab 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanTransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class CanTransformSkillCondition implements ISkillCondition // TODO: What to do with this? // private final int _transformId; - public CanTransformSkillCondition(StatsSet params) + public CanTransformSkillCondition(StatSet params) { // _transformId = params.getInt("transformId"); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java index 800d0375be..771873a553 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanUntransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class CanUntransformSkillCondition implements ISkillCondition { - public CanUntransformSkillCondition(StatsSet params) + public CanUntransformSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java index e651b3b1d5..ffe2e4a026 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInBattlefieldSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class CanUseInBattlefieldSkillCondition implements ISkillCondition { - public CanUseInBattlefieldSkillCondition(StatsSet params) + public CanUseInBattlefieldSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java index 5ff751abce..ba030b97a4 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseInDragonLairSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanUseInDragonLairSkillCondition implements ISkillCondition { - public CanUseInDragonLairSkillCondition(StatsSet params) + public CanUseInDragonLairSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java index 4d914c28fe..8a0cb18ac7 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseSwoopCannonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class CanUseSwoopCannonSkillCondition implements ISkillCondition { - public CanUseSwoopCannonSkillCondition(StatsSet params) + public CanUseSwoopCannonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java index 6a2d832a4c..e9996580fc 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class CanUseVitalityConsumeItemSkillCondition implements ISkillCondition { - public CanUseVitalityConsumeItemSkillCondition(StatsSet params) + public CanUseVitalityConsumeItemSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java index f694956e7e..48dafb46c3 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CannotUseInTransformSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class CannotUseInTransformSkillCondition implements ISkillCondition { private final int _transformId; - public CannotUseInTransformSkillCondition(StatsSet params) + public CannotUseInTransformSkillCondition(StatSet params) { _transformId = params.getInt("transformId", -1); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java index 141c69322f..6591233504 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CheckLevelSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -32,7 +32,7 @@ public class CheckLevelSkillCondition implements ISkillCondition private final int _maxLevel; private final SkillConditionAffectType _affectType; - public CheckLevelSkillCondition(StatsSet params) + public CheckLevelSkillCondition(StatSet params) { _minLevel = params.getInt("minLevel"); _maxLevel = params.getInt("maxLevel"); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java index 15163a3373..d72f463c4e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class CheckSexSkillCondition implements ISkillCondition { private final boolean _isFemale; - public CheckSexSkillCondition(StatsSet params) + public CheckSexSkillCondition(StatSet params) { _isFemale = params.getBoolean("isFemale"); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java index 8dee11ef9c..12e49c23a7 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/ConsumeBodySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConsumeBodySkillCondition implements ISkillCondition { - public ConsumeBodySkillCondition(StatsSet params) + public ConsumeBodySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java index c24da9ebcd..ba1b1cdd5f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EnergySavedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class EnergySavedSkillCondition implements ISkillCondition { private final int _amount; - public EnergySavedSkillCondition(StatsSet params) + public EnergySavedSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 192f3487e2..cbaf72bb00 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -35,7 +35,7 @@ public class EquipArmorSkillCondition implements ISkillCondition { private int _armorTypesMask = 0; - public EquipArmorSkillCondition(StatsSet params) + public EquipArmorSkillCondition(StatSet params) { final List armorTypes = params.getEnumList("armorType", ArmorType.class); if (armorTypes != null) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index e5f22008fa..708b4dd1d4 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class EquipShieldSkillCondition implements ISkillCondition { - public EquipShieldSkillCondition(StatsSet params) + public EquipShieldSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 4561945254..f733f81f62 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -33,7 +33,7 @@ public class EquipWeaponSkillCondition implements ISkillCondition { private int _weaponTypesMask = 0; - public EquipWeaponSkillCondition(StatsSet params) + public EquipWeaponSkillCondition(StatSet params) { final List weaponTypes = params.getEnumList("weaponType", WeaponType.class); if (weaponTypes != null) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java index 5f77215218..e36c06fa11 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/NotFearedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.EffectFlag; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class NotFearedSkillCondition implements ISkillCondition { - public NotFearedSkillCondition(StatsSet params) + public NotFearedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java index b9096cc1a9..b6e7bcd826 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/NotInUnderwaterSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class NotInUnderwaterSkillCondition implements ISkillCondition { - public NotInUnderwaterSkillCondition(StatsSet params) + public NotInUnderwaterSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index eee6ec73e9..18d8dc8a11 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Item; @@ -35,7 +35,7 @@ public class Op2hWeaponSkillCondition implements ISkillCondition { private final List _weaponTypes = new ArrayList<>(); - public Op2hWeaponSkillCondition(StatsSet params) + public Op2hWeaponSkillCondition(StatSet params) { final List weaponTypes = params.getList("weaponType", String.class); if (weaponTypes != null) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 3b91f36fe4..6223172dbc 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; - public OpAffectedBySkillSkillCondition(StatsSet params) + public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java index 2eb561291e..3818df4736 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpAgathionEnergySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAgathionEnergySkillCondition implements ISkillCondition { - public OpAgathionEnergySkillCondition(StatsSet params) + public OpAgathionEnergySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java index 76a7ebc5a8..ee2b415021 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpAlignmentSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.enums.SkillConditionAlignment; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -32,7 +32,7 @@ public class OpAlignmentSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final SkillConditionAlignment _alignment; - public OpAlignmentSkillCondition(StatsSet params) + public OpAlignmentSkillCondition(StatSet params) { _affectType = params.getEnum("affectType", SkillConditionAffectType.class); _alignment = params.getEnum("alignment", SkillConditionAlignment.class); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index 1c83d18f4e..bcc6715bb2 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -33,7 +33,7 @@ public class OpBlinkSkillCondition implements ISkillCondition private final int _angle; private final int _range; - public OpBlinkSkillCondition(StatsSet params) + public OpBlinkSkillCondition(StatSet params) { switch (params.getEnum("direction", Position.class)) { diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java index 5215f86ae6..fde0c7f0f8 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCallPcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpCallPcSkillCondition implements ISkillCondition { - public OpCallPcSkillCondition(StatsSet params) + public OpCallPcSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java index dddafec6f0..1de2a32550 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanEscapeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCanEscapeSkillCondition implements ISkillCondition { - public OpCanEscapeSkillCondition(StatsSet params) + public OpCanEscapeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java index 3f1685a1e0..a87fd8adb6 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCanNotUseAirshipSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCanNotUseAirshipSkillCondition implements ISkillCondition { - public OpCanNotUseAirshipSkillCondition(StatsSet params) + public OpCanNotUseAirshipSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java index 8eec19a568..ac7a81c015 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCannotUseTargetWithPrivateStoreSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.PrivateStoreType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCannotUseTargetWithPrivateStoreSkillCondition implements ISkillCondition { - public OpCannotUseTargetWithPrivateStoreSkillCondition(StatsSet params) + public OpCannotUseTargetWithPrivateStoreSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 91de0adc8c..4030b79d00 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Weapon; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpChangeWeaponSkillCondition implements ISkillCondition { - public OpChangeWeaponSkillCondition(StatsSet params) + public OpChangeWeaponSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java index c2de03de1e..3e304e7d9d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAbnormalSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.AbnormalType; @@ -34,7 +34,7 @@ public class OpCheckAbnormalSkillCondition implements ISkillCondition private final boolean _hasAbnormal; private final SkillConditionAffectType _affectType; - public OpCheckAbnormalSkillCondition(StatsSet params) + public OpCheckAbnormalSkillCondition(StatSet params) { _type = params.getEnum("type", AbnormalType.class); _level = params.getInt("level"); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java index 65084182b1..c70b58dc50 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckAccountTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpCheckAccountTypeSkillCondition implements ISkillCondition { - public OpCheckAccountTypeSkillCondition(StatsSet params) + public OpCheckAccountTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java index 3d4f0a58a0..11eb804274 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCastRangeSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.geoengine.GeoEngine; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpCheckCastRangeSkillCondition implements ISkillCondition { private final int _distance; - public OpCheckCastRangeSkillCondition(StatsSet params) + public OpCheckCastRangeSkillCondition(StatSet params) { _distance = params.getInt("distance"); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java index 7e2e391595..03af1ac63d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.ClassId; @@ -35,7 +35,7 @@ public class OpCheckClassListSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final boolean _isWithin; - public OpCheckClassListSkillCondition(StatsSet params) + public OpCheckClassListSkillCondition(StatSet params) { _classIds = params.getEnumList("classIds", ClassId.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java index 9f779f937a..9702804304 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.base.ClassId; @@ -33,7 +33,7 @@ public class OpCheckClassSkillCondition implements ISkillCondition private final SkillConditionAffectType _affectType; private final boolean _isWithin; - public OpCheckClassSkillCondition(StatsSet params) + public OpCheckClassSkillCondition(StatSet params) { _classId = params.getEnum("classId", ClassId.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java index 3bf6b65dc8..ad997dced7 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckCrtEffectSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckCrtEffectSkillCondition implements ISkillCondition { - public OpCheckCrtEffectSkillCondition(StatsSet params) + public OpCheckCrtEffectSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java index 144dc95daa..1d5a3adff9 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class OpCheckFlagSkillCondition implements ISkillCondition { - public OpCheckFlagSkillCondition(StatsSet params) + public OpCheckFlagSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java index 75af2ab89a..2e0c07d040 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckOnGoingEventCampaignSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckOnGoingEventCampaignSkillCondition implements ISkillCondition { - public OpCheckOnGoingEventCampaignSkillCondition(StatsSet params) + public OpCheckOnGoingEventCampaignSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java index c64f7c6722..f11569f43c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckPcbangPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpCheckPcbangPointSkillCondition implements ISkillCondition { - public OpCheckPcbangPointSkillCondition(StatsSet params) + public OpCheckPcbangPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java index 252519f7ff..997a4d0fec 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.data.xml.impl.ClanHallData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -35,7 +35,7 @@ public class OpCheckResidenceSkillCondition implements ISkillCondition private final List _residencesId; private final boolean _isWithin; - public OpCheckResidenceSkillCondition(StatsSet params) + public OpCheckResidenceSkillCondition(StatSet params) { _residencesId = params.getList("residencesId", Integer.class); _isWithin = params.getBoolean("isWithin"); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java index 6abeed7d35..3a1bcf424c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillListSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.List; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -34,7 +34,7 @@ public class OpCheckSkillListSkillCondition implements ISkillCondition private final List _skillIds; private final SkillConditionAffectType _affectType; - public OpCheckSkillListSkillCondition(StatsSet params) + public OpCheckSkillListSkillCondition(StatSet params) { _skillIds = params.getList("skillIds", Integer.class); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java index 984338b2c0..af563d983f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckSkillSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpCheckSkillSkillCondition implements ISkillCondition private final int _skillId; private final SkillConditionAffectType _affectType; - public OpCheckSkillSkillCondition(StatsSet params) + public OpCheckSkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java index ea882c3635..5d85a2dbdb 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCompanionSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionCompanionType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpCompanionSkillCondition implements ISkillCondition { private final SkillConditionCompanionType _type; - public OpCompanionSkillCondition(StatsSet params) + public OpCompanionSkillCondition(StatSet params) { _type = params.getEnum("type", SkillConditionCompanionType.class); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java index 069b9d1759..464853c00c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnchantRangeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpEnchantRangeSkillCondition implements ISkillCondition { - public OpEnchantRangeSkillCondition(StatsSet params) + public OpEnchantRangeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java index 99f22bb16a..e12f3ae007 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class OpEncumberedSkillCondition implements ISkillCondition private final int _slotsPercent; private final int _weightPercent; - public OpEncumberedSkillCondition(StatsSet params) + public OpEncumberedSkillCondition(StatSet params) { _slotsPercent = params.getInt("slotsPercent"); _weightPercent = params.getInt("weightPercent"); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java index 187dfba744..49cf8e2cb8 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpEnergyMaxSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpEnergyMaxSkillCondition implements ISkillCondition { private final int _amount; - public OpEnergyMaxSkillCondition(StatsSet params) + public OpEnergyMaxSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 75bdf465e0..82eb70b770 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -32,7 +32,7 @@ public class OpEquipItemSkillCondition implements ISkillCondition private final int _itemId; private final SkillConditionAffectType _affectType; - public OpEquipItemSkillCondition(StatsSet params) + public OpEquipItemSkillCondition(StatSet params) { _itemId = params.getInt("itemId"); _affectType = params.getEnum("affectType", SkillConditionAffectType.class); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java index 2c4576c2fa..fa6e82082b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpExistNpcSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -35,7 +35,7 @@ public class OpExistNpcSkillCondition implements ISkillCondition private final int _range; private final boolean _isAround; - public OpExistNpcSkillCondition(StatsSet params) + public OpExistNpcSkillCondition(StatSet params) { _npcIds = params.getList("npcIds", Integer.class); _range = params.getInt("range"); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java index 27cc3e90a9..8299b40047 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingCastSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingCastSkillCondition implements ISkillCondition { - public OpFishingCastSkillCondition(StatsSet params) + public OpFishingCastSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java index 84cc031a24..4b43eb834e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingPumpingSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingPumpingSkillCondition implements ISkillCondition { - public OpFishingPumpingSkillCondition(StatsSet params) + public OpFishingPumpingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java index 86aa667bee..a6a400f96f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpFishingReelingSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpFishingReelingSkillCondition implements ISkillCondition { - public OpFishingReelingSkillCondition(StatsSet params) + public OpFishingReelingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java index d22733df7e..50e6dafb82 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpHaveSummonSkillCondition implements ISkillCondition { - public OpHaveSummonSkillCondition(StatsSet params) + public OpHaveSummonSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 2e854ca2b8..cceb4e937b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { private final int _npcId; - public OpHaveSummonedNpcSkillCondition(StatsSet params) + public OpHaveSummonedNpcSkillCondition(StatSet params) { _npcId = params.getInt("npcId"); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java index 16932ce531..374a75bfab 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpHomeSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.impl.ClanHallData; import org.l2jmobius.gameserver.enums.ResidenceType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -34,7 +34,7 @@ public class OpHomeSkillCondition implements ISkillCondition { private final ResidenceType _type; - public OpHomeSkillCondition(StatsSet params) + public OpHomeSkillCondition(StatSet params) { _type = params.getEnum("type", ResidenceType.class); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java index 9482a0bf55..62ad48bdcc 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpInSiegeTimeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpInSiegeTimeSkillCondition implements ISkillCondition { - public OpInSiegeTimeSkillCondition(StatsSet params) + public OpInSiegeTimeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java index 1bffdacd6c..f2fb298398 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpInstantzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -30,7 +30,7 @@ public class OpInstantzoneSkillCondition implements ISkillCondition { private final int _instanceId; - public OpInstantzoneSkillCondition(StatsSet params) + public OpInstantzoneSkillCondition(StatSet params) { _instanceId = params.getInt("instanceId"); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java index 76703cc53b..7418ef9b64 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpMainjobSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpMainjobSkillCondition implements ISkillCondition { - public OpMainjobSkillCondition(StatsSet params) + public OpMainjobSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java index d4c9f1f331..3c81369bbb 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedAgathionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNeedAgathionSkillCondition implements ISkillCondition { - public OpNeedAgathionSkillCondition(StatsSet params) + public OpNeedAgathionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java index 96f6774f25..e7a477b0ee 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpNeedSummonOrPetSkillCondition.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; @@ -34,7 +34,7 @@ public class OpNeedSummonOrPetSkillCondition implements ISkillCondition { private final List _npcIds = new ArrayList<>(); - public OpNeedSummonOrPetSkillCondition(StatsSet params) + public OpNeedSummonOrPetSkillCondition(StatSet params) { final List npcIds = params.getList("npcIds", String.class); if (npcIds != null) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java index 9701002065..ae1edfd719 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotCursedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotCursedSkillCondition implements ISkillCondition { - public OpNotCursedSkillCondition(StatsSet params) + public OpNotCursedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java index bf909425d8..1de79f388a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInPeacezoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpNotInPeacezoneSkillCondition implements ISkillCondition { - public OpNotInPeacezoneSkillCondition(StatsSet params) + public OpNotInPeacezoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java index 0752ba4a6a..0d3e4cb4dd 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotInstantzoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotInstantzoneSkillCondition implements ISkillCondition { - public OpNotInstantzoneSkillCondition(StatsSet params) + public OpNotInstantzoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java index 45891cd0ac..7ea02159ba 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotOlympiadSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpNotOlympiadSkillCondition implements ISkillCondition { - public OpNotOlympiadSkillCondition(StatsSet params) + public OpNotOlympiadSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java index 5c5d293ae8..2397a68e99 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpNotTerritorySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpNotTerritorySkillCondition implements ISkillCondition { - public OpNotTerritorySkillCondition(StatsSet params) + public OpNotTerritorySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java index 874872bb2e..d9f8c1fa3b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpPeacezoneSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpPeacezoneSkillCondition implements ISkillCondition { - public OpPeacezoneSkillCondition(StatsSet params) + public OpPeacezoneSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java index c20c4665bb..08d6bb095a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpPkcountSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpPkcountSkillCondition implements ISkillCondition { private final SkillConditionAffectType _affectType; - public OpPkcountSkillCondition(StatsSet params) + public OpPkcountSkillCondition(StatSet params) { _affectType = params.getEnum("affectType", SkillConditionAffectType.class); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java index 879fc88c4c..d393c5ddc3 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpPledgeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -30,7 +30,7 @@ public class OpPledgeSkillCondition implements ISkillCondition { private final int _level; - public OpPledgeSkillCondition(StatsSet params) + public OpPledgeSkillCondition(StatSet params) { _level = params.getInt("level"); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java index 9adc89b98d..adf16f8feb 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpRestartPointSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpRestartPointSkillCondition implements ISkillCondition { - public OpRestartPointSkillCondition(StatsSet params) + public OpRestartPointSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java index bbd1d9d7d1..6874091ba2 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpResurrectionSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class OpResurrectionSkillCondition implements ISkillCondition { - public OpResurrectionSkillCondition(StatsSet params) + public OpResurrectionSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java index 8bbf796ad2..566f935a50 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpSiegeHammerSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; */ public class OpSiegeHammerSkillCondition implements ISkillCondition { - public OpSiegeHammerSkillCondition(StatsSet params) + public OpSiegeHammerSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java index be3ad18e05..cbfc1a25b2 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class OpSkillAcquireSkillCondition implements ISkillCondition private final int _skillId; private final boolean _hasLearned; - public OpSkillAcquireSkillCondition(StatsSet params) + public OpSkillAcquireSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _hasLearned = params.getBoolean("hasLearned"); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java index c8789d28e4..a8382b83b3 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpSkillSkillCondition implements ISkillCondition private final int _skillLevel; private final boolean _hasLearned; - public OpSkillSkillCondition(StatsSet params) + public OpSkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId"); _skillLevel = params.getInt("skillLevel"); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java index 5127071683..a3d188f3eb 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpSocialClassSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class OpSocialClassSkillCondition implements ISkillCondition { private final int _socialClass; - public OpSocialClassSkillCondition(StatsSet params) + public OpSocialClassSkillCondition(StatSet params) { _socialClass = params.getInt("socialClass"); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java index b9d37d18c0..c86984a218 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpSoulMaxSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.stats.Stat; */ public class OpSoulMaxSkillCondition implements ISkillCondition { - public OpSoulMaxSkillCondition(StatsSet params) + public OpSoulMaxSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java index 4780c13a58..0faa676bbe 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpSubjobSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpSubjobSkillCondition implements ISkillCondition { - public OpSubjobSkillCondition(StatsSet params) + public OpSubjobSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java index 17a9a1a9e3..a14192847a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpSweeperSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.concurrent.atomic.AtomicBoolean; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class OpSweeperSkillCondition implements ISkillCondition { - public OpSweeperSkillCondition(StatsSet params) + public OpSweeperSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java index b36585bf00..c4b3923e92 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetAllItemTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTargetAllItemTypeSkillCondition implements ISkillCondition { - public OpTargetAllItemTypeSkillCondition(StatsSet params) + public OpTargetAllItemTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 6b85389d62..5492e96e1a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTargetArmorTypeSkillCondition implements ISkillCondition { - public OpTargetArmorTypeSkillCondition(StatsSet params) + public OpTargetArmorTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java index 0c0090fbc4..97e07a1822 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetDoorSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpTargetDoorSkillCondition implements ISkillCondition { private final List _doorIds; - public OpTargetDoorSkillCondition(StatsSet params) + public OpTargetDoorSkillCondition(StatSet params) { _doorIds = params.getList("doorIds", Integer.class); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java index 6fbc3cda10..eaabf4a73d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetMyPledgeAcademySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpTargetMyPledgeAcademySkillCondition implements ISkillCondition { - public OpTargetMyPledgeAcademySkillCondition(StatsSet params) + public OpTargetMyPledgeAcademySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java index d5820600dd..14a744613d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetNpcSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class OpTargetNpcSkillCondition implements ISkillCondition { private final List _npcId; - public OpTargetNpcSkillCondition(StatsSet params) + public OpTargetNpcSkillCondition(StatSet params) { _npcId = params.getList("npcIds", Integer.class); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java index 854225a75a..b0c5e50ae3 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetPcSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpTargetPcSkillCondition implements ISkillCondition { - public OpTargetPcSkillCondition(StatsSet params) + public OpTargetPcSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index 7faecb2ffd..62fd4b365f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.items.Weapon; @@ -34,7 +34,7 @@ public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition { private final List _weaponTypes = new ArrayList<>(); - public OpTargetWeaponAttackTypeSkillCondition(StatsSet params) + public OpTargetWeaponAttackTypeSkillCondition(StatSet params) { final List weaponTypes = params.getList("weaponType", String.class); if (weaponTypes != null) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java index 8451365885..e114c03412 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTerritorySkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpTerritorySkillCondition implements ISkillCondition { - public OpTerritorySkillCondition(StatsSet params) + public OpTerritorySkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java index 13f287687e..fde1293086 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpUnlockSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpUnlockSkillCondition implements ISkillCondition { - public OpUnlockSkillCondition(StatsSet params) + public OpUnlockSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java index 8cc76a34bb..46dea5bbcb 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpUseFirecrackerSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpUseFirecrackerSkillCondition implements ISkillCondition { - public OpUseFirecrackerSkillCondition(StatsSet params) + public OpUseFirecrackerSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java index f3b54bbad7..651dade274 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpUsePraseedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpUsePraseedSkillCondition implements ISkillCondition { - public OpUsePraseedSkillCondition(StatsSet params) + public OpUsePraseedSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java index 890b0fcd5f..dd57df0e13 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpWyvernSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.MountType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class OpWyvernSkillCondition implements ISkillCondition { - public OpWyvernSkillCondition(StatsSet params) + public OpWyvernSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java index 49085b6674..8590262afc 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class PossessHolythingSkillCondition implements ISkillCondition { - public PossessHolythingSkillCondition(StatsSet params) + public PossessHolythingSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java index 8b0fb55554..38b5644fb1 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/RemainCpPerSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class RemainCpPerSkillCondition implements ISkillCondition private final int _amount; private final SkillConditionPercentType _percentType; - public RemainCpPerSkillCondition(StatsSet params) + public RemainCpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java index 612367a233..1ad96100ad 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/RemainHpPerSkillCondition.java @@ -18,7 +18,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -33,7 +33,7 @@ public class RemainHpPerSkillCondition implements ISkillCondition private final SkillConditionPercentType _percentType; private final SkillConditionAffectType _affectType; - public RemainHpPerSkillCondition(StatsSet params) + public RemainHpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java index 5455c1587a..39085349d9 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/RemainMpPerSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.SkillConditionPercentType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -31,7 +31,7 @@ public class RemainMpPerSkillCondition implements ISkillCondition private final int _amount; private final SkillConditionPercentType _percentType; - public RemainMpPerSkillCondition(StatsSet params) + public RemainMpPerSkillCondition(StatSet params) { _amount = params.getInt("amount"); _percentType = params.getEnum("percentType", SkillConditionPercentType.class); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java index 7de47f103f..6e9e5ad821 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/SoulSavedSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -29,7 +29,7 @@ public class SoulSavedSkillCondition implements ISkillCondition { private final int _amount; - public SoulSavedSkillCondition(StatsSet params) + public SoulSavedSkillCondition(StatSet params) { _amount = params.getInt("amount"); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java index 0b75a5a623..f4bdbaaecb 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/TargetItemCrystalTypeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class TargetItemCrystalTypeSkillCondition implements ISkillCondition { - public TargetItemCrystalTypeSkillCondition(StatsSet params) + public TargetItemCrystalTypeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java index 51502ff209..604a41f904 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyMenteeSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.instancemanager.MentorManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMyMenteeSkillCondition implements ISkillCondition { - public TargetMyMenteeSkillCondition(StatsSet params) + public TargetMyMenteeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java index fc621365a9..4bfb496634 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.Party; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class TargetMyPartySkillCondition implements ISkillCondition { private final boolean _includeMe; - public TargetMyPartySkillCondition(StatsSet params) + public TargetMyPartySkillCondition(StatSet params) { _includeMe = params.getBoolean("includeMe"); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java index 9ebec0e691..d44a1bc8a9 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPledgeSkillCondition.java @@ -16,7 +16,7 @@ */ package handlers.skillconditionhandlers; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class TargetMyPledgeSkillCondition implements ISkillCondition { - public TargetMyPledgeSkillCondition(StatsSet params) + public TargetMyPledgeSkillCondition(StatSet params) { } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java index f4da8d6079..5045aa3848 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java @@ -17,7 +17,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skills.ISkillCondition; @@ -30,7 +30,7 @@ public class TargetRaceSkillCondition implements ISkillCondition { private final Race _race; - public TargetRaceSkillCondition(StatsSet params) + public TargetRaceSkillCondition(StatSet params) { _race = params.getEnum("race", Race.class); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java index b1d0ec8553..7e9236b634 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ActionData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.ActionDataHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -57,7 +57,7 @@ public class ActionData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "action", actionNode -> { - final ActionDataHolder holder = new ActionDataHolder(new StatsSet(parseAttributes(actionNode))); + final ActionDataHolder holder = new ActionDataHolder(new StatSet(parseAttributes(actionNode))); _actionData.put(holder.getId(), holder); })); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java index 36002572b0..f7762ab07b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/AdminData.java @@ -32,7 +32,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.AdminCommandAccessRight; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -72,7 +72,7 @@ public class AdminData implements IXmlReader { NamedNodeMap attrs; Node attr; - StatsSet set; + StatSet set; AccessLevel level; AdminCommandAccessRight command; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -83,7 +83,7 @@ public class AdminData implements IXmlReader { if ("access".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -99,7 +99,7 @@ public class AdminData implements IXmlReader } else if ("admin".equalsIgnoreCase(d.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); attrs = d.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index 6d25769eab..817f0cabde 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; @@ -83,7 +83,7 @@ public class AppearanceItemData implements IXmlReader { if ("appearance_stone".equalsIgnoreCase(d.getNodeName())) { - final AppearanceStone stone = new AppearanceStone(new StatsSet(parseAttributes(d))); + final AppearanceStone stone = new AppearanceStone(new StatSet(parseAttributes(d))); for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) { switch (c.getNodeName()) @@ -120,7 +120,7 @@ public class AppearanceItemData implements IXmlReader } case "visual": { - stone.addVisualId(new AppearanceHolder(new StatsSet(parseAttributes(c)))); + stone.addVisualId(new AppearanceHolder(new StatSet(parseAttributes(c)))); } } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java index 6c96d3874a..6eac3240e7 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -64,7 +64,7 @@ public class AttendanceRewardData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "item", rewardNode -> { - final StatsSet set = new StatsSet(parseAttributes(rewardNode)); + final StatSet set = new StatSet(parseAttributes(rewardNode)); final int itemId = set.getInt("id"); final int itemCount = set.getInt("count"); if (ItemTable.getInstance().getTemplate(itemId) == null) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java index 891d19fcf2..3054b0e7ef 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.beautyshop.BeautyData; import org.l2jmobius.gameserver.model.beautyshop.BeautyItem; @@ -56,7 +56,7 @@ public class BeautyShopData implements IXmlReader public void parseDocument(Document doc, File f) { NamedNodeMap attrs; - StatsSet set; + StatSet set; Node att; Race race = null; Sex sex = null; @@ -92,7 +92,7 @@ public class BeautyShopData implements IXmlReader if ("hair".equalsIgnoreCase(a.getNodeName())) { attrs = a.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -105,7 +105,7 @@ public class BeautyShopData implements IXmlReader if ("color".equalsIgnoreCase(g.getNodeName())) { attrs = g.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -119,7 +119,7 @@ public class BeautyShopData implements IXmlReader else if ("face".equalsIgnoreCase(a.getNodeName())) { attrs = a.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java index 37e977c51e..530a5d975a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ClanHallData.java @@ -34,7 +34,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.entity.ClanHall; @@ -66,7 +66,7 @@ public class ClanHallData implements IXmlReader final List doors = new ArrayList<>(); final List npcs = new ArrayList<>(); final List teleports = new ArrayList<>(); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); for (Node listNode = doc.getFirstChild(); listNode != null; listNode = listNode.getNextSibling()) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java index ae608cefb6..f1a23734e0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.combination.CombinationItem; import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; @@ -57,7 +57,7 @@ public class CombinationItemsData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "item", itemNode -> { - final CombinationItem item = new CombinationItem(new StatsSet(parseAttributes(itemNode))); + final CombinationItem item = new CombinationItem(new StatSet(parseAttributes(itemNode))); forEach(itemNode, "reward", rewardNode -> { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java index 038738b138..4af039b48d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/CubicData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.CubicSkill; import org.l2jmobius.gameserver.model.cubic.ICubicConditionHolder; @@ -61,7 +61,7 @@ public class CubicData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - forEach(doc, "list", listNode -> forEach(listNode, "cubic", cubicNode -> parseTemplate(cubicNode, new CubicTemplate(new StatsSet(parseAttributes(cubicNode)))))); + forEach(doc, "list", listNode -> forEach(listNode, "cubic", cubicNode -> parseTemplate(cubicNode, new CubicTemplate(new StatSet(parseAttributes(cubicNode)))))); } /** @@ -137,7 +137,7 @@ public class CubicData implements IXmlReader { forEach(cubicNode, "skill", skillNode -> { - final CubicSkill skill = new CubicSkill(new StatsSet(parseAttributes(skillNode))); + final CubicSkill skill = new CubicSkill(new StatSet(parseAttributes(skillNode))); forEach(cubicNode, "conditions", conditionNode -> parseConditions(cubicNode, template, skill)); template.getSkills().add(skill); }); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java index 3d19bee079..ede9b72202 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -62,7 +62,7 @@ public class DailyMissionData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "reward", rewardNode -> { - final StatsSet set = new StatsSet(parseAttributes(rewardNode)); + final StatSet set = new StatSet(parseAttributes(rewardNode)); final List items = new ArrayList<>(1); forEach(rewardNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> @@ -80,14 +80,14 @@ public class DailyMissionData implements IXmlReader // Initial values in case handler doesn't exists set.set("handler", ""); - set.set("params", StatsSet.EMPTY_STATSET); + set.set("params", StatSet.EMPTY_STATSET); // Parse handler and parameters forEach(rewardNode, "handler", handlerNode -> { set.set("handler", parseString(handlerNode.getAttributes(), "name")); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); set.set("params", params); forEach(handlerNode, "param", paramNode -> params.set(parseString(paramNode.getAttributes(), "name"), paramNode.getTextContent())); }); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java index 835eab4fe9..53248de524 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/DoorData.java @@ -35,7 +35,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -51,7 +51,7 @@ public class DoorData implements IXmlReader // Info holders private final Map> _groups = new HashMap<>(); private final Map _doors = new HashMap<>(); - private final Map _templates = new HashMap<>(); + private final Map _templates = new HashMap<>(); private final Map> _regions = new HashMap<>(); protected DoorData() @@ -75,9 +75,9 @@ public class DoorData implements IXmlReader LOGGER.info(getClass().getSimpleName() + ": Loaded " + _doors.size() + " Door Templates for " + _regions.size() + " regions."); } - public StatsSet parseDoor(Node doorNode) + public StatSet parseDoor(Node doorNode) { - final StatsSet params = new StatsSet(parseAttributes(doorNode)); + final StatSet params = new StatSet(parseAttributes(doorNode)); params.set("baseHpMax", 1); // Avoid doors without HP value created dead due to default value 0 in CreatureTemplate forEach(doorNode, IXmlReader::isNode, innerDoorNode -> @@ -115,7 +115,7 @@ public class DoorData implements IXmlReader /** * @param set */ - private void applyCollisions(StatsSet set) + private void applyCollisions(StatSet set) { // Insert Collision data if (set.contains("nodeX_0") && set.contains("nodeY_0") && set.contains("nodeX_1") && set.contains("nodeY_1")) @@ -142,7 +142,7 @@ public class DoorData implements IXmlReader * @param set * @return */ - public DoorInstance spawnDoor(StatsSet set) + public DoorInstance spawnDoor(StatSet set) { // Create door template + door instance final DoorTemplate template = new DoorTemplate(set); @@ -183,7 +183,7 @@ public class DoorData implements IXmlReader return door; } - public StatsSet getDoorTemplate(int doorId) + public StatSet getDoorTemplate(int doorId) { return _templates.get(doorId); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java index eca42a9a34..637ef1e953 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -64,7 +64,7 @@ public class EnchantItemData implements IXmlReader @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; Node att; NamedNodeMap attrs; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -76,7 +76,7 @@ public class EnchantItemData implements IXmlReader if ("enchant".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -107,7 +107,7 @@ public class EnchantItemData implements IXmlReader else if ("support".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java index 46701fd777..bb1e8026b7 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.SkillEnchantType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.EnchantSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -69,10 +69,10 @@ public class EnchantSkillGroupsData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "enchant", enchantNode -> { - final EnchantSkillHolder enchantSkillHolder = new EnchantSkillHolder(new StatsSet(parseAttributes(enchantNode))); + final EnchantSkillHolder enchantSkillHolder = new EnchantSkillHolder(new StatSet(parseAttributes(enchantNode))); forEach(enchantNode, "sps", spsNode -> forEach(spsNode, "sp", spNode -> enchantSkillHolder.addSp(parseEnum(spNode.getAttributes(), SkillEnchantType.class, "type"), parseInteger(spNode.getAttributes(), "amount")))); forEach(enchantNode, "chances", chancesNode -> forEach(chancesNode, "chance", chanceNode -> enchantSkillHolder.addChance(parseEnum(chanceNode.getAttributes(), SkillEnchantType.class, "type"), parseInteger(chanceNode.getAttributes(), "value")))); - forEach(enchantNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> enchantSkillHolder.addRequiredItem(parseEnum(itemNode.getAttributes(), SkillEnchantType.class, "type"), new ItemHolder(new StatsSet(parseAttributes(itemNode)))))); + forEach(enchantNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> enchantSkillHolder.addRequiredItem(parseEnum(itemNode.getAttributes(), SkillEnchantType.class, "type"), new ItemHolder(new StatSet(parseAttributes(itemNode)))))); _enchantSkillHolders.put(parseInteger(enchantNode.getAttributes(), "level"), enchantSkillHolder); })); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java index a8bb0397ac..037af7e1ae 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/EventEngineData.java @@ -34,7 +34,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.eventengine.AbstractEventManager; import org.l2jmobius.gameserver.model.eventengine.EventMethodNotification; import org.l2jmobius.gameserver.model.eventengine.EventScheduler; @@ -156,7 +156,7 @@ public class EventEngineData implements IXmlReader */ private void parseVariables(AbstractEventManager eventManager, Node innerNode) { - final StatsSet variables = new StatsSet(LinkedHashMap::new); + final StatSet variables = new StatSet(LinkedHashMap::new); for (Node variableNode = innerNode.getFirstChild(); variableNode != null; variableNode = variableNode.getNextSibling()) { if ("variable".equals(variableNode.getNodeName())) @@ -188,7 +188,7 @@ public class EventEngineData implements IXmlReader { if ("schedule".equals(scheduleNode.getNodeName())) { - final StatsSet params = new StatsSet(LinkedHashMap::new); + final StatSet params = new StatSet(LinkedHashMap::new); final NamedNodeMap attrs = scheduleNode.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -235,7 +235,7 @@ public class EventEngineData implements IXmlReader } else if ("conditionalSchedule".equals(scheduleNode.getNodeName())) { - final StatsSet params = new StatsSet(LinkedHashMap::new); + final StatSet params = new StatSet(LinkedHashMap::new); final NamedNodeMap attrs = scheduleNode.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { @@ -346,7 +346,7 @@ public class EventEngineData implements IXmlReader * @param variableNode */ @SuppressWarnings("unchecked") - private void parseListVariables(AbstractEventManager eventManager, StatsSet variables, Node variableNode) + private void parseListVariables(AbstractEventManager eventManager, StatSet variables, Node variableNode) { final String name = parseString(variableNode.getAttributes(), "name"); final String type = parseString(variableNode.getAttributes(), "type"); @@ -419,7 +419,7 @@ public class EventEngineData implements IXmlReader * @param variableNode */ @SuppressWarnings("unchecked") - private void parseMapVariables(AbstractEventManager eventManager, StatsSet variables, Node variableNode) + private void parseMapVariables(AbstractEventManager eventManager, StatSet variables, Node variableNode) { final String name = parseString(variableNode.getAttributes(), "name"); final String keyType = parseString(variableNode.getAttributes(), "keyType"); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java index db19c5fdff..0724877d9d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.ConditionHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.ICondition; import org.l2jmobius.gameserver.model.holders.ExtendDropDataHolder; import org.l2jmobius.gameserver.model.holders.ExtendDropItemHolder; @@ -62,7 +62,7 @@ public class ExtendDropData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "drop", dropNode -> { - final StatsSet set = new StatsSet(parseAttributes(dropNode)); + final StatSet set = new StatSet(parseAttributes(dropNode)); final List items = new ArrayList<>(1); forEach(dropNode, "items", itemsNode -> forEach(itemsNode, "item", itemNode -> @@ -80,8 +80,8 @@ public class ExtendDropData implements IXmlReader forEach(dropNode, "conditions", conditionsNode -> forEach(conditionsNode, "condition", conditionNode -> { final String conditionName = parseString(conditionNode.getAttributes(), "name"); - final StatsSet params = (StatsSet) parseValue(conditionNode); - final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); + final StatSet params = (StatSet) parseValue(conditionNode); + final Function conditionFunction = ConditionHandler.getInstance().getHandlerFactory(conditionName); if (conditionFunction != null) { conditions.add(conditionFunction.apply(params)); @@ -109,7 +109,7 @@ public class ExtendDropData implements IXmlReader private Object parseValue(Node node) { - StatsSet statsSet = null; + StatSet statSet = null; List list = null; Object text = null; for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) @@ -145,12 +145,12 @@ public class ExtendDropData implements IXmlReader final Object value = parseValue(node); if (value != null) { - if (statsSet == null) + if (statSet == null) { - statsSet = new StatsSet(); + statSet = new StatSet(); } - statsSet.set(nodeName, value); + statSet.set(nodeName, value); } } } @@ -161,9 +161,9 @@ public class ExtendDropData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", list); + statSet.set(".", list); } else { @@ -176,16 +176,16 @@ public class ExtendDropData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", text); + statSet.set(".", text); } else { return text; } } - return statsSet; + return statSet; } public ExtendDropDataHolder getExtendDropById(int id) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java index 57a16d6390..608f4702b8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.FakePlayerHolder; @@ -72,7 +72,7 @@ public class FakePlayerData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayer", fakePlayerNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerNode)); final int npcId = set.getInt("npcId"); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); final String name = template.getName(); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java index 18cc499b71..a5ade27c03 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/FenceData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.FenceState; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldRegion; import org.l2jmobius.gameserver.model.actor.instance.FenceInstance; @@ -79,7 +79,7 @@ public class FenceData implements IXmlReader private void spawnFence(Node fenceNode) { - final StatsSet set = new StatsSet(parseAttributes(fenceNode)); + final StatSet set = new StatSet(parseAttributes(fenceNode)); spawnFence(set.getInt("x"), set.getInt("y"), set.getInt("z"), set.getString("name"), set.getInt("width"), set.getInt("length"), set.getInt("height"), 0, set.getEnum("state", FenceState.class, FenceState.CLOSED)); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java index 67dd4e396b..02efb756f2 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/HennaData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.Henna; import org.l2jmobius.gameserver.model.skills.Skill; @@ -86,7 +86,7 @@ public class HennaData implements IXmlReader */ private void parseHenna(Node d) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final List wearClassIds = new ArrayList<>(); final List skills = new ArrayList<>(); NamedNodeMap attrs = d.getAttributes(); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java index 03ad8ab79e..d81e85948d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; @@ -93,7 +93,7 @@ public class InitialEquipmentData implements IXmlReader { if ("item".equalsIgnoreCase(c.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java index 72080aa4ac..54b1909d60 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemPointHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; @@ -55,17 +55,17 @@ public class LuckyGameData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "luckygame", rewardNode -> { - final LuckyGameDataHolder holder = new LuckyGameDataHolder(new StatsSet(parseAttributes(rewardNode))); + final LuckyGameDataHolder holder = new LuckyGameDataHolder(new StatSet(parseAttributes(rewardNode))); forEach(rewardNode, "common_reward", commonRewardNode -> forEach(commonRewardNode, "item", itemNode -> { - final StatsSet stats = new StatsSet(parseAttributes(itemNode)); + final StatSet stats = new StatSet(parseAttributes(itemNode)); holder.addCommonReward(new ItemChanceHolder(stats.getInt("id"), stats.getDouble("chance"), stats.getLong("count"))); })); forEach(rewardNode, "unique_reward", uniqueRewardNode -> forEach(uniqueRewardNode, "item", itemNode -> { - holder.addUniqueReward(new ItemPointHolder(new StatsSet(parseAttributes(itemNode)))); + holder.addUniqueReward(new ItemPointHolder(new StatSet(parseAttributes(itemNode)))); })); forEach(rewardNode, "modify_reward", uniqueRewardNode -> @@ -74,7 +74,7 @@ public class LuckyGameData implements IXmlReader holder.setMaxModifyRewardGame(parseInteger(uniqueRewardNode.getAttributes(), "max_game")); forEach(uniqueRewardNode, "item", itemNode -> { - final StatsSet stats = new StatsSet(parseAttributes(itemNode)); + final StatSet stats = new StatSet(parseAttributes(itemNode)); holder.addModifyReward(new ItemChanceHolder(stats.getInt("id"), stats.getDouble("chance"), stats.getLong("count"))); }); }); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java index 3873a8dd28..6e3fc343a5 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java @@ -35,7 +35,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.SpecialItemType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; @@ -91,7 +91,7 @@ public class MultisellData implements IXmlReader { forEach(doc, "list", listNode -> { - final StatsSet set = new StatsSet(parseAttributes(listNode)); + final StatSet set = new StatSet(parseAttributes(listNode)); final int listId = Integer.parseInt(f.getName().substring(0, f.getName().length() - 4)); final List entries = new ArrayList<>(listNode.getChildNodes().getLength()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java index 6052edac58..12f4c1a648 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/NpcData.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.enums.AISkillScope; import org.l2jmobius.gameserver.enums.DropType; import org.l2jmobius.gameserver.enums.MpRewardAffectType; import org.l2jmobius.gameserver.enums.MpRewardType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.DropHolder; @@ -97,7 +97,7 @@ public class NpcData implements IXmlReader if ("npc".equalsIgnoreCase(listNode.getNodeName())) { NamedNodeMap attrs = listNode.getAttributes(); - final StatsSet set = new StatsSet(new HashMap<>()); + final StatSet set = new StatSet(new HashMap<>()); final int npcId = parseInteger(attrs, "id"); Map parameters = null; Map skills = null; @@ -524,11 +524,11 @@ public class NpcData implements IXmlReader if (parameters != null) { // Using unmodifiable map parameters of template are not meant to be changed at runtime. - template.setParameters(new StatsSet(Collections.unmodifiableMap(parameters))); + template.setParameters(new StatSet(Collections.unmodifiableMap(parameters))); } else { - template.setParameters(StatsSet.EMPTY_STATSET); + template.setParameters(StatSet.EMPTY_STATSET); } if (skills != null) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java index 3712cca6af..373f87ecfc 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -79,7 +79,7 @@ public class NpcNameLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); NPC_NAME_LOCALISATIONS.get(_lang).put(set.getInt("id"), new String[] { set.getString("name"), diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 55dcd539aa..36c5897ecd 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -26,7 +26,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.EffectHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; @@ -71,7 +71,7 @@ public class OptionData implements IXmlReader forEach(innerNode, "effect", effectNode -> { final String name = parseString(effectNode.getAttributes(), "name"); - final StatsSet params = new StatsSet(); + final StatSet params = new StatSet(); forEach(effectNode, IXmlReader::isNode, paramNode -> params.set(paramNode.getNodeName(), SkillData.getInstance().parseValue(paramNode, true, false, Collections.emptyMap()))); option.addEffect(EffectHandler.getInstance().getHandlerFactory(name).apply(params)); }); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java index b1bb74baf6..c893725bc3 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/PetDataTable.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.PetLevelData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * This class parse and hold all pet parameters.
    @@ -116,7 +116,7 @@ public class PetDataTable implements IXmlReader if (s.getNodeName().equals("stat")) { final int level = Integer.parseInt(s.getAttributes().getNamedItem("level").getNodeValue()); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (Node bean = s.getFirstChild(); bean != null; bean = bean.getNextSibling()) { if (bean.getNodeName().equals("set")) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java index ab1cb3b257..b646782547 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.base.ClassId; @@ -83,7 +83,7 @@ public class PlayerTemplateData implements IXmlReader } else if ("staticData".equalsIgnoreCase(d.getNodeName())) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.set("classId", classId); final List creationPoints = new ArrayList<>(); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java index 34a04edd9b..35b879e73f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; @@ -83,7 +83,7 @@ public class PrimeShopData implements IXmlReader { NamedNodeMap attrs = d.getAttributes(); Node att; - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java index 1f1a420fd8..d03c177a07 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/RecipeData.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.model.RecipeInstance; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.RecipeStatInstance; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.items.type.CrystalType; @@ -86,7 +86,7 @@ public class RecipeData implements IXmlReader Node att; int id = -1; boolean haveRare = false; - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); att = attrs.getNamedItem("id"); if (att == null) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java index 796f5ae085..9a8397e085 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java @@ -29,7 +29,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate; /** @@ -60,7 +60,7 @@ public class ResidenceFunctionsData implements IXmlReader forEach(doc, "list", list -> forEach(list, "function", func -> { final NamedNodeMap attrs = func.getAttributes(); - final StatsSet set = new StatsSet(HashMap::new); + final StatSet set = new StatSet(HashMap::new); for (int i = 0; i < attrs.getLength(); i++) { final Node node = attrs.item(i); @@ -69,7 +69,7 @@ public class ResidenceFunctionsData implements IXmlReader forEach(func, "function", levelNode -> { final NamedNodeMap levelAttrs = levelNode.getAttributes(); - final StatsSet levelSet = new StatsSet(HashMap::new); + final StatSet levelSet = new StatSet(HashMap::new); levelSet.merge(set); for (int i = 0; i < levelAttrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java index 053d9089ce..d6b28a5962 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; /** @@ -82,7 +82,7 @@ public class SendMessageLocalisationData implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "localisation", localisationNode -> { - final StatsSet set = new StatsSet(parseAttributes(localisationNode)); + final StatSet set = new StatSet(parseAttributes(localisationNode)); SEND_MESSAGE_LOCALISATIONS.get(_lang).put(set.getString("message").split(SPLIT_STRING), set.getString("translation").split(SPLIT_STRING)); })); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java index e473030c56..c3eda1f3b8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ShuttleData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.actor.instance.ShuttleInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; @@ -72,7 +72,7 @@ public class ShuttleData implements IXmlReader public void parseDocument(Document doc, File f) { NamedNodeMap attrs; - StatsSet set; + StatSet set; Node att; ShuttleDataHolder data; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -84,7 +84,7 @@ public class ShuttleData implements IXmlReader if ("shuttle".equalsIgnoreCase(d.getNodeName())) { attrs = d.getAttributes(); - set = new StatsSet(); + set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { att = attrs.item(i); @@ -164,7 +164,7 @@ public class ShuttleData implements IXmlReader { for (ShuttleDataHolder data : _shuttles.values()) { - final ShuttleInstance shuttle = new ShuttleInstance(new CreatureTemplate(new StatsSet())); + final ShuttleInstance shuttle = new ShuttleInstance(new CreatureTemplate(new StatSet())); shuttle.setData(data); shuttle.setHeading(data.getLocation().getHeading()); shuttle.setLocationInvisible(data.getLocation()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java index 9db0b5f64b..ba000649f2 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.SiegeScheduleDate; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.util.Util; /** @@ -54,7 +54,7 @@ public class SiegeScheduleData implements IXmlReader LOGGER.info(getClass().getSimpleName() + ": Loaded " + _scheduleData.size() + " siege schedulers."); if (_scheduleData.isEmpty()) { - _scheduleData.add(new SiegeScheduleDate(new StatsSet())); + _scheduleData.add(new SiegeScheduleDate(new StatSet())); LOGGER.info(getClass().getSimpleName() + ": Emergency loaded " + _scheduleData.size() + " default siege schedulers."); } } @@ -72,7 +72,7 @@ public class SiegeScheduleData implements IXmlReader { case "schedule": { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); final NamedNodeMap attrs = cd.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java index cc019c4dbb..2592b3ed97 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java @@ -40,7 +40,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.handler.EffectHandler; import org.l2jmobius.gameserver.handler.SkillConditionHandler; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.EffectScope; @@ -67,9 +67,9 @@ public class SkillData implements IXmlReader private final Integer _toLevel; private final Integer _fromSubLevel; private final Integer _toSubLevel; - private final Map> _info; + private final Map> _info; - public NamedParamInfo(String name, Integer fromLevel, Integer toLevel, Integer fromSubLevel, Integer toSubLevel, Map> info) + public NamedParamInfo(String name, Integer fromLevel, Integer toLevel, Integer fromSubLevel, Integer toSubLevel, Map> info) { _name = name; _fromLevel = fromLevel; @@ -104,7 +104,7 @@ public class SkillData implements IXmlReader return _toSubLevel; } - public Map> getInfo() + public Map> getInfo() { return _info; } @@ -241,8 +241,8 @@ public class SkillData implements IXmlReader { NamedNodeMap attributes = listNode.getAttributes(); final Map> levels = new HashMap<>(); - final Map> skillInfo = new HashMap<>(); - final StatsSet generalSkillInfo = skillInfo.computeIfAbsent(-1, k -> new HashMap<>()).computeIfAbsent(-1, k -> new StatsSet()); + final Map> skillInfo = new HashMap<>(); + final StatSet generalSkillInfo = skillInfo.computeIfAbsent(-1, k -> new HashMap<>()).computeIfAbsent(-1, k -> new StatSet()); parseAttributes(attributes, "", generalSkillInfo); @@ -321,7 +321,7 @@ public class SkillData implements IXmlReader { return; } - subLevelMap.forEach((subLevel, statsSet) -> + subLevelMap.forEach((subLevel, statSet) -> { if (subLevel == -1) { @@ -339,7 +339,7 @@ public class SkillData implements IXmlReader { return; } - subLevelMap.forEach((subLevel, statsSet) -> + subLevelMap.forEach((subLevel, statSet) -> { if (subLevel == -1) { @@ -371,31 +371,31 @@ public class SkillData implements IXmlReader levels.forEach((level, subLevels) -> subLevels.forEach(subLevel -> { - final StatsSet statsSet = Optional.ofNullable(skillInfo.getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatsSet::new); - skillInfo.getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(statsSet.getSet()::putIfAbsent); - skillInfo.getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(statsSet.getSet()::putIfAbsent); - statsSet.set(".level", level); - statsSet.set(".subLevel", subLevel); - final Skill skill = new Skill(statsSet); + final StatSet statSet = Optional.ofNullable(skillInfo.getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatSet::new); + skillInfo.getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(statSet.getSet()::putIfAbsent); + skillInfo.getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(statSet.getSet()::putIfAbsent); + statSet.set(".level", level); + statSet.set(".subLevel", subLevel); + final Skill skill = new Skill(statSet); forEachNamedParamInfoParam(effectParamInfo, level, subLevel, ((effectScope, params) -> { final String effectName = params.getString(".name"); params.remove(".name"); try { - final Function effectFunction = EffectHandler.getInstance().getHandlerFactory(effectName); + final Function effectFunction = EffectHandler.getInstance().getHandlerFactory(effectName); if (effectFunction != null) { skill.addEffect(effectScope, effectFunction.apply(params)); } else { - LOGGER.warning(getClass().getSimpleName() + ": Missing effect for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]"); + LOGGER.warning(getClass().getSimpleName() + ": Missing effect for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]"); } } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading effect for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading effect for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + effectScope + "] Effect Name[" + effectName + "]", e); } })); @@ -405,19 +405,19 @@ public class SkillData implements IXmlReader params.remove(".name"); try { - final Function conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName); + final Function conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName); if (conditionFunction != null) { skill.addCondition(skillConditionScope, conditionFunction.apply(params)); } else { - LOGGER.warning(getClass().getSimpleName() + ": Missing condition for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + skillConditionScope + "] Effect Name[" + conditionName + "]"); + LOGGER.warning(getClass().getSimpleName() + ": Missing condition for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Effect Scope[" + skillConditionScope + "] Effect Name[" + conditionName + "]"); } } catch (Exception e) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading condition for Skill Id[" + statsSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Condition Scope[" + skillConditionScope + "] Condition Name[" + conditionName + "]", e); + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Failed loading condition for Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "] Condition Scope[" + skillConditionScope + "] Condition Name[" + conditionName + "]", e); } })); @@ -434,16 +434,16 @@ public class SkillData implements IXmlReader } } - private void forEachNamedParamInfoParam(Map> paramInfo, int level, int subLevel, BiConsumer consumer) + private void forEachNamedParamInfoParam(Map> paramInfo, int level, int subLevel, BiConsumer consumer) { paramInfo.forEach((scope, namedParamInfos) -> namedParamInfos.forEach(namedParamInfo -> { if ((((namedParamInfo.getFromLevel() == null) && (namedParamInfo.getToLevel() == null)) || ((namedParamInfo.getFromLevel() <= level) && (namedParamInfo.getToLevel() >= level))) // && (((namedParamInfo.getFromSubLevel() == null) && (namedParamInfo.getToSubLevel() == null)) || ((namedParamInfo.getFromSubLevel() <= subLevel) && (namedParamInfo.getToSubLevel() >= subLevel)))) { - final StatsSet params = Optional.ofNullable(namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatsSet::new); - namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); - namedParamInfo.getInfo().getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatsSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); + final StatSet params = Optional.ofNullable(namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).get(subLevel)).orElseGet(StatSet::new); + namedParamInfo.getInfo().getOrDefault(level, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); + namedParamInfo.getInfo().getOrDefault(-1, Collections.emptyMap()).getOrDefault(-1, StatSet.EMPTY_STATSET).getSet().forEach(params.getSet()::putIfAbsent); params.set(".name", namedParamInfo.getName()); consumer.accept(scope, params); } @@ -460,7 +460,7 @@ public class SkillData implements IXmlReader final Integer subLevel = parseInteger(attributes, "subLevel"); final Integer fromSubLevel = parseInteger(attributes, "fromSubLevel", subLevel); final Integer toSubLevel = parseInteger(attributes, "toSubLevel", subLevel); - final Map> info = new HashMap<>(); + final Map> info = new HashMap<>(); for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) { if (!node.getNodeName().equals("#text")) @@ -471,7 +471,7 @@ public class SkillData implements IXmlReader return new NamedParamInfo(name, fromLevel, toLevel, fromSubLevel, toSubLevel, info); } - private void parseInfo(Node node, Map>> variableValues, Map> info) + private void parseInfo(Node node, Map>> variableValues, Map> info) { Map> values = parseValues(node); final Object generalValue = values.getOrDefault(-1, Collections.emptyMap()).get(-1); @@ -492,7 +492,7 @@ public class SkillData implements IXmlReader } } - values.forEach((level, subLevelMap) -> subLevelMap.forEach((subLevel, value) -> info.computeIfAbsent(level, k -> new HashMap<>()).computeIfAbsent(subLevel, k -> new StatsSet()).set(node.getNodeName(), value))); + values.forEach((level, subLevelMap) -> subLevelMap.forEach((subLevel, value) -> info.computeIfAbsent(level, k -> new HashMap<>()).computeIfAbsent(subLevel, k -> new StatSet()).set(node.getNodeName(), value))); } private Map> parseValues(Node node) @@ -535,7 +535,7 @@ public class SkillData implements IXmlReader variables.put("index", (i - fromLevel) + 1d); variables.put("subIndex", (j - fromSubLevel) + 1d); final Object base = values.getOrDefault(i, Collections.emptyMap()).get(-1); - if ((base != null) && !(base instanceof StatsSet)) + if ((base != null) && !(base instanceof StatSet)) { variables.put("base", Double.parseDouble(String.valueOf(base))); } @@ -555,13 +555,13 @@ public class SkillData implements IXmlReader Object parseValue(Node node, boolean blockValue, boolean parseAttributes, Map variables) { - StatsSet statsSet = null; + StatSet statSet = null; List list = null; Object text = null; if (parseAttributes && (!node.getNodeName().equals("value") || !blockValue) && (node.getAttributes().getLength() > 0)) { - statsSet = new StatsSet(); - parseAttributes(node.getAttributes(), "", statsSet, variables); + statSet = new StatSet(); + parseAttributes(node.getAttributes(), "", statSet, variables); } for (node = node.getFirstChild(); node != null; node = node.getNextSibling()) { @@ -604,12 +604,12 @@ public class SkillData implements IXmlReader final Object value = parseValue(node, false, true, variables); if (value != null) { - if (statsSet == null) + if (statSet == null) { - statsSet = new StatsSet(); + statSet = new StatSet(); } - statsSet.set(nodeName, value); + statSet.set(nodeName, value); } } } @@ -620,9 +620,9 @@ public class SkillData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", list); + statSet.set(".", list); } else { @@ -635,30 +635,30 @@ public class SkillData implements IXmlReader { throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]"); } - if (statsSet != null) + if (statSet != null) { - statsSet.set(".", text); + statSet.set(".", text); } else { return text; } } - return statsSet; + return statSet; } - private void parseAttributes(NamedNodeMap attributes, String prefix, StatsSet statsSet, Map variables) + private void parseAttributes(NamedNodeMap attributes, String prefix, StatSet statSet, Map variables) { for (int i = 0; i < attributes.getLength(); i++) { final Node attributeNode = attributes.item(i); - statsSet.set(prefix + "." + attributeNode.getNodeName(), parseNodeValue(attributeNode.getNodeValue(), variables)); + statSet.set(prefix + "." + attributeNode.getNodeName(), parseNodeValue(attributeNode.getNodeValue(), variables)); } } - private void parseAttributes(NamedNodeMap attributes, String prefix, StatsSet statsSet) + private void parseAttributes(NamedNodeMap attributes, String prefix, StatSet statSet) { - parseAttributes(attributes, prefix, statsSet, Collections.emptyMap()); + parseAttributes(attributes, prefix, statSet, Collections.emptyMap()); } private Object parseNodeValue(String value, Map variables) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java index fdd0012ffe..d23d1ebee3 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.SubclassType; import org.l2jmobius.gameserver.model.SkillLearn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.base.ClassId; @@ -229,7 +229,7 @@ public class SkillTreesData implements IXmlReader { if ("skill".equalsIgnoreCase(c.getNodeName())) { - final StatsSet learnSkillSet = new StatsSet(); + final StatSet learnSkillSet = new StatSet(); attrs = c.getAttributes(); for (int i = 0; i < attrs.getLength(); i++) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java index 87915d89eb..78c22d1e7d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SpawnsData.java @@ -36,7 +36,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.ChanceLocation; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.MinionHolder; import org.l2jmobius.gameserver.model.interfaces.IParameterized; @@ -169,7 +169,7 @@ public class SpawnsData implements IXmlReader public void parseSpawn(Node spawnsNode, File file, Collection spawns) { - final SpawnTemplate spawnTemplate = new SpawnTemplate(new StatsSet(parseAttributes(spawnsNode)), file); + final SpawnTemplate spawnTemplate = new SpawnTemplate(new StatSet(parseAttributes(spawnsNode)), file); SpawnGroup defaultGroup = null; for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling()) { @@ -185,7 +185,7 @@ public class SpawnsData implements IXmlReader { if (defaultGroup == null) { - defaultGroup = new SpawnGroup(StatsSet.EMPTY_STATSET); + defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET); } parseNpc(innerNode, spawnTemplate, defaultGroup); } @@ -244,7 +244,7 @@ public class SpawnsData implements IXmlReader private void parseGroup(Node n, SpawnTemplate spawnTemplate) { - final SpawnGroup group = new SpawnGroup(new StatsSet(parseAttributes(n))); + final SpawnGroup group = new SpawnGroup(new StatSet(parseAttributes(n))); forEach(n, IXmlReader::isNode, npcNode -> { switch (npcNode.getNodeName()) @@ -271,7 +271,7 @@ public class SpawnsData implements IXmlReader */ private void parseNpc(Node n, SpawnTemplate spawnTemplate, SpawnGroup group) { - final NpcSpawnTemplate npcTemplate = new NpcSpawnTemplate(spawnTemplate, group, new StatsSet(parseAttributes(n))); + final NpcSpawnTemplate npcTemplate = new NpcSpawnTemplate(spawnTemplate, group, new StatSet(parseAttributes(n))); final NpcTemplate template = NpcData.getInstance().getTemplate(npcTemplate.getId()); if (template == null) { @@ -332,10 +332,10 @@ public class SpawnsData implements IXmlReader * @param n * @param npcTemplate */ - private void parseParameters(Node n, IParameterized npcTemplate) + private void parseParameters(Node n, IParameterized npcTemplate) { final Map params = parseParameters(n); - npcTemplate.setParameters(!params.isEmpty() ? new StatsSet(Collections.unmodifiableMap(params)) : StatsSet.EMPTY_STATSET); + npcTemplate.setParameters(!params.isEmpty() ? new StatSet(Collections.unmodifiableMap(params)) : StatSet.EMPTY_STATSET); } /** @@ -344,7 +344,7 @@ public class SpawnsData implements IXmlReader */ private void parseMinions(Node n, NpcSpawnTemplate npcTemplate) { - forEach(n, "minion", minionNode -> npcTemplate.addMinion(new MinionHolder(new StatsSet(parseAttributes(minionNode))))); + forEach(n, "minion", minionNode -> npcTemplate.addMinion(new MinionHolder(new StatSet(parseAttributes(minionNode))))); } /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java index 98d333446c..ef93935404 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java @@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; @@ -69,7 +69,7 @@ public class StaticObjectData implements IXmlReader if ("object".equalsIgnoreCase(d.getNodeName())) { final NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -86,9 +86,9 @@ public class StaticObjectData implements IXmlReader * Initialize an static object based on the stats set and add it to the map. * @param set the stats set to add. */ - private void addObject(StatsSet set) + private void addObject(StatSet set) { - final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatsSet()), set.getInt("id")); + final StaticObjectInstance obj = new StaticObjectInstance(new CreatureTemplate(new StatSet()), set.getInt("id")); obj.setType(set.getInt("type", 0)); obj.setName(set.getString("name")); obj.setMap(set.getString("texture", "none"), set.getInt("map_x", 0), set.getInt("map_y", 0)); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java index 7c8c9a538d..487bae9dea 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/TeleportersData.java @@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.TeleportType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.teleporter.TeleportHolder; /** @@ -74,7 +74,7 @@ public class TeleportersData implements IXmlReader final String name = parseString(nodeAttrs, "name", type.name()); // Parse locations final TeleportHolder holder = new TeleportHolder(name, type); - forEach(node, "location", location -> holder.registerLocation(new StatsSet(parseAttributes(location)))); + forEach(node, "location", location -> holder.registerLocation(new StatSet(parseAttributes(location)))); // Register holder if (teleList.putIfAbsent(name, holder) != null) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java index b6b3bf2e90..c2f5f94adb 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/TransformData.java @@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.transform.Transform; import org.l2jmobius.gameserver.model.actor.transform.TransformLevelData; import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate; @@ -70,7 +70,7 @@ public class TransformData implements IXmlReader if ("transform".equalsIgnoreCase(d.getNodeName())) { NamedNodeMap attrs = d.getAttributes(); - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); for (int i = 0; i < attrs.getLength(); i++) { final Node att = attrs.item(i); @@ -192,7 +192,7 @@ public class TransformData implements IXmlReader transform.setTemplate(isMale, templateData); } - final StatsSet levelsSet = new StatsSet(); + final StatSet levelsSet = new StatSet(); for (Node s = z.getFirstChild(); s != null; s = s.getNextSibling()) { if ("level".equals(s.getNodeName())) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java index ba3fc7f6b4..d178b10006 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.PlayerState; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionCategoryType; @@ -178,7 +178,7 @@ public abstract class DocumentBase protected abstract void parseDocument(Document doc); - protected abstract StatsSet getStatsSet(); + protected abstract StatSet getStatSet(); protected abstract String getTableValue(String name); @@ -1245,7 +1245,7 @@ public abstract class DocumentBase setTable(name, array.toArray(new String[array.size()])); } - protected void parseBeanSet(Node n, StatsSet set, Integer level) + protected void parseBeanSet(Node n, StatSet set, Integer level) { final String name = n.getAttributes().getNamedItem("name").getNodeValue().trim(); final String value = n.getAttributes().getNamedItem("val").getNodeValue().trim(); @@ -1260,7 +1260,7 @@ public abstract class DocumentBase } } - protected void setExtractableSkillData(StatsSet set, String value) + protected void setExtractableSkillData(StatSet set, String value) { set.set("capsuled_items_skill", value); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java index e8c77b206e..46f8f9be1f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBaseGeneral.java @@ -21,7 +21,7 @@ import java.io.File; import org.w3c.dom.Document; import org.w3c.dom.Node; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; /** @@ -41,7 +41,7 @@ public class DocumentBaseGeneral extends DocumentBase } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return null; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java index 3ea7f41bb6..419552cf68 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.engines.DocumentBase; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -57,7 +57,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader } @Override - protected StatsSet getStatsSet() + protected StatSet getStatSet() { return _currentItem.set; } @@ -111,7 +111,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader _currentItem.id = itemId; _currentItem.name = itemName; _currentItem.type = className; - _currentItem.set = new StatsSet(); + _currentItem.set = new StatSet(); _currentItem.set.set("item_id", itemId); _currentItem.set.set("name", itemName); _currentItem.set.set("additionalName", additionalName); @@ -218,7 +218,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatsSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (Item) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java index 56e5b21a9f..967c1fc34d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/engines/items/ItemDataHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.engines.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; public class ItemDataHolder @@ -24,7 +24,7 @@ public class ItemDataHolder int id; String type; String name; - StatsSet set; + StatSet set; int currentLevel; Item item; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/ConditionHandler.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/ConditionHandler.java index 47f24d690d..b53f170fb3 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/ConditionHandler.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/ConditionHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.ICondition; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class ConditionHandler { - private final Map> _conditionHandlerFactories = new HashMap<>(); + private final Map> _conditionHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _conditionHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _conditionHandlerFactories.get(name); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/EffectHandler.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/EffectHandler.java index a58de8efb4..328265d9db 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/EffectHandler.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/EffectHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class EffectHandler { - private final Map> _effectHandlerFactories = new HashMap<>(); + private final Map> _effectHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _effectHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _effectHandlerFactories.get(name); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java index a6e2275d04..32438040e0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/SkillConditionHandler.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -29,14 +29,14 @@ import org.l2jmobius.gameserver.scripting.ScriptEngineManager; */ public class SkillConditionHandler { - private final Map> _skillConditionHandlerFactories = new HashMap<>(); + private final Map> _skillConditionHandlerFactories = new HashMap<>(); - public void registerHandler(String name, Function handlerFactory) + public void registerHandler(String name, Function handlerFactory) { _skillConditionHandlerFactories.put(name, handlerFactory); } - public Function getHandlerFactory(String name) + public Function getHandlerFactory(String name) { return _skillConditionHandlerFactories.get(name); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java index 6992dd5366..65a8c52d7e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/AirShipManager.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.model.AirShipTeleportList; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.actor.instance.AirShipInstance; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShipInstance; @@ -45,13 +45,13 @@ public class AirShipManager private static final String UPDATE_DB = "UPDATE airships SET fuel=? WHERE owner_id=?"; private CreatureTemplate _airShipTemplate = null; - private final Map _airShipsInfo = new HashMap<>(); + private final Map _airShipsInfo = new HashMap<>(); private final Map _airShips = new HashMap<>(); private final Map _teleports = new HashMap<>(); protected AirShipManager() { - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", 9); npcDat.set("level", 0); npcDat.set("jClass", "boat"); @@ -113,7 +113,7 @@ public class AirShipManager public AirShipInstance getNewAirShip(int x, int y, int z, int heading, int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return null; @@ -147,7 +147,7 @@ public class AirShipManager if (ship.getOwnerId() != 0) { storeInDb(ship.getOwnerId()); - final StatsSet info = _airShipsInfo.get(ship.getOwnerId()); + final StatSet info = _airShipsInfo.get(ship.getOwnerId()); if (info != null) { info.set("fuel", ship.getFuel()); @@ -164,7 +164,7 @@ public class AirShipManager { if (!_airShipsInfo.containsKey(ownerId)) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("fuel", 600); _airShipsInfo.put(ownerId, info); @@ -264,10 +264,10 @@ public class AirShipManager Statement s = con.createStatement(); ResultSet rs = s.executeQuery(LOAD_DB)) { - StatsSet info; + StatSet info; while (rs.next()) { - info = new StatsSet(); + info = new StatSet(); info.set("fuel", rs.getInt("fuel")); _airShipsInfo.put(rs.getInt("owner_id"), info); } @@ -285,7 +285,7 @@ public class AirShipManager private void storeInDb(int ownerId) { - final StatsSet info = _airShipsInfo.get(ownerId); + final StatSet info = _airShipsInfo.get(ownerId); if (info == null) { return; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java index 2db10dd045..e5c610b3f2 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/BoatManager.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.BoatInstance; @@ -57,7 +57,7 @@ public class BoatManager return null; } - final StatsSet npcDat = new StatsSet(); + final StatSet npcDat = new StatSet(); npcDat.set("npcId", boatId); npcDat.set("level", 0); npcDat.set("jClass", "boat"); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 99a9678ece..56f08422cd 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.enums.ManorMode; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; import org.l2jmobius.gameserver.model.SeedProduction; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.entity.Castle; @@ -126,7 +126,7 @@ public class CastleManorManager implements IXmlReader, IStorable @Override public void parseDocument(Document doc, File f) { - StatsSet set; + StatSet set; NamedNodeMap attrs; Node att; for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) @@ -142,7 +142,7 @@ public class CastleManorManager implements IXmlReader, IStorable { if ("crop".equalsIgnoreCase(c.getNodeName())) { - set = new StatsSet(); + set = new StatSet(); set.set("castleId", castleId); attrs = c.getAttributes(); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java index 8cb2c76f84..b329a67097 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java @@ -27,7 +27,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosState; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -181,7 +181,7 @@ public class CeremonyOfChaosManager extends AbstractEventManager _npcs = new ConcurrentHashMap<>(); protected final Map _spawns = new ConcurrentHashMap<>(); - protected final Map _storedInfo = new ConcurrentHashMap<>(); + protected final Map _storedInfo = new ConcurrentHashMap<>(); protected final Map> _schedules = new ConcurrentHashMap<>(); /** @@ -161,7 +161,7 @@ public class DBSpawnManager { npc.setDBStatus(RaidBossStatus.ALIVE); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getCurrentHp()); info.set("currentMP", npc.getCurrentMp()); info.set("respawnTime", 0); @@ -181,7 +181,7 @@ public class DBSpawnManager */ public void updateStatus(Npc npc, boolean isNpcDead) { - final StatsSet info = _storedInfo.get(npc.getId()); + final StatSet info = _storedInfo.get(npc.getId()); if (info == null) { return; @@ -254,7 +254,7 @@ public class DBSpawnManager _npcs.put(npcId, npc); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", currentHP); info.set("currentMP", currentMP); info.set("respawnTime", 0); @@ -316,7 +316,7 @@ public class DBSpawnManager } npc.setDBStatus(RaidBossStatus.ALIVE); - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", 0); @@ -401,7 +401,7 @@ public class DBSpawnManager try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("UPDATE npc_respawns SET respawnTime = ?, currentHP = ?, currentMP = ? WHERE id = ?")) { - for (Entry entry : _storedInfo.entrySet()) + for (Entry entry : _storedInfo.entrySet()) { final Integer npcId = entry.getKey(); if (npcId == null) @@ -420,7 +420,7 @@ public class DBSpawnManager updateStatus(npc, false); } - final StatsSet info = entry.getValue(); + final StatSet info = entry.getValue(); if (info == null) { continue; @@ -529,7 +529,7 @@ public class DBSpawnManager */ public void notifySpawnNightNpc(Npc npc) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("currentHP", npc.getCurrentHp()); info.set("currentMP", npc.getCurrentMp()); info.set("respawnTime", 0); @@ -572,7 +572,7 @@ public class DBSpawnManager * Gets the stored info. * @return the stored info */ - public Map getStoredInfo() + public Map getStoredInfo() { return _storedInfo; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index 3dd4e3f652..767bed6954 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.datatables.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.FakePlayerChatHolder; @@ -73,7 +73,7 @@ public class FakePlayerChatManager implements IXmlReader { forEach(doc, "list", listNode -> forEach(listNode, "fakePlayerChat", fakePlayerChatNode -> { - final StatsSet set = new StatsSet(parseAttributes(fakePlayerChatNode)); + final StatSet set = new StatSet(parseAttributes(fakePlayerChatNode)); MESSAGES.add(new FakePlayerChatHolder(set.getString("fpcName"), set.getString("searchMethod"), set.getString("searchText"), set.getString("answers"))); })); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java index 07c111065e..52bab09349 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java @@ -33,7 +33,7 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.tasks.GrandBossManagerStoreTask; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance; import org.l2jmobius.gameserver.model.interfaces.IStorable; @@ -51,7 +51,7 @@ public class GrandBossManager implements IStorable protected static Map _bosses = new ConcurrentHashMap<>(); - protected static Map _storedInfo = new HashMap<>(); + protected static Map _storedInfo = new HashMap<>(); private final Map _bossStatus = new HashMap<>(); @@ -72,7 +72,7 @@ public class GrandBossManager implements IStorable final int bossId = rs.getInt("boss_id"); if (NpcData.getInstance().getTemplate(bossId) != null) { - final StatsSet info = new StatsSet(); + final StatSet info = new StatSet(); info.set("loc_x", rs.getInt("loc_x")); info.set("loc_y", rs.getInt("loc_y")); info.set("loc_z", rs.getInt("loc_z")); @@ -140,12 +140,12 @@ public class GrandBossManager implements IStorable return _bosses.get(bossId); } - public StatsSet getStatsSet(int bossId) + public StatSet getStatSet(int bossId) { return _storedInfo.get(bossId); } - public void setStatsSet(int bossId, StatsSet info) + public void setStatSet(int bossId, StatSet info) { _storedInfo.put(bossId, info); updateDb(bossId, false); @@ -156,10 +156,10 @@ public class GrandBossManager implements IStorable { try (Connection con = DatabaseFactory.getConnection()) { - for (Entry e : _storedInfo.entrySet()) + for (Entry e : _storedInfo.entrySet()) { final GrandBossInstance boss = _bosses.get(e.getKey()); - final StatsSet info = e.getValue(); + final StatSet info = e.getValue(); if ((boss == null) || (info == null)) { try (PreparedStatement update = con.prepareStatement(UPDATE_GRAND_BOSS_DATA2)) @@ -209,7 +209,7 @@ public class GrandBossManager implements IStorable try (Connection con = DatabaseFactory.getConnection()) { final GrandBossInstance boss = _bosses.get(bossId); - final StatsSet info = _storedInfo.get(bossId); + final StatSet info = _storedInfo.get(bossId); if (statusOnly || (boss == null) || (info == null)) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index d77642378f..29e517b0cd 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.enums.InstanceReenterType; import org.l2jmobius.gameserver.enums.InstanceRemoveBuffType; import org.l2jmobius.gameserver.enums.InstanceTeleportType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.holders.InstanceReenterTimeHolder; @@ -151,7 +151,7 @@ public class InstanceManager implements IXmlReader return; } - final InstanceTemplate template = new InstanceTemplate(new StatsSet(parseAttributes(instanceNode))); + final InstanceTemplate template = new InstanceTemplate(new StatSet(parseAttributes(instanceNode))); // Update name if wasn't provided if (template.getName() == null) @@ -241,10 +241,10 @@ public class InstanceManager implements IXmlReader { if (doorNode.getNodeName().equals("door")) { - final StatsSet parsedSet = DoorData.getInstance().parseDoor(doorNode); - final StatsSet mergedSet = new StatsSet(); + final StatSet parsedSet = DoorData.getInstance().parseDoor(doorNode); + final StatSet mergedSet = new StatSet(); final int doorId = parsedSet.getInt("id"); - final StatsSet templateSet = DoorData.getInstance().getDoorTemplate(doorId); + final StatSet templateSet = DoorData.getInstance().getDoorTemplate(doorId); if (templateSet != null) { mergedSet.merge(templateSet); @@ -324,14 +324,14 @@ public class InstanceManager implements IXmlReader final boolean onlyLeader = parseBoolean(attrs, "onlyLeader", false); final boolean showMessageAndHtml = parseBoolean(attrs, "showMessageAndHtml", false); // Load parameters - StatsSet params = null; + StatSet params = null; for (Node f = conditionNode.getFirstChild(); f != null; f = f.getNextSibling()) { if (f.getNodeName().equals("param")) { if (params == null) { - params = new StatsSet(); + params = new StatSet(); } params.set(parseString(f.getAttributes(), "name"), parseString(f.getAttributes(), "value")); @@ -341,14 +341,14 @@ public class InstanceManager implements IXmlReader // If none parameters found then set empty StatSet if (params == null) { - params = StatsSet.EMPTY_STATSET; + params = StatSet.EMPTY_STATSET; } // Now when everything is loaded register condition to template try { final Class clazz = Class.forName("org.l2jmobius.gameserver.model.instancezone.conditions.Condition" + type); - final Constructor constructor = clazz.getConstructor(InstanceTemplate.class, StatsSet.class, boolean.class, boolean.class); + final Constructor constructor = clazz.getConstructor(InstanceTemplate.class, StatSet.class, boolean.class, boolean.class); conditions.add((Condition) constructor.newInstance(template, params, onlyLeader, showMessageAndHtml)); } catch (Exception ex) @@ -378,7 +378,7 @@ public class InstanceManager implements IXmlReader */ public Instance createInstance() { - return new Instance(getNewInstanceId(), new InstanceTemplate(StatsSet.EMPTY_STATSET), null); + return new Instance(getNewInstanceId(), new InstanceTemplate(StatSet.EMPTY_STATSET), null); } /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/AccessLevel.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/AccessLevel.java index 772c1fe77e..72b77905e1 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/AccessLevel.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/AccessLevel.java @@ -52,7 +52,7 @@ public class AccessLevel /** Flag to gain exp in party */ private boolean _gainExp = false; - public AccessLevel(StatsSet set) + public AccessLevel(StatSet set) { _accessLevel = set.getInt("level"); _name = set.getString("name"); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ActionDataHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ActionDataHolder.java index 4887bedba8..ca6d9ee685 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ActionDataHolder.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ActionDataHolder.java @@ -25,7 +25,7 @@ public class ActionDataHolder private final String _handler; private final int _optionId; - public ActionDataHolder(StatsSet set) + public ActionDataHolder(StatSet set) { _id = set.getInt("id"); _handler = set.getString("handler"); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java index 656119098e..3f88e455d7 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/AdminCommandAccessRight.java @@ -27,7 +27,7 @@ public class AdminCommandAccessRight private final int _accessLevel; private final boolean _requireConfirm; - public AdminCommandAccessRight(StatsSet set) + public AdminCommandAccessRight(StatSet set) { _adminCommand = set.getString("command"); _requireConfirm = set.getBoolean("confirmDlg", false); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index efc53c7e48..6102d39d06 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -36,7 +36,7 @@ public class DailyMissionDataHolder private final List _rewardsItems; private final List _classRestriction; private final int _requiredCompletions; - private final StatsSet _params; + private final StatSet _params; private final boolean _dailyReset; private final boolean _isOneTime; private final boolean _isMainClassOnly; @@ -44,7 +44,7 @@ public class DailyMissionDataHolder private final boolean _isDisplayedWhenNotAvailable; private final AbstractDailyMissionHandler _handler; - public DailyMissionDataHolder(StatsSet set) + public DailyMissionDataHolder(StatSet set) { final Function handler = DailyMissionHandler.getInstance().getHandler(set.getString("handler")); @@ -53,7 +53,7 @@ public class DailyMissionDataHolder _requiredCompletions = set.getInt("requiredCompletion", 0); _rewardsItems = set.getList("items", ItemHolder.class); _classRestriction = set.getList("classRestriction", ClassId.class); - _params = set.getObject("params", StatsSet.class); + _params = set.getObject("params", StatSet.class); _dailyReset = set.getBoolean("dailyReset", true); _isOneTime = set.getBoolean("isOneTime", true); _isMainClassOnly = set.getBoolean("isMainClassOnly", true); @@ -87,7 +87,7 @@ public class DailyMissionDataHolder return _requiredCompletions; } - public StatsSet getParams() + public StatSet getParams() { return _params; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Location.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Location.java index 1c61740e4d..024c71075f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Location.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Location.java @@ -49,7 +49,7 @@ public class Location implements IPositionable this(obj.getX(), obj.getY(), obj.getZ(), obj.getHeading()); } - public Location(StatsSet set) + public Location(StatSet set) { _x = set.getInt("x"); _y = set.getInt("y"); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/PetLevelData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/PetLevelData.java index e46b215b5f..7cad1a225a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/PetLevelData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/PetLevelData.java @@ -46,7 +46,7 @@ public class PetLevelData private final double _slowFlySpeedOnRide; private final double _fastFlySpeedOnRide; - public PetLevelData(StatsSet set) + public PetLevelData(StatSet set) { _ownerExpTaken = set.getInt("get_exp_type"); _petMaxExp = set.getLong("exp"); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/RecipeList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/RecipeList.java index 9e4a3b2387..a81bbb1802 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/RecipeList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/RecipeList.java @@ -68,7 +68,7 @@ public class RecipeList * @param set * @param haveRare */ - public RecipeList(StatsSet set, boolean haveRare) + public RecipeList(StatSet set, boolean haveRare) { _recipes = new RecipeInstance[0]; _statUse = new RecipeStatInstance[0]; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Seed.java index 6d31ffc60f..54ef8acd9f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Seed.java @@ -35,7 +35,7 @@ public class Seed private final int _seedReferencePrice; private final int _cropReferencePrice; - public Seed(StatsSet set) + public Seed(StatSet set) { _cropId = set.getInt("id"); _seedId = set.getInt("seedId"); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java index 78897cf4f1..4de77df228 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/SiegeScheduleDate.java @@ -27,7 +27,7 @@ public class SiegeScheduleDate private final int _hour; private final int _maxConcurrent; - public SiegeScheduleDate(StatsSet set) + public SiegeScheduleDate(StatSet set) { _day = set.getInt("day", Calendar.SUNDAY); _hour = set.getInt("hour", 16); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/SkillLearn.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/SkillLearn.java index e2ccdd6331..00f53c0cb9 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/SkillLearn.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/SkillLearn.java @@ -58,7 +58,7 @@ public class SkillLearn * Constructor for SkillLearn. * @param set the set with the SkillLearn data. */ - public SkillLearn(StatsSet set) + public SkillLearn(StatSet set) { _skillName = set.getString("skillName"); _skillId = set.getInt("skillId"); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/StatSet.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/StatSet.java new file mode 100644 index 0000000000..3c824d9fa4 --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/StatSet.java @@ -0,0 +1,968 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Supplier; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.stream.Collectors; + +import org.l2jmobius.commons.util.TimeUtil; +import org.l2jmobius.gameserver.model.holders.MinionHolder; +import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.interfaces.IParserAdvUtils; +import org.l2jmobius.gameserver.util.Util; + +/** + * This class is meant to hold a set of (key,value) pairs.
    + * They are stored as object but can be retrieved in any type wanted. As long as cast is available.
    + * @author mkizub + */ +public class StatSet implements IParserAdvUtils +{ + private static final Logger LOGGER = Logger.getLogger(StatSet.class.getName()); + /** Static empty immutable map, used to avoid multiple null checks over the source. */ + public static final StatSet EMPTY_STATSET = new StatSet(Collections.emptyMap()); + + private final Map _set; + + public StatSet() + { + this(ConcurrentHashMap::new); + } + + public StatSet(Supplier> mapFactory) + { + this(mapFactory.get()); + } + + public StatSet(Map map) + { + _set = map; + } + + /** + * Returns the set of values + * @return HashMap + */ + public Map getSet() + { + return _set; + } + + /** + * Add a set of couple values in the current set + * @param newSet : StatSet pointing out the list of couples to add in the current set + */ + public void merge(StatSet newSet) + { + _set.putAll(newSet.getSet()); + } + + /** + * Verifies if the stat set is empty. + * @return {@code true} if the stat set is empty, {@code false} otherwise + */ + public boolean isEmpty() + { + return _set.isEmpty(); + } + + /** + * Return the boolean value associated with key. + * @param key : String designating the key in the set + * @return boolean : value associated to the key + * @throws IllegalArgumentException : If value is not set or value is not boolean + */ + @Override + public boolean getBoolean(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Boolean value required, but not specified"); + } + if (val instanceof Boolean) + { + return ((Boolean) val).booleanValue(); + } + try + { + return Boolean.parseBoolean((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Boolean value required, but found: " + val); + } + } + + /** + * Return the boolean value associated with key.
    + * If no value is associated with key, or type of value is wrong, returns defaultValue. + * @param key : String designating the key in the entry set + * @return boolean : value associated to the key + */ + @Override + public boolean getBoolean(String key, boolean defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Boolean) + { + return ((Boolean) val).booleanValue(); + } + try + { + return Boolean.parseBoolean((String) val); + } + catch (Exception e) + { + return defaultValue; + } + } + + @Override + public byte getByte(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Byte value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).byteValue(); + } + try + { + return Byte.parseByte((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + + @Override + public byte getByte(String key, byte defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).byteValue(); + } + try + { + return Byte.parseByte((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + + public short increaseByte(String key, byte increaseWith) + { + final byte newValue = (byte) (getByte(key) + increaseWith); + set(key, newValue); + return newValue; + } + + public short increaseByte(String key, byte defaultValue, byte increaseWith) + { + final byte newValue = (byte) (getByte(key, defaultValue) + increaseWith); + set(key, newValue); + return newValue; + } + + public byte[] getByteArray(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Byte value required, but not specified"); + } + if (val instanceof Number) + { + return new byte[] + { + ((Number) val).byteValue() + }; + } + int c = 0; + final String[] vals = ((String) val).split(splitOn); + final byte[] result = new byte[vals.length]; + for (String v : vals) + { + try + { + result[c++] = Byte.parseByte(v); + } + catch (Exception e) + { + throw new IllegalArgumentException("Byte value required, but found: " + val); + } + } + return result; + } + + public List getByteList(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final List result = new ArrayList<>(); + for (Byte i : getByteArray(key, splitOn)) + { + result.add(i); + } + return result; + } + + @Override + public short getShort(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Short value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).shortValue(); + } + try + { + return Short.parseShort((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Short value required, but found: " + val); + } + } + + @Override + public short getShort(String key, short defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).shortValue(); + } + try + { + return Short.parseShort((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Short value required, but found: " + val); + } + } + + public short increaseShort(String key, short increaseWith) + { + final short newValue = (short) (getShort(key) + increaseWith); + set(key, newValue); + return newValue; + } + + public short increaseShort(String key, short defaultValue, short increaseWith) + { + final short newValue = (short) (getShort(key, defaultValue) + increaseWith); + set(key, newValue); + return newValue; + } + + @Override + public int getInt(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Integer value required, but not specified: " + key + "!"); + } + + if (val instanceof Number) + { + return ((Number) val).intValue(); + } + + try + { + return Integer.parseInt((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val + "!"); + } + } + + @Override + public int getInt(String key, int defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).intValue(); + } + try + { + return Integer.parseInt((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val); + } + } + + public int increaseInt(String key, int increaseWith) + { + final int newValue = getInt(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public int increaseInt(String key, int defaultValue, int increaseWith) + { + final int newValue = getInt(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + public int[] getIntArray(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Integer value required, but not specified"); + } + if (val instanceof Number) + { + return new int[] + { + ((Number) val).intValue() + }; + } + int c = 0; + final String[] vals = ((String) val).split(splitOn); + final int[] result = new int[vals.length]; + for (String v : vals) + { + try + { + result[c++] = Integer.parseInt(v); + } + catch (Exception e) + { + throw new IllegalArgumentException("Integer value required, but found: " + val); + } + } + return result; + } + + public List getIntegerList(String key, String splitOn) + { + Objects.requireNonNull(key); + Objects.requireNonNull(splitOn); + final List result = new ArrayList<>(); + for (int i : getIntArray(key, splitOn)) + { + result.add(i); + } + return result; + } + + @Override + public long getLong(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Long value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).longValue(); + } + try + { + return Long.parseLong((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Long value required, but found: " + val); + } + } + + @Override + public long getLong(String key, long defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).longValue(); + } + try + { + return Long.parseLong((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Long value required, but found: " + val); + } + } + + public long increaseLong(String key, long increaseWith) + { + final long newValue = getLong(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public long increaseLong(String key, long defaultValue, long increaseWith) + { + final long newValue = getLong(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public float getFloat(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Float value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).floatValue(); + } + try + { + return Float.parseFloat((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Float value required, but found: " + val); + } + } + + @Override + public float getFloat(String key, float defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).floatValue(); + } + try + { + return Float.parseFloat((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Float value required, but found: " + val); + } + } + + public float increaseFloat(String key, float increaseWith) + { + final float newValue = getFloat(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public float increaseFloat(String key, float defaultValue, float increaseWith) + { + final float newValue = getFloat(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public double getDouble(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Double value required, but not specified"); + } + if (val instanceof Number) + { + return ((Number) val).doubleValue(); + } + try + { + return Double.parseDouble((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Double value required, but found: " + val); + } + } + + @Override + public double getDouble(String key, double defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (val instanceof Number) + { + return ((Number) val).doubleValue(); + } + try + { + return Double.parseDouble((String) val); + } + catch (Exception e) + { + throw new IllegalArgumentException("Double value required, but found: " + val); + } + } + + public double increaseDouble(String key, double increaseWith) + { + final double newValue = getDouble(key) + increaseWith; + set(key, newValue); + return newValue; + } + + public double increaseDouble(String key, double defaultValue, double increaseWith) + { + final double newValue = getDouble(key, defaultValue) + increaseWith; + set(key, newValue); + return newValue; + } + + @Override + public String getString(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("String value required, but not specified"); + } + return String.valueOf(val); + } + + @Override + public String getString(String key, String defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + return String.valueOf(val); + } + + @Override + public Duration getDuration(String key) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("String value required, but not specified"); + } + return TimeUtil.parseDuration(String.valueOf(val)); + } + + @Override + public Duration getDuration(String key, Duration defaultValue) + { + Objects.requireNonNull(key); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + return TimeUtil.parseDuration(String.valueOf(val)); + } + + @Override + @SuppressWarnings("unchecked") + public > T getEnum(String key, Class enumClass) + { + Objects.requireNonNull(key); + Objects.requireNonNull(enumClass); + final Object val = _set.get(key); + if (val == null) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but not specified"); + } + if (enumClass.isInstance(val)) + { + return (T) val; + } + try + { + return Enum.valueOf(enumClass, String.valueOf(val)); + } + catch (Exception e) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); + } + } + + @Override + @SuppressWarnings("unchecked") + public > T getEnum(String key, Class enumClass, T defaultValue) + { + Objects.requireNonNull(key); + Objects.requireNonNull(enumClass); + final Object val = _set.get(key); + if (val == null) + { + return defaultValue; + } + if (enumClass.isInstance(val)) + { + return (T) val; + } + try + { + return Enum.valueOf(enumClass, String.valueOf(val)); + } + catch (Exception e) + { + throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); + } + } + + @SuppressWarnings("unchecked") + public A getObject(String name, Class type) + { + Objects.requireNonNull(name); + Objects.requireNonNull(type); + final Object obj = _set.get(name); + if ((obj == null) || !type.isAssignableFrom(obj.getClass())) + { + return null; + } + + return (A) obj; + } + + @SuppressWarnings("unchecked") + public A getObject(String name, Class type, A defaultValue) + { + Objects.requireNonNull(name); + Objects.requireNonNull(type); + final Object obj = _set.get(name); + if ((obj == null) || !type.isAssignableFrom(obj.getClass())) + { + return defaultValue; + } + + return (A) obj; + } + + public SkillHolder getSkillHolder(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof SkillHolder)) + { + return null; + } + + return (SkillHolder) obj; + } + + public Location getLocation(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof Location)) + { + return null; + } + return (Location) obj; + } + + @SuppressWarnings("unchecked") + public List getMinionList(String key) + { + Objects.requireNonNull(key); + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return Collections.emptyList(); + } + + return (List) obj; + } + + @SuppressWarnings("unchecked") + public List getList(String key, Class clazz) + { + Objects.requireNonNull(key); + Objects.requireNonNull(clazz); + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return null; + } + + final List originalList = (List) obj; + if (!originalList.isEmpty() && !originalList.stream().allMatch(clazz::isInstance)) + { + if (clazz.getSuperclass() == Enum.class) + { + throw new IllegalAccessError("Please use getEnumList if you want to get list of Enums!"); + } + + // Attempt to convert the list + final List convertedList = convertList(originalList, clazz); + if (convertedList == null) + { + LOGGER.log(Level.WARNING, "getList(\"" + key + "\", " + clazz.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); + return null; + } + + // Overwrite the existing list with proper generic type + _set.put(key, convertedList); + return convertedList; + } + return (List) obj; + } + + public List getList(String key, Class clazz, List defaultValue) + { + final List list = getList(key, clazz); + return list == null ? defaultValue : list; + } + + @SuppressWarnings("unchecked") + public > List getEnumList(String key, Class clazz) + { + final Object obj = _set.get(key); + if (!(obj instanceof List)) + { + return null; + } + + final List originalList = (List) obj; + if (!originalList.isEmpty() && (obj.getClass().getGenericInterfaces()[0] != clazz) && originalList.stream().allMatch(name -> Util.isEnum(name.toString(), clazz))) + { + final List convertedList = originalList.stream().map(Object::toString).map(name -> Enum.valueOf(clazz, name)).map(clazz::cast).collect(Collectors.toList()); + + // Overwrite the existing list with proper generic type + _set.put(key, convertedList); + return convertedList; + } + return (List) obj; + } + + /** + * @param + * @param originalList + * @param clazz + * @return + */ + private List convertList(List originalList, Class clazz) + { + if (clazz == Integer.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isInteger)) + { + return originalList.stream().map(Object::toString).map(Integer::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + else if (clazz == Float.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isFloat)) + { + return originalList.stream().map(Object::toString).map(Float::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + else if (clazz == Double.class) + { + if (originalList.stream().map(Object::toString).allMatch(Util::isDouble)) + { + return originalList.stream().map(Object::toString).map(Double::valueOf).map(clazz::cast).collect(Collectors.toList()); + } + } + return null; + } + + @SuppressWarnings("unchecked") + public Map getMap(String key, Class keyClass, Class valueClass) + { + final Object obj = _set.get(key); + if (!(obj instanceof Map)) + { + return null; + } + + final Map originalList = (Map) obj; + if (!originalList.isEmpty() && ((!originalList.keySet().stream().allMatch(keyClass::isInstance)) || (!originalList.values().stream().allMatch(valueClass::isInstance)))) + { + LOGGER.log(Level.WARNING, "getMap(\"" + key + "\", " + keyClass.getSimpleName() + ", " + valueClass.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); + } + return (Map) obj; + } + + public StatSet set(String name, Object value) + { + if (value == null) + { + return this; + } + _set.put(name, value); + return this; + } + + public StatSet set(String key, boolean value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, byte value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, short value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, int value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, long value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, float value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, double value) + { + _set.put(key, value); + return this; + } + + public StatSet set(String key, String value) + { + if (value == null) + { + return this; + } + _set.put(key, value); + return this; + } + + public StatSet set(String key, Enum value) + { + if (value == null) + { + return this; + } + _set.put(key, value); + return this; + } + + public static StatSet valueOf(String key, Object value) + { + final StatSet set = new StatSet(); + set.set(key, value); + return set; + } + + public void remove(String key) + { + _set.remove(key); + } + + public boolean contains(String name) + { + return _set.containsKey(name); + } + + @Override + public String toString() + { + return "StatSet{_set=" + _set + '}'; + } +} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/StatsSet.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/StatsSet.java deleted file mode 100644 index 5ce013ebd2..0000000000 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/StatsSet.java +++ /dev/null @@ -1,968 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.ConcurrentHashMap; -import java.util.function.Supplier; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.stream.Collectors; - -import org.l2jmobius.commons.util.TimeUtil; -import org.l2jmobius.gameserver.model.holders.MinionHolder; -import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.interfaces.IParserAdvUtils; -import org.l2jmobius.gameserver.util.Util; - -/** - * This class is meant to hold a set of (key,value) pairs.
    - * They are stored as object but can be retrieved in any type wanted. As long as cast is available.
    - * @author mkizub - */ -public class StatsSet implements IParserAdvUtils -{ - private static final Logger LOGGER = Logger.getLogger(StatsSet.class.getName()); - /** Static empty immutable map, used to avoid multiple null checks over the source. */ - public static final StatsSet EMPTY_STATSET = new StatsSet(Collections.emptyMap()); - - private final Map _set; - - public StatsSet() - { - this(ConcurrentHashMap::new); - } - - public StatsSet(Supplier> mapFactory) - { - this(mapFactory.get()); - } - - public StatsSet(Map map) - { - _set = map; - } - - /** - * Returns the set of values - * @return HashMap - */ - public Map getSet() - { - return _set; - } - - /** - * Add a set of couple values in the current set - * @param newSet : StatsSet pointing out the list of couples to add in the current set - */ - public void merge(StatsSet newSet) - { - _set.putAll(newSet.getSet()); - } - - /** - * Verifies if the stat set is empty. - * @return {@code true} if the stat set is empty, {@code false} otherwise - */ - public boolean isEmpty() - { - return _set.isEmpty(); - } - - /** - * Return the boolean value associated with key. - * @param key : String designating the key in the set - * @return boolean : value associated to the key - * @throws IllegalArgumentException : If value is not set or value is not boolean - */ - @Override - public boolean getBoolean(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Boolean value required, but not specified"); - } - if (val instanceof Boolean) - { - return ((Boolean) val).booleanValue(); - } - try - { - return Boolean.parseBoolean((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Boolean value required, but found: " + val); - } - } - - /** - * Return the boolean value associated with key.
    - * If no value is associated with key, or type of value is wrong, returns defaultValue. - * @param key : String designating the key in the entry set - * @return boolean : value associated to the key - */ - @Override - public boolean getBoolean(String key, boolean defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Boolean) - { - return ((Boolean) val).booleanValue(); - } - try - { - return Boolean.parseBoolean((String) val); - } - catch (Exception e) - { - return defaultValue; - } - } - - @Override - public byte getByte(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Byte value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).byteValue(); - } - try - { - return Byte.parseByte((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - - @Override - public byte getByte(String key, byte defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).byteValue(); - } - try - { - return Byte.parseByte((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - - public short increaseByte(String key, byte increaseWith) - { - final byte newValue = (byte) (getByte(key) + increaseWith); - set(key, newValue); - return newValue; - } - - public short increaseByte(String key, byte defaultValue, byte increaseWith) - { - final byte newValue = (byte) (getByte(key, defaultValue) + increaseWith); - set(key, newValue); - return newValue; - } - - public byte[] getByteArray(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Byte value required, but not specified"); - } - if (val instanceof Number) - { - return new byte[] - { - ((Number) val).byteValue() - }; - } - int c = 0; - final String[] vals = ((String) val).split(splitOn); - final byte[] result = new byte[vals.length]; - for (String v : vals) - { - try - { - result[c++] = Byte.parseByte(v); - } - catch (Exception e) - { - throw new IllegalArgumentException("Byte value required, but found: " + val); - } - } - return result; - } - - public List getByteList(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final List result = new ArrayList<>(); - for (Byte i : getByteArray(key, splitOn)) - { - result.add(i); - } - return result; - } - - @Override - public short getShort(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Short value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).shortValue(); - } - try - { - return Short.parseShort((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Short value required, but found: " + val); - } - } - - @Override - public short getShort(String key, short defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).shortValue(); - } - try - { - return Short.parseShort((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Short value required, but found: " + val); - } - } - - public short increaseShort(String key, short increaseWith) - { - final short newValue = (short) (getShort(key) + increaseWith); - set(key, newValue); - return newValue; - } - - public short increaseShort(String key, short defaultValue, short increaseWith) - { - final short newValue = (short) (getShort(key, defaultValue) + increaseWith); - set(key, newValue); - return newValue; - } - - @Override - public int getInt(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Integer value required, but not specified: " + key + "!"); - } - - if (val instanceof Number) - { - return ((Number) val).intValue(); - } - - try - { - return Integer.parseInt((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val + "!"); - } - } - - @Override - public int getInt(String key, int defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).intValue(); - } - try - { - return Integer.parseInt((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val); - } - } - - public int increaseInt(String key, int increaseWith) - { - final int newValue = getInt(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public int increaseInt(String key, int defaultValue, int increaseWith) - { - final int newValue = getInt(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - public int[] getIntArray(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Integer value required, but not specified"); - } - if (val instanceof Number) - { - return new int[] - { - ((Number) val).intValue() - }; - } - int c = 0; - final String[] vals = ((String) val).split(splitOn); - final int[] result = new int[vals.length]; - for (String v : vals) - { - try - { - result[c++] = Integer.parseInt(v); - } - catch (Exception e) - { - throw new IllegalArgumentException("Integer value required, but found: " + val); - } - } - return result; - } - - public List getIntegerList(String key, String splitOn) - { - Objects.requireNonNull(key); - Objects.requireNonNull(splitOn); - final List result = new ArrayList<>(); - for (int i : getIntArray(key, splitOn)) - { - result.add(i); - } - return result; - } - - @Override - public long getLong(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Long value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).longValue(); - } - try - { - return Long.parseLong((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Long value required, but found: " + val); - } - } - - @Override - public long getLong(String key, long defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).longValue(); - } - try - { - return Long.parseLong((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Long value required, but found: " + val); - } - } - - public long increaseLong(String key, long increaseWith) - { - final long newValue = getLong(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public long increaseLong(String key, long defaultValue, long increaseWith) - { - final long newValue = getLong(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public float getFloat(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Float value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).floatValue(); - } - try - { - return Float.parseFloat((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Float value required, but found: " + val); - } - } - - @Override - public float getFloat(String key, float defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).floatValue(); - } - try - { - return Float.parseFloat((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Float value required, but found: " + val); - } - } - - public float increaseFloat(String key, float increaseWith) - { - final float newValue = getFloat(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public float increaseFloat(String key, float defaultValue, float increaseWith) - { - final float newValue = getFloat(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public double getDouble(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Double value required, but not specified"); - } - if (val instanceof Number) - { - return ((Number) val).doubleValue(); - } - try - { - return Double.parseDouble((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Double value required, but found: " + val); - } - } - - @Override - public double getDouble(String key, double defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (val instanceof Number) - { - return ((Number) val).doubleValue(); - } - try - { - return Double.parseDouble((String) val); - } - catch (Exception e) - { - throw new IllegalArgumentException("Double value required, but found: " + val); - } - } - - public double increaseDouble(String key, double increaseWith) - { - final double newValue = getDouble(key) + increaseWith; - set(key, newValue); - return newValue; - } - - public double increaseDouble(String key, double defaultValue, double increaseWith) - { - final double newValue = getDouble(key, defaultValue) + increaseWith; - set(key, newValue); - return newValue; - } - - @Override - public String getString(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("String value required, but not specified"); - } - return String.valueOf(val); - } - - @Override - public String getString(String key, String defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - return String.valueOf(val); - } - - @Override - public Duration getDuration(String key) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("String value required, but not specified"); - } - return TimeUtil.parseDuration(String.valueOf(val)); - } - - @Override - public Duration getDuration(String key, Duration defaultValue) - { - Objects.requireNonNull(key); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - return TimeUtil.parseDuration(String.valueOf(val)); - } - - @Override - @SuppressWarnings("unchecked") - public > T getEnum(String key, Class enumClass) - { - Objects.requireNonNull(key); - Objects.requireNonNull(enumClass); - final Object val = _set.get(key); - if (val == null) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but not specified"); - } - if (enumClass.isInstance(val)) - { - return (T) val; - } - try - { - return Enum.valueOf(enumClass, String.valueOf(val)); - } - catch (Exception e) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); - } - } - - @Override - @SuppressWarnings("unchecked") - public > T getEnum(String key, Class enumClass, T defaultValue) - { - Objects.requireNonNull(key); - Objects.requireNonNull(enumClass); - final Object val = _set.get(key); - if (val == null) - { - return defaultValue; - } - if (enumClass.isInstance(val)) - { - return (T) val; - } - try - { - return Enum.valueOf(enumClass, String.valueOf(val)); - } - catch (Exception e) - { - throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val); - } - } - - @SuppressWarnings("unchecked") - public A getObject(String name, Class type) - { - Objects.requireNonNull(name); - Objects.requireNonNull(type); - final Object obj = _set.get(name); - if ((obj == null) || !type.isAssignableFrom(obj.getClass())) - { - return null; - } - - return (A) obj; - } - - @SuppressWarnings("unchecked") - public A getObject(String name, Class type, A defaultValue) - { - Objects.requireNonNull(name); - Objects.requireNonNull(type); - final Object obj = _set.get(name); - if ((obj == null) || !type.isAssignableFrom(obj.getClass())) - { - return defaultValue; - } - - return (A) obj; - } - - public SkillHolder getSkillHolder(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof SkillHolder)) - { - return null; - } - - return (SkillHolder) obj; - } - - public Location getLocation(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof Location)) - { - return null; - } - return (Location) obj; - } - - @SuppressWarnings("unchecked") - public List getMinionList(String key) - { - Objects.requireNonNull(key); - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return Collections.emptyList(); - } - - return (List) obj; - } - - @SuppressWarnings("unchecked") - public List getList(String key, Class clazz) - { - Objects.requireNonNull(key); - Objects.requireNonNull(clazz); - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return null; - } - - final List originalList = (List) obj; - if (!originalList.isEmpty() && !originalList.stream().allMatch(clazz::isInstance)) - { - if (clazz.getSuperclass() == Enum.class) - { - throw new IllegalAccessError("Please use getEnumList if you want to get list of Enums!"); - } - - // Attempt to convert the list - final List convertedList = convertList(originalList, clazz); - if (convertedList == null) - { - LOGGER.log(Level.WARNING, "getList(\"" + key + "\", " + clazz.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); - return null; - } - - // Overwrite the existing list with proper generic type - _set.put(key, convertedList); - return convertedList; - } - return (List) obj; - } - - public List getList(String key, Class clazz, List defaultValue) - { - final List list = getList(key, clazz); - return list == null ? defaultValue : list; - } - - @SuppressWarnings("unchecked") - public > List getEnumList(String key, Class clazz) - { - final Object obj = _set.get(key); - if (!(obj instanceof List)) - { - return null; - } - - final List originalList = (List) obj; - if (!originalList.isEmpty() && (obj.getClass().getGenericInterfaces()[0] != clazz) && originalList.stream().allMatch(name -> Util.isEnum(name.toString(), clazz))) - { - final List convertedList = originalList.stream().map(Object::toString).map(name -> Enum.valueOf(clazz, name)).map(clazz::cast).collect(Collectors.toList()); - - // Overwrite the existing list with proper generic type - _set.put(key, convertedList); - return convertedList; - } - return (List) obj; - } - - /** - * @param - * @param originalList - * @param clazz - * @return - */ - private List convertList(List originalList, Class clazz) - { - if (clazz == Integer.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isInteger)) - { - return originalList.stream().map(Object::toString).map(Integer::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - else if (clazz == Float.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isFloat)) - { - return originalList.stream().map(Object::toString).map(Float::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - else if (clazz == Double.class) - { - if (originalList.stream().map(Object::toString).allMatch(Util::isDouble)) - { - return originalList.stream().map(Object::toString).map(Double::valueOf).map(clazz::cast).collect(Collectors.toList()); - } - } - return null; - } - - @SuppressWarnings("unchecked") - public Map getMap(String key, Class keyClass, Class valueClass) - { - final Object obj = _set.get(key); - if (!(obj instanceof Map)) - { - return null; - } - - final Map originalList = (Map) obj; - if (!originalList.isEmpty() && ((!originalList.keySet().stream().allMatch(keyClass::isInstance)) || (!originalList.values().stream().allMatch(valueClass::isInstance)))) - { - LOGGER.log(Level.WARNING, "getMap(\"" + key + "\", " + keyClass.getSimpleName() + ", " + valueClass.getSimpleName() + ") requested with wrong generic type: " + obj.getClass().getGenericInterfaces()[0] + "!", new ClassNotFoundException()); - } - return (Map) obj; - } - - public StatsSet set(String name, Object value) - { - if (value == null) - { - return this; - } - _set.put(name, value); - return this; - } - - public StatsSet set(String key, boolean value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, byte value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, short value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, int value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, long value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, float value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, double value) - { - _set.put(key, value); - return this; - } - - public StatsSet set(String key, String value) - { - if (value == null) - { - return this; - } - _set.put(key, value); - return this; - } - - public StatsSet set(String key, Enum value) - { - if (value == null) - { - return this; - } - _set.put(key, value); - return this; - } - - public static StatsSet valueOf(String key, Object value) - { - final StatsSet set = new StatsSet(); - set.set(key, value); - return set; - } - - public void remove(String key) - { - _set.remove(key); - } - - public boolean contains(String name) - { - return _set.containsKey(name); - } - - @Override - public String toString() - { - return "StatsSet{_set=" + _set + '}'; - } -} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java index 74109a5102..9efcc7d9c8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.MpRewardTask; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.FishermanInstance; @@ -148,7 +148,7 @@ public class Npc extends Creature private NpcStringId _titleString; private NpcStringId _nameString; - private StatsSet _params; + private StatSet _params; private RaidBossStatus _raidStatus; /** Contains information about local tax payments. */ @@ -1756,7 +1756,7 @@ public class Npc extends Creature /** * @return the parameters of the npc merged with the spawn parameters (if there are any) */ - public StatsSet getParameters() + public StatSet getParameters() { if (_params != null) { @@ -1768,10 +1768,10 @@ public class Npc extends Creature final NpcSpawnTemplate npcSpawnTemplate = _spawn.getNpcSpawnTemplate(); if ((npcSpawnTemplate != null) && (npcSpawnTemplate.getParameters() != null) && !npcSpawnTemplate.getParameters().isEmpty()) { - final StatsSet params = getTemplate().getParameters(); + final StatSet params = getTemplate().getParameters(); if ((params != null) && !params.getSet().isEmpty()) { - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); set.merge(params); set.merge(npcSpawnTemplate.getParameters()); _params = set; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index c8cbb989c0..a4d95ae3fc 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -21,7 +21,7 @@ import java.util.EnumMap; import java.util.Map; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; @@ -49,12 +49,12 @@ public class CreatureTemplate extends ListenersContainer /** The creature's race. */ private Race _race; - public CreatureTemplate(StatsSet set) + public CreatureTemplate(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { // Base stats _baseValues.put(Stat.STAT_STR, set.getDouble("baseSTR", 0)); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java index 86441c678c..14f0e9cae8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/CubicTemplate.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.CubicInstance; @@ -46,7 +46,7 @@ public class CubicTemplate implements ICubicConditionHolder private final List _conditions = new ArrayList<>(); public List _skills = new ArrayList<>(); - public CubicTemplate(StatsSet set) + public CubicTemplate(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java index c40883ac75..410040bc86 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/DoorTemplate.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.templates; import org.l2jmobius.gameserver.enums.DoorOpenType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -57,7 +57,7 @@ public class DoorTemplate extends CreatureTemplate implements IIdentifiable private final boolean _stealth; private final boolean _isInverted; - public DoorTemplate(StatsSet set) + public DoorTemplate(StatSet set) { super(set); _doorId = set.getInt("id"); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 1eedf5be50..92f55589e8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.enums.MpRewardAffectType; import org.l2jmobius.gameserver.enums.MpRewardType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -63,7 +63,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private boolean _usingServerSideName; private String _title; private boolean _usingServerSideTitle; - private StatsSet _parameters; + private StatSet _parameters; private Sex _sex; private int _chestId; private int _rhandId; @@ -123,15 +123,15 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable /** * Constructor of Creature. - * @param set The StatsSet object to transfer data to the method + * @param set The StatSet object to transfer data to the method */ - public NpcTemplate(StatsSet set) + public NpcTemplate(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _id = set.getInt("id"); @@ -320,12 +320,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _usingServerSideTitle; } - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } - public void setParameters(StatsSet set) + public void setParameters(StatSet set) { _parameters = set; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 50292b8bc8..28458aa09e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -50,7 +50,7 @@ public class PlayerTemplate extends CreatureTemplate private final List _creationPoints; private final Map _baseSlotDef; - public PlayerTemplate(StatsSet set, List creationPoints) + public PlayerTemplate(StatSet set, List creationPoints) { super(set); _classId = ClassId.getClassId(set.getInt("classId")); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index aa28a0f648..260da48365 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -23,7 +23,7 @@ import java.util.Objects; import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import org.l2jmobius.gameserver.enums.InventoryBlockType; import org.l2jmobius.gameserver.enums.Sex; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -57,7 +57,7 @@ public class Transform implements IIdentifiable private TransformTemplate _maleTemplate; private TransformTemplate _femaleTemplate; - public Transform(StatsSet set) + public Transform(StatSet set) { _id = set.getInt("id"); _displayId = set.getInt("displayId", _id); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java index 5660852a01..729998503f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/TransformLevelData.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.actor.transform; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.stats.Stat; /** @@ -31,7 +31,7 @@ public class TransformLevelData private final double _levelMod; private Map _stats; - public TransformLevelData(StatsSet set) + public TransformLevelData(StatSet set) { _level = set.getInt("val"); _levelMod = set.getDouble("levelMod"); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 4de84b8bdc..7aca059f91 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -23,7 +23,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -49,7 +49,7 @@ public class TransformTemplate private ExBasicActionList _list; private final Map _data = new LinkedHashMap<>(100); - public TransformTemplate(StatsSet set) + public TransformTemplate(StatSet set) { _collisionRadius = set.contains("radius") ? set.getDouble("radius") : null; _collisionHeight = set.contains("height") ? set.getDouble("height") : null; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java index d808a6b8bf..02550d2818 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/alchemy/AlchemyCraftData.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -36,7 +36,7 @@ public class AlchemyCraftData private ItemHolder _productionSuccess; private ItemHolder _productionFailure; - public AlchemyCraftData(StatsSet set) + public AlchemyCraftData(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java index 0bd061d3c4..79dd6c0207 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/beautyshop/BeautyItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.beautyshop; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -32,7 +32,7 @@ public class BeautyItem private final int _beautyShopTicket; private final Map _colors = new HashMap<>(); - public BeautyItem(StatsSet set) + public BeautyItem(StatSet set) { _id = set.getInt("id"); _adena = set.getInt("adena", 0); @@ -60,7 +60,7 @@ public class BeautyItem return _beautyShopTicket; } - public void addColor(StatsSet set) + public void addColor(StatSet set) { final BeautyItem color = new BeautyItem(set); _colors.put(set.getInt("id"), color); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index e0d1486962..1c341e0c31 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.Party.MessageType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.appearance.PlayerAppearance; @@ -244,7 +244,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent player.teleToLocation(_instance.getEnterLocations().get(index++), 0, _instance); } - getTimers().addTimer("match_start_countdown", StatsSet.valueOf("time", 60), 100, null, null); + getTimers().addTimer("match_start_countdown", StatSet.valueOf("time", 60), 100, null, null); getTimers().addTimer("teleport_message1", 10000, null, null); getTimers().addTimer("teleport_message2", 14000, null, null); @@ -394,7 +394,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent } } getTimers().cancelTimer("update", null, null); - getTimers().addTimer("match_end_countdown", StatsSet.valueOf("time", 30), 30 * 1000, null, null); + getTimers().addTimer("match_end_countdown", StatSet.valueOf("time", 30), 30 * 1000, null, null); EventDispatcher.getInstance().notifyEvent(new OnCeremonyOfChaosMatchResult(winners, members)); } @@ -487,7 +487,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent } @Override - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { switch (event) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java index 39f9196d93..371f8dc459 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/cubic/CubicSkill.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.conditions.ICubicCondition; @@ -38,7 +38,7 @@ public class CubicSkill extends SkillHolder implements ICubicConditionHolder private final List _conditions = new ArrayList<>(); private final boolean _targetDebuff; - public CubicSkill(StatsSet set) + public CubicSkill(StatSet set) { super(set.getInt("id"), set.getInt("level")); _triggerRate = set.getInt("triggerRate", 100); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/entity/ClanHall.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/entity/ClanHall.java index 8da77477fd..22af370709 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/entity/ClanHall.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/entity/ClanHall.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -75,7 +75,7 @@ public class ClanHall extends AbstractResidence private static final String LOAD_CLANHALL = "SELECT * FROM clanhall WHERE id=?"; private static final String UPDATE_CLANHALL = "UPDATE clanhall SET ownerId=?,paidUntil=? WHERE id=?"; - public ClanHall(StatsSet params) + public ClanHall(StatSet params) { super(params.getInt("id")); // Set static parameters diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/entity/Hero.java index ef005ff325..aee8b019ee 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/entity/Hero.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/entity/Hero.java @@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.data.xml.impl.ClassListData; import org.l2jmobius.gameserver.data.xml.impl.NpcData; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -74,13 +74,13 @@ public class Hero // delete hero items private static final String DELETE_ITEMS = "DELETE FROM items WHERE item_id IN (30392, 30393, 30394, 30395, 30396, 30397, 30398, 30399, 30400, 30401, 30402, 30403, 30404, 30405, 30372, 30373, 6842, 6611, 6612, 6613, 6614, 6615, 6616, 6617, 6618, 6619, 6620, 6621, 9388, 9389, 9390) AND owner_id NOT IN (SELECT charId FROM characters WHERE accesslevel > 0)"; - private static final Map HEROES = new ConcurrentHashMap<>(); - private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); + private static final Map HEROES = new ConcurrentHashMap<>(); + private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); - private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); - private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); + private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); + private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); - private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); + private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); private static final Map HERO_MESSAGE = new ConcurrentHashMap<>(); public static final String COUNT = "count"; @@ -118,7 +118,7 @@ public class Hero { while (rset.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset.getInt(Olympiad.CLASS_ID)); @@ -137,7 +137,7 @@ public class Hero while (rset2.next()) { - final StatsSet hero = new StatsSet(); + final StatSet hero = new StatSet(); final int charId = rset2.getInt(Olympiad.CHAR_ID); hero.set(Olympiad.CHAR_NAME, rset2.getString(Olympiad.CHAR_NAME)); hero.set(Olympiad.CLASS_ID, rset2.getInt(Olympiad.CLASS_ID)); @@ -159,7 +159,7 @@ public class Hero LOGGER.info("Hero System: Loaded " + COMPLETE_HEROS.size() + " all time Heroes."); } - private void processHeros(PreparedStatement ps, int charId, StatsSet hero) throws SQLException + private void processHeros(PreparedStatement ps, int charId, StatSet hero) throws SQLException { ps.setInt(1, charId); try (ResultSet rs = ps.executeQuery()) @@ -224,7 +224,7 @@ public class Hero public void loadDiary(int charId) { - final List diary = new ArrayList<>(); + final List diary = new ArrayList<>(); int diaryentries = 0; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement("SELECT * FROM heroes_diary WHERE charId=? ORDER BY time ASC")) @@ -234,7 +234,7 @@ public class Hero { while (rset.next()) { - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final long time = rset.getLong("time"); final int action = rset.getInt("action"); @@ -279,8 +279,8 @@ public class Hero public void loadFights(int charId) { - final List fights = new ArrayList<>(); - final StatsSet heroCountData = new StatsSet(); + final List fights = new ArrayList<>(); + final StatSet heroCountData = new StatSet(); final Calendar data = Calendar.getInstance(); data.set(Calendar.DAY_OF_MONTH, 1); data.set(Calendar.HOUR_OF_DAY, 0); @@ -326,7 +326,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charTwoClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -362,7 +362,7 @@ public class Hero final String cls = ClassListData.getInstance().getClass(charOneClass).getClientCode(); if ((name != null) && (cls != null)) { - final StatsSet fight = new StatsSet(); + final StatSet fight = new StatSet(); fight.set("oponent", name); fight.set("oponentclass", cls); @@ -410,14 +410,14 @@ public class Hero } } - public Map getHeroes() + public Map getHeroes() { return HEROES; } public int getHeroByClass(int classid) { - for (Entry e : HEROES.entrySet()) + for (Entry e : HEROES.entrySet()) { if (e.getValue().getInt(Olympiad.CLASS_ID) == classid) { @@ -438,7 +438,7 @@ public class Hero public void showHeroDiary(PlayerInstance player, int heroclass, int charid, int page) { final int perpage = 10; - final List mainList = HERO_DIARY.get(charid); + final List mainList = HERO_DIARY.get(charid); if (mainList != null) { final NpcHtmlMessage diaryReply = new NpcHtmlMessage(); @@ -453,7 +453,7 @@ public class Hero if (!mainList.isEmpty()) { - final List list = new ArrayList<>(mainList); + final List list = new ArrayList<>(mainList); Collections.reverse(list); boolean color = true; @@ -463,7 +463,7 @@ public class Hero for (int i = (page - 1) * perpage; i < list.size(); i++) { breakat = i; - final StatsSet diaryEntry = list.get(i); + final StatSet diaryEntry = list.get(i); fList.append(""); if (color) { @@ -524,7 +524,7 @@ public class Hero int loss = 0; int draw = 0; - final List heroFights = HERO_FIGHTS.get(charid); + final List heroFights = HERO_FIGHTS.get(charid); if (heroFights != null) { final NpcHtmlMessage fightReply = new NpcHtmlMessage(); @@ -536,7 +536,7 @@ public class Hero if (!heroFights.isEmpty()) { - final StatsSet heroCount = HERO_COUNTS.get(charid); + final StatSet heroCount = HERO_COUNTS.get(charid); if (heroCount != null) { win = heroCount.getInt("victory"); @@ -551,7 +551,7 @@ public class Hero for (int i = (page - 1) * perpage; i < heroFights.size(); i++) { breakat = i; - final StatsSet fight = heroFights.get(i); + final StatSet fight = heroFights.get(i); fList.append(""); if (color) { @@ -609,7 +609,7 @@ public class Hero } } - public synchronized void computeNewHeroes(List newHeroes) + public synchronized void computeNewHeroes(List newHeroes) { updateHeroes(true); @@ -659,13 +659,13 @@ public class Hero return; } - for (StatsSet hero : newHeroes) + for (StatSet hero : newHeroes) { final int charId = hero.getInt(Olympiad.CHAR_ID); if (COMPLETE_HEROS.containsKey(charId)) { - final StatsSet oldHero = COMPLETE_HEROS.get(charId); + final StatSet oldHero = COMPLETE_HEROS.get(charId); final int count = oldHero.getInt(COUNT); oldHero.set(COUNT, count + 1); oldHero.set(PLAYED, 1); @@ -674,7 +674,7 @@ public class Hero } else { - final StatsSet newHero = new StatsSet(); + final StatSet newHero = new StatSet(); newHero.set(Olympiad.CHAR_NAME, hero.getString(Olympiad.CHAR_NAME)); newHero.set(Olympiad.CLASS_ID, hero.getInt(Olympiad.CLASS_ID)); newHero.set(COUNT, 1); @@ -700,9 +700,9 @@ public class Hero } else { - StatsSet hero; + StatSet hero; int heroId; - for (Entry entry : HEROES.entrySet()) + for (Entry entry : HEROES.entrySet()) { hero = entry.getValue(); heroId = entry.getKey(); @@ -787,13 +787,13 @@ public class Hero setDiaryData(charId, ACTION_RAID_KILLED, npcId); final NpcTemplate template = NpcData.getInstance().getTemplate(npcId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (template == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -806,13 +806,13 @@ public class Hero setDiaryData(charId, ACTION_CASTLE_TAKEN, castleId); final Castle castle = CastleManager.getInstance().getCastleById(castleId); - final List list = HERO_DIARY.get(charId); + final List list = HERO_DIARY.get(charId); if ((list == null) || (castle == null)) { return; } // Prepare new data - final StatsSet diaryEntry = new StatsSet(); + final StatSet diaryEntry = new StatSet(); final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -922,10 +922,10 @@ public class Hero */ public void claimHero(PlayerInstance player) { - StatsSet hero = HEROES.get(player.getObjectId()); + StatSet hero = HEROES.get(player.getObjectId()); if (hero == null) { - hero = new StatsSet(); + hero = new StatSet(); HEROES.put(player.getObjectId(), hero); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java index f1263e8d44..c52f487402 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/eventengine/AbstractEventManager.java @@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.atomic.AtomicReference; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.eventengine.drop.IEventDrop; import org.l2jmobius.gameserver.model.events.AbstractScript; @@ -42,7 +42,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogout public abstract class AbstractEventManager>extends AbstractScript { private String _name; - private StatsSet _variables = StatsSet.EMPTY_STATSET; + private StatSet _variables = StatSet.EMPTY_STATSET; private Set _schedulers = Collections.emptySet(); private Set _conditionalSchedulers = Collections.emptySet(); private Map _rewards = Collections.emptyMap(); @@ -67,14 +67,14 @@ public abstract class AbstractEventManager>extends Ab /* ********************** */ - public StatsSet getVariables() + public StatSet getVariables() { return _variables; } - public void setVariables(StatsSet variables) + public void setVariables(StatSet variables) { - _variables = new StatsSet(Collections.unmodifiableMap(variables.getSet())); + _variables = new StatSet(Collections.unmodifiableMap(variables.getSet())); } /* ********************** */ diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java index 59c64b812c..e41af41d1a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/eventengine/EventScheduler.java @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.util.cron4j.PastPredictor; import org.l2jmobius.gameserver.util.cron4j.Predictor; @@ -45,7 +45,7 @@ public class EventScheduler private List _notifications; private ScheduledFuture _task; - public EventScheduler(AbstractEventManager manager, StatsSet set) + public EventScheduler(AbstractEventManager manager, StatSet set) { _eventManager = manager; _name = set.getString("name", ""); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 4fc2d3b8b0..819c3bf34d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -50,7 +50,7 @@ import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -181,12 +181,12 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime onTimerCancel(holder.getEvent(), holder.getParams(), holder.getNpc(), holder.getPlayer()); } - public void onTimerEvent(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerEvent(String event, StatSet params, Npc npc, PlayerInstance player) { LOGGER.warning("[" + getClass().getSimpleName() + "]: Timer event arrived at non overriden onTimerEvent method event: " + event + " npc: " + npc + " player: " + player); } - public void onTimerCancel(String event, StatsSet params, Npc npc, PlayerInstance player) + public void onTimerCancel(String event, StatSet params, Npc npc, PlayerInstance player) { } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java index 400fb64b6e..861c4a9b31 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/TimerExecutor.java @@ -24,7 +24,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.timers.IEventTimerCancel; @@ -69,7 +69,7 @@ public class TimerExecutor * @param eventTimer * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - public boolean addTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) + public boolean addTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) { return addTimer(new TimerHolder<>(event, params, time, npc, player, false, eventTimer, _cancelListener, this)); } @@ -95,7 +95,7 @@ public class TimerExecutor * @param player * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - public boolean addTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player) + public boolean addTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player) { return addTimer(event, params, time, npc, player, _eventListener); } @@ -123,7 +123,7 @@ public class TimerExecutor * @param eventTimer * @return {@code true} if timer were successfully added, {@code false} in case it exists already */ - private boolean addRepeatingTimer(T event, StatsSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) + private boolean addRepeatingTimer(T event, StatSet params, long time, Npc npc, PlayerInstance player, IEventTimerEvent eventTimer) { return addTimer(new TimerHolder<>(event, params, time, npc, player, true, eventTimer, _cancelListener, this)); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java index ab8fa150ca..0fcafba759 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/timers/TimerHolder.java @@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.gameserver.instancemanager.TimersManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.events.TimerExecutor; @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.events.TimerExecutor; public class TimerHolder implements Runnable { private final T _event; - private final StatsSet _params; + private final StatSet _params; private final long _time; private final Npc _npc; private final PlayerInstance _player; @@ -44,7 +44,7 @@ public class TimerHolder implements Runnable private final TimerExecutor _postExecutor; private final ScheduledFuture _task; - public TimerHolder(T event, StatsSet params, long time, Npc npc, PlayerInstance player, boolean isRepeating, IEventTimerEvent eventScript, IEventTimerCancel cancelScript, TimerExecutor postExecutor) + public TimerHolder(T event, StatSet params, long time, Npc npc, PlayerInstance player, boolean isRepeating, IEventTimerEvent eventScript, IEventTimerCancel cancelScript, TimerExecutor postExecutor) { Objects.requireNonNull(event, getClass().getSimpleName() + ": \"event\" cannot be null!"); Objects.requireNonNull(eventScript, getClass().getSimpleName() + ": \"script\" cannot be null!"); @@ -73,7 +73,7 @@ public class TimerHolder implements Runnable /** * @return the parameters of this timer */ - public StatsSet getParams() + public StatSet getParams() { return _params; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index 4a017eaaa2..78b7d0eaa3 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; @@ -37,7 +37,7 @@ public class AppearanceHolder private final AppearanceTargetType _targetType; private final Integer _bodyPart; - public AppearanceHolder(StatsSet set) + public AppearanceHolder(StatSet set) { _visualId = set.getInt("id", 0); _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java index 29740873cd..0f9488448d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/AttachSkillHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Nik @@ -43,7 +43,7 @@ public class AttachSkillHolder extends SkillHolder return _requiredSkillLevel; } - public static AttachSkillHolder fromStatsSet(StatsSet set) + public static AttachSkillHolder fromStatSet(StatSet set) { return new AttachSkillHolder(set.getInt("skillId"), set.getInt("skillLevel", 1), set.getInt("requiredSkillId"), set.getInt("requiredSkillLevel", 1)); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java index cc41724532..57b6d47c40 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Set; import org.l2jmobius.gameserver.enums.SkillEnchantType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -36,7 +36,7 @@ public class EnchantSkillHolder private final Map _chance = new EnumMap<>(SkillEnchantType.class); private final Map> _requiredItems = new EnumMap<>(SkillEnchantType.class); - public EnchantSkillHolder(StatsSet set) + public EnchantSkillHolder(StatSet set) { _level = set.getInt("level"); _enchantFailLevel = set.getInt("enchantFailLevel"); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java index e6706c8467..33d14e4345 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/ExtendDropDataHolder.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Map; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.ICondition; @@ -36,7 +36,7 @@ public class ExtendDropDataHolder private final List _conditions; private final Map _systemMessages; - public ExtendDropDataHolder(StatsSet set) + public ExtendDropDataHolder(StatSet set) { _id = set.getInt("id"); _items = set.getList("items", ExtendDropItemHolder.class); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java index 16454d764a..d63d4eb775 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/FakePlayerHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Mobius @@ -52,7 +52,7 @@ public class FakePlayerHolder private final int _clanId; private final int _pledgeStatus; - public FakePlayerHolder(StatsSet set) + public FakePlayerHolder(StatSet set) { _classId = set.getInt("classId", 182); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java index a9c72776cd..86af0c1405 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -29,7 +29,7 @@ public class ItemHolder implements IIdentifiable private final int _id; private final long _count; - public ItemHolder(StatsSet set) + public ItemHolder(StatSet set) { _id = set.getInt("id"); _count = set.getLong("count"); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java index 5b581c4cfe..a54dfa8300 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/ItemPointHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -25,7 +25,7 @@ public class ItemPointHolder extends ItemHolder { private final int _points; - public ItemPointHolder(StatsSet params) + public ItemPointHolder(StatSet params) { this(params.getInt("id"), params.getLong("count"), params.getInt("points")); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java index 22c6c327eb..0ba78224d3 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.holders; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Sdw @@ -34,7 +34,7 @@ public class LuckyGameDataHolder private int _minModifyRewardGame; private int _maxModifyRewardGame; - public LuckyGameDataHolder(StatsSet params) + public LuckyGameDataHolder(StatSet params) { _index = params.getInt("index"); _turningPoints = params.getInt("turning_point"); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java index f77e380e8d..9fa8c99654 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/MinionHolder.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.holders; import java.time.Duration; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -32,7 +32,7 @@ public class MinionHolder implements IIdentifiable private final long _respawnTime; private final int _weightPoint; - public MinionHolder(StatsSet set) + public MinionHolder(StatSet set) { _id = set.getInt("id"); _count = set.getInt("count", 1); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java index bc6f27d8cb..ae8bd560fc 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/MultisellListHolder.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** @@ -52,7 +52,7 @@ public class MultisellListHolder implements IIdentifiable } @SuppressWarnings("unchecked") - public MultisellListHolder(StatsSet set) + public MultisellListHolder(StatSet set) { _listId = set.getInt("listId"); _isChanceMultisell = set.getBoolean("isChanceMultisell", false); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index f1b98ee9ac..ecd1069283 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -45,7 +45,7 @@ import org.l2jmobius.gameserver.enums.InstanceReenterType; import org.l2jmobius.gameserver.enums.InstanceTeleportType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.TeleportWhereType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -87,7 +87,7 @@ public class Instance implements IIdentifiable, INamable private final Set _players = ConcurrentHashMap.newKeySet(); // Players inside instance private final Set _npcs = ConcurrentHashMap.newKeySet(); // Spawned NPCs inside instance private final Map _doors = new HashMap<>(); // Spawned doors inside instance - private final StatsSet _parameters = new StatsSet(); + private final StatSet _parameters = new StatSet(); // Timers private final Map> _ejectDeadTasks = new ConcurrentHashMap<>(); private ScheduledFuture _cleanUpTask = null; @@ -171,7 +171,7 @@ public class Instance implements IIdentifiable, INamable * Get instance world parameters. * @return instance parameters */ - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } @@ -1020,7 +1020,7 @@ public class Instance implements IIdentifiable, INamable * Get parameters from instance template.
    * @return template parameters */ - public StatsSet getTemplateParameters() + public StatSet getTemplateParameters() { return _template.getParameters(); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 2a196f73ef..b53b0a819d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.AbstractPlayerGroup; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -71,7 +71,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl private float _spRate = Config.RATE_INSTANCE_SP; private float _expPartyRate = Config.RATE_INSTANCE_PARTY_XP; private float _spPartyRate = Config.RATE_INSTANCE_PARTY_SP; - private StatsSet _parameters = StatsSet.EMPTY_STATSET; + private StatSet _parameters = StatSet.EMPTY_STATSET; private final Map _doors = new HashMap<>(); private final List _spawns = new ArrayList<>(); // Locations @@ -92,7 +92,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl /** * @param set */ - public InstanceTemplate(StatsSet set) + public InstanceTemplate(StatSet set) { _templateId = set.getInt("id", 0); _name = set.getString("name", null); @@ -178,7 +178,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (!set.isEmpty()) { - _parameters = new StatsSet(Collections.unmodifiableMap(set)); + _parameters = new StatSet(Collections.unmodifiableMap(set)); } } @@ -469,7 +469,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl * Get instance template parameters. * @return parameters of template */ - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java index 3b67ff72f4..3627959662 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/Condition.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; import java.util.function.BiConsumer; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public abstract class Condition { private final InstanceTemplate _template; - private final StatsSet _parameters; + private final StatSet _parameters; private final boolean _leaderOnly; private final boolean _showMessageAndHtml; private SystemMessageId _systemMsg = null; @@ -46,7 +46,7 @@ public abstract class Condition * @param onlyLeader flag which means if only leader should be affected (leader means player who wants to enter not group leader!) * @param showMessageAndHtml if {@code true} and HTML message is defined then both are send, otherwise only HTML or message is send */ - public Condition(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public Condition(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { _template = template; _parameters = parameters; @@ -58,7 +58,7 @@ public abstract class Condition * Gets parameters of condition. * @return set of parameters */ - protected final StatsSet getParameters() + protected final StatSet getParameters() { return _parameters; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java index e379741b59..c27d92d662 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannel.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionCommandChannel extends Condition { - public ConditionCommandChannel(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionCommandChannel(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_CANNOT_ENTER_BECAUSE_YOU_ARE_NOT_ASSOCIATED_WITH_THE_CURRENT_COMMAND_CHANNEL); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java index ed434e3524..a828dcceae 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionCommandChannelLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.model.AbstractPlayerGroup; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionCommandChannelLeader extends Condition { - public ConditionCommandChannelLeader(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionCommandChannelLeader(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java index d2a60816d0..423a37a94e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionDistance extends Condition { - public ConditionDistance(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionDistance(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); setSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED, (message, player) -> message.addString(player.getName())); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java index 3dc78a98c7..8aa68b7e08 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMax.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionGroupMax extends Condition { - public ConditionGroupMax(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionGroupMax(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_CANNOT_ENTER_DUE_TO_THE_PARTY_HAVING_EXCEEDED_THE_LIMIT); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java index f7930b1d8c..fde9d13439 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionGroupMin.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionGroupMin extends Condition { - public ConditionGroupMin(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionGroupMin(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_MUST_HAVE_A_MINIMUM_OF_S1_PEOPLE_TO_ENTER_THIS_INSTANCED_ZONE, (msg, player) -> msg.addInt(getLimit())); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 3088d8ae64..53fee609aa 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.enums.ResidenceType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; */ public class ConditionHasResidence extends Condition { - public ConditionHasResidence(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionHasResidence(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); } @@ -43,7 +43,7 @@ public class ConditionHasResidence extends Condition return false; } - final StatsSet params = getParameters(); + final StatSet params = getParameters(); final int id = params.getInt("id"); boolean test = false; switch (params.getEnum("type", ResidenceType.class)) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java index 4e1c407325..eed350db38 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -32,7 +32,7 @@ public class ConditionItem extends Condition private final long _count; private final boolean _take; - public ConditionItem(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionItem(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Load params diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java index 7d509a20c7..b38f8c0e2c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -32,7 +32,7 @@ public class ConditionLevel extends Condition private final int _min; private final int _max; - public ConditionLevel(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionLevel(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Load params diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java index b91deeffdb..d71e6d0a39 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionNoParty.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; */ public class ConditionNoParty extends Condition { - public ConditionNoParty(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionNoParty(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java index dd31bf3ca5..5bf768a03e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionParty.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionParty extends Condition { - public ConditionParty(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionParty(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java index 524a59675a..0363715536 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionPartyLeader.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionPartyLeader extends Condition { - public ConditionPartyLeader(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionPartyLeader(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, true, showMessageAndHtml); setSystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java index 481cb251ce..48d7fc7981 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.instancemanager.QuestManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ConditionQuest extends Condition { - public ConditionQuest(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionQuest(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); // Set message diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 899b17aff9..a073129734 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.instancezone.conditions; import org.l2jmobius.gameserver.instancemanager.InstanceManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class ConditionReenter extends Condition { - public ConditionReenter(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) + public ConditionReenter(InstanceTemplate template, StatSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); setSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET, (message, player) -> message.addString(player.getName())); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java index ec255025c3..fafafe5604 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.itemauction; import java.util.Calendar; import java.util.concurrent.TimeUnit; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author Forsaiken @@ -40,7 +40,7 @@ public class AuctionDateGenerator private int _hour_of_day; private int _minute_of_hour; - public AuctionDateGenerator(StatsSet config) + public AuctionDateGenerator(StatSet config) { _calendar = Calendar.getInstance(); _interval = config.getInt(FIELD_INTERVAL, -1); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 64bf0a6ff1..cb554e4dce 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.itemauction; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.idfactory.IdFactory; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -34,9 +34,9 @@ public class AuctionItem private final int _itemId; private final long _itemCount; @SuppressWarnings("unused") - private final StatsSet _itemExtra; + private final StatSet _itemExtra; - public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatsSet itemExtra) + public AuctionItem(int auctionItemId, int auctionLength, long auctionInitBid, int itemId, long itemCount, StatSet itemExtra) { _auctionItemId = auctionItemId; _auctionLength = auctionLength; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 6dff6e3a4d..dc3a7f6f6b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -44,7 +44,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.impl.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -84,7 +84,7 @@ public class ItemAuctionInstance _items = new ArrayList<>(); final NamedNodeMap nanode = node.getAttributes(); - final StatsSet generatorConfig = new StatsSet(); + final StatSet generatorConfig = new StatSet(); for (int i = nanode.getLength(); i-- > 0;) { final Node n = nanode.item(i); @@ -115,7 +115,7 @@ public class ItemAuctionInstance throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } - final StatsSet itemExtra = new StatsSet(); + final StatSet itemExtra = new StatSet(); final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Armor.java index ac707b015b..c87f7ed45e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Armor.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.type.ArmorType; /** @@ -28,15 +28,15 @@ public class Armor extends Item /** * Constructor for Armor. - * @param set the StatsSet designating the set of couples (key,value) characterizing the armor. + * @param set the StatSet designating the set of couples (key,value) characterizing the armor. */ - public Armor(StatsSet set) + public Armor(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/EtcItem.java index 86d7291595..a902860c0d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/EtcItem.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -38,15 +38,15 @@ public class EtcItem extends Item /** * Constructor for EtcItem. - * @param set StatsSet designating the set of couples (key,value) for description of the Etc + * @param set StatSet designating the set of couples (key,value) for description of the Etc */ - public EtcItem(StatsSet set) + public EtcItem(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Henna.java index 921fa10dfb..87cea36031 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; @@ -44,7 +44,7 @@ public class Henna private final List _skills; private final List _wear_class; - public Henna(StatsSet set) + public Henna(StatSet set) { _dyeId = set.getInt("dyeId"); _dyeItemId = set.getInt("dyeItemId"); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Item.java index 4a5c714d97..7ed78ba385 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Item.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.enums.ItemGrade; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; @@ -175,14 +175,14 @@ public abstract class Item extends ListenersContainer implements IIdentifiable /** * Constructor of the Item that fill class variables.
    *
    - * @param set : StatsSet corresponding to a set of couples (key,value) for description of the item + * @param set : StatSet corresponding to a set of couples (key,value) for description of the item */ - protected Item(StatsSet set) + protected Item(StatSet set) { set(set); } - public void set(StatsSet set) + public void set(StatSet set) { _itemId = set.getInt("item_id"); _displayId = set.getInt("displayId", _itemId); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java index ab196007a8..3ca228cbe5 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -29,7 +29,7 @@ public class PlayerItemTemplate extends ItemHolder /** * @param set the set containing the values for this object */ - public PlayerItemTemplate(StatsSet set) + public PlayerItemTemplate(StatSet set) { super(set.getInt("id"), set.getInt("count")); _equipped = set.getBoolean("equipped", false); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Weapon.java index 16f0c47287..5f9f8507bd 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Weapon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.items; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ItemSkillType; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; @@ -58,15 +58,15 @@ public class Weapon extends Item /** * Constructor for Weapon. - * @param set the StatsSet designating the set of couples (key,value) characterizing the weapon. + * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. */ - public Weapon(StatsSet set) + public Weapon(StatSet set) { super(set); } @Override - public void set(StatsSet set) + public void set(StatSet set) { super.set(set); _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java index 422054b245..aa1f33acce 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java @@ -23,7 +23,7 @@ import java.util.List; import org.l2jmobius.gameserver.datatables.ItemTable; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; import org.l2jmobius.gameserver.model.items.Item; @@ -54,7 +54,7 @@ public class AppearanceStone private List _racesNot; private List _allVisualIds; - public AppearanceStone(StatsSet set) + public AppearanceStone(StatSet set) { _id = set.getInt("id"); _visualId = set.getInt("visualId", 0); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java index f3b53f1a67..a2897ba911 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.items.combination; import java.util.EnumMap; import java.util.Map; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -31,7 +31,7 @@ public class CombinationItem private final int _chance; private final Map _rewards = new EnumMap<>(CombinationItemType.class); - public CombinationItem(StatsSet set) + public CombinationItem(StatSet set) { _itemOne = set.getInt("one"); _itemTwo = set.getInt("two"); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java index 1cde38a6d6..a7f1326bd8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.datatables.ItemTable; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.CrystalType; @@ -59,7 +59,7 @@ public abstract class AbstractEnchantItem private final int _maxEnchantLevel; private final double _bonusRate; - public AbstractEnchantItem(StatsSet set) + public AbstractEnchantItem(StatSet set) { _id = set.getInt("id"); if (getItem() == null) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java index b6b34cc667..7329d8728e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java @@ -22,7 +22,7 @@ import java.util.Set; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData; import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.type.EtcItemType; @@ -40,7 +40,7 @@ public class EnchantScroll extends AbstractEnchantItem private final int _scrollGroupId; private Set _items; - public EnchantScroll(StatsSet set) + public EnchantScroll(StatSet set) { super(set); _scrollGroupId = set.getInt("scrollGroupId", 0); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java index c02095428b..978e38d533 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.items.enchant; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.items.type.ItemType; @@ -30,7 +30,7 @@ public class EnchantSupportItem extends AbstractEnchantItem private final boolean _isGiant; private final ItemType type; - public EnchantSupportItem(StatsSet set) + public EnchantSupportItem(StatSet set) { super(set); type = getItem().getItemType(); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index c965e15d4c..36efcc2103 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -45,7 +45,7 @@ import org.l2jmobius.gameserver.data.xml.impl.ClassListData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.base.ClassId; @@ -63,7 +63,7 @@ public class Olympiad extends ListenersContainer protected static final Logger LOGGER = Logger.getLogger(Olympiad.class.getName()); protected static final Logger LOGGER_OLYMPIAD = Logger.getLogger("olympiad"); - private static final Map NOBLES = new ConcurrentHashMap<>(); + private static final Map NOBLES = new ConcurrentHashMap<>(); private static final Map NOBLES_RANK = new HashMap<>(); public static final String OLYMPIAD_HTML_PATH = "data/html/olympiad/"; @@ -228,10 +228,10 @@ public class Olympiad extends ListenersContainer PreparedStatement statement = con.prepareStatement(OLYMPIAD_LOAD_NOBLES); ResultSet rset = statement.executeQuery()) { - StatsSet statData; + StatSet statData; while (rset.next()) { - statData = new StatsSet(); + statData = new StatSet(); statData.set(CLASS_ID, rset.getInt(CLASS_ID)); statData.set(CHAR_NAME, rset.getString(CHAR_NAME)); statData.set(POINTS, rset.getInt(POINTS)); @@ -454,7 +454,7 @@ public class Olympiad extends ListenersContainer saveNobleData(); _period = 1; - final List heroesToBe = sortHerosToBe(); + final List heroesToBe = sortHerosToBe(); Hero.getInstance().resetData(); Hero.getInstance().computeNewHeroes(heroesToBe); @@ -488,7 +488,7 @@ public class Olympiad extends ListenersContainer return NOBLES.size(); } - public static StatsSet getNobleStats(int playerId) + public static StatSet getNobleStats(int playerId) { return NOBLES.get(playerId); } @@ -787,7 +787,7 @@ public class Olympiad extends ListenersContainer } int currentPoints; - for (StatsSet nobleInfo : NOBLES.values()) + for (StatSet nobleInfo : NOBLES.values()) { currentPoints = nobleInfo.getInt(POINTS); currentPoints += WEEKLY_POINTS; @@ -805,7 +805,7 @@ public class Olympiad extends ListenersContainer return; } - for (StatsSet nobleInfo : NOBLES.values()) + for (StatSet nobleInfo : NOBLES.values()) { nobleInfo.set(COMP_DONE_WEEK, 0); } @@ -838,9 +838,9 @@ public class Olympiad extends ListenersContainer try (Connection con = DatabaseFactory.getConnection()) { - for (Entry entry : NOBLES.entrySet()) + for (Entry entry : NOBLES.entrySet()) { - final StatsSet nobleInfo = entry.getValue(); + final StatSet nobleInfo = entry.getValue(); if (nobleInfo == null) { @@ -953,7 +953,7 @@ public class Olympiad extends ListenersContainer } } - protected List sortHerosToBe() + protected List sortHerosToBe() { if (_period != 1) { @@ -961,8 +961,8 @@ public class Olympiad extends ListenersContainer } LOGGER_OLYMPIAD.info("Noble,charid,classid,compDone,points"); - StatsSet nobleInfo; - for (Entry entry : NOBLES.entrySet()) + StatSet nobleInfo; + for (Entry entry : NOBLES.entrySet()) { nobleInfo = entry.getValue(); if (nobleInfo == null) @@ -979,12 +979,12 @@ public class Olympiad extends ListenersContainer LOGGER_OLYMPIAD.info(charName + "," + charId + "," + classId + "," + compDone + "," + points); } - final List heroesToBe = new LinkedList<>(); + final List heroesToBe = new LinkedList<>(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(OLYMPIAD_GET_HEROS)) { - StatsSet hero; + StatSet hero; for (int element : HERO_IDS) { // Classic can have 2nd and 3rd class competitors, but only 1 hero @@ -996,7 +996,7 @@ public class Olympiad extends ListenersContainer { if (rset.next()) { - hero = new StatsSet(); + hero = new StatSet(); hero.set(CLASS_ID, element); // save the 3rd class title hero.set(CHAR_ID, rset.getInt(CHAR_ID)); hero.set(CHAR_NAME, rset.getString(CHAR_NAME)); @@ -1050,7 +1050,7 @@ public class Olympiad extends ListenersContainer return 0; } - final StatsSet noble = NOBLES.get(objectId); + final StatSet noble = NOBLES.get(objectId); if ((noble == null) || (noble.getInt(POINTS) == 0)) { return 0; @@ -1100,7 +1100,7 @@ public class Olympiad extends ListenersContainer { if (!NOBLES.containsKey(player.getObjectId())) { - final StatsSet statDat = new StatsSet(); + final StatSet statDat = new StatSet(); statDat.set(CLASS_ID, player.getBaseClass()); statDat.set(CHAR_NAME, player.getName()); statDat.set(POINTS, DEFAULT_POINTS); @@ -1207,7 +1207,7 @@ public class Olympiad extends ListenersContainer * @param data the stats set data to add. * @return the old stats set if the noble is already present, null otherwise. */ - public static StatsSet addNobleStats(int charId, StatsSet data) + public static StatSet addNobleStats(int charId, StatSet data) { return NOBLES.put(charId, data); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Participant.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Participant.java index 670066ac32..b6d879b902 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Participant.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Participant.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.olympiad; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -32,7 +32,7 @@ public class Participant private final int baseClass; private boolean disconnected = false; private boolean defaulted = false; - private final StatsSet stats; + private final StatSet stats; public String clanName; public int clanId; @@ -125,7 +125,7 @@ public class Participant /** * @return the stats */ - public StatsSet getStats() + public StatSet getStats() { return stats; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java index 4d5231ca5d..c1fb0f88f6 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/primeshop/PrimeShopGroup.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.primeshop; import java.util.List; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid @@ -49,7 +49,7 @@ public class PrimeShopGroup private final int _availableCount; private final List _items; - public PrimeShopGroup(StatsSet set, List items) + public PrimeShopGroup(StatSet set, List items) { _brId = set.getInt("id"); _category = set.getInt("cat", 0); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java index d150ec98cd..88795e0721 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/residences/ResidenceFunctionTemplate.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.residences; import java.time.Duration; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** @@ -33,7 +33,7 @@ public class ResidenceFunctionTemplate private final Duration _duration; private final double _value; - public ResidenceFunctionTemplate(StatsSet set) + public ResidenceFunctionTemplate(StatSet set) { _id = set.getInt("id"); _level = set.getInt("level"); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java index 4f15efda0b..b19f8e59d5 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/shuttle/ShuttleDataHolder.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.VehiclePathPoint; /** @@ -34,7 +34,7 @@ public class ShuttleDataHolder private final List _stops = new ArrayList<>(2); private final List _routes = new ArrayList<>(2); - public ShuttleDataHolder(StatsSet set) + public ShuttleDataHolder(StatSet set) { _id = set.getInt("id"); _loc = new Location(set); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/Skill.java index c44b45a781..0e97466a3a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.handler.IAffectScopeHandler; import org.l2jmobius.gameserver.handler.ITargetTypeHandler; import org.l2jmobius.gameserver.handler.TargetHandler; import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.cubic.CubicInstance; @@ -210,7 +210,7 @@ public class Skill implements IIdentifiable private final SkillBuffType _buffType; private final boolean _displayInList; - public Skill(StatsSet set) + public Skill(StatSet set) { _id = set.getInt(".id"); _level = set.getInt(".level"); @@ -391,7 +391,7 @@ public class Skill implements IIdentifiable _toggleGroupId = set.getInt("toggleGroupId", -1); _attachToggleGroupId = set.getInt("attachToggleGroupId", -1); - _attachSkills = set.getList("attachSkillList", StatsSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatsSet).collect(Collectors.toList()); + _attachSkills = set.getList("attachSkillList", StatSet.class, Collections.emptyList()).stream().map(AttachSkillHolder::fromStatSet).collect(Collectors.toList()); final String abnormalResist = set.getString("abnormalResists", null); if (abnormalResist != null) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java index bfc25bddde..39b738dbca 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.ChanceLocation; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory; /** * @author UnAfraid */ -public class NpcSpawnTemplate implements Cloneable, IParameterized +public class NpcSpawnTemplate implements Cloneable, IParameterized { private static final Logger LOGGER = Logger.getLogger(NpcSpawnTemplate.class.getName()); @@ -56,7 +56,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized private final Duration _respawnTimeRandom; private List _locations; private SpawnTerritory _zone; - private StatsSet _parameters; + private StatSet _parameters; private final boolean _spawnAnimation; private final boolean _saveInDB; private final String _dbName; @@ -82,7 +82,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized _minions = template._minions; } - public NpcSpawnTemplate(SpawnTemplate spawnTemplate, SpawnGroup group, StatsSet set) + public NpcSpawnTemplate(SpawnTemplate spawnTemplate, SpawnGroup group, StatSet set) { _spawnTemplate = spawnTemplate; _group = group; @@ -128,14 +128,14 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized mergeParameters(spawnTemplate, group); } - private StatsSet mergeParameters(SpawnTemplate spawnTemplate, SpawnGroup group) + private StatSet mergeParameters(SpawnTemplate spawnTemplate, SpawnGroup group) { if ((_parameters == null) && (spawnTemplate.getParameters() == null) && (group.getParameters() == null)) { return null; } - final StatsSet set = new StatsSet(); + final StatSet set = new StatSet(); if (spawnTemplate.getParameters() != null) { set.merge(spawnTemplate.getParameters()); @@ -206,13 +206,13 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized } @Override - public StatsSet getParameters() + public StatSet getParameters() { return _parameters; } @Override - public void setParameters(StatsSet parameters) + public void setParameters(StatSet parameters) { if (_parameters == null) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java index 6723863c93..7ceb2d46af 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/spawns/SpawnGroup.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IParameterized; import org.l2jmobius.gameserver.model.interfaces.ITerritorized; @@ -31,16 +31,16 @@ import org.l2jmobius.gameserver.model.zone.type.SpawnTerritory; /** * @author UnAfraid */ -public class SpawnGroup implements Cloneable, ITerritorized, IParameterized +public class SpawnGroup implements Cloneable, ITerritorized, IParameterized { private final String _name; private final boolean _spawnByDefault; private List _territories; private List _bannedTerritories; private final List _spawns = new ArrayList<>(); - private StatsSet _parameters; + private StatSet _parameters; - public SpawnGroup(StatsSet set) + public SpawnGroup(StatSet set) { this(set.getString("name", null), set.getBoolean("spawnByDefault", true)); } @@ -104,13 +104,13 @@ public class SpawnGroup implements Cloneable, ITerritorized, IParameterized +public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized { private final String _name; private final String _ai; @@ -45,9 +45,9 @@ public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized _territories; private List _bannedTerritories; private final List _groups = new ArrayList<>(); - private StatsSet _parameters; + private StatSet _parameters; - public SpawnTemplate(StatsSet set, File file) + public SpawnTemplate(StatSet set, File file) { this(set.getString("name", null), set.getString("ai", null), set.getBoolean("spawnByDefault", true), file); } @@ -128,13 +128,13 @@ public class SpawnTemplate implements Cloneable, ITerritorized, IParameterized _castleId; - public TeleportLocation(int id, StatsSet set) + public TeleportLocation(int id, StatSet set) { super(set); _id = id; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java index 916ae0790c..33cf6ac3bc 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/variables/AbstractVariables.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.variables; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.IRestorable; import org.l2jmobius.gameserver.model.interfaces.IStorable; @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.interfaces.IStorable; /** * @author UnAfraid */ -public abstract class AbstractVariables extends StatsSet implements IRestorable, IStorable, IDeletable +public abstract class AbstractVariables extends StatSet implements IRestorable, IStorable, IDeletable { private final AtomicBoolean _hasChanges = new AtomicBoolean(false); @@ -41,42 +41,42 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, */ @Override - public StatsSet set(String name, boolean value) + public StatSet set(String name, boolean value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, double value) + public StatSet set(String name, double value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, Enum value) + public StatSet set(String name, Enum value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, int value) + public StatSet set(String name, int value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, long value) + public StatSet set(String name, long value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); } @Override - public StatsSet set(String name, String value) + public StatSet set(String name, String value) { _hasChanges.compareAndSet(false, true); return super.set(name, value); @@ -89,7 +89,7 @@ public abstract class AbstractVariables extends StatsSet implements IRestorable, * @param markAsChanged * @return */ - public StatsSet set(String name, String value, boolean markAsChanged) + public StatSet set(String name, String value, boolean markAsChanged) { if (markAsChanged) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index 5c03122a62..4d97f0017a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExHeroList implements IClientOutgoingPacket { - private final Map _heroList; + private final Map _heroList; public ExHeroList() { @@ -42,7 +42,7 @@ public class ExHeroList implements IClientOutgoingPacket OutgoingPackets.EX_HERO_LIST.writeId(packet); packet.writeD(_heroList.size()); - for (StatsSet hero : _heroList.values()) + for (StatSet hero : _heroList.values()) { packet.writeS(hero.getString(Olympiad.CHAR_NAME)); packet.writeD(hero.getInt(Olympiad.CLASS_ID)); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/BypassParser.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/BypassParser.java index 414125bdeb..a80323ba1f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/BypassParser.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/BypassParser.java @@ -20,12 +20,12 @@ import java.util.LinkedHashMap; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.l2jmobius.gameserver.model.StatsSet; +import org.l2jmobius.gameserver.model.StatSet; /** * @author UnAfraid */ -public class BypassParser extends StatsSet +public class BypassParser extends StatSet { private static final String ALLOWED_CHARS = "a-zA-Z0-9-_`!@#%^&*()\\[\\]|\\\\/"; private static final Pattern PATTERN = Pattern.compile(String.format("([%s]*)=('([%s ]*)'|[%s]*)", ALLOWED_CHARS, ALLOWED_CHARS, ALLOWED_CHARS));